Fix build on F16

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index b0215f9..eeb33c7 100644 (file)
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -689,6 +689,7 @@ Patch19: linux-2.6-660-nmi-watchdog-default.patch
 Patch20: linux-2.6-680-htb-hysteresis-tso.patch
 
 Patch10000: linux-2.6-10000-gcc-4.5.patch
 Patch20: linux-2.6-680-htb-hysteresis-tso.patch
 
 Patch10000: linux-2.6-10000-gcc-4.5.patch

+Patch10001: linux-2.6-10001-f16-fix.patch

 # empty final patch file to facilitate testing of kernel patches
 Patch999999: linux-kernel-test.patch
 
 # empty final patch file to facilitate testing of kernel patches
 Patch999999: linux-kernel-test.patch
 


@@ -985,6 +986,7 @@ ApplyPatch linux-2.6-650-hangcheck-reboot.patch
 ApplyPatch linux-2.6-660-nmi-watchdog-default.patch
 ApplyPatch linux-2.6-680-htb-hysteresis-tso.patch
 ApplyPatch linux-2.6-10000-gcc-4.5.patch
 ApplyPatch linux-2.6-660-nmi-watchdog-default.patch
 ApplyPatch linux-2.6-680-htb-hysteresis-tso.patch
 ApplyPatch linux-2.6-10000-gcc-4.5.patch

+ApplyPatch linux-2.6-10001-f16-fix.patch

 #### Planet-Lab ####
 
 ApplyOptionalPatch linux-kernel-test.patch
 #### Planet-Lab ####
 
 ApplyOptionalPatch linux-kernel-test.patch

diff --git a/linux-2.6-10001-f16-fix.patch b/linux-2.6-10001-f16-fix.patch
new file mode 100644 (file)
index 0000000..5da11d2
--- /dev/null
+++ b/linux-2.6-10001-f16-fix.patch
@@ -0,0 +1,11 @@
+--- linux-2.6.32-71.24.1.el6.i686/arch/x86/kernel/entry_64.S.orig      2011-03-26 14:42:29.000000000 -0400
++++ linux-2.6.32-71.24.1.el6.i686/arch/x86/kernel/entry_64.S   2012-01-24 12:27:39.000000000 -0500
+@@ -1303,7 +1303,7 @@
+       decl PER_CPU_VAR(irq_count)
+       jmp  error_exit
+       CFI_ENDPROC
+-END(do_hypervisor_callback)
++END(xen_do_hypervisor_callback)
+ 
+ /*
+  * Hypervisor uses this for application faults while it executes.