From: youfeng <youfeng>
Date: Fri, 7 Nov 2003 07:06:11 +0000 (+0000)
Subject: romve the reduntant/useless modifications in kernel_patches/patches/kernel_text_addre... 
X-Git-Tag: v1_7_0_51~2^7~294
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=a08678f64fb6dac163c60b6ee13ad95ad20c51a3;p=fs%2Flustre-release.git

romve the reduntant/useless modifications in kernel_patches/patches/kernel_text_address-2.4.20-rh.patch on my bugfix 2075
---

diff --git a/lustre/kernel_patches/patches/kernel_text_address-2.4.20-rh.patch b/lustre/kernel_patches/patches/kernel_text_address-2.4.20-rh.patch
index bc7253d..6e78be1 100644
--- a/lustre/kernel_patches/patches/kernel_text_address-2.4.20-rh.patch
+++ b/lustre/kernel_patches/patches/kernel_text_address-2.4.20-rh.patch
@@ -25,30 +25,6 @@ Index: linux-2.4.20-20.9/arch/i386/kernel/traps.c
 ===================================================================
 --- linux-2.4.20-20.9.orig/arch/i386/kernel/traps.c	2003-11-06 18:35:56.000000000 +0800
 +++ linux-2.4.20-20.9/arch/i386/kernel/traps.c	2003-11-06 18:43:26.000000000 +0800
-@@ -52,10 +52,6 @@
- #include <linux/irq.h>
- #include <linux/module.h>
- 
--#ifdef CONFIG_MCL_COREDUMP
--#include <linux/crash.h>
--#endif
--
- asmlinkage int system_call(void);
- asmlinkage void lcall7(void);
- asmlinkage void lcall27(void);
-@@ -313,11 +309,7 @@
- 		netdump_func(regs);
- 	bust_spinlocks(0);
- 	spin_unlock_irq(&die_lock);
--#ifdef CONFIG_MCL_COREDUMP 
--	if(panic_on_oops)
--		panic("die");
--#endif
--	do_exit(SIGSEGV);/* NOTREACHED */
-+	do_exit(SIGSEGV);
- }
- 
- static inline void die_if_kernel(const char * str, struct pt_regs * regs, long err)
 @@ -1027,9 +1019,39 @@
  #endif
  }