Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@novell.com>2010-03-15 12:22:00 +0100
committerJan Beulich <jbeulich@novell.com>2010-03-15 12:22:00 +0100
commitb71f07e7a69c588ea64068fe033a0a91c0b3b36c (patch)
tree31d6821e915f9f8d06c377644c84c4960c1b618a
parentc17febf5e6f6591e820a46065e3cfbda3ee62dea (diff)
- patches.xen/xen3-patch-2.6.32: Xen pv driver fix forrpm-2.6.32.9-0.5
CONFIG_CPUMASK_OFFSTACK.
-rw-r--r--kernel-source.changes6
-rw-r--r--patches.xen/xen3-patch-2.6.3239
2 files changed, 31 insertions, 14 deletions
diff --git a/kernel-source.changes b/kernel-source.changes
index ce6c1fd624..57cd5c1046 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Mar 15 12:21:17 CET 2010 - jbeulich@novell.com
+
+- patches.xen/xen3-patch-2.6.32: Xen pv driver fix for
+ CONFIG_CPUMASK_OFFSTACK.
+
+-------------------------------------------------------------------
Mon Mar 15 11:31:04 CET 2010 - hare@suse.de
- patches.drivers/mpt2sas-03.100.03.00-update: Remove duplicate
diff --git a/patches.xen/xen3-patch-2.6.32 b/patches.xen/xen3-patch-2.6.32
index 72c18e9885..72484d33e5 100644
--- a/patches.xen/xen3-patch-2.6.32
+++ b/patches.xen/xen3-patch-2.6.32
@@ -196,7 +196,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
extern int xen_update_persistent_clock(void);
#endif
---- sle11sp1-2010-03-11.orig/arch/x86/include/asm/uv/uv_hub.h 2010-03-11 09:10:10.000000000 +0100
+--- sle11sp1-2010-03-11.orig/arch/x86/include/asm/uv/uv_hub.h 2010-03-15 12:08:09.000000000 +0100
+++ sle11sp1-2010-03-11/arch/x86/include/asm/uv/uv_hub.h 2009-11-06 11:32:17.000000000 +0100
@@ -11,7 +11,7 @@
#ifndef _ASM_X86_UV_UV_HUB_H
@@ -1717,7 +1717,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
#endif
/* Make sure %fs and %gs are initialized properly in idle threads */
---- sle11sp1-2010-03-11.orig/arch/x86/kernel/cpu/mcheck/mce-inject.c 2010-03-11 09:10:10.000000000 +0100
+--- sle11sp1-2010-03-11.orig/arch/x86/kernel/cpu/mcheck/mce-inject.c 2010-03-15 12:08:09.000000000 +0100
+++ sle11sp1-2010-03-11/arch/x86/kernel/cpu/mcheck/mce-inject.c 2009-11-06 10:52:22.000000000 +0100
@@ -143,7 +143,7 @@ static void raise_mce(struct mce *m)
if (context == MCJ_CTX_RANDOM)
@@ -3984,7 +3984,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
#endif /* CONFIG_X86_32 */
#ifdef CONFIG_XEN
---- sle11sp1-2010-03-11.orig/arch/x86/kernel/sfi.c 2010-03-11 09:10:10.000000000 +0100
+--- sle11sp1-2010-03-11.orig/arch/x86/kernel/sfi.c 2010-03-15 12:08:09.000000000 +0100
+++ sle11sp1-2010-03-11/arch/x86/kernel/sfi.c 2009-11-06 10:52:23.000000000 +0100
@@ -31,7 +31,7 @@
#include <asm/setup.h>
@@ -5601,7 +5601,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
BUG();
} else {
xen_l1_entry_update(ptep, entry);
---- sle11sp1-2010-03-11.orig/arch/x86/mm/physaddr.c 2010-03-11 09:10:10.000000000 +0100
+--- sle11sp1-2010-03-11.orig/arch/x86/mm/physaddr.c 2010-03-15 12:08:09.000000000 +0100
+++ sle11sp1-2010-03-11/arch/x86/mm/physaddr.c 2009-11-06 10:52:23.000000000 +0100
@@ -8,6 +8,10 @@
@@ -5625,7 +5625,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
pr->cdev = thermal_cooling_device_register("Processor", device,
&processor_cooling_ops);
---- sle11sp1-2010-03-11.orig/drivers/char/agp/agp.h 2010-03-11 09:10:10.000000000 +0100
+--- sle11sp1-2010-03-11.orig/drivers/char/agp/agp.h 2010-03-15 12:08:09.000000000 +0100
+++ sle11sp1-2010-03-11/drivers/char/agp/agp.h 2009-11-06 10:52:23.000000000 +0100
@@ -31,6 +31,10 @@
@@ -5638,7 +5638,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
#define PFX "agpgart: "
//#define AGP_DEBUG 1
---- sle11sp1-2010-03-11.orig/drivers/char/agp/amd-k7-agp.c 2010-03-11 09:10:10.000000000 +0100
+--- sle11sp1-2010-03-11.orig/drivers/char/agp/amd-k7-agp.c 2010-03-15 12:08:09.000000000 +0100
+++ sle11sp1-2010-03-11/drivers/char/agp/amd-k7-agp.c 2009-11-06 10:52:23.000000000 +0100
@@ -44,7 +44,7 @@ static int amd_create_page_map(struct am
#ifndef CONFIG_X86
@@ -5667,7 +5667,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
page_dir.remapped+GET_PAGE_DIR_OFF(addr));
readl(page_dir.remapped+GET_PAGE_DIR_OFF(addr)); /* PCI Posting. */
}
---- sle11sp1-2010-03-11.orig/drivers/char/agp/amd64-agp.c 2010-03-11 09:10:10.000000000 +0100
+--- sle11sp1-2010-03-11.orig/drivers/char/agp/amd64-agp.c 2010-03-15 12:08:09.000000000 +0100
+++ sle11sp1-2010-03-11/drivers/char/agp/amd64-agp.c 2009-11-06 10:52:23.000000000 +0100
@@ -178,7 +178,7 @@ static const struct aper_size_info_32 am
@@ -5687,7 +5687,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
amd64_aperture_sizes[bridge->aperture_size_idx].size);
agp_remove_bridge(bridge);
agp_put_bridge(bridge);
---- sle11sp1-2010-03-11.orig/drivers/char/agp/ati-agp.c 2010-03-11 09:10:10.000000000 +0100
+--- sle11sp1-2010-03-11.orig/drivers/char/agp/ati-agp.c 2010-03-15 12:08:09.000000000 +0100
+++ sle11sp1-2010-03-11/drivers/char/agp/ati-agp.c 2009-11-06 10:52:23.000000000 +0100
@@ -360,7 +360,7 @@ static int ati_create_gatt_table(struct
@@ -5707,7 +5707,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
page_dir.remapped+GET_PAGE_DIR_OFF(addr));
readl(page_dir.remapped+GET_PAGE_DIR_OFF(addr)); /* PCI Posting. */
}
---- sle11sp1-2010-03-11.orig/drivers/char/agp/efficeon-agp.c 2010-03-11 09:10:10.000000000 +0100
+--- sle11sp1-2010-03-11.orig/drivers/char/agp/efficeon-agp.c 2010-03-15 12:08:09.000000000 +0100
+++ sle11sp1-2010-03-11/drivers/char/agp/efficeon-agp.c 2009-11-06 10:52:23.000000000 +0100
@@ -226,7 +226,7 @@ static int efficeon_create_gatt_table(st
@@ -5718,7 +5718,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
pci_write_config_dword(agp_bridge->dev,
EFFICEON_ATTPAGE, value);
---- sle11sp1-2010-03-11.orig/drivers/char/agp/generic.c 2010-03-11 09:10:10.000000000 +0100
+--- sle11sp1-2010-03-11.orig/drivers/char/agp/generic.c 2010-03-15 12:08:09.000000000 +0100
+++ sle11sp1-2010-03-11/drivers/char/agp/generic.c 2009-11-06 10:52:23.000000000 +0100
@@ -988,7 +988,7 @@ int agp_generic_create_gatt_table(struct
set_memory_uc((unsigned long)table, 1 << page_order);
@@ -5738,7 +5738,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
/* AK: bogus, should encode addresses > 4GB */
for (i = 0; i < num_entries; i++) {
---- sle11sp1-2010-03-11.orig/drivers/char/agp/sworks-agp.c 2010-03-11 09:10:10.000000000 +0100
+--- sle11sp1-2010-03-11.orig/drivers/char/agp/sworks-agp.c 2010-03-15 12:08:09.000000000 +0100
+++ sle11sp1-2010-03-11/drivers/char/agp/sworks-agp.c 2009-11-06 10:52:23.000000000 +0100
@@ -155,7 +155,7 @@ static int serverworks_create_gatt_table
/* Create a fake scratch directory */
@@ -5878,7 +5878,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
msi_dev_entry = get_msi_dev_pirq_list(dev);
---- sle11sp1-2010-03-11.orig/drivers/pci/probe.c 2010-03-11 09:10:10.000000000 +0100
+--- sle11sp1-2010-03-11.orig/drivers/pci/probe.c 2010-03-15 12:08:09.000000000 +0100
+++ sle11sp1-2010-03-11/drivers/pci/probe.c 2010-03-11 09:20:12.000000000 +0100
@@ -1128,7 +1128,11 @@ int pci_scan_slot(struct pci_bus *bus, i
if (dev && !dev->is_added) /* new device? */
@@ -5892,7 +5892,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
for (fn = 1; fn < 8; fn++) {
dev = pci_scan_single_device(bus, devfn + fn);
if (dev) {
---- sle11sp1-2010-03-11.orig/drivers/sfi/sfi_core.c 2010-03-11 09:10:10.000000000 +0100
+--- sle11sp1-2010-03-11.orig/drivers/sfi/sfi_core.c 2010-03-15 12:08:09.000000000 +0100
+++ sle11sp1-2010-03-11/drivers/sfi/sfi_core.c 2009-12-16 11:53:57.000000000 +0100
@@ -387,6 +387,11 @@ void __init sfi_init(void)
if (!acpi_disabled)
@@ -5906,7 +5906,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
if (sfi_disabled)
return;
---- sle11sp1-2010-03-11.orig/drivers/staging/hv/Kconfig 2010-03-11 09:10:10.000000000 +0100
+--- sle11sp1-2010-03-11.orig/drivers/staging/hv/Kconfig 2010-03-15 12:08:09.000000000 +0100
+++ sle11sp1-2010-03-11/drivers/staging/hv/Kconfig 2009-11-06 10:52:23.000000000 +0100
@@ -1,6 +1,6 @@
config HYPERV
@@ -6042,6 +6042,17 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
#ifdef CONFIG_SMP
+--- sle11sp1-2010-03-11.orig/drivers/xen/core/reboot.c 2009-11-06 10:51:42.000000000 +0100
++++ sle11sp1-2010-03-11/drivers/xen/core/reboot.c 2010-03-15 12:13:22.000000000 +0100
+@@ -83,7 +83,7 @@ static int xen_suspend(void *__unused)
+ int err, old_state;
+
+ daemonize("suspend");
+- err = set_cpus_allowed(current, cpumask_of_cpu(0));
++ err = set_cpus_allowed_ptr(current, cpumask_of(0));
+ if (err) {
+ printk(KERN_ERR "Xen suspend can't run on CPU0 (%d)\n", err);
+ goto fail;
--- sle11sp1-2010-03-11.orig/drivers/xen/netback/interface.c 2010-01-04 12:40:53.000000000 +0100
+++ sle11sp1-2010-03-11/drivers/xen/netback/interface.c 2010-01-04 12:42:38.000000000 +0100
@@ -159,7 +159,7 @@ static void netbk_get_strings(struct net