# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1227525080 0
# Node ID 0b8c6c91c5a408345e6ed650fb9f19e4fa9809b9
# Parent cd45b5c9561250b999476227dbc7f7ede377d3d4
pv-on-hvm drivers: build fixes for Linux 2.6.27+
Make the drivers build properly in a 2.6.27 environment as well as
against a kernel with pv-ops Xen configured on (in the latter case
more work would be needed to also make the drivers work, as there's a
large number of duplicate exports).
Portions from Charles Arnold <carnold@xxxxxxxxxx>.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
unmodified_drivers/linux-2.6/balloon/Kbuild | 5 ++---
unmodified_drivers/linux-2.6/mkbuildtree | 1 +
unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c | 4 ++++
unmodified_drivers/linux-2.6/platform-pci/platform-compat.c | 4 ++++
4 files changed, 11 insertions(+), 3 deletions(-)
diff -r cd45b5c95612 -r 0b8c6c91c5a4 unmodified_drivers/linux-2.6/balloon/Kbuild
--- a/unmodified_drivers/linux-2.6/balloon/Kbuild Mon Nov 24 11:06:16
2008 +0000
+++ b/unmodified_drivers/linux-2.6/balloon/Kbuild Mon Nov 24 11:11:20
2008 +0000
@@ -4,6 +4,5 @@ obj-m = xen-balloon.o
EXTRA_CFLAGS += -I$(M)/platform-pci
-xen-balloon-objs =
-xen-balloon-objs += balloon.o
-xen-balloon-objs += sysfs.o
+xen-balloon-y := balloon.o sysfs.o
+xen-balloon-$(CONFIG_XEN_SCRUB_PAGES) += scrub.o
diff -r cd45b5c95612 -r 0b8c6c91c5a4 unmodified_drivers/linux-2.6/mkbuildtree
--- a/unmodified_drivers/linux-2.6/mkbuildtree Mon Nov 24 11:06:16 2008 +0000
+++ b/unmodified_drivers/linux-2.6/mkbuildtree Mon Nov 24 11:11:20 2008 +0000
@@ -53,6 +53,7 @@ i[34567]86|x86_64)
ln -sf ${XL}/include/asm-x86/mach-xen/asm/synch_bitops*.h include/asm
ln -sf ${XL}/include/asm-x86/mach-xen/asm/maddr*.h include/asm
ln -sf ${XL}/include/asm-x86/mach-xen/asm/gnttab_dma.h include/asm
+ ln -sf ${XL}/arch/x86/lib/scrub.c balloon
else
if [ $uname = x86_64 ]; then
mkdir -p include/asm-i386
diff -r cd45b5c95612 -r 0b8c6c91c5a4
unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c
--- a/unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c Mon Nov
24 11:06:16 2008 +0000
+++ b/unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c Mon Nov
24 11:11:20 2008 +0000
@@ -34,7 +34,11 @@ static void ap_suspend(void *_info)
atomic_dec(&info->nr_spinning);
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
#define initiate_ap_suspend(i) smp_call_function(ap_suspend, i, 0, 0)
+#else
+#define initiate_ap_suspend(i) smp_call_function(ap_suspend, i, 0)
+#endif
#else /* !defined(CONFIG_SMP) */
diff -r cd45b5c95612 -r 0b8c6c91c5a4
unmodified_drivers/linux-2.6/platform-pci/platform-compat.c
--- a/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c Mon Nov
24 11:06:16 2008 +0000
+++ b/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c Mon Nov
24 11:11:20 2008 +0000
@@ -14,7 +14,11 @@ EXPORT_SYMBOL(system_state);
void ctrl_alt_del(void)
{
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
kill_proc(1, SIGINT, 1); /* interrupt init */
+#else
+ kill_cad_pid(SIGINT, 1);
+#endif
}
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,8)
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home