Merge 5.5-rc1 into android-mainline
Linux 5.5-rc1 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I6f952ebdd40746115165a2f99bab340482f5c237
This commit is contained in:
@@ -58,8 +58,8 @@ extern int remove_proc_subtree(const char *, struct proc_dir_entry *);
|
||||
struct proc_dir_entry *proc_create_net_data(const char *name, umode_t mode,
|
||||
struct proc_dir_entry *parent, const struct seq_operations *ops,
|
||||
unsigned int state_size, void *data);
|
||||
#define proc_create_net(name, mode, parent, state_size, ops) \
|
||||
proc_create_net_data(name, mode, parent, state_size, ops, NULL)
|
||||
#define proc_create_net(name, mode, parent, ops, state_size) \
|
||||
proc_create_net_data(name, mode, parent, ops, state_size, NULL)
|
||||
struct proc_dir_entry *proc_create_net_single(const char *name, umode_t mode,
|
||||
struct proc_dir_entry *parent,
|
||||
int (*show)(struct seq_file *, void *), void *data);
|
||||
|
Reference in New Issue
Block a user