Imported linux-2.6.27.39 suse/xen patches.

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

diff --git a/src/patches/suse-2.6.27.31/patches.arch/x2APIC_PATCH_15_of_41_2d7a66d02e11af9ab8e16c76d22767e622b4e3d7 b/src/patches/suse-2.6.27.39/patches.arch/x2APIC_PATCH_15_of_41_2d7a66d02e11af9ab8e16c76d22767e622b4e3d7
similarity index 89%
rename from src/patches/suse-2.6.27.31/patches.arch/x2APIC_PATCH_15_of_41_2d7a66d02e11af9ab8e16c76d22767e622b4e3d7
rename to src/patches/suse-2.6.27.39/patches.arch/x2APIC_PATCH_15_of_41_2d7a66d02e11af9ab8e16c76d22767e622b4e3d7
index 4b1144bafbfc8b917bf6d8d43606f4ed087f0620..8a1908d1df84e3906c3e2f1435609a4dfc5e1e90 100644 (file)
--- a/src/patches/suse-2.6.27.31/patches.arch/x2APIC_PATCH_15_of_41_2d7a66d02e11af9ab8e16c76d22767e622b4e3d7
+++ b/src/patches/suse-2.6.27.39/patches.arch/x2APIC_PATCH_15_of_41_2d7a66d02e11af9ab8e16c76d22767e622b4e3d7
@@ -50,11 +50,9 @@ Signed-off-by: Ingo Molnar <mingo@elte.hu>
  arch/x86/kernel/apic_64.c |    6 +++---
  1 file changed, 3 insertions(+), 3 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
-@@ -629,10 +629,10 @@ int __init verify_local_APIC(void)
+--- a/arch/x86/kernel/apic_64.c
++++ b/arch/x86/kernel/apic_64.c
+@@ -656,10 +656,10 @@ int __init verify_local_APIC(void)
        /*
         * The ID register is read/write in a real APIC.
         */
@@ -67,7 +65,7 @@ Index: linux-2.6.26/arch/x86/kernel/apic_64.c
        apic_printk(APIC_DEBUG, "Getting ID: %x\n", reg1);
        apic_write(APIC_ID, reg0);
        if (reg1 != (reg0 ^ APIC_ID_MASK))
-@@ -1136,7 +1136,7 @@ static int lapic_suspend(struct sys_devi
+@@ -1163,7 +1163,7 @@ static int lapic_suspend(struct sys_devi
  
        maxlvt = lapic_get_maxlvt();