This commit is contained in:
committed by
Git OBS Bridge
parent
997dde689d
commit
b834258fb8
@@ -1,13 +1,29 @@
|
||||
Index: xen-3.3.0-testing/unmodified_drivers/linux-2.6/mkbuildtree
|
||||
Index: xen-3.3.1-testing/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c
|
||||
===================================================================
|
||||
--- xen-3.3.0-testing.orig/unmodified_drivers/linux-2.6/mkbuildtree
|
||||
+++ xen-3.3.0-testing/unmodified_drivers/linux-2.6/mkbuildtree
|
||||
@@ -40,7 +40,7 @@ ln -sf ${XL}/drivers/xen/core/reboot.c p
|
||||
mkdir -p include/asm include/xen
|
||||
--- xen-3.3.1-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c
|
||||
+++ xen-3.3.1-testing/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c
|
||||
@@ -14,7 +14,7 @@ EXPORT_SYMBOL(system_state);
|
||||
|
||||
lndir -silent ${XL}/include/xen include/xen
|
||||
-ln -nsf ${XEN}/include/public include/xen/interface
|
||||
+ln -nsf ${XEN}/interface include/xen/interface
|
||||
void ctrl_alt_del(void)
|
||||
{
|
||||
- kill_proc(1, SIGINT, 1); /* interrupt init */
|
||||
+ kill_proc_info(SIGINT, SEND_SIG_PRIV, 1);
|
||||
}
|
||||
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,8)
|
||||
Index: xen-3.3.1-testing/unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c
|
||||
===================================================================
|
||||
--- xen-3.3.1-testing.orig/unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c
|
||||
+++ xen-3.3.1-testing/unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c
|
||||
@@ -44,7 +44,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) */
|
||||
|
||||
# Need to be quite careful here: we don't want the files we link in to
|
||||
# risk overriding the native Linux ones (in particular, system.h must
|
||||
|
Reference in New Issue
Block a user