r3374 - trunk/kernel/source/kernel-source-2.6.12-2.6.12/debian/patches

[Dann Frazier]

Author: dannf
Date: 2005-06-20 15:46:11 +0000 (Mon, 20 Jun 2005)
New Revision: 3374

Modified:
   trunk/kernel/source/kernel-source-2.6.12-2.6.12/debian/patches/ia64-generic-nosmp.patch
Log:
remove .rej file, oops

Modified: trunk/kernel/source/kernel-source-2.6.12-2.6.12/debian/patches/ia64-generic-nosmp.patch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.12-2.6.12/debian/patches/ia64-generic-nosmp.patch	2005-06-19 23:36:25 UTC (rev 3373)
+++ trunk/kernel/source/kernel-source-2.6.12-2.6.12/debian/patches/ia64-generic-nosmp.patch	2005-06-20 15:46:11 UTC (rev 3374)
@@ -278,26 +278,6 @@
  
  /**
   * show_mem - give short summary of memory stats
-diff -urN linux-2.6.12.orig/include/asm-ia64/smp.h.rej linux-2.6.12/include/asm-ia64/smp.h.rej
---- linux-2.6.12.orig/include/asm-ia64/smp.h.rej	1969-12-31 17:00:00.000000000 -0700
-+++ linux-2.6.12/include/asm-ia64/smp.h.rej	2005-06-18 22:14:35.000000000 -0600
-@@ -0,0 +1,16 @@
-+***************
-+*** 126,131 ****
-+  #else
-+  
-+  #define cpu_logical_id(cpuid)		0
-+  
-+  #endif /* CONFIG_SMP */
-+  #endif /* _ASM_IA64_SMP_H */
-+--- 126,132 ----
-+  #else
-+  
-+  #define cpu_logical_id(cpuid)		0
-++ #define cpu_physical_id(i)     ((ia64_getreg(_IA64_REG_CR_LID) >> 16) & 0xffff)
-+  
-+  #endif /* CONFIG_SMP */
-+  #endif /* _ASM_IA64_SMP_H */
 diff -urN linux-2.6.12.orig/include/asm-ia64/sn/arch.h linux-2.6.12/include/asm-ia64/sn/arch.h
 --- linux-2.6.12.orig/include/asm-ia64/sn/arch.h	2005-06-17 13:48:29.000000000 -0600
 +++ linux-2.6.12/include/asm-ia64/sn/arch.h	2005-06-18 22:15:39.000000000 -0600