Imported linux-2.6.27.39 suse/xen patches.

[ipfire-2.x.git] / src / patches / suse-2.6.27.39 / patches.arch / x2APIC_PATCH_14_of_41_0c81c746f9bdbfaafe64322d540c8b7b59c27314

diff --git a/src/patches/suse-2.6.27.31/patches.arch/x2APIC_PATCH_14_of_41_0c81c746f9bdbfaafe64322d540c8b7b59c27314 b/src/patches/suse-2.6.27.39/patches.arch/x2APIC_PATCH_14_of_41_0c81c746f9bdbfaafe64322d540c8b7b59c27314
similarity index 73%
rename from src/patches/suse-2.6.27.31/patches.arch/x2APIC_PATCH_14_of_41_0c81c746f9bdbfaafe64322d540c8b7b59c27314
rename to src/patches/suse-2.6.27.39/patches.arch/x2APIC_PATCH_14_of_41_0c81c746f9bdbfaafe64322d540c8b7b59c27314
index 348ebc9dc40d99c4b341a1d395ce942e75df3a69..c01036f2a0435b5b7f92a47e946b82daf4cead0b 100644 (file)
--- a/src/patches/suse-2.6.27.31/patches.arch/x2APIC_PATCH_14_of_41_0c81c746f9bdbfaafe64322d540c8b7b59c27314
+++ b/src/patches/suse-2.6.27.39/patches.arch/x2APIC_PATCH_14_of_41_0c81c746f9bdbfaafe64322d540c8b7b59c27314
@@ -28,11 +28,9 @@ Signed-off-by: Ingo Molnar <mingo@elte.hu>
  include/asm-x86/smp.h                       |    4 +---
  8 files changed, 36 insertions(+), 17 deletions(-)
 
-Index: linux-2.6.26/arch/x86/kernel/apic_64.c
-===================================================================
---- linux-2.6.26.orig/arch/x86/kernel/apic_64.c
-+++ linux-2.6.26/arch/x86/kernel/apic_64.c
-@@ -1095,6 +1095,11 @@ void __cpuinit generic_processor_info(in
+--- a/arch/x86/kernel/apic_64.c
++++ b/arch/x86/kernel/apic_64.c
+@@ -1122,6 +1122,11 @@ void __cpuinit generic_processor_info(in
        cpu_set(cpu, cpu_present_map);
  }
  
@@ -44,10 +42,8 @@ Index: linux-2.6.26/arch/x86/kernel/apic_64.c
  /*
   * Power management
   */
-Index: linux-2.6.26/arch/x86/kernel/genapic_64.c
-===================================================================
---- linux-2.6.26.orig/arch/x86/kernel/genapic_64.c
-+++ linux-2.6.26/arch/x86/kernel/genapic_64.c
+--- a/arch/x86/kernel/genapic_64.c
++++ b/arch/x86/kernel/genapic_64.c
 @@ -79,17 +79,6 @@ int __init acpi_madt_oem_check(char *oem
        return 0;
  }
@@ -66,10 +62,8 @@ Index: linux-2.6.26/arch/x86/kernel/genapic_64.c
  enum uv_system_type get_uv_system_type(void)
  {
        return uv_system_type;
-Index: linux-2.6.26/arch/x86/kernel/genapic_flat_64.c
-===================================================================
---- linux-2.6.26.orig/arch/x86/kernel/genapic_flat_64.c
-+++ linux-2.6.26/arch/x86/kernel/genapic_flat_64.c
+--- a/arch/x86/kernel/genapic_flat_64.c
++++ b/arch/x86/kernel/genapic_flat_64.c
 @@ -15,9 +15,11 @@
  #include <linux/kernel.h>
  #include <linux/ctype.h>
@@ -115,10 +109,8 @@ Index: linux-2.6.26/arch/x86/kernel/genapic_flat_64.c
        .phys_pkg_id = phys_pkg_id,
 +      .read_apic_id = read_xapic_id,
  };
-Index: linux-2.6.26/arch/x86/kernel/genx2apic_uv_x.c
-===================================================================
---- linux-2.6.26.orig/arch/x86/kernel/genx2apic_uv_x.c
-+++ linux-2.6.26/arch/x86/kernel/genx2apic_uv_x.c
+--- a/arch/x86/kernel/genx2apic_uv_x.c
++++ b/arch/x86/kernel/genx2apic_uv_x.c
 @@ -18,6 +18,7 @@
  #include <linux/sched.h>
  #include <linux/bootmem.h>
@@ -156,10 +148,8 @@ Index: linux-2.6.26/arch/x86/kernel/genx2apic_uv_x.c
  };
  
  static __cpuinit void set_x2apic_extra_bits(int pnode)
-Index: linux-2.6.26/include/asm-x86/genapic_64.h
-===================================================================
---- linux-2.6.26.orig/include/asm-x86/genapic_64.h
-+++ linux-2.6.26/include/asm-x86/genapic_64.h
+--- a/include/asm-x86/genapic_64.h
++++ b/include/asm-x86/genapic_64.h
 @@ -27,6 +27,7 @@ struct genapic {
        /* */
        unsigned int (*cpu_mask_to_apicid)(cpumask_t cpumask);
@@ -168,10 +158,8 @@ Index: linux-2.6.26/include/asm-x86/genapic_64.h
  };
  
  extern struct genapic *genapic;
-Index: linux-2.6.26/include/asm-x86/mach-default/mach_apic.h
-===================================================================
---- linux-2.6.26.orig/include/asm-x86/mach-default/mach_apic.h
-+++ linux-2.6.26/include/asm-x86/mach-default/mach_apic.h
+--- a/include/asm-x86/mach-default/mach_apic.h
++++ b/include/asm-x86/mach-default/mach_apic.h
 @@ -30,6 +30,7 @@ static inline cpumask_t target_cpus(void
  #define cpu_mask_to_apicid (genapic->cpu_mask_to_apicid)
  #define phys_pkg_id   (genapic->phys_pkg_id)
@@ -180,10 +168,8 @@ Index: linux-2.6.26/include/asm-x86/mach-default/mach_apic.h
  extern void setup_apic_routing(void);
  #else
  #define INT_DELIVERY_MODE dest_LowestPrio
-Index: linux-2.6.26/include/asm-x86/mach-default/mach_apicdef.h
-===================================================================
---- linux-2.6.26.orig/include/asm-x86/mach-default/mach_apicdef.h
-+++ linux-2.6.26/include/asm-x86/mach-default/mach_apicdef.h
+--- a/include/asm-x86/mach-default/mach_apicdef.h
++++ b/include/asm-x86/mach-default/mach_apicdef.h
 @@ -5,8 +5,9 @@
  
  #ifdef CONFIG_X86_64
@@ -195,10 +181,8 @@ Index: linux-2.6.26/include/asm-x86/mach-default/mach_apicdef.h
  #else
  #define               APIC_ID_MASK            (0xF<<24)
  static inline unsigned get_apic_id(unsigned long x) 
-Index: linux-2.6.26/include/asm-x86/smp.h
-===================================================================
---- linux-2.6.26.orig/include/asm-x86/smp.h
-+++ linux-2.6.26/include/asm-x86/smp.h
+--- a/include/asm-x86/smp.h
++++ b/include/asm-x86/smp.h
 @@ -176,12 +176,10 @@ static inline unsigned int read_apic_id(
  {
        return *(u32 *)(APIC_BASE + APIC_ID);