This commit is contained in:
committed by
Git OBS Bridge
parent
ef3323a4b5
commit
0c6232eec3
@@ -1,14 +1,3 @@
|
||||
--- a/unmodified_drivers/linux-2.6/balloon/Kbuild
|
||||
+++ b/unmodified_drivers/linux-2.6/balloon/Kbuild
|
||||
@@ -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
|
||||
--- a/unmodified_drivers/linux-2.6/blkfront/Kbuild
|
||||
+++ b/unmodified_drivers/linux-2.6/blkfront/Kbuild
|
||||
@@ -3,3 +3,4 @@ include $(M)/overrides.mk
|
||||
@@ -16,41 +5,3 @@
|
||||
|
||||
xen-vbd-objs := blkfront.o vbd.o
|
||||
+xen-vbd-objs += $(patsubst %.c,%.o,$(notdir $(wildcard $(src)/vcd.c)))
|
||||
--- a/unmodified_drivers/linux-2.6/mkbuildtree
|
||||
+++ b/unmodified_drivers/linux-2.6/mkbuildtree
|
||||
@@ -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
|
||||
--- a/unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c
|
||||
+++ b/unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c
|
||||
@@ -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) */
|
||||
|
||||
--- a/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c
|
||||
+++ b/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c
|
||||
@@ -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)
|
||||
|
Reference in New Issue
Block a user