---

yaml --- r: 280267 b: refs/heads/master c: 36fcb58 h: refs/heads/master i: 280265: 1471262 280263: 91a241b v: v3
git-mirror · Jan 4, 2012 · 0d04a5c · 0d04a5c
1 parent ee7fa94
commit 0d04a5c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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;