From: wangdi <wangdi>
Date: Wed, 29 Oct 2003 07:52:31 +0000 (+0000)
Subject: fix patch confilcts on dsp.patch for 2.4.20-rh kernel
X-Git-Tag: v1_7_0_51~2^9~211
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=84c2cd3c01644235435a215cdbc188ae0b8771a8;p=fs%2Flustre-release.git

fix patch confilcts on dsp.patch for 2.4.20-rh kernel
---

diff --git a/lustre/kernel_patches/patches/dsp.patch b/lustre/kernel_patches/patches/dsp.patch
index f2e5b93..e6d1c81 100644
--- a/lustre/kernel_patches/patches/dsp.patch
+++ b/lustre/kernel_patches/patches/dsp.patch
@@ -6,9 +6,11 @@
  kernel/bootimg_pic.c     |    6 ++++--
  6 files changed, 36 insertions(+), 12 deletions(-)
 
---- linux-rh-2.4.20-8/kernel/bootimg.c~dsp	2003-05-07 19:30:47.000000000 +0800
-+++ linux-rh-2.4.20-8-root/kernel/bootimg.c	2003-05-07 19:31:12.000000000 +0800
-@@ -238,9 +238,20 @@ int boot_image()
+Index: linux-2.4.20-rh/kernel/bootimg.c
+===================================================================
+--- linux-2.4.20-rh.orig/kernel/bootimg.c	2003-10-29 23:44:50.000000000 +0800
++++ linux-2.4.20-rh/kernel/bootimg.c	2003-10-29 23:45:55.000000000 +0800
+@@ -238,9 +238,20 @@
  	int error = -ENOMEM;
  
  	if (bootimg_checksum(__va(bootimg_dsc.page_dir),bootimg_dsc.pages) 
@@ -30,9 +32,11 @@
  	code_page = get_identity_mapped_page();
  	if (!code_page) goto out3;
  	code = (relocate_and_jump_t) virt_to_phys((void *) code_page);
---- linux-rh-2.4.20-8/kernel/bootimg_pic.c~dsp	2003-05-07 19:30:47.000000000 +0800
-+++ linux-rh-2.4.20-8-root/kernel/bootimg_pic.c	2003-05-07 19:31:12.000000000 +0800
-@@ -69,7 +69,8 @@ void __bootimg relocate_and_jump(void)
+Index: linux-2.4.20-rh/kernel/bootimg_pic.c
+===================================================================
+--- linux-2.4.20-rh.orig/kernel/bootimg_pic.c	2003-10-29 23:44:50.000000000 +0800
++++ linux-2.4.20-rh/kernel/bootimg_pic.c	2003-10-29 23:45:56.000000000 +0800
+@@ -69,7 +69,8 @@
  			for (j = i+1; j < dsc.pages; j++) {
  				table = dsc.page_dir+FROM_TABLE(j);
  				if (((unsigned long) *table) == to) {
@@ -42,7 +46,7 @@
  					break;
  				}
  				if ((*table)[PAGE_NR(j)] == to) {
-@@ -79,7 +80,8 @@ void __bootimg relocate_and_jump(void)
+@@ -79,7 +80,8 @@
  				}
  				table = dsc.page_dir+TO_TABLE(j);
  				if (((unsigned long) *table) == to) {
@@ -52,19 +56,11 @@
  					break;
  				}
  			}
---- linux-rh-2.4.20-8/include/asm-i386/apic.h~dsp	2003-05-07 17:00:16.000000000 +0800
-+++ linux-rh-2.4.20-8-root/include/asm-i386/apic.h	2003-05-07 19:31:12.000000000 +0800
-@@ -86,6 +86,7 @@ extern struct pm_dev *apic_pm_register(p
- extern void apic_pm_unregister(struct pm_dev*);
- 
- extern int check_nmi_watchdog (void);
-+extern void disable_apic_nmi_watchdog(void);
- 
- extern unsigned int nmi_watchdog;
- #define NMI_NONE	0
---- linux-rh-2.4.20-8/include/linux/crash.h~dsp	2003-05-07 19:30:47.000000000 +0800
-+++ linux-rh-2.4.20-8-root/include/linux/crash.h	2003-05-07 19:31:12.000000000 +0800
-@@ -71,7 +71,7 @@ extern void stop_this_cpu(void *);
+Index: linux-2.4.20-rh/include/linux/crash.h
+===================================================================
+--- linux-2.4.20-rh.orig/include/linux/crash.h	2003-10-29 23:44:49.000000000 +0800
++++ linux-2.4.20-rh/include/linux/crash.h	2003-10-29 23:45:56.000000000 +0800
+@@ -71,7 +71,7 @@
  #define CRASH_ZALLOC_PAGES 16*5*2	/* 2 to handle crash in crash */
  #define CRASH_LOW_WATER_PAGES 100
  
@@ -73,8 +69,10 @@
  
  #define CRASH_MARK_RESERVED(addr) (set_bit(PG_reserved,&mem_map[MAP_NR(addr)].flags))
  #define CRASH_CLEAR_RESERVED(addr) (clear_bit(PG_reserved,&mem_map[MAP_NR(addr)].flags))
---- linux-rh-2.4.20-8/arch/i386/kernel/crash.c~dsp	2003-05-07 19:30:47.000000000 +0800
-+++ linux-rh-2.4.20-8-root/arch/i386/kernel/crash.c	2003-05-07 19:31:39.000000000 +0800
+Index: linux-2.4.20-rh/arch/i386/kernel/crash.c
+===================================================================
+--- linux-2.4.20-rh.orig/arch/i386/kernel/crash.c	2003-10-29 23:44:49.000000000 +0800
++++ linux-2.4.20-rh/arch/i386/kernel/crash.c	2003-10-29 23:45:56.000000000 +0800
 @@ -9,6 +9,8 @@
  #include <linux/crash.h>
  #include <linux/reboot.h>
@@ -84,7 +82,7 @@
  
  inline void crash_save_regs(void) {
  	static unsigned long regs[8];
-@@ -30,15 +32,23 @@ inline void crash_save_regs(void) {
+@@ -30,15 +32,23 @@
   */
  void crash_save_current_state(struct task_struct *tp)
  {
@@ -115,9 +113,11 @@
  
  	save_core();
  
---- linux-rh-2.4.20-8/arch/i386/kernel/nmi.c~dsp	2003-05-07 19:30:47.000000000 +0800
-+++ linux-rh-2.4.20-8-root/arch/i386/kernel/nmi.c	2003-05-07 19:31:12.000000000 +0800
-@@ -138,7 +138,7 @@ __setup("nmi_watchdog=", setup_nmi_watch
+Index: linux-2.4.20-rh/arch/i386/kernel/nmi.c
+===================================================================
+--- linux-2.4.20-rh.orig/arch/i386/kernel/nmi.c	2003-10-29 23:44:49.000000000 +0800
++++ linux-2.4.20-rh/arch/i386/kernel/nmi.c	2003-10-29 23:45:56.000000000 +0800
+@@ -138,7 +138,7 @@
  
  struct pm_dev *nmi_pmdev;
  
@@ -126,5 +126,3 @@
  {
  	switch (boot_cpu_data.x86_vendor) {
  	case X86_VENDOR_AMD:
-
-_