diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-09 14:57:04 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-09 14:57:04 +1100 |
| commit | 5f339c09300f1d10a5cc1590aeea35b8ab5b51e1 (patch) | |
| tree | b3936bf255accdc8f7493965e812fd0fa12d789e /include | |
| parent | 94a42f1fa417dbf6a6cd24cb51606a2ffd42613f (diff) | |
| parent | 64e90a8acb8590c2468c919f803652f081e3a4bf (diff) | |
Merge remote-tracking branch 'driver-core/driver-core-next'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/debugfs.h | 3 | ||||
| -rw-r--r-- | include/linux/kmod.h | 7 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/debugfs.h b/include/linux/debugfs.h index c0befcf41b58..9d571acd3a48 100644 --- a/include/linux/debugfs.h +++ b/include/linux/debugfs.h @@ -52,8 +52,7 @@ extern struct srcu_struct debugfs_srcu; * Must only be called under the protection established by * debugfs_use_file_start(). */ -static inline const struct file_operations * -debugfs_real_fops(const struct file *filp) +static inline const struct file_operations *debugfs_real_fops(const struct file *filp) __must_hold(&debugfs_srcu) { /* diff --git a/include/linux/kmod.h b/include/linux/kmod.h index fcfd2bf14d3f..c4e441e00db5 100644 --- a/include/linux/kmod.h +++ b/include/linux/kmod.h @@ -56,7 +56,7 @@ struct file; struct subprocess_info { struct work_struct work; struct completion *complete; - char *path; + const char *path; char **argv; char **envp; int wait; @@ -67,10 +67,11 @@ struct subprocess_info { }; extern int -call_usermodehelper(char *path, char **argv, char **envp, int wait); +call_usermodehelper(const char *path, char **argv, char **envp, int wait); extern struct subprocess_info * -call_usermodehelper_setup(char *path, char **argv, char **envp, gfp_t gfp_mask, +call_usermodehelper_setup(const char *path, char **argv, char **envp, + gfp_t gfp_mask, int (*init)(struct subprocess_info *info, struct cred *new), void (*cleanup)(struct subprocess_info *), void *data); |