From: "Jan Beulich" <jbeulich@novell.com>
To: xen-devel@lists.xensource.com
Cc: Charles Arnold <CARNOLD@novell.com>
Subject: [PATCH] unmodified driver build fixes
Date: Fri, 21 Nov 2008 13:52:00 +0000 [thread overview]
Message-ID: <4926CB10.76E4.0078.0@novell.com> (raw)
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@novell.com>.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Index: 2008-11-20/unmodified_drivers/linux-2.6/balloon/Kbuild
===================================================================
--- 2008-11-20.orig/unmodified_drivers/linux-2.6/balloon/Kbuild 2007-04-05 17:35:34.000000000 +0200
+++ 2008-11-20/unmodified_drivers/linux-2.6/balloon/Kbuild 2008-11-21 10:14:15.000000000 +0100
@@ -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
Index: 2008-11-20/unmodified_drivers/linux-2.6/mkbuildtree
===================================================================
--- 2008-11-20.orig/unmodified_drivers/linux-2.6/mkbuildtree 2008-02-22 10:04:45.000000000 +0100
+++ 2008-11-20/unmodified_drivers/linux-2.6/mkbuildtree 2008-11-21 10:16:40.000000000 +0100
@@ -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
Index: 2008-11-20/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c
===================================================================
--- 2008-11-20.orig/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c 2007-04-16 09:26:34.000000000 +0200
+++ 2008-11-20/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c 2008-11-21 09:52:00.000000000 +0100
@@ -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)
Index: 2008-11-20/unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c
===================================================================
--- 2008-11-20.orig/unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c 2008-10-24 11:21:38.000000000 +0200
+++ 2008-11-20/unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c 2008-11-21 09:41:52.000000000 +0100
@@ -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) */
reply other threads:[~2008-11-21 13:52 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4926CB10.76E4.0078.0@novell.com \
--to=jbeulich@novell.com \
--cc=CARNOLD@novell.com \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.