Re: 2.6.21-rc4-mm1

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Randy Dunlap <randy.dunlap@...>
Cc: Andrew Morton <akpm@...>, <linux-kernel@...>
Date: Tuesday, March 20, 2007 - 3:20 pm

On Tue, Mar 20, 2007 at 10:31:51AM -0700, Randy Dunlap wrote:

Gah!  Apologies.  This should fix it, but I can't test it since I can't 
get 2.6.21-rc4-mm1 to compile (with or without this fix):

  GEN     .version
init/.missing_syscalls.h.cmd:2: *** missing separator.  Stop.
make: *** [.tmp_vmlinux1] Error 2


Signed-off-by: Kees Cook <kees@outflux.net>
---
diff -uNrp linux-2.6.21-rc4-mm1/kernel/sysctl.c linux-2.6.21-rc4-mm1-kees/kernel/sysctl.c
--- linux-2.6.21-rc4-mm1/kernel/sysctl.c	2007-03-20 10:45:06.000000000 -0700
+++ linux-2.6.21-rc4-mm1-kees/kernel/sysctl.c	2007-03-20 11:36:06.000000000 -0700
@@ -77,9 +77,12 @@ extern int pid_max_min, pid_max_max;
 extern int sysctl_drop_caches;
 extern int percpu_pagelist_fraction;
 extern int compat_log;
-extern int maps_protect;
 extern int print_fatal_signals;
 
+#ifdef CONFIG_PROC_FS
+extern int maps_protect;
+#endif
+
 #if defined(CONFIG_ADAPTIVE_READAHEAD)
 extern int readahead_ratio;
 extern int readahead_hit_rate;
@@ -619,6 +622,7 @@ static ctl_table kern_table[] = {
 		.proc_handler	= &proc_dointvec,
 	},
 #endif
+#ifdef CONFIG_PROC_FS
 	{
 		.ctl_name       = CTL_UNNUMBERED,
 		.procname       = "maps_protect",
@@ -627,6 +631,7 @@ static ctl_table kern_table[] = {
 		.mode           = 0644,
 		.proc_handler   = &proc_dointvec,
 	},
+#endif
 
 	{ .ctl_name = 0 }
 };




-- 
Kees Cook                                            @outflux.net
-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
2.6.21-rc4-mm1, Andrew Morton, (Tue Mar 20, 12:56 am)
Re: 2.6.21-rc4-mm1, Badari Pulavarty, (Mon Mar 26, 5:57 pm)
Re: 2.6.21-rc4-mm1, Andrew Morton, (Mon Mar 26, 6:22 pm)
Re: 2.6.21-rc4-mm1, Badari Pulavarty, (Mon Mar 26, 7:43 pm)
Re: 2.6.21-rc4-mm1, Badari Pulavarty, (Mon Mar 26, 4:05 pm)
Re: 2.6.21-rc4-mm1, Jean Delvare, (Mon Mar 26, 3:35 pm)
Re: 2.6.21-rc4-mm1, Greg KH, (Mon Mar 26, 7:26 pm)
Re: 2.6.21-rc4-mm1, Badari Pulavarty, (Mon Mar 26, 3:47 pm)
Re: 2.6.21-rc4-mm1, Paul Mackerras, (Mon Mar 26, 7:29 pm)
[-mm patch] unexport bio_{,un}map_user, Adrian Bunk, (Sat Mar 24, 9:07 am)
[-mm patch] lguest: #if 0 check_bug_kill(), Adrian Bunk, (Sat Mar 24, 9:06 am)
Re: [-mm patch] lguest: #if 0 check_bug_kill(), Rusty Russell, (Sun Mar 25, 3:33 am)
[-mm patch] lguest: remove check_bug_kill(), Adrian Bunk, (Sun Mar 25, 10:57 am)
Re: 2.6.21-rc4-mm1, J.A. , (Thu Mar 22, 7:27 pm)
Re: 2.6.21-rc4-mm1, J.A. , (Mon Mar 26, 4:31 pm)
Re: 2.6.21-rc4-mm1, Andrew Morton, (Thu Mar 22, 9:41 pm)
Re: 2.6.21-rc4-mm1, Reuben Farrelly, (Wed Mar 21, 6:14 am)
Re: 2.6.21-rc4-mm1, Randy Dunlap, (Tue Mar 20, 9:47 pm)
Re: 2.6.21-rc4-mm1, Greg KH, (Wed Mar 21, 2:36 pm)
Re: 2.6.21-rc4-mm1, Randy Dunlap, (Tue Mar 20, 7:49 pm)
FireWire update in -mm (was 2.6.21-rc4-mm1), Stefan Richter, (Tue Mar 20, 7:10 pm)
Re: 2.6.21-rc4-mm1, J.A. , (Tue Mar 20, 5:04 pm)
Re: 2.6.21-rc4-mm1: multiple definition of `queue_pushbutton..., Kristen Carlson Accardi, (Wed Mar 21, 2:45 pm)
[PATCH] utrace: make an inline void, Randy Dunlap, (Tue Mar 20, 2:09 pm)
Re: [PATCH] utrace: make an inline void, Roland McGrath, (Tue Mar 20, 9:48 pm)
Re: 2.6.21-rc4-mm1, Randy Dunlap, (Tue Mar 20, 1:31 pm)
Re: 2.6.21-rc4-mm1, Kees Cook, (Tue Mar 20, 3:20 pm)
Re: 2.6.21-rc4-mm1, Andrew Morton, (Wed Mar 21, 1:47 am)
Re: 2.6.21-rc4-mm1, Sam Ravnborg, (Wed Mar 21, 6:19 pm)
Re: 2.6.21-rc4-mm1, Andrew Morton, (Wed Mar 21, 7:01 pm)
Re: 2.6.21-rc4-mm1, Sam Ravnborg, (Thu Mar 22, 4:54 am)
Re: 2.6.21-rc4-mm1, Sam Ravnborg, (Wed Mar 21, 7:59 am)
Re: 2.6.21-rc4-mm1, David Woodhouse, (Thu Mar 22, 5:17 am)
Re: 2.6.21-rc4-mm1, Sam Ravnborg, (Thu Mar 22, 7:41 am)
Re: 2.6.21-rc4-mm1, David Woodhouse, (Thu Mar 22, 12:25 pm)
Re: 2.6.21-rc4-mm1, Sam Ravnborg, (Thu Mar 22, 12:28 pm)
Re: 2.6.21-rc4-mm1, David Woodhouse, (Wed Mar 21, 7:25 am)
Re: 2.6.21-rc4-mm1, Randy Dunlap, (Tue Mar 20, 4:50 pm)
Re: 2.6.21-rc4-mm1, Stéphane Jourdois, (Tue Mar 20, 4:42 pm)
Re: 2.6.21-rc4-mm1, J.A. , (Tue Mar 20, 12:36 pm)
Re: 2.6.21-rc4-mm1, J.A. , (Tue Mar 20, 8:14 pm)
Re: 2.6.21-rc4-mm1, Jiri Slaby, (Tue Mar 20, 10:31 am)
Re: 2.6.21-rc4-mm1, Andrew Morton, (Tue Mar 20, 12:09 pm)
Re: 2.6.21-rc4-mm1, Pavel Machek, (Tue Mar 20, 2:38 pm)
Re: 2.6.21-rc4-mm1, Jiri Slaby, (Tue Mar 20, 3:40 pm)
Re: 2.6.21-rc4-mm1, Rafael J. Wysocki, (Tue Mar 20, 4:12 pm)
Re: 2.6.21-rc4-mm1, Pavel Machek, (Tue Mar 20, 3:56 pm)
Re: 2.6.21-rc4-mm1, Jiri Slaby, (Tue Mar 20, 4:13 pm)
Re: [linux-pm] 2.6.21-rc4-mm1, Pavel Machek, (Tue Mar 20, 4:21 pm)
Re: [linux-pm] 2.6.21-rc4-mm1, Rafael J. Wysocki, (Tue Mar 20, 4:58 pm)
Re: [linux-pm] 2.6.21-rc4-mm1, Jiri Slaby, (Tue Mar 20, 4:58 pm)
Re: [linux-pm] 2.6.21-rc4-mm1, Rafael J. Wysocki, (Tue Mar 20, 5:06 pm)
Re: 2.6.21-rc4-mm1 [PATCH] init/missing_syscalls.h fix, Stephane Jourdois, (Tue Mar 20, 6:52 am)
Re: 2.6.21-rc4-mm1, Andy Whitcroft, (Tue Mar 20, 5:45 am)
Re: 2.6.21-rc4-mm1, Andy Whitcroft, (Thu Mar 22, 4:41 am)
Re: 2.6.21-rc4-mm1, Andy Whitcroft, (Thu Mar 22, 5:48 am)
Re: 2.6.21-rc4-mm1, Con Kolivas, (Thu Mar 22, 6:04 am)
Re: 2.6.21-rc4-mm1, Andy Whitcroft, (Thu Mar 22, 1:07 pm)
Re: 2.6.21-rc4-mm1, Andy Whitcroft, (Thu Mar 22, 2:17 pm)
Re: 2.6.21-rc4-mm1, Con Kolivas, (Fri Mar 23, 2:18 am)
Re: 2.6.21-rc4-mm1, Andy Whitcroft, (Fri Mar 23, 4:45 am)
Re: 2.6.21-rc4-mm1, Andy Whitcroft, (Fri Mar 23, 8:28 am)
Re: 2.6.21-rc4-mm1, Con Kolivas, (Fri Mar 23, 5:45 pm)
debug rsdl 0.33, Con Kolivas, (Fri Mar 23, 7:26 pm)
Re: debug rsdl 0.33, Torsten Kaiser, (Sun Mar 25, 2:28 pm)
Re: debug rsdl 0.33, Con Kolivas, (Sun Mar 25, 6:49 pm)
Re: debug rsdl 0.33, Con Kolivas, (Sun Mar 25, 6:59 pm)
Re: debug rsdl 0.33, Andy Whitcroft, (Mon Mar 26, 3:49 am)
Re: debug rsdl 0.33, Andy Whitcroft, (Mon Mar 26, 11:28 am)
Re: debug rsdl 0.33, Con Kolivas, (Mon Mar 26, 12:12 pm)
Re: debug rsdl 0.33, Andrew Morton, (Sun Mar 25, 6:01 pm)
Re: debug rsdl 0.33, Andy Whitcroft, (Sun Mar 25, 8:27 am)
Re: 2.6.21-rc4-mm1, Con Kolivas, (Thu Mar 22, 6:14 pm)
Re: 2.6.21-rc4-mm1, Michal Piotrowski, (Tue Mar 20, 3:54 am)