From 25e5215f84fd7c1115f440f7522b73b224bbc92a Mon Sep 17 00:00:00 2001 From: Sapan Bhatia <gwsapan@gmail.com> Date: Tue, 24 Jan 2012 12:33:13 -0500 Subject: [PATCH] Fix build on F16 --- kernel-2.6.spec | 2 ++ linux-2.6-10001-f16-fix.patch | 11 +++++++++++ 2 files changed, 13 insertions(+) create mode 100644 linux-2.6-10001-f16-fix.patch diff --git a/kernel-2.6.spec b/kernel-2.6.spec index b0215f994..eeb33c7c2 100644 --- 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 +Patch10001: linux-2.6-10001-f16-fix.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-10001-f16-fix.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 index 000000000..5da11d289 --- /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. -- 2.47.0