From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Sat, 20 Aug 2005 19:14:04 +0000 (+0000)
Subject: - remove last vestiges of lkcd patch (kexec functionality subsumed by
X-Git-Tag: before-fedora-2_6_18-1_2239_FC5-vs2_0_2_2-rc6-merge~144
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c2f314c9bae25e6963a7941375729fd4bdb2b67c;p=linux-2.6.git

- remove last vestiges of lkcd patch (kexec functionality subsumed by
  kexec patch applied by alk, the rest of it never worked anyway)
---

diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 6b838ee0a..a3f22678a 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -139,9 +139,7 @@ enum
 	KERN_UNKNOWN_NMI_PANIC=66, /* int: unknown nmi panic flag */
 	KERN_BOOTLOADER_TYPE=67, /* int: boot loader type */
 	KERN_RANDOMIZE=68, /* int: randomize virtual address space */
-	KERN_SETUID_DUMPABLE=69, /* int: behaviour of dumps for setuid core */
-	KERN_DUMP=70,		/* dir: dump parameters */
-	KERN_VSHELPER=71,	/* string: path to vshelper policy agent */
+	KERN_VSHELPER=69,	/* string: path to vshelper policy agent */
 };
 
 
diff --git a/init/Makefile b/init/Makefile
index 51e654880..93a53fbdb 100644
--- a/init/Makefile
+++ b/init/Makefile
@@ -11,9 +11,6 @@ mounts-$(CONFIG_BLK_DEV_RAM)	+= do_mounts_rd.o
 mounts-$(CONFIG_BLK_DEV_INITRD)	+= do_mounts_initrd.o
 mounts-$(CONFIG_BLK_DEV_MD)	+= do_mounts_md.o
 
-extra-$(subst m,y,$(CONFIG_CRASH_DUMP))	+= kerntypes.o
-CFLAGS_kerntypes.o		:= -gstabs
-
 # files to be removed upon make clean
 clean-files := ../include/linux/compile.h
 
diff --git a/init/version.c b/init/version.c
index 558a040a6..b92ca0801 100644
--- a/init/version.c
+++ b/init/version.c
@@ -11,7 +11,6 @@
 #include <linux/uts.h>
 #include <linux/utsname.h>
 #include <linux/version.h>
-#include <linux/stringify.h>
 
 #define version(a) Version_ ## a
 #define version_string(a) version(a)
@@ -33,9 +32,7 @@ const char linux_banner[] =
 	"Linux version " UTS_RELEASE " (" LINUX_COMPILE_BY "@"
 	LINUX_COMPILE_HOST ") (" LINUX_COMPILER ") " UTS_VERSION "\n";
 
-const char *LINUX_COMPILE_VERSION_ID = __stringify(LINUX_COMPILE_VERSION_ID);
-LINUX_COMPILE_VERSION_ID_TYPE;
-
 const char vx_linux_banner[] =
 	"Linux version %s (" LINUX_COMPILE_BY "@"
 	LINUX_COMPILE_HOST ") (" LINUX_COMPILER ") %s\n";
+
diff --git a/kernel/panic.c b/kernel/panic.c
index a0da2324b..047cd09e0 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -26,10 +26,8 @@ int panic_on_oops = 1;
 int tainted;
 unsigned int crashed;
 int crash_dump_on;
-void (*dump_function_ptr)(const char *, const struct pt_regs *) = 0;
 
 EXPORT_SYMBOL(panic_timeout);
-EXPORT_SYMBOL(dump_function_ptr);
 
 struct notifier_block *panic_notifier_list;
 
@@ -82,8 +80,6 @@ NORET_TYPE void panic(const char * fmt, ...)
 	/* If we have crashed, perform a kexec reboot, for dump write-out */
 	crash_machine_kexec();
 
-        notifier_call_chain(&panic_notifier_list, 0, buf);
-	
 #ifdef CONFIG_SMP
 	smp_send_stop();
 #endif
@@ -100,17 +96,6 @@ NORET_TYPE void panic(const char * fmt, ...)
 		 * We can't use the "normal" timers since we just panicked..
 	 	 */
 		printk(KERN_EMERG "Rebooting in %d seconds..",panic_timeout);
-#ifdef CONFIG_KEXEC
- {		
-		struct kimage *image;
-		image = xchg(&kexec_image, 0);
- 		if (image) {
- 			printk(KERN_EMERG "by starting a new kernel ..\n");
- 			mdelay(panic_timeout*1000);
-			machine_kexec(image);
- 		}
- }
-#endif
 		for (i = 0; i < panic_timeout*1000; ) {
 			touch_nmi_watchdog();
 			i += panic_blink(i);