From 0d04a5cf2e0fc68814783b4f8560881c279dcbcc Mon Sep 17 00:00:00 2001 From: Al Viro Date: Tue, 26 Jul 2011 03:47:31 -0400 Subject: [PATCH] --- yaml --- r: 280267 b: refs/heads/master c: 36fcb589e752fa9c71f8a447db94126d102fd937 h: refs/heads/master i: 280265: 14712629469364513e90234d0b6cadf14454a047 280263: 91a241ba2947f41e8116a43b35b6cc53c2721df6 v: v3 --- [refs] | 2 +- trunk/include/linux/sysctl.h | 2 +- trunk/kernel/sched.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6169b8746f73..a7198da55374 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dba19c6064766730dd64757a010ec3aec503ecdb +refs/heads/master: 36fcb589e752fa9c71f8a447db94126d102fd937 diff --git a/trunk/include/linux/sysctl.h b/trunk/include/linux/sysctl.h index 703cfa33a3ca..bb9127dd814b 100644 --- a/trunk/include/linux/sysctl.h +++ b/trunk/include/linux/sysctl.h @@ -1038,7 +1038,7 @@ struct ctl_table const char *procname; /* Text ID for /proc/sys, or zero */ void *data; int maxlen; - mode_t mode; + umode_t mode; struct ctl_table *child; struct ctl_table *parent; /* Automatically set */ proc_handler *proc_handler; /* Callback for text formatting */ diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index d6b149ccf925..e64f45741e0e 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -6480,7 +6480,7 @@ static void sd_free_ctl_entry(struct ctl_table **tablep) static void set_table_entry(struct ctl_table *entry, const char *procname, void *data, int maxlen, - mode_t mode, proc_handler *proc_handler) + umode_t mode, proc_handler *proc_handler) { entry->procname = procname; entry->data = data;