diff options
| author | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2024-03-26 12:08:35 +0000 |
|---|---|---|
| committer | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2024-03-26 12:08:35 +0000 |
| commit | f843bc9bc952bdeb21586ee921d29f5c2ae5a863 (patch) | |
| tree | 05daf639c7add0e0fcb94f65143f10d7d87bd0b5 /include/linux/psi.h | |
| parent | 3c688a55831db128cc709396992886396d4f1654 (diff) | |
| parent | 3d5a640ecf92e4c8d6e157849217b68984a819bc (diff) | |
Merge branches 'sa1100-for-next' and 'unstable/sa11x0-asoc' into sa1100
Diffstat (limited to 'include/linux/psi.h')
| -rw-r--r-- | include/linux/psi.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/psi.h b/include/linux/psi.h index ab26200c2803..e0745873e3f2 100644 --- a/include/linux/psi.h +++ b/include/linux/psi.h @@ -23,8 +23,9 @@ void psi_memstall_enter(unsigned long *flags); void psi_memstall_leave(unsigned long *flags); int psi_show(struct seq_file *s, struct psi_group *group, enum psi_res res); -struct psi_trigger *psi_trigger_create(struct psi_group *group, - char *buf, enum psi_res res, struct file *file); +struct psi_trigger *psi_trigger_create(struct psi_group *group, char *buf, + enum psi_res res, struct file *file, + struct kernfs_open_file *of); void psi_trigger_destroy(struct psi_trigger *t); __poll_t psi_trigger_poll(void **trigger_ptr, struct file *file, |