Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@novell.com>2011-10-07 17:46:06 +0200
committerJan Beulich <jbeulich@novell.com>2011-10-07 17:46:06 +0200
commit8f986a2285fc9b395cbcad72ccd66dac303f1b3d (patch)
tree39538f19b8a71fd62e0e824c390bf646acfbb397
parent9c8680ab9a72a8339ab09106baf1676e03c92399 (diff)
- Update Xen patches to 3.1-rc9 and c/s 1116.
-rw-r--r--patches.xen/pci-guestdev54
-rw-r--r--patches.xen/xen-blkback-cdrom4
-rw-r--r--patches.xen/xen-blkif-protocol-fallback-hack14
-rw-r--r--patches.xen/xen-cpufreq-report16
-rw-r--r--patches.xen/xen-dcdbas22
-rw-r--r--patches.xen/xen-pci-multi-segment305
-rw-r--r--patches.xen/xen-unpriv-build98
-rw-r--r--patches.xen/xen-x86-EFI47
-rw-r--r--patches.xen/xen-x86-bigmem20
-rw-r--r--patches.xen/xen-x86-msr-on-pcpu10
-rw-r--r--patches.xen/xen3-auto-arch-i386.diff2
-rw-r--r--patches.xen/xen3-auto-arch-x86.diff2
-rw-r--r--patches.xen/xen3-auto-arch-x86_64.diff2
-rw-r--r--patches.xen/xen3-auto-common.diff196
-rw-r--r--patches.xen/xen3-auto-include-xen-interface.diff182
-rw-r--r--patches.xen/xen3-auto-xen-arch.diff266
-rw-r--r--patches.xen/xen3-auto-xen-drivers.diff325
-rw-r--r--patches.xen/xen3-auto-xen-kconfig.diff48
-rw-r--r--patches.xen/xen3-fixup-xen446
-rw-r--r--patches.xen/xen3-patch-2.6.1823
-rw-r--r--patches.xen/xen3-patch-2.6.19520
-rw-r--r--patches.xen/xen3-patch-2.6.20324
-rw-r--r--patches.xen/xen3-patch-2.6.21400
-rw-r--r--patches.xen/xen3-patch-2.6.22463
-rw-r--r--patches.xen/xen3-patch-2.6.23526
-rw-r--r--patches.xen/xen3-patch-2.6.24758
-rw-r--r--patches.xen/xen3-patch-2.6.25527
-rw-r--r--patches.xen/xen3-patch-2.6.26462
-rw-r--r--patches.xen/xen3-patch-2.6.27649
-rw-r--r--patches.xen/xen3-patch-2.6.28450
-rw-r--r--patches.xen/xen3-patch-2.6.29435
-rw-r--r--patches.xen/xen3-patch-2.6.30458
-rw-r--r--patches.xen/xen3-patch-2.6.31506
-rw-r--r--patches.xen/xen3-patch-2.6.32450
-rw-r--r--patches.xen/xen3-patch-2.6.33276
-rw-r--r--patches.xen/xen3-patch-2.6.35186
-rw-r--r--patches.xen/xen3-patch-2.6.36242
-rw-r--r--patches.xen/xen3-patch-2.6.37521
-rw-r--r--patches.xen/xen3-patch-2.6.38264
-rw-r--r--patches.xen/xen3-patch-2.6.39248
-rw-r--r--patches.xen/xen3-patch-3.0246
-rw-r--r--patches.xen/xen3-patch-3.1-rc5372
-rw-r--r--patches.xen/xen3-patch-3.1-rc6-rc712
-rw-r--r--patches.xen/xen3-patch-3.1-rc7-rc8305
-rw-r--r--patches.xen/xen3-patch-3.1-rc8-rc982
-rw-r--r--patches.xen/xen3-stack-unwind14
-rw-r--r--patches.xen/xen3-x86_64-unwind-annotations18
-rw-r--r--series.conf3
48 files changed, 6058 insertions, 5741 deletions
diff --git a/patches.xen/pci-guestdev b/patches.xen/pci-guestdev
index 66011637ed..1c458641e1 100644
--- a/patches.xen/pci-guestdev
+++ b/patches.xen/pci-guestdev
@@ -8,8 +8,8 @@ jb: Added support for guestiomuldev=all.
jb: split /dev/xen/pci_iomul driver to be separate (so it can be a module)
Acked-by: jbeulich@novell.com
---- head-2011-09-23.orig/Documentation/kernel-parameters.txt 2011-09-23 09:40:45.000000000 +0200
-+++ head-2011-09-23/Documentation/kernel-parameters.txt 2011-09-23 09:41:45.000000000 +0200
+--- head-2011-10-07.orig/Documentation/kernel-parameters.txt 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/Documentation/kernel-parameters.txt 2011-09-23 09:41:45.000000000 +0200
@@ -831,6 +831,24 @@ bytes respectively. Such letter suffixes
gpt [EFI] Forces disk with valid GPT signature but
invalid Protective MBR to be treated as GPT.
@@ -46,8 +46,8 @@ Acked-by: jbeulich@novell.com
reboot= [BUGS=X86-32,BUGS=ARM,BUGS=IA-64] Rebooting mode
Format: <reboot_mode>[,<reboot_mode2>[,...]]
See arch/*/kernel/reboot.c or arch/*/kernel/process.c
---- head-2011-09-23.orig/drivers/acpi/pci_root.c 2011-09-23 09:35:34.000000000 +0200
-+++ head-2011-09-23/drivers/acpi/pci_root.c 2011-06-30 15:22:30.000000000 +0200
+--- head-2011-10-07.orig/drivers/acpi/pci_root.c 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/acpi/pci_root.c 2011-06-30 15:22:30.000000000 +0200
@@ -449,6 +449,41 @@ out:
}
EXPORT_SYMBOL(acpi_pci_osc_control_set);
@@ -136,8 +136,8 @@ Acked-by: jbeulich@novell.com
+ return FALSE;
+}
+#endif
---- head-2011-09-23.orig/drivers/acpi/scan.c 2011-09-23 09:35:34.000000000 +0200
-+++ head-2011-09-23/drivers/acpi/scan.c 2011-05-09 11:37:03.000000000 +0200
+--- head-2011-10-07.orig/drivers/acpi/scan.c 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/acpi/scan.c 2011-05-09 11:37:03.000000000 +0200
@@ -175,6 +175,16 @@ acpi_device_hid_show(struct device *dev,
}
static DEVICE_ATTR(hid, 0444, acpi_device_hid_show, NULL);
@@ -191,8 +191,8 @@ Acked-by: jbeulich@novell.com
if (info->valid & ACPI_VALID_ADR) {
device->pnp.bus_address = info->address;
device->flags.bus_address = 1;
---- head-2011-09-23.orig/drivers/pci/Kconfig 2011-09-23 09:35:34.000000000 +0200
-+++ head-2011-09-23/drivers/pci/Kconfig 2011-01-31 14:31:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/pci/Kconfig 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/pci/Kconfig 2011-01-31 14:31:27.000000000 +0100
@@ -31,6 +31,20 @@ config PCI_DEBUG
When in doubt, say N.
@@ -214,8 +214,8 @@ Acked-by: jbeulich@novell.com
config PCI_STUB
tristate "PCI Stub driver"
depends on PCI
---- head-2011-09-23.orig/drivers/pci/Makefile 2011-09-23 09:35:34.000000000 +0200
-+++ head-2011-09-23/drivers/pci/Makefile 2011-01-31 14:31:28.000000000 +0100
+--- head-2011-10-07.orig/drivers/pci/Makefile 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/pci/Makefile 2011-01-31 14:31:28.000000000 +0100
@@ -7,6 +7,10 @@ obj-y += access.o bus.o probe.o remove.
irq.o vpd.o
obj-$(CONFIG_PROC_FS) += proc.o
@@ -228,7 +228,7 @@ Acked-by: jbeulich@novell.com
obj-$(CONFIG_PCI_QUIRKS) += quirks.o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-09-23/drivers/pci/guestdev.c 2011-01-31 14:31:28.000000000 +0100
++++ head-2011-10-07/drivers/pci/guestdev.c 2011-01-31 14:31:28.000000000 +0100
@@ -0,0 +1,881 @@
+/*
+ * Copyright (c) 2008, 2009 NEC Corporation.
@@ -1112,7 +1112,7 @@ Acked-by: jbeulich@novell.com
+fs_initcall(pci_check_guestdev_exists);
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-09-23/drivers/pci/iomulti.c 2011-09-09 15:02:07.000000000 +0200
++++ head-2011-10-07/drivers/pci/iomulti.c 2011-09-09 15:02:07.000000000 +0200
@@ -0,0 +1,904 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
@@ -2019,7 +2019,7 @@ Acked-by: jbeulich@novell.com
+late_initcall(pci_iomul_hotplug_init);
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-09-23/drivers/pci/iomulti.h 2011-01-31 14:31:28.000000000 +0100
++++ head-2011-10-07/drivers/pci/iomulti.h 2011-01-31 14:31:28.000000000 +0100
@@ -0,0 +1,122 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
@@ -2143,8 +2143,8 @@ Acked-by: jbeulich@novell.com
+int pci_iomul_switch_io_allocated(const struct pci_iomul_switch *);
+void pci_iomul_get_lock_switch(struct pci_dev *, struct pci_iomul_switch **,
+ struct pci_iomul_slot **);
---- head-2011-09-23.orig/drivers/pci/pci.c 2011-09-23 09:35:34.000000000 +0200
-+++ head-2011-09-23/drivers/pci/pci.c 2011-08-09 10:25:20.000000000 +0200
+--- head-2011-10-07.orig/drivers/pci/pci.c 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/pci/pci.c 2011-08-09 10:25:20.000000000 +0200
@@ -3470,6 +3470,13 @@ resource_size_t pci_specified_resource_a
*/
int pci_is_reassigndev(struct pci_dev *dev)
@@ -2159,8 +2159,8 @@ Acked-by: jbeulich@novell.com
return (pci_specified_resource_alignment(dev) != 0);
}
---- head-2011-09-23.orig/drivers/pci/pci.h 2011-09-23 09:35:34.000000000 +0200
-+++ head-2011-09-23/drivers/pci/pci.h 2011-07-21 12:03:10.000000000 +0200
+--- head-2011-10-07.orig/drivers/pci/pci.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/pci/pci.h 2011-07-21 12:03:10.000000000 +0200
@@ -316,4 +316,11 @@ static inline int pci_dev_specific_reset
}
#endif
@@ -2174,7 +2174,7 @@ Acked-by: jbeulich@novell.com
+
#endif /* DRIVERS_PCI_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-09-23/drivers/pci/pci-iomul.c 2011-09-09 14:16:22.000000000 +0200
++++ head-2011-10-07/drivers/pci/pci-iomul.c 2011-09-09 14:16:22.000000000 +0200
@@ -0,0 +1,440 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
@@ -2616,8 +2616,8 @@ Acked-by: jbeulich@novell.com
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Isaku Yamahata <yamahata@valinux.co.jp>");
+MODULE_DESCRIPTION("PCI IO space multiplexing driver");
---- head-2011-09-23.orig/include/linux/acpi.h 2011-09-23 09:35:34.000000000 +0200
-+++ head-2011-09-23/include/linux/acpi.h 2011-09-23 09:41:53.000000000 +0200
+--- head-2011-10-07.orig/include/linux/acpi.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/include/linux/acpi.h 2011-09-23 09:41:53.000000000 +0200
@@ -250,6 +250,8 @@ int acpi_check_region(resource_size_t st
int acpi_resources_are_enforced(void);
@@ -2627,9 +2627,9 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_PM_SLEEP
void __init acpi_no_s4_hw_signature(void);
void __init acpi_old_suspend_ordering(void);
---- head-2011-09-23.orig/include/linux/pci.h 2011-09-23 09:35:34.000000000 +0200
-+++ head-2011-09-23/include/linux/pci.h 2011-06-30 15:21:48.000000000 +0200
-@@ -1642,5 +1642,11 @@ static inline void pci_release_bus_of_no
+--- head-2011-10-07.orig/include/linux/pci.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/include/linux/pci.h 2011-10-07 10:46:46.000000000 +0200
+@@ -1643,5 +1643,11 @@ static inline void pci_release_bus_of_no
*/
struct pci_dev *pci_find_upstream_pcie_bridge(struct pci_dev *pdev);
@@ -2641,18 +2641,18 @@ Acked-by: jbeulich@novell.com
+
#endif /* __KERNEL__ */
#endif /* LINUX_PCI_H */
---- head-2011-09-23.orig/include/xen/Kbuild 2011-09-23 09:35:34.000000000 +0200
-+++ head-2011-09-23/include/xen/Kbuild 2011-01-31 14:31:28.000000000 +0100
+--- head-2011-10-07.orig/include/xen/Kbuild 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/include/xen/Kbuild 2011-01-31 14:31:28.000000000 +0100
@@ -1,2 +1,3 @@
header-y += evtchn.h
header-y += privcmd.h
+header-y += public/
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-09-23/include/xen/public/Kbuild 2011-01-31 14:31:28.000000000 +0100
++++ head-2011-10-07/include/xen/public/Kbuild 2011-01-31 14:31:28.000000000 +0100
@@ -0,0 +1 @@
+header-y += iomulti.h
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-09-23/include/xen/public/iomulti.h 2011-01-31 14:31:28.000000000 +0100
++++ head-2011-10-07/include/xen/public/iomulti.h 2011-01-31 14:31:28.000000000 +0100
@@ -0,0 +1,50 @@
+#ifndef __LINUX_PUBLIC_IOMULTI_H__
+#define __LINUX_PUBLIC_IOMULTI_H__
diff --git a/patches.xen/xen-blkback-cdrom b/patches.xen/xen-blkback-cdrom
index cc82e15c47..e778182456 100644
--- a/patches.xen/xen-blkback-cdrom
+++ b/patches.xen/xen-blkback-cdrom
@@ -118,8 +118,8 @@ References: 159907
+ DPRINTK("nodename:%s", dev->nodename);
+ if (cdrom_is_type(be)) {
+ DPRINTK("is a cdrom");
-+ if ( cdrom_xenstore_write_media_present(be) == 0 ) {
-+ DPRINTK( "xenstore wrote OK");
++ if (cdrom_xenstore_write_media_present(be) == 0) {
++ DPRINTK("xenstore wrote OK");
+ err = xenbus_watch_path2(dev, dev->nodename, MEDIA_PRESENT,
+ &be->cdrom_watch,
+ cdrom_media_changed);
diff --git a/patches.xen/xen-blkif-protocol-fallback-hack b/patches.xen/xen-blkif-protocol-fallback-hack
index e797b89624..7da1df88ac 100644
--- a/patches.xen/xen-blkif-protocol-fallback-hack
+++ b/patches.xen/xen-blkif-protocol-fallback-hack
@@ -105,8 +105,8 @@ See the comment below. Oh well.
+CFLAGS_domctl.o := -D__XEN_PUBLIC_XEN_H__ -D__XEN_PUBLIC_GRANT_TABLE_H__
+CFLAGS_domctl.o += -D__XEN_TOOLS__ -imacros xen/interface/domctl.h
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-09-23/drivers/xen/core/domctl.c 2010-10-11 10:31:06.000000000 +0200
-@@ -0,0 +1,127 @@
++++ head-2011-09-23/drivers/xen/core/domctl.c 2011-10-04 17:01:11.000000000 +0200
+@@ -0,0 +1,131 @@
+/*
+ * !!! dirty hack alert !!!
+ *
@@ -160,7 +160,8 @@ See the comment below. Oh well.
+ /*
+ * v5: upstream: xen 3.1
+ * v6: upstream: xen 4.0
-+ * v7: sle11 sp1: xen 4.0 + cpupools patches
++ * v7: upstream: xen 4.1; sle11 sp1: xen 4.0 + cpupools patches
++ * v8: upstream: xen 4.2
+ */
+ struct {
+ uint32_t cmd;
@@ -171,7 +172,7 @@ See the comment below. Oh well.
+ uint64_aligned_t dummy_align;
+ uint8_t dummy_pad[128];
+ };
-+ } v5, v6, v7;
++ } v5, v6, v7, v8;
+};
+
+/* The actual code comes here */
@@ -199,8 +200,11 @@ See the comment below. Oh well.
+ } \
+} while (0)
+
-+ BUILD_BUG_ON(XEN_DOMCTL_INTERFACE_VERSION > 7);
++ BUILD_BUG_ON(XEN_DOMCTL_INTERFACE_VERSION > 8);
++ guest_address_size(8);
++#if CONFIG_XEN_COMPAT < 0x040200
+ guest_address_size(7);
++#endif
+#if CONFIG_XEN_COMPAT < 0x040100
+ guest_address_size(6);
+#endif
diff --git a/patches.xen/xen-cpufreq-report b/patches.xen/xen-cpufreq-report
index 6d02668ae9..078170860a 100644
--- a/patches.xen/xen-cpufreq-report
+++ b/patches.xen/xen-cpufreq-report
@@ -2,8 +2,8 @@ From: jbeulich@novell.com
Subject: make /proc/cpuinfo track CPU speed
Patch-mainline: obsolete
---- head-2011-09-23.orig/arch/x86/kernel/acpi/processor_extcntl_xen.c 2011-02-02 15:09:57.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/acpi/processor_extcntl_xen.c 2011-09-23 10:29:53.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/kernel/acpi/processor_extcntl_xen.c 2011-02-02 15:09:57.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/acpi/processor_extcntl_xen.c 2011-09-23 10:29:53.000000000 +0200
@@ -266,3 +266,12 @@ static int __init init_extcntl(void)
return 0;
}
@@ -17,8 +17,8 @@ Patch-mainline: obsolete
+ op.u.get_cpu_freq.vcpu = cpu;
+ return HYPERVISOR_platform_op(&op) == 0 ? op.u.get_cpu_freq.freq : 0;
+}
---- head-2011-09-23.orig/include/linux/cpufreq.h 2011-09-23 09:35:32.000000000 +0200
-+++ head-2011-09-23/include/linux/cpufreq.h 2011-09-09 15:52:26.000000000 +0200
+--- head-2011-10-07.orig/include/linux/cpufreq.h 2011-10-07 10:46:15.000000000 +0200
++++ head-2011-10-07/include/linux/cpufreq.h 2011-09-09 15:52:26.000000000 +0200
@@ -322,7 +322,7 @@ static inline unsigned int cpufreq_get(u
#endif
@@ -28,9 +28,9 @@ Patch-mainline: obsolete
unsigned int cpufreq_quick_get(unsigned int cpu);
unsigned int cpufreq_quick_get_max(unsigned int cpu);
#else
---- head-2011-09-23.orig/include/xen/interface/platform.h 2011-08-19 11:46:44.000000000 +0200
-+++ head-2011-09-23/include/xen/interface/platform.h 2011-08-23 13:12:54.000000000 +0200
-@@ -451,6 +451,14 @@ struct xenpf_mem_hotadd
+--- head-2011-10-07.orig/include/xen/interface/platform.h 2011-10-07 10:44:29.000000000 +0200
++++ head-2011-10-07/include/xen/interface/platform.h 2011-10-07 13:32:59.000000000 +0200
+@@ -475,6 +475,14 @@ struct xenpf_mem_hotadd
uint32_t flags;
};
@@ -45,7 +45,7 @@ Patch-mainline: obsolete
struct xen_platform_op {
uint32_t cmd;
uint32_t interface_version; /* XENPF_INTERFACE_VERSION */
-@@ -471,6 +479,7 @@ struct xen_platform_op {
+@@ -495,6 +503,7 @@ struct xen_platform_op {
struct xenpf_cpu_ol cpu_ol;
struct xenpf_cpu_hotadd cpu_add;
struct xenpf_mem_hotadd mem_add;
diff --git a/patches.xen/xen-dcdbas b/patches.xen/xen-dcdbas
index 4ed8b63de7..e65b3209ad 100644
--- a/patches.xen/xen-dcdbas
+++ b/patches.xen/xen-dcdbas
@@ -105,7 +105,7 @@ The only caveat is that this doesn't work when Dom0 has its vCPU-s pinned.
if (error)
return error;
--- head-2011-04-11.orig/drivers/xen/core/domctl.c 2010-10-11 10:31:06.000000000 +0200
-+++ head-2011-04-11/drivers/xen/core/domctl.c 2010-11-23 16:20:20.000000000 +0100
++++ head-2011-04-11/drivers/xen/core/domctl.c 2011-10-04 17:03:34.000000000 +0200
@@ -20,6 +20,8 @@
#undef __XEN_TOOLS__
#include <linux/kernel.h>
@@ -153,7 +153,7 @@ The only caveat is that this doesn't work when Dom0 has its vCPU-s pinned.
uint64_t dummy_align;
uint8_t dummy_pad[128];
};
-@@ -59,6 +85,7 @@ union xen_domctl {
+@@ -60,6 +86,7 @@ union xen_domctl {
domid_t domain;
union {
struct xen_domctl_address_size address_size;
@@ -161,7 +161,7 @@ The only caveat is that this doesn't work when Dom0 has its vCPU-s pinned.
uint64_aligned_t dummy_align;
uint8_t dummy_pad[128];
};
-@@ -124,4 +151,118 @@ int xen_guest_blkif_protocol(int domid)
+@@ -128,4 +155,126 @@ int xen_guest_blkif_protocol(int domid)
}
EXPORT_SYMBOL_GPL(xen_guest_blkif_protocol);
@@ -184,8 +184,12 @@ The only caveat is that this doesn't work when Dom0 has its vCPU-s pinned.
+ union xen_domctl domctl;
+ int rc;
+
-+ BUILD_BUG_ON(XEN_DOMCTL_INTERFACE_VERSION > 7);
-+ rc = vcpuaffinity(get, 7);
++ BUILD_BUG_ON(XEN_DOMCTL_INTERFACE_VERSION > 8);
++ rc = vcpuaffinity(get, 8);
++#if CONFIG_XEN_COMPAT < 0x040200
++ if (rc)
++ rc = vcpuaffinity(get, 7);
++#endif
+#if CONFIG_XEN_COMPAT < 0x040100
+ if (rc)
+ rc = vcpuaffinity(get, 6);
@@ -206,8 +210,12 @@ The only caveat is that this doesn't work when Dom0 has its vCPU-s pinned.
+ union xen_domctl domctl;
+ int rc;
+
-+ BUILD_BUG_ON(XEN_DOMCTL_INTERFACE_VERSION > 7);
-+ rc = vcpuaffinity(set, 7);
++ BUILD_BUG_ON(XEN_DOMCTL_INTERFACE_VERSION > 8);
++ rc = vcpuaffinity(set, 8);
++#if CONFIG_XEN_COMPAT < 0x040200
++ if (rc)
++ rc = vcpuaffinity(set, 7);
++#endif
+#if CONFIG_XEN_COMPAT < 0x040100
+ if (rc)
+ rc = vcpuaffinity(set, 6);
diff --git a/patches.xen/xen-pci-multi-segment b/patches.xen/xen-pci-multi-segment
deleted file mode 100644
index ca147246e4..0000000000
--- a/patches.xen/xen-pci-multi-segment
+++ /dev/null
@@ -1,305 +0,0 @@
-Subject: pass PCI segment information to Xen
-From: jbeulich@novell.com
-Patch-mainline: n/a
-
---- head-2011-08-09.orig/drivers/pci/msi-xen.c 2011-02-01 15:03:03.000000000 +0100
-+++ head-2011-08-09/drivers/pci/msi-xen.c 2011-08-09 13:41:53.000000000 +0200
-@@ -26,6 +26,11 @@
- #include "msi.h"
-
- static int pci_msi_enable = 1;
-+#if CONFIG_XEN_COMPAT < 0x040200
-+static bool pci_seg_supported = true;
-+#else
-+#define pci_seg_supported true
-+#endif
-
- static LIST_HEAD(msi_dev_head);
- DEFINE_SPINLOCK(msi_dev_lock);
-@@ -232,21 +237,34 @@ static u64 find_table_base(struct pci_de
- static int msi_map_vector(struct pci_dev *dev, int entry_nr, u64 table_base)
- {
- struct physdev_map_pirq map_irq;
-- int rc;
-+ int rc = -EINVAL;
- domid_t domid = DOMID_SELF;
-
- domid = msi_get_dev_owner(dev);
-
- map_irq.domid = domid;
-- map_irq.type = MAP_PIRQ_TYPE_MSI;
-+ map_irq.type = MAP_PIRQ_TYPE_MSI_SEG;
- map_irq.index = -1;
- map_irq.pirq = -1;
-- map_irq.bus = dev->bus->number;
-+ map_irq.bus = dev->bus->number | (pci_domain_nr(dev->bus) << 16);
- map_irq.devfn = dev->devfn;
- map_irq.entry_nr = entry_nr;
- map_irq.table_base = table_base;
-
-- if ((rc = HYPERVISOR_physdev_op(PHYSDEVOP_map_pirq, &map_irq)))
-+ if (pci_seg_supported)
-+ rc = HYPERVISOR_physdev_op(PHYSDEVOP_map_pirq, &map_irq);
-+#if CONFIG_XEN_COMPAT < 0x040200
-+ if (rc == -EINVAL && !pci_domain_nr(dev->bus)) {
-+ map_irq.type = MAP_PIRQ_TYPE_MSI;
-+ map_irq.index = -1;
-+ map_irq.pirq = -1;
-+ map_irq.bus = dev->bus->number;
-+ rc = HYPERVISOR_physdev_op(PHYSDEVOP_map_pirq, &map_irq);
-+ if (rc != -EINVAL)
-+ pci_seg_supported = false;
-+ }
-+#endif
-+ if (rc)
- dev_warn(&dev->dev, "map irq failed\n");
-
- if (rc < 0)
-@@ -282,8 +300,7 @@ static void pci_intx_for_msi(struct pci_
-
- void pci_restore_msi_state(struct pci_dev *dev)
- {
-- int rc;
-- struct physdev_restore_msi restore;
-+ int rc = -ENOSYS;
-
- if (!dev->msi_enabled && !dev->msix_enabled)
- return;
-@@ -297,9 +314,27 @@ void pci_restore_msi_state(struct pci_de
- if (dev->msix_enabled)
- msix_set_enable(dev, 0);
-
-- restore.bus = dev->bus->number;
-- restore.devfn = dev->devfn;
-- rc = HYPERVISOR_physdev_op(PHYSDEVOP_restore_msi, &restore);
-+ if (pci_seg_supported) {
-+ struct physdev_pci_device restore = {
-+ .seg = pci_domain_nr(dev->bus),
-+ .bus = dev->bus->number,
-+ .devfn = dev->devfn
-+ };
-+
-+ rc = HYPERVISOR_physdev_op(PHYSDEVOP_restore_msi_ext,
-+ &restore);
-+ }
-+#if CONFIG_XEN_COMPAT < 0x040200
-+ if (rc == -ENOSYS && !pci_domain_nr(dev->bus)) {
-+ struct physdev_restore_msi restore = {
-+ .bus = dev->bus->number,
-+ .devfn = dev->devfn
-+ };
-+
-+ pci_seg_supported = false;
-+ rc = HYPERVISOR_physdev_op(PHYSDEVOP_restore_msi, &restore);
-+ }
-+#endif
- WARN(rc && rc != -ENOSYS, "restore_msi -> %d\n", rc);
- }
- EXPORT_SYMBOL_GPL(pci_restore_msi_state);
---- head-2011-08-09.orig/drivers/xen/pci.c 2011-08-18 11:21:53.000000000 +0200
-+++ head-2011-08-09/drivers/xen/pci.c 2011-08-18 11:42:23.000000000 +0200
-@@ -18,11 +18,13 @@
- */
-
- #include <linux/pci.h>
-+#include <linux/acpi.h>
- #include <xen/xen.h>
- #include <xen/interface/physdev.h>
- #include <xen/interface/xen.h>
-
- #ifdef CONFIG_PARAVIRT_XEN
-+#define CONFIG_XEN_COMPAT 0x040000
- #include <asm/xen/hypervisor.h>
- #include <asm/xen/hypercall.h>
- #else
-@@ -30,26 +32,91 @@
- #endif
- #include "../pci/pci.h"
-
-+#if CONFIG_XEN_COMPAT < 0x040200
-+static bool __read_mostly pci_seg_supported = true;
-+#else
-+#define pci_seg_supported true
-+#endif
-+
- static int xen_add_device(struct device *dev)
- {
- int r;
- struct pci_dev *pci_dev = to_pci_dev(dev);
-+#ifdef CONFIG_PCI_IOV
-+ struct pci_dev *physfn = pci_dev->physfn;
-+#endif
-+
-+ if (pci_seg_supported) {
-+ struct physdev_pci_device_add add = {
-+ .seg = pci_domain_nr(pci_dev->bus),
-+ .bus = pci_dev->bus->number,
-+ .devfn = pci_dev->devfn
-+ };
-+#ifdef CONFIG_ACPI
-+ acpi_handle handle;
-+#endif
-+
-+#ifdef CONFIG_PCI_IOV
-+ if (pci_dev->is_virtfn) {
-+ add.flags = XEN_PCI_DEV_VIRTFN;
-+ add.physfn.bus = physfn->bus->number;
-+ add.physfn.devfn = physfn->devfn;
-+ } else
-+#endif
-+ if (pci_ari_enabled(pci_dev->bus) && PCI_SLOT(pci_dev->devfn))
-+ add.flags = XEN_PCI_DEV_EXTFN;
-
-+#ifdef CONFIG_ACPI
-+ handle = DEVICE_ACPI_HANDLE(&pci_dev->dev);
-+ if (!handle)
-+ handle = DEVICE_ACPI_HANDLE(pci_dev->bus->bridge);
- #ifdef CONFIG_PCI_IOV
-- if (pci_dev->is_virtfn) {
-+ if (!handle && pci_dev->is_virtfn)
-+ handle = DEVICE_ACPI_HANDLE(physfn->bus->bridge);
-+#endif
-+ if (handle) {
-+ acpi_status status;
-+
-+ do {
-+ unsigned long long pxm;
-+
-+ status = acpi_evaluate_integer(handle, "_PXM",
-+ NULL, &pxm);
-+ if (ACPI_SUCCESS(status)) {
-+ add.optarr[0] = pxm;
-+ add.flags |= XEN_PCI_DEV_PXM;
-+ break;
-+ }
-+ status = acpi_get_parent(handle, &handle);
-+ } while (ACPI_SUCCESS(status));
-+ }
-+#endif /* CONFIG_ACPI */
-+
-+ r = HYPERVISOR_physdev_op(PHYSDEVOP_pci_device_add, &add);
-+ if (r != -ENOSYS)
-+ return r;
-+#if CONFIG_XEN_COMPAT < 0x040200
-+ pci_seg_supported = false;
-+#endif
-+ }
-+
-+ if (pci_domain_nr(pci_dev->bus))
-+ r = -ENOSYS;
-+#ifdef CONFIG_PCI_IOV
-+ else if (pci_dev->is_virtfn) {
- struct physdev_manage_pci_ext manage_pci_ext = {
- .bus = pci_dev->bus->number,
- .devfn = pci_dev->devfn,
- .is_virtfn = 1,
-- .physfn.bus = pci_dev->physfn->bus->number,
-- .physfn.devfn = pci_dev->physfn->devfn,
-+ .physfn.bus = physfn->bus->number,
-+ .physfn.devfn = physfn->devfn,
- };
-
- r = HYPERVISOR_physdev_op(PHYSDEVOP_manage_pci_add_ext,
- &manage_pci_ext);
-- } else
-+ }
- #endif
-- if (pci_ari_enabled(pci_dev->bus) && PCI_SLOT(pci_dev->devfn)) {
-+ else if (pci_ari_enabled(pci_dev->bus) && PCI_SLOT(pci_dev->devfn)) {
- struct physdev_manage_pci_ext manage_pci_ext = {
- .bus = pci_dev->bus->number,
- .devfn = pci_dev->devfn,
-@@ -75,13 +142,27 @@ static int xen_remove_device(struct devi
- {
- int r;
- struct pci_dev *pci_dev = to_pci_dev(dev);
-- struct physdev_manage_pci manage_pci;
-
-- manage_pci.bus = pci_dev->bus->number;
-- manage_pci.devfn = pci_dev->devfn;
-+ if (pci_seg_supported) {
-+ struct physdev_pci_device device = {
-+ .seg = pci_domain_nr(pci_dev->bus),
-+ .bus = pci_dev->bus->number,
-+ .devfn = pci_dev->devfn
-+ };
-
-- r = HYPERVISOR_physdev_op(PHYSDEVOP_manage_pci_remove,
-- &manage_pci);
-+ r = HYPERVISOR_physdev_op(PHYSDEVOP_pci_device_remove,
-+ &device);
-+ } else if (pci_domain_nr(pci_dev->bus))
-+ r = -ENOSYS;
-+ else {
-+ struct physdev_manage_pci manage_pci = {
-+ .bus = pci_dev->bus->number,
-+ .devfn = pci_dev->devfn
-+ };
-+
-+ r = HYPERVISOR_physdev_op(PHYSDEVOP_manage_pci_remove,
-+ &manage_pci);
-+ }
-
- return r;
- }
---- head-2011-08-09.orig/include/xen/interface/physdev.h 2011-07-05 17:23:43.000000000 +0200
-+++ head-2011-08-09/include/xen/interface/physdev.h 2011-08-10 08:21:19.000000000 +0200
-@@ -142,6 +142,7 @@ DEFINE_XEN_GUEST_HANDLE(physdev_irq_t);
- #define MAP_PIRQ_TYPE_MSI 0x0
- #define MAP_PIRQ_TYPE_GSI 0x1
- #define MAP_PIRQ_TYPE_UNKNOWN 0x2
-+#define MAP_PIRQ_TYPE_MSI_SEG 0x3
-
- #define PHYSDEVOP_map_pirq 13
- struct physdev_map_pirq {
-@@ -152,7 +153,7 @@ struct physdev_map_pirq {
- int index;
- /* IN or OUT */
- int pirq;
-- /* IN */
-+ /* IN - high 16 bits hold segment for MAP_PIRQ_TYPE_MSI_SEG */
- int bus;
- /* IN */
- int devfn;
-@@ -264,6 +265,41 @@ struct physdev_pci_mmcfg_reserved {
- typedef struct physdev_pci_mmcfg_reserved physdev_pci_mmcfg_reserved_t;
- DEFINE_XEN_GUEST_HANDLE(physdev_pci_mmcfg_reserved_t);
-
-+#define XEN_PCI_DEV_EXTFN 0x1
-+#define XEN_PCI_DEV_VIRTFN 0x2
-+#define XEN_PCI_DEV_PXM 0x4
-+
-+#define PHYSDEVOP_pci_device_add 25
-+struct physdev_pci_device_add {
-+ /* IN */
-+ uint16_t seg;
-+ uint8_t bus;
-+ uint8_t devfn;
-+ uint32_t flags;
-+ struct {
-+ uint8_t bus;
-+ uint8_t devfn;
-+ } physfn;
-+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-+ uint32_t optarr[];
-+#elif defined(__GNUC__)
-+ uint32_t optarr[0];
-+#endif
-+};
-+typedef struct physdev_pci_device_add physdev_pci_device_add_t;
-+DEFINE_XEN_GUEST_HANDLE(physdev_pci_device_add_t);
-+
-+#define PHYSDEVOP_pci_device_remove 26
-+#define PHYSDEVOP_restore_msi_ext 27
-+struct physdev_pci_device {
-+ /* IN */
-+ uint16_t seg;
-+ uint8_t bus;
-+ uint8_t devfn;
-+};
-+typedef struct physdev_pci_device physdev_pci_device_t;
-+DEFINE_XEN_GUEST_HANDLE(physdev_pci_device_t);
-+
- /*
- * Notify that some PIRQ-bound event channels have been unmasked.
- * ** This command is obsolete since interface version 0x00030202 and is **
diff --git a/patches.xen/xen-unpriv-build b/patches.xen/xen-unpriv-build
index 88c86110cb..282ec41e53 100644
--- a/patches.xen/xen-unpriv-build
+++ b/patches.xen/xen-unpriv-build
@@ -2,8 +2,8 @@ From: jbeulich@novell.com
Subject: no need to build certain bits when building non-privileged kernel
Patch-mainline: n/a
---- head-2011-09-23.orig/arch/x86/Kconfig 2011-09-09 15:54:01.000000000 +0200
-+++ head-2011-09-23/arch/x86/Kconfig 2011-09-09 15:55:02.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/Kconfig 2011-09-09 15:54:01.000000000 +0200
++++ head-2011-10-07/arch/x86/Kconfig 2011-09-09 15:55:02.000000000 +0200
@@ -692,6 +692,7 @@ config APB_TIMER
config DMI
default y
@@ -64,8 +64,8 @@ Patch-mainline: n/a
source "fs/Kconfig"
---- head-2011-09-23.orig/arch/x86/Kconfig.debug 2011-06-30 16:39:08.000000000 +0200
-+++ head-2011-09-23/arch/x86/Kconfig.debug 2011-07-21 12:33:36.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/Kconfig.debug 2011-06-30 16:39:08.000000000 +0200
++++ head-2011-10-07/arch/x86/Kconfig.debug 2011-07-21 12:33:36.000000000 +0200
@@ -33,6 +33,7 @@ config X86_VERBOSE_BOOTUP
config EARLY_PRINTK
@@ -74,8 +74,8 @@ Patch-mainline: n/a
default y
---help---
Write kernel log output directly into the VGA buffer or to a serial
---- head-2011-09-23.orig/arch/x86/include/mach-xen/asm/swiotlb.h 2011-02-01 15:09:47.000000000 +0100
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/swiotlb.h 2011-02-02 15:10:34.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/swiotlb.h 2011-02-01 15:09:47.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/swiotlb.h 2011-02-02 15:10:34.000000000 +0100
@@ -1,4 +1,8 @@
#include_next <asm/swiotlb.h>
@@ -85,8 +85,8 @@ Patch-mainline: n/a
+
dma_addr_t swiotlb_map_single_phys(struct device *, phys_addr_t, size_t size,
int dir);
---- head-2011-09-23.orig/drivers/firmware/Kconfig 2011-04-13 12:52:07.000000000 +0200
-+++ head-2011-09-23/drivers/firmware/Kconfig 2011-09-23 10:29:26.000000000 +0200
+--- head-2011-10-07.orig/drivers/firmware/Kconfig 2011-04-13 12:52:07.000000000 +0200
++++ head-2011-10-07/drivers/firmware/Kconfig 2011-09-23 10:29:26.000000000 +0200
@@ -126,7 +126,7 @@ config DMI_SYSFS
config ISCSI_IBFT_FIND
@@ -96,8 +96,8 @@ Patch-mainline: n/a
default n
help
This option enables the kernel to find the region of memory
---- head-2011-09-23.orig/drivers/pci/Kconfig 2011-02-01 15:09:47.000000000 +0100
-+++ head-2011-09-23/drivers/pci/Kconfig 2011-02-02 15:10:34.000000000 +0100
+--- head-2011-10-07.orig/drivers/pci/Kconfig 2011-02-01 15:09:47.000000000 +0100
++++ head-2011-10-07/drivers/pci/Kconfig 2011-02-02 15:10:34.000000000 +0100
@@ -74,7 +74,7 @@ config PARAVIRT_XEN_PCIDEV_FRONTEND
config XEN_PCIDEV_FRONTEND
@@ -107,8 +107,28 @@ Patch-mainline: n/a
depends on PCI && XEN && (PCI_GOXEN_FE || PCI_GOANY || X86_64)
select HOTPLUG
help
---- head-2011-09-23.orig/drivers/video/Kconfig 2011-06-30 16:35:51.000000000 +0200
-+++ head-2011-09-23/drivers/video/Kconfig 2011-07-04 12:16:02.000000000 +0200
+--- head-2011-10-07.orig/drivers/pci/msi-xen.c 2011-02-01 15:03:03.000000000 +0100
++++ head-2011-10-07/drivers/pci/msi-xen.c 2011-10-07 15:41:04.000000000 +0200
+@@ -153,6 +153,7 @@ static void detach_pirq_entry(int entry_
+ }
+ }
+
++#ifdef CONFIG_XEN_PRIVILEGED_GUEST
+ /*
+ * pciback will provide device's owner
+ */
+@@ -190,6 +191,9 @@ static int msi_get_dev_owner(struct pci_
+
+ return DOMID_SELF;
+ }
++#else
++#define msi_get_dev_owner(dev) ({ BUG(); DOMID_SELF; })
++#endif
+
+ static int msi_unmap_pirq(struct pci_dev *dev, int pirq)
+ {
+--- head-2011-10-07.orig/drivers/video/Kconfig 2011-06-30 16:35:51.000000000 +0200
++++ head-2011-10-07/drivers/video/Kconfig 2011-07-04 12:16:02.000000000 +0200
@@ -745,7 +745,7 @@ config FB_UVESA
config FB_VESA
@@ -118,8 +138,8 @@ Patch-mainline: n/a
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
---- head-2011-09-23.orig/drivers/xen/Kconfig 2011-09-23 10:28:17.000000000 +0200
-+++ head-2011-09-23/drivers/xen/Kconfig 2011-09-23 10:29:33.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/Kconfig 2011-09-23 10:28:17.000000000 +0200
++++ head-2011-10-07/drivers/xen/Kconfig 2011-09-23 10:29:33.000000000 +0200
@@ -18,7 +18,8 @@ config XEN_PRIVILEGED_GUEST
Support for privileged operation (domain 0)
@@ -138,8 +158,8 @@ Patch-mainline: n/a
default XEN_PRIVILEGED_GUEST
help
Device for accessing (in user-space) pages that have been granted
---- head-2011-09-23.orig/drivers/xen/balloon/balloon.c 2011-04-26 09:16:13.000000000 +0200
-+++ head-2011-09-23/drivers/xen/balloon/balloon.c 2011-09-23 10:29:36.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/balloon/balloon.c 2011-04-26 09:16:13.000000000 +0200
++++ head-2011-10-07/drivers/xen/balloon/balloon.c 2011-09-23 10:29:36.000000000 +0200
@@ -653,6 +653,9 @@ void balloon_update_driver_allowance(lon
bs.driver_pages += delta;
balloon_unlock(flags);
@@ -179,8 +199,8 @@ Patch-mainline: n/a
EXPORT_SYMBOL_GPL(balloon_release_driver_page);
MODULE_LICENSE("Dual BSD/GPL");
---- head-2011-09-23.orig/drivers/xen/console/console.c 2011-02-01 15:04:27.000000000 +0100
-+++ head-2011-09-23/drivers/xen/console/console.c 2011-02-02 15:10:34.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/console/console.c 2011-02-01 15:04:27.000000000 +0100
++++ head-2011-10-07/drivers/xen/console/console.c 2011-02-02 15:10:34.000000000 +0100
@@ -47,7 +47,6 @@
#include <linux/init.h>
#include <linux/console.h>
@@ -223,8 +243,8 @@ Patch-mainline: n/a
/******************** User-space console driver (/dev/console) ************/
---- head-2011-09-23.orig/drivers/xen/core/Makefile 2011-08-18 11:17:15.000000000 +0200
-+++ head-2011-09-23/drivers/xen/core/Makefile 2011-08-18 11:17:50.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/core/Makefile 2011-08-18 11:17:15.000000000 +0200
++++ head-2011-10-07/drivers/xen/core/Makefile 2011-08-18 11:17:50.000000000 +0200
@@ -2,9 +2,10 @@
# Makefile for the linux kernel.
#
@@ -237,8 +257,8 @@ Patch-mainline: n/a
obj-$(CONFIG_PROC_FS) += xen_proc.o
obj-$(CONFIG_SYS_HYPERVISOR) += hypervisor_sysfs.o
obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o
---- head-2011-09-23.orig/drivers/xen/core/evtchn.c 2011-04-14 16:36:32.000000000 +0200
-+++ head-2011-09-23/drivers/xen/core/evtchn.c 2011-09-23 10:29:42.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/core/evtchn.c 2011-04-14 16:36:32.000000000 +0200
++++ head-2011-10-07/drivers/xen/core/evtchn.c 2011-09-23 10:29:42.000000000 +0200
@@ -1813,6 +1813,7 @@ void evtchn_register_pirq(int irq)
"fasteoi");
}
@@ -255,8 +275,8 @@ Patch-mainline: n/a
int evtchn_get_xen_pirq(int irq)
{
---- head-2011-09-23.orig/drivers/xen/core/gnttab.c 2011-04-14 17:21:05.000000000 +0200
-+++ head-2011-09-23/drivers/xen/core/gnttab.c 2011-02-02 15:10:34.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/core/gnttab.c 2011-04-14 17:21:05.000000000 +0200
++++ head-2011-10-07/drivers/xen/core/gnttab.c 2011-02-02 15:10:34.000000000 +0100
@@ -436,8 +436,6 @@ static inline unsigned int max_nr_grant_
#ifdef CONFIG_XEN
@@ -286,8 +306,8 @@ Patch-mainline: n/a
#ifdef __HAVE_ARCH_PTE_SPECIAL
static unsigned int GNTMAP_pte_special;
---- head-2011-09-23.orig/drivers/xen/privcmd/Makefile 2007-07-10 09:42:30.000000000 +0200
-+++ head-2011-09-23/drivers/xen/privcmd/Makefile 2011-02-02 15:10:34.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/privcmd/Makefile 2007-07-10 09:42:30.000000000 +0200
++++ head-2011-10-07/drivers/xen/privcmd/Makefile 2011-02-02 15:10:34.000000000 +0100
@@ -1,3 +1,3 @@
-
-obj-y += privcmd.o
@@ -295,8 +315,8 @@ Patch-mainline: n/a
+priv-$(CONFIG_COMPAT) := compat_privcmd.o
+obj-y := privcmd.o
+obj-$(CONFIG_XEN_PRIVILEGED_GUEST) += $(priv-y)
---- head-2011-09-23.orig/drivers/xen/privcmd/privcmd.c 2011-02-01 15:09:47.000000000 +0100
-+++ head-2011-09-23/drivers/xen/privcmd/privcmd.c 2011-02-02 15:10:34.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/privcmd/privcmd.c 2011-02-01 15:09:47.000000000 +0100
++++ head-2011-10-07/drivers/xen/privcmd/privcmd.c 2011-02-02 15:10:34.000000000 +0100
@@ -32,6 +32,9 @@
static struct proc_dir_entry *privcmd_intf;
static struct proc_dir_entry *capabilities_intf;
@@ -350,8 +370,8 @@ Patch-mainline: n/a
};
static int capabilities_read(char *page, char **start, off_t off,
---- head-2011-09-23.orig/drivers/xen/xenbus/xenbus_comms.c 2011-04-11 15:03:17.000000000 +0200
-+++ head-2011-09-23/drivers/xen/xenbus/xenbus_comms.c 2011-04-01 10:23:25.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/xenbus/xenbus_comms.c 2011-04-11 15:03:17.000000000 +0200
++++ head-2011-10-07/drivers/xen/xenbus/xenbus_comms.c 2011-04-01 10:23:25.000000000 +0200
@@ -52,12 +52,12 @@
static int xenbus_irq;
@@ -375,8 +395,8 @@ Patch-mainline: n/a
wake_up(&xb_waitq);
return IRQ_HANDLED;
}
---- head-2011-09-23.orig/drivers/xen/xenbus/xenbus_probe.c 2011-09-09 09:52:35.000000000 +0200
-+++ head-2011-09-23/drivers/xen/xenbus/xenbus_probe.c 2011-09-09 15:55:11.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/xenbus/xenbus_probe.c 2011-09-09 09:52:35.000000000 +0200
++++ head-2011-10-07/drivers/xen/xenbus/xenbus_probe.c 2011-10-07 13:32:44.000000000 +0200
@@ -92,7 +92,11 @@ static unsigned long xen_store_mfn;
extern struct mutex xenwatch_mutex;
@@ -390,7 +410,7 @@ Patch-mainline: n/a
#if defined(CONFIG_XEN) || defined(MODULE)
static void wait_for_devices(struct xenbus_driver *xendrv);
-@@ -1048,7 +1052,13 @@ static void xenbus_reset_state(void)
+@@ -1076,7 +1080,13 @@ static void xenbus_reset_state(void)
}
#endif
@@ -405,8 +425,8 @@ Patch-mainline: n/a
{
BUG_ON(!is_xenstored_ready());
---- head-2011-09-23.orig/fs/compat_ioctl.c 2011-09-07 16:00:52.000000000 +0200
-+++ head-2011-09-23/fs/compat_ioctl.c 2011-09-09 15:55:19.000000000 +0200
+--- head-2011-10-07.orig/fs/compat_ioctl.c 2011-09-07 16:00:52.000000000 +0200
++++ head-2011-10-07/fs/compat_ioctl.c 2011-09-09 15:55:19.000000000 +0200
@@ -1487,7 +1487,7 @@ static long do_ioctl_trans(int fd, unsig
return do_video_stillpicture(fd, cmd, argp);
case VIDEO_SET_SPU_PALETTE:
@@ -416,8 +436,8 @@ Patch-mainline: n/a
case IOCTL_PRIVCMD_MMAP_32:
case IOCTL_PRIVCMD_MMAPBATCH_32:
case IOCTL_PRIVCMD_MMAPBATCH_V2_32:
---- head-2011-09-23.orig/include/xen/firmware.h 2007-07-02 08:16:19.000000000 +0200
-+++ head-2011-09-23/include/xen/firmware.h 2011-02-02 15:10:34.000000000 +0100
+--- head-2011-10-07.orig/include/xen/firmware.h 2007-07-02 08:16:19.000000000 +0200
++++ head-2011-10-07/include/xen/firmware.h 2011-02-02 15:10:34.000000000 +0100
@@ -5,6 +5,10 @@
void copy_edd(void);
#endif
@@ -429,8 +449,8 @@ Patch-mainline: n/a
+#endif
#endif /* __XEN_FIRMWARE_H__ */
---- head-2011-09-23.orig/include/xen/gnttab.h 2010-11-23 15:07:01.000000000 +0100
-+++ head-2011-09-23/include/xen/gnttab.h 2011-02-02 15:10:34.000000000 +0100
+--- head-2011-10-07.orig/include/xen/gnttab.h 2010-11-23 15:07:01.000000000 +0100
++++ head-2011-10-07/include/xen/gnttab.h 2011-02-02 15:10:34.000000000 +0100
@@ -104,7 +104,11 @@ void gnttab_grant_foreign_transfer_ref(g
unsigned long pfn);
diff --git a/patches.xen/xen-x86-EFI b/patches.xen/xen-x86-EFI
index 492ed618b6..e0c0039c88 100644
--- a/patches.xen/xen-x86-EFI
+++ b/patches.xen/xen-x86-EFI
@@ -609,50 +609,3 @@ References: fate#311376, fate#311529, bnc#578927, bnc#628554
} efi;
static inline int
---- head-2011-09-23.orig/include/xen/interface/platform.h 2011-08-23 13:12:54.000000000 +0200
-+++ head-2011-09-23/include/xen/interface/platform.h 2011-09-14 15:02:15.000000000 +0200
-@@ -123,6 +123,9 @@ DEFINE_XEN_GUEST_HANDLE(xenpf_platform_q
- #define XEN_EFI_get_variable 6
- #define XEN_EFI_set_variable 7
- #define XEN_EFI_get_next_variable_name 8
-+#define XEN_EFI_query_variable_info 9
-+#define XEN_EFI_query_capsule_capabilities 10
-+#define XEN_EFI_update_capsule 11
- struct xenpf_efi_runtime_call {
- uint32_t function;
- /*
-@@ -180,6 +183,26 @@ struct xenpf_efi_runtime_call {
- XEN_GUEST_HANDLE(void) name; /* UCS-2/UTF-16 string */
- struct xenpf_efi_guid vendor_guid;
- } get_next_variable_name;
-+
-+ struct {
-+ uint32_t attr;
-+ uint64_t max_store_size;
-+ uint64_t remain_store_size;
-+ uint64_t max_size;
-+ } query_variable_info;
-+
-+ struct {
-+ XEN_GUEST_HANDLE(void) capsule_header_array;
-+ unsigned long capsule_count;
-+ uint64_t max_capsule_size;
-+ unsigned int reset_type;
-+ } query_capsule_capabilities;
-+
-+ struct {
-+ XEN_GUEST_HANDLE(void) capsule_header_array;
-+ unsigned long capsule_count;
-+ uint64_t sg_list; /* machine address */
-+ } update_capsule;
- } u;
- };
- typedef struct xenpf_efi_runtime_call xenpf_efi_runtime_call_t;
-@@ -194,6 +217,7 @@ DEFINE_XEN_GUEST_HANDLE(xenpf_efi_runtim
- #define XEN_FW_EFI_CONFIG_TABLE 1
- #define XEN_FW_EFI_VENDOR 2
- #define XEN_FW_EFI_MEM_INFO 3
-+#define XEN_FW_EFI_RT_VERSION 4
- struct xenpf_firmware_info {
- /* IN variables. */
- uint32_t type;
diff --git a/patches.xen/xen-x86-bigmem b/patches.xen/xen-x86-bigmem
index 9189fc3ee0..2c13b30d27 100644
--- a/patches.xen/xen-x86-bigmem
+++ b/patches.xen/xen-x86-bigmem
@@ -17,7 +17,7 @@ References: bnc#482614, bnc#537435, bnc#700856
void xen_set_ldt(const void *ptr, unsigned int ents);
--- head-2011-09-23.orig/arch/x86/kernel/e820-xen.c 2011-09-23 16:02:43.000000000 +0200
-+++ head-2011-09-23/arch/x86/kernel/e820-xen.c 2011-09-23 16:03:31.000000000 +0200
++++ head-2011-09-23/arch/x86/kernel/e820-xen.c 2011-10-07 11:53:31.000000000 +0200
@@ -958,6 +958,26 @@ static int __init parse_memopt(char *p)
/* don't remove all of memory when handling "mem={invalid}" param */
if (mem_size == 0)
@@ -45,28 +45,32 @@ References: bnc#482614, bnc#537435, bnc#700856
e820_remove_range(mem_size, ULLONG_MAX - mem_size, E820_RAM, 1);
i = e820.nr_map - 1;
-@@ -1157,6 +1177,7 @@ void __init e820_reserve_resources_late(
+@@ -1157,6 +1177,8 @@ void __init e820_reserve_resources_late(
char *__init default_machine_specific_memory_setup(void)
{
int rc, nr_map;
-+ unsigned long long maxmem;
++ unsigned long maxmem;
++ domid_t domid = DOMID_SELF;
struct xen_memory_map memmap;
static struct e820entry __initdata map[E820MAX];
-@@ -1182,6 +1203,22 @@ char *__init default_machine_specific_me
+@@ -1182,6 +1204,25 @@ char *__init default_machine_specific_me
BUG();
#ifdef CONFIG_XEN
+ /* See the comment in parse_memopt(). */
+ for (maxmem = rc = 0; rc < e820.nr_map; ++rc)
+ if (e820.map[rc].type == E820_RAM)
-+ maxmem += e820.map[rc].size;
-+ if ((maxmem >> (PAGE_SHIFT + 5)) > xen_start_info->nr_pages) {
++ maxmem += e820.map[rc].size >> PAGE_SHIFT;
++ rc = HYPERVISOR_memory_op(XENMEM_maximum_reservation, &domid);
++ if (rc > 0 && maxmem > rc)
++ maxmem = rc;
++ if ((maxmem >> 5) > xen_start_info->nr_pages) {
+ unsigned long long size = (u64)xen_start_info->nr_pages << 5;
+
-+ pr_warn("maxmem of %LuM is invalid for an initial"
++ pr_warn("maxmem of %luM is invalid for an initial"
+ " allocation of %luM, using %LuM\n",
-+ maxmem >> 20,
++ maxmem >> (20 - PAGE_SHIFT),
+ xen_start_info->nr_pages >> (20 - PAGE_SHIFT),
+ size >> (20 - PAGE_SHIFT));
+ size <<= PAGE_SHIFT;
diff --git a/patches.xen/xen-x86-msr-on-pcpu b/patches.xen/xen-x86-msr-on-pcpu
index 5808d3bc11..2099a4f0a4 100644
--- a/patches.xen/xen-x86-msr-on-pcpu
+++ b/patches.xen/xen-x86-msr-on-pcpu
@@ -394,9 +394,9 @@ Patch-mainline: n/a
-CFLAGS_domctl.o += -D__XEN_TOOLS__ -imacros xen/interface/domctl.h
+CFLAGS_domctl.o += -D__XEN_TOOLS__ -imacros xen/interface/domctl.h -imacros xen/interface/sysctl.h
--- head-2011-09-07.orig/drivers/xen/core/domctl.c 2010-11-23 16:20:20.000000000 +0100
-+++ head-2011-09-07/drivers/xen/core/domctl.c 2011-02-03 14:42:26.000000000 +0100
-@@ -92,6 +92,110 @@ union xen_domctl {
- } v5, v6, v7;
++++ head-2011-09-07/drivers/xen/core/domctl.c 2011-10-04 17:06:38.000000000 +0200
+@@ -93,6 +93,110 @@ union xen_domctl {
+ } v5, v6, v7, v8;
};
+struct xen_sysctl_physinfo_v6 {
@@ -506,7 +506,7 @@ Patch-mainline: n/a
/* The actual code comes here */
static inline int hypervisor_domctl(void *domctl)
-@@ -99,6 +203,11 @@ static inline int hypervisor_domctl(void
+@@ -100,6 +204,11 @@ static inline int hypervisor_domctl(void
return _hypercall1(int, domctl, domctl);
}
@@ -518,7 +518,7 @@ Patch-mainline: n/a
int xen_guest_address_size(int domid)
{
union xen_domctl domctl;
-@@ -263,6 +372,172 @@ int xen_set_physical_cpu_affinity(int pc
+@@ -275,6 +384,172 @@ int xen_set_physical_cpu_affinity(int pc
}
EXPORT_SYMBOL_GPL(xen_set_physical_cpu_affinity);
diff --git a/patches.xen/xen3-auto-arch-i386.diff b/patches.xen/xen3-auto-arch-i386.diff
index 0ee90fd9f7..83437cea2c 100644
--- a/patches.xen/xen3-auto-arch-i386.diff
+++ b/patches.xen/xen3-auto-arch-i386.diff
@@ -1,5 +1,5 @@
Subject: xen3 arch-i386
-From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1105:f4f25124b1b6)
+From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1116:40e33b2fce94)
Patch-mainline: n/a
Acked-by: jbeulich@novell.com
diff --git a/patches.xen/xen3-auto-arch-x86.diff b/patches.xen/xen3-auto-arch-x86.diff
index 5dcdbff9dd..7040d05981 100644
--- a/patches.xen/xen3-auto-arch-x86.diff
+++ b/patches.xen/xen3-auto-arch-x86.diff
@@ -1,5 +1,5 @@
Subject: xen3 arch-x86
-From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1105:f4f25124b1b6)
+From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1116:40e33b2fce94)
Patch-mainline: n/a
Acked-by: jbeulich@novell.com
diff --git a/patches.xen/xen3-auto-arch-x86_64.diff b/patches.xen/xen3-auto-arch-x86_64.diff
index 4a440d5c7e..67d4060031 100644
--- a/patches.xen/xen3-auto-arch-x86_64.diff
+++ b/patches.xen/xen3-auto-arch-x86_64.diff
@@ -1,5 +1,5 @@
Subject: xen3 arch-x86_64
-From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1105:f4f25124b1b6)
+From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1116:40e33b2fce94)
Patch-mainline: n/a
Acked-by: jbeulich@novell.com
diff --git a/patches.xen/xen3-auto-common.diff b/patches.xen/xen3-auto-common.diff
index 24e597219a..b26cb52c95 100644
--- a/patches.xen/xen3-auto-common.diff
+++ b/patches.xen/xen3-auto-common.diff
@@ -1,5 +1,5 @@
Subject: xen3 common
-From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1105:f4f25124b1b6)
+From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1116:40e33b2fce94)
Patch-mainline: n/a
Acked-by: jbeulich@novell.com
@@ -19,8 +19,8 @@ take the forward porting patches:
2.6.30/include/linux/pci_regs.h
2.6.35/kernel/time.c
---- head-2011-09-07.orig/drivers/Makefile 2011-09-07 13:56:14.000000000 +0200
-+++ head-2011-09-07/drivers/Makefile 2011-06-30 15:36:40.000000000 +0200
+--- head-2011-10-07.orig/drivers/Makefile 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/Makefile 2011-06-30 15:36:40.000000000 +0200
@@ -45,6 +45,7 @@ obj-$(CONFIG_PARPORT) += parport/
obj-y += base/ block/ misc/ mfd/ nfc/
obj-$(CONFIG_NUBUS) += nubus/
@@ -29,8 +29,8 @@ take the forward porting patches:
obj-$(CONFIG_IDE) += ide/
obj-$(CONFIG_SCSI) += scsi/
obj-$(CONFIG_ATA) += ata/
---- head-2011-09-07.orig/drivers/acpi/Makefile 2011-07-22 04:17:23.000000000 +0200
-+++ head-2011-09-07/drivers/acpi/Makefile 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-10-07.orig/drivers/acpi/Makefile 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/acpi/Makefile 2011-04-13 11:25:29.000000000 +0200
@@ -67,6 +67,9 @@ obj-$(CONFIG_ACPI_CUSTOM_METHOD)+= custo
processor-y := processor_driver.o processor_throttling.o
processor-y += processor_idle.o processor_thermal.o
@@ -41,8 +41,8 @@ take the forward porting patches:
obj-$(CONFIG_ACPI_PROCESSOR_AGGREGATOR) += acpi_pad.o
obj-$(CONFIG_ACPI_IPMI) += acpi_ipmi.o
---- head-2011-09-07.orig/drivers/acpi/acpica/hwsleep.c 2011-03-15 02:20:32.000000000 +0100
-+++ head-2011-09-07/drivers/acpi/acpica/hwsleep.c 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-10-07.orig/drivers/acpi/acpica/hwsleep.c 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/acpi/acpica/hwsleep.c 2011-04-13 11:25:29.000000000 +0200
@@ -236,7 +236,11 @@ acpi_status asmlinkage acpi_enter_sleep_
u32 pm1b_control;
struct acpi_bit_register_info *sleep_type_reg_info;
@@ -80,8 +80,8 @@ take the forward porting patches:
return_ACPI_STATUS(AE_OK);
}
---- head-2011-09-07.orig/drivers/acpi/processor_driver.c 2011-05-19 06:06:34.000000000 +0200
-+++ head-2011-09-07/drivers/acpi/processor_driver.c 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-10-07.orig/drivers/acpi/processor_driver.c 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/acpi/processor_driver.c 2011-04-13 11:25:29.000000000 +0200
@@ -325,7 +325,8 @@ static int acpi_processor_get_info(struc
*/
if (pr->id == -1) {
@@ -256,7 +256,7 @@ take the forward porting patches:
cpu_down(pr->id);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-09-07/drivers/acpi/processor_extcntl.c 2011-01-31 14:53:38.000000000 +0100
++++ head-2011-10-07/drivers/acpi/processor_extcntl.c 2011-01-31 14:53:38.000000000 +0100
@@ -0,0 +1,241 @@
+/*
+ * processor_extcntl.c - channel to external control logic
@@ -499,8 +499,8 @@ take the forward porting patches:
+ kfree(perf);
+ return ret;
+}
---- head-2011-09-07.orig/drivers/acpi/processor_idle.c 2011-07-22 04:17:23.000000000 +0200
-+++ head-2011-09-07/drivers/acpi/processor_idle.c 2011-09-07 14:39:37.000000000 +0200
+--- head-2011-10-07.orig/drivers/acpi/processor_idle.c 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/acpi/processor_idle.c 2011-09-07 14:39:37.000000000 +0200
@@ -458,7 +458,8 @@ static int acpi_processor_get_power_info
*/
cx.entry_method = ACPI_CSTATE_HALT;
@@ -545,8 +545,8 @@ take the forward porting patches:
return 0;
}
---- head-2011-09-07.orig/drivers/acpi/processor_perflib.c 2011-07-22 04:17:23.000000000 +0200
-+++ head-2011-09-07/drivers/acpi/processor_perflib.c 2011-06-30 15:36:54.000000000 +0200
+--- head-2011-10-07.orig/drivers/acpi/processor_perflib.c 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/acpi/processor_perflib.c 2011-06-30 15:36:54.000000000 +0200
@@ -75,6 +75,7 @@ MODULE_PARM_DESC(ignore_ppc, "If the fre
static int acpi_processor_ppc_status;
@@ -626,8 +626,8 @@ take the forward porting patches:
{
int result = 0;
acpi_status status = AE_OK;
---- head-2011-09-07.orig/drivers/acpi/sleep.c 2011-09-07 13:56:14.000000000 +0200
-+++ head-2011-09-07/drivers/acpi/sleep.c 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-10-07.orig/drivers/acpi/sleep.c 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/acpi/sleep.c 2011-04-13 11:25:29.000000000 +0200
@@ -61,6 +61,7 @@ static struct notifier_block tts_notifie
static int acpi_sleep_prepare(u32 acpi_state)
{
@@ -644,8 +644,8 @@ take the forward porting patches:
ACPI_FLUSH_CPU_CACHE();
#endif
printk(KERN_INFO PREFIX "Preparing to enter system sleep state S%d\n",
---- head-2011-09-07.orig/drivers/char/agp/intel-gtt.c 2011-07-22 04:17:23.000000000 +0200
-+++ head-2011-09-07/drivers/char/agp/intel-gtt.c 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-10-07.orig/drivers/char/agp/intel-gtt.c 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/char/agp/intel-gtt.c 2011-04-13 11:25:29.000000000 +0200
@@ -147,8 +147,19 @@ static struct page *i8xx_alloc_pages(voi
if (page == NULL)
return NULL;
@@ -676,8 +676,8 @@ take the forward porting patches:
put_page(page);
__free_pages(page, 2);
atomic_dec(&agp_bridge->current_memory_agp);
---- head-2011-09-07.orig/drivers/char/mem.c 2011-07-22 04:17:23.000000000 +0200
-+++ head-2011-09-07/drivers/char/mem.c 2011-05-23 10:56:58.000000000 +0200
+--- head-2011-10-07.orig/drivers/char/mem.c 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/char/mem.c 2011-05-23 10:56:58.000000000 +0200
@@ -86,6 +86,7 @@ void __weak unxlate_dev_mem_ptr(unsigned
{
}
@@ -736,16 +736,16 @@ take the forward porting patches:
#ifdef CONFIG_DEVKMEM
static const struct file_operations kmem_fops = {
---- head-2011-09-07.orig/drivers/char/tpm/Makefile 2006-09-20 05:42:06.000000000 +0200
-+++ head-2011-09-07/drivers/char/tpm/Makefile 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-10-07.orig/drivers/char/tpm/Makefile 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/char/tpm/Makefile 2011-04-13 11:25:29.000000000 +0200
@@ -9,3 +9,5 @@ obj-$(CONFIG_TCG_TIS) += tpm_tis.o
obj-$(CONFIG_TCG_NSC) += tpm_nsc.o
obj-$(CONFIG_TCG_ATMEL) += tpm_atmel.o
obj-$(CONFIG_TCG_INFINEON) += tpm_infineon.o
+obj-$(CONFIG_TCG_XEN) += tpm_xenu.o
+tpm_xenu-y = tpm_xen.o tpm_vtpm.o
---- head-2011-09-07.orig/drivers/char/tpm/tpm.h 2011-09-07 13:56:14.000000000 +0200
-+++ head-2011-09-07/drivers/char/tpm/tpm.h 2011-09-07 14:38:52.000000000 +0200
+--- head-2011-10-07.orig/drivers/char/tpm/tpm.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/char/tpm/tpm.h 2011-09-07 14:38:52.000000000 +0200
@@ -115,6 +115,9 @@ struct tpm_chip {
struct dentry **bios_dir;
@@ -776,7 +776,7 @@ take the forward porting patches:
extern void tpm_gen_interrupt(struct tpm_chip *);
extern void tpm_continue_selftest(struct tpm_chip *);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-09-07/drivers/char/tpm/tpm_vtpm.c 2011-01-31 14:53:38.000000000 +0100
++++ head-2011-10-07/drivers/char/tpm/tpm_vtpm.c 2011-01-31 14:53:38.000000000 +0100
@@ -0,0 +1,542 @@
+/*
+ * Copyright (C) 2006 IBM Corporation
@@ -1321,7 +1321,7 @@ take the forward porting patches:
+ kfree(vtpms);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-09-07/drivers/char/tpm/tpm_vtpm.h 2011-01-31 14:53:38.000000000 +0100
++++ head-2011-10-07/drivers/char/tpm/tpm_vtpm.h 2011-01-31 14:53:38.000000000 +0100
@@ -0,0 +1,55 @@
+#ifndef TPM_VTPM_H
+#define TPM_VTPM_H
@@ -1379,7 +1379,7 @@ take the forward porting patches:
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-09-07/drivers/char/tpm/tpm_xen.c 2011-01-31 14:53:38.000000000 +0100
++++ head-2011-10-07/drivers/char/tpm/tpm_xen.c 2011-01-31 14:53:38.000000000 +0100
@@ -0,0 +1,722 @@
+/*
+ * Copyright (c) 2005, IBM Corporation
@@ -2103,8 +2103,8 @@ take the forward porting patches:
+module_init(tpmif_init);
+
+MODULE_LICENSE("Dual BSD/GPL");
---- head-2011-09-07.orig/drivers/edac/edac_mc.c 2011-07-22 04:17:23.000000000 +0200
-+++ head-2011-09-07/drivers/edac/edac_mc.c 2011-06-30 15:37:01.000000000 +0200
+--- head-2011-10-07.orig/drivers/edac/edac_mc.c 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/edac/edac_mc.c 2011-06-30 15:37:01.000000000 +0200
@@ -611,6 +611,10 @@ static void edac_mc_scrub_block(unsigned
debugf3("%s()\n", __func__);
@@ -2116,8 +2116,8 @@ take the forward porting patches:
/* ECC error page was not in our memory. Ignore it. */
if (!pfn_valid(page))
return;
---- head-2011-09-07.orig/drivers/firmware/dell_rbu.c 2010-08-02 00:11:14.000000000 +0200
-+++ head-2011-09-07/drivers/firmware/dell_rbu.c 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-10-07.orig/drivers/firmware/dell_rbu.c 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/firmware/dell_rbu.c 2011-04-13 11:25:29.000000000 +0200
@@ -170,9 +170,28 @@ static int create_packet(void *data, siz
spin_lock(&rbu_data.lock);
goto out_alloc_packet_array;
@@ -2224,8 +2224,8 @@ take the forward porting patches:
spin_lock_init(&rbu_data.lock);
init_packet_head();
---- head-2011-09-07.orig/drivers/ide/ide-lib.c 2009-09-10 00:13:59.000000000 +0200
-+++ head-2011-09-07/drivers/ide/ide-lib.c 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-10-07.orig/drivers/ide/ide-lib.c 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/ide/ide-lib.c 2011-04-13 11:25:29.000000000 +0200
@@ -18,12 +18,12 @@ void ide_toggle_bounce(ide_drive_t *driv
{
u64 addr = BLK_BOUNCE_HIGH; /* dma64_addr_t */
@@ -2243,8 +2243,8 @@ take the forward porting patches:
addr = *dev->dma_mask;
}
---- head-2011-09-07.orig/drivers/oprofile/buffer_sync.c 2011-07-22 04:17:23.000000000 +0200
-+++ head-2011-09-07/drivers/oprofile/buffer_sync.c 2011-06-30 15:37:10.000000000 +0200
+--- head-2011-10-07.orig/drivers/oprofile/buffer_sync.c 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/oprofile/buffer_sync.c 2011-06-30 15:37:10.000000000 +0200
@@ -8,6 +8,10 @@
* @author Barry Kasindorf
* @author Robert Richter <robert.richter@amd.com>
@@ -2421,8 +2421,8 @@ take the forward porting patches:
mark_done(cpu);
mutex_unlock(&buffer_mutex);
---- head-2011-09-07.orig/drivers/oprofile/cpu_buffer.c 2011-05-19 06:06:34.000000000 +0200
-+++ head-2011-09-07/drivers/oprofile/cpu_buffer.c 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-10-07.orig/drivers/oprofile/cpu_buffer.c 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/oprofile/cpu_buffer.c 2011-04-13 11:25:29.000000000 +0200
@@ -8,6 +8,10 @@
* @author Barry Kasindorf <barry.kasindorf@amd.com>
* @author Robert Richter <robert.richter@amd.com>
@@ -2538,8 +2538,8 @@ take the forward porting patches:
/*
* This serves to avoid cpu buffer overflow, and makes sure
* the task mortuary progresses
---- head-2011-09-07.orig/drivers/oprofile/cpu_buffer.h 2011-01-05 01:50:19.000000000 +0100
-+++ head-2011-09-07/drivers/oprofile/cpu_buffer.h 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-10-07.orig/drivers/oprofile/cpu_buffer.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/oprofile/cpu_buffer.h 2011-04-13 11:25:29.000000000 +0200
@@ -41,7 +41,7 @@ struct op_entry;
struct oprofile_cpu_buffer {
unsigned long buffer_size;
@@ -2574,8 +2574,8 @@ take the forward porting patches:
+#define DOMAIN_SWITCH (1UL << 5)
#endif /* OPROFILE_CPU_BUFFER_H */
---- head-2011-09-07.orig/drivers/oprofile/event_buffer.h 2011-07-22 04:17:23.000000000 +0200
-+++ head-2011-09-07/drivers/oprofile/event_buffer.h 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-10-07.orig/drivers/oprofile/event_buffer.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/oprofile/event_buffer.h 2011-04-13 11:25:29.000000000 +0200
@@ -30,6 +30,9 @@ void wake_up_buffer_waiter(void);
#define INVALID_COOKIE ~0UL
#define NO_COOKIE 0UL
@@ -2586,8 +2586,8 @@ take the forward porting patches:
extern const struct file_operations event_buffer_fops;
/* mutex between sync_cpu_buffers() and the
---- head-2011-09-07.orig/drivers/oprofile/oprof.c 2011-07-22 04:17:23.000000000 +0200
-+++ head-2011-09-07/drivers/oprofile/oprof.c 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-10-07.orig/drivers/oprofile/oprof.c 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/oprofile/oprof.c 2011-04-13 11:25:29.000000000 +0200
@@ -5,6 +5,10 @@
* @remark Read the file COPYING
*
@@ -2632,8 +2632,8 @@ take the forward porting patches:
int oprofile_setup(void)
{
int err;
---- head-2011-09-07.orig/drivers/oprofile/oprof.h 2011-01-05 01:50:19.000000000 +0100
-+++ head-2011-09-07/drivers/oprofile/oprof.h 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-10-07.orig/drivers/oprofile/oprof.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/oprofile/oprof.h 2011-04-13 11:25:29.000000000 +0200
@@ -40,4 +40,7 @@ void oprofile_timer_exit(void);
int oprofile_set_ulong(unsigned long *addr, unsigned long val);
int oprofile_set_timeout(unsigned long time);
@@ -2642,8 +2642,8 @@ take the forward porting patches:
+int oprofile_set_passive(int passive_domains[], unsigned int pdomains);
+
#endif /* OPROF_H */
---- head-2011-09-07.orig/drivers/oprofile/oprofile_files.c 2011-01-05 01:50:19.000000000 +0100
-+++ head-2011-09-07/drivers/oprofile/oprofile_files.c 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-10-07.orig/drivers/oprofile/oprofile_files.c 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/oprofile/oprofile_files.c 2011-04-13 11:25:29.000000000 +0200
@@ -5,11 +5,17 @@
* @remark Read the file COPYING
*
@@ -2867,8 +2867,8 @@ take the forward porting patches:
oprofilefs_create_file(sb, root, "buffer", &event_buffer_fops);
oprofilefs_create_ulong(sb, root, "buffer_size", &oprofile_buffer_size);
oprofilefs_create_ulong(sb, root, "buffer_watershed", &oprofile_buffer_watershed);
---- head-2011-09-07.orig/fs/aio.c 2011-05-19 06:06:34.000000000 +0200
-+++ head-2011-09-07/fs/aio.c 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-10-07.orig/fs/aio.c 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/fs/aio.c 2011-04-13 11:25:29.000000000 +0200
@@ -39,6 +39,11 @@
#include <asm/kmap_types.h>
#include <asm/uaccess.h>
@@ -3056,8 +3056,8 @@ take the forward porting patches:
get_ioctx(ioctx); /* io_destroy() expects us to hold a ref */
io_destroy(ioctx);
---- head-2011-09-07.orig/fs/compat_ioctl.c 2011-09-07 13:56:37.000000000 +0200
-+++ head-2011-09-07/fs/compat_ioctl.c 2011-09-07 14:38:39.000000000 +0200
+--- head-2011-10-07.orig/fs/compat_ioctl.c 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/fs/compat_ioctl.c 2011-09-07 14:38:39.000000000 +0200
@@ -116,6 +116,13 @@
#include <asm/fbio.h>
#endif
@@ -3092,8 +3092,8 @@ take the forward porting patches:
};
/*
---- head-2011-09-07.orig/include/acpi/processor.h 2011-09-07 13:56:37.000000000 +0200
-+++ head-2011-09-07/include/acpi/processor.h 2011-06-30 15:37:24.000000000 +0200
+--- head-2011-10-07.orig/include/acpi/processor.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/include/acpi/processor.h 2011-06-30 15:37:24.000000000 +0200
@@ -17,6 +17,12 @@
#define ACPI_PROCESSOR_MAX_THROTTLE 250 /* 25% */
#define ACPI_PROCESSOR_MAX_DUTY_WIDTH 4
@@ -3277,8 +3277,8 @@ take the forward porting patches:
+#endif /* CONFIG_XEN */
+
#endif
---- head-2011-09-07.orig/include/asm-generic/pgtable.h 2011-07-22 04:17:23.000000000 +0200
-+++ head-2011-09-07/include/asm-generic/pgtable.h 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-10-07.orig/include/asm-generic/pgtable.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/include/asm-generic/pgtable.h 2011-04-13 11:25:29.000000000 +0200
@@ -156,6 +156,10 @@ static inline void pmdp_set_wrprotect(st
#endif /* CONFIG_TRANSPARENT_HUGEPAGE */
#endif
@@ -3290,8 +3290,8 @@ take the forward porting patches:
#ifndef __HAVE_ARCH_PMDP_SPLITTING_FLUSH
extern pmd_t pmdp_splitting_flush(struct vm_area_struct *vma,
unsigned long address,
---- head-2011-09-07.orig/include/linux/aio.h 2011-09-07 13:56:38.000000000 +0200
-+++ head-2011-09-07/include/linux/aio.h 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-10-07.orig/include/linux/aio.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/include/linux/aio.h 2011-04-13 11:25:29.000000000 +0200
@@ -199,6 +199,12 @@ struct kioctx {
struct delayed_work wq;
@@ -3305,8 +3305,8 @@ take the forward porting patches:
struct rcu_head rcu_head;
};
---- head-2011-09-07.orig/include/linux/highmem.h 2011-03-15 02:20:32.000000000 +0100
-+++ head-2011-09-07/include/linux/highmem.h 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-10-07.orig/include/linux/highmem.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/include/linux/highmem.h 2011-04-13 11:25:29.000000000 +0200
@@ -178,12 +178,14 @@ alloc_zeroed_user_highpage_movable(struc
return __alloc_zeroed_user_highpage(__GFP_MOVABLE, vma, vaddr);
}
@@ -3338,8 +3338,8 @@ take the forward porting patches:
+#endif
+
#endif /* _LINUX_HIGHMEM_H */
---- head-2011-09-07.orig/include/linux/interrupt.h 2011-09-07 13:56:38.000000000 +0200
-+++ head-2011-09-07/include/linux/interrupt.h 2011-04-13 11:26:32.000000000 +0200
+--- head-2011-10-07.orig/include/linux/interrupt.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/include/linux/interrupt.h 2011-04-13 11:26:32.000000000 +0200
@@ -375,6 +375,11 @@ static inline int disable_irq_wake(unsig
}
#endif /* CONFIG_GENERIC_HARDIRQS */
@@ -3352,8 +3352,8 @@ take the forward porting patches:
#ifdef CONFIG_IRQ_FORCED_THREADING
extern bool force_irqthreads;
---- head-2011-09-07.orig/include/linux/kexec.h 2011-05-19 06:06:34.000000000 +0200
-+++ head-2011-09-07/include/linux/kexec.h 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-10-07.orig/include/linux/kexec.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/include/linux/kexec.h 2011-04-13 11:25:29.000000000 +0200
@@ -46,6 +46,13 @@
KEXEC_CORE_NOTE_NAME_BYTES + \
KEXEC_CORE_NOTE_DESC_BYTES )
@@ -3381,8 +3381,8 @@ take the forward porting patches:
extern asmlinkage long sys_kexec_load(unsigned long entry,
unsigned long nr_segments,
struct kexec_segment __user *segments,
---- head-2011-09-07.orig/include/linux/mm.h 2011-09-07 13:56:42.000000000 +0200
-+++ head-2011-09-07/include/linux/mm.h 2011-09-07 14:38:06.000000000 +0200
+--- head-2011-10-07.orig/include/linux/mm.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/include/linux/mm.h 2011-09-07 14:38:06.000000000 +0200
@@ -114,7 +114,12 @@ extern unsigned int kobjsize(const void
#define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */
@@ -3425,8 +3425,8 @@ take the forward porting patches:
#ifdef CONFIG_NUMA
/*
* set_policy() op must add a reference to any non-NULL @new mempolicy
---- head-2011-09-07.orig/include/linux/oprofile.h 2011-09-07 13:56:38.000000000 +0200
-+++ head-2011-09-07/include/linux/oprofile.h 2011-09-07 14:37:55.000000000 +0200
+--- head-2011-10-07.orig/include/linux/oprofile.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/include/linux/oprofile.h 2011-09-07 14:37:55.000000000 +0200
@@ -19,6 +19,8 @@
#include <linux/errno.h>
#include <linux/printk.h>
@@ -3478,8 +3478,8 @@ take the forward porting patches:
/**
* Create a file of the given name as a child of the given root, with
---- head-2011-09-07.orig/include/linux/page-flags.h 2011-09-07 13:56:38.000000000 +0200
-+++ head-2011-09-07/include/linux/page-flags.h 2011-09-07 14:38:10.000000000 +0200
+--- head-2011-10-07.orig/include/linux/page-flags.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/include/linux/page-flags.h 2011-09-07 14:38:10.000000000 +0200
@@ -107,6 +107,11 @@ enum pageflags {
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
PG_compound_lock,
@@ -3544,21 +3544,9 @@ take the forward porting patches:
/*
* Flags checked when a page is prepped for return by the page allocator.
---- head-2011-09-07.orig/include/linux/pci.h 2011-06-30 15:21:48.000000000 +0200
-+++ head-2011-09-07/include/linux/pci.h 2011-09-07 14:38:16.000000000 +0200
-@@ -1022,6 +1022,11 @@ static inline int pci_msi_enabled(void)
- {
- return 0;
- }
-+
-+#ifdef CONFIG_XEN
-+#define register_msi_get_owner(func) 0
-+#define unregister_msi_get_owner(func) 0
-+#endif
- #else
- extern int pci_enable_msi_block(struct pci_dev *dev, unsigned int nvec);
- extern void pci_msi_shutdown(struct pci_dev *dev);
-@@ -1034,6 +1039,10 @@ extern void pci_disable_msix(struct pci_
+--- head-2011-10-07.orig/include/linux/pci.h 2011-10-07 10:46:46.000000000 +0200
++++ head-2011-10-07/include/linux/pci.h 2011-10-07 10:47:26.000000000 +0200
+@@ -1035,6 +1035,10 @@ extern void pci_disable_msix(struct pci_
extern void msi_remove_pci_irq_vectors(struct pci_dev *dev);
extern void pci_restore_msi_state(struct pci_dev *dev);
extern int pci_msi_enabled(void);
@@ -3569,8 +3557,8 @@ take the forward porting patches:
#endif
#ifdef CONFIG_PCIEPORTBUS
---- head-2011-09-07.orig/include/linux/vermagic.h 2010-02-24 19:52:17.000000000 +0100
-+++ head-2011-09-07/include/linux/vermagic.h 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-10-07.orig/include/linux/vermagic.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/include/linux/vermagic.h 2011-04-13 11:25:29.000000000 +0200
@@ -22,6 +22,11 @@
#else
#define MODULE_VERMAGIC_MODVERSIONS ""
@@ -3590,8 +3578,8 @@ take the forward porting patches:
- MODULE_ARCH_VERMAGIC
+ MODULE_VERMAGIC_XEN MODULE_ARCH_VERMAGIC
---- head-2011-09-07.orig/kernel/irq/spurious.c 2011-07-22 04:17:23.000000000 +0200
-+++ head-2011-09-07/kernel/irq/spurious.c 2011-06-30 15:38:11.000000000 +0200
+--- head-2011-10-07.orig/kernel/irq/spurious.c 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/kernel/irq/spurious.c 2011-06-30 15:38:11.000000000 +0200
@@ -288,7 +288,7 @@ void note_interrupt(unsigned int irq, st
*/
if (time_after(jiffies, desc->last_unhandled + HZ/10))
@@ -3601,8 +3589,8 @@ take the forward porting patches:
desc->irqs_unhandled++;
desc->last_unhandled = jiffies;
}
---- head-2011-09-07.orig/kernel/kexec.c 2011-09-07 13:56:40.000000000 +0200
-+++ head-2011-09-07/kernel/kexec.c 2011-04-28 11:06:56.000000000 +0200
+--- head-2011-10-07.orig/kernel/kexec.c 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/kernel/kexec.c 2011-04-28 11:06:56.000000000 +0200
@@ -357,13 +357,26 @@ static int kimage_is_destination_range(s
return 0;
}
@@ -3803,8 +3791,8 @@ take the forward porting patches:
/* Install the new kernel, and Uninstall the old */
image = xchg(dest_image, image);
---- head-2011-09-07.orig/kernel/sysctl.c 2011-09-07 13:56:42.000000000 +0200
-+++ head-2011-09-07/kernel/sysctl.c 2011-06-30 15:38:23.000000000 +0200
+--- head-2011-10-07.orig/kernel/sysctl.c 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/kernel/sysctl.c 2011-06-30 15:38:23.000000000 +0200
@@ -855,7 +855,7 @@ static struct ctl_table kern_table[] = {
.proc_handler = proc_dointvec,
},
@@ -3814,8 +3802,8 @@ take the forward porting patches:
{
.procname = "acpi_video_flags",
.data = &acpi_realmode_flags,
---- head-2011-09-07.orig/mm/memory.c 2011-09-07 13:56:40.000000000 +0200
-+++ head-2011-09-07/mm/memory.c 2011-09-07 14:38:26.000000000 +0200
+--- head-2011-10-07.orig/mm/memory.c 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/mm/memory.c 2011-09-07 14:38:26.000000000 +0200
@@ -802,6 +802,12 @@ struct page *vm_normal_page(struct vm_ar
{
unsigned long pfn = pte_pfn(pte);
@@ -3891,8 +3879,8 @@ take the forward porting patches:
if (!vma ||
(vma->vm_flags & (VM_IO | VM_PFNMAP)) ||
!(vm_flags & vma->vm_flags))
---- head-2011-09-07.orig/mm/mmap.c 2011-09-07 13:56:40.000000000 +0200
-+++ head-2011-09-07/mm/mmap.c 2011-09-07 14:38:29.000000000 +0200
+--- head-2011-10-07.orig/mm/mmap.c 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/mm/mmap.c 2011-09-07 14:38:29.000000000 +0200
@@ -1890,6 +1890,12 @@ static void unmap_region(struct mm_struc
tlb_finish_mmu(&tlb, start, end);
}
@@ -3924,8 +3912,8 @@ take the forward porting patches:
vma = mm->mmap;
if (!vma) /* Can happen if dup_mmap() received an OOM */
return;
---- head-2011-09-07.orig/mm/mprotect.c 2011-03-15 02:20:32.000000000 +0100
-+++ head-2011-09-07/mm/mprotect.c 2011-06-30 15:38:52.000000000 +0200
+--- head-2011-10-07.orig/mm/mprotect.c 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/mm/mprotect.c 2011-06-30 15:38:52.000000000 +0200
@@ -97,6 +97,8 @@ static inline void change_pmd_range(stru
}
if (pmd_none_or_clear_bad(pmd))
@@ -3935,8 +3923,8 @@ take the forward porting patches:
change_pte_range(vma->vm_mm, pmd, addr, next, newprot,
dirty_accountable);
} while (pmd++, addr = next, addr != end);
---- head-2011-09-07.orig/mm/page_alloc.c 2011-09-07 13:56:42.000000000 +0200
-+++ head-2011-09-07/mm/page_alloc.c 2011-06-30 15:38:58.000000000 +0200
+--- head-2011-10-07.orig/mm/page_alloc.c 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/mm/page_alloc.c 2011-06-30 15:38:58.000000000 +0200
@@ -653,6 +653,13 @@ static bool free_pages_prepare(struct pa
int i;
int bad = 0;
@@ -3951,8 +3939,8 @@ take the forward porting patches:
trace_mm_page_free_direct(page, order);
kmemcheck_free_shadow(page, order);
---- head-2011-09-07.orig/scripts/Makefile.build 2011-09-07 13:56:42.000000000 +0200
-+++ head-2011-09-07/scripts/Makefile.build 2011-06-30 15:39:08.000000000 +0200
+--- head-2011-10-07.orig/scripts/Makefile.build 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/scripts/Makefile.build 2011-06-30 15:39:08.000000000 +0200
@@ -126,6 +126,21 @@ ifndef obj
$(warning kbuild: Makefile.build is included improperly)
endif
@@ -3975,8 +3963,8 @@ take the forward porting patches:
# ===========================================================================
ifneq ($(strip $(lib-y) $(lib-m) $(lib-n) $(lib-)),)
---- head-2011-09-07.orig/scripts/Makefile.lib 2011-09-07 13:56:40.000000000 +0200
-+++ head-2011-09-07/scripts/Makefile.lib 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-10-07.orig/scripts/Makefile.lib 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/scripts/Makefile.lib 2011-04-13 11:25:29.000000000 +0200
@@ -22,6 +22,12 @@ obj-m := $(filter-out $(obj-y),$(obj-m))
lib-y := $(filter-out $(obj-y), $(sort $(lib-y) $(lib-m)))
diff --git a/patches.xen/xen3-auto-include-xen-interface.diff b/patches.xen/xen3-auto-include-xen-interface.diff
index ebac6e34b8..d2d88bb66f 100644
--- a/patches.xen/xen3-auto-include-xen-interface.diff
+++ b/patches.xen/xen3-auto-include-xen-interface.diff
@@ -1,10 +1,10 @@
Subject: xen3 include-xen-interface
-From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1105:f4f25124b1b6)
+From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1116:40e33b2fce94)
Patch-mainline: n/a
Acked-by: jbeulich@novell.com
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/interface/COPYING 2007-06-12 13:14:19.000000000 +0200
++++ head-2011-10-07/include/xen/interface/COPYING 2007-06-12 13:14:19.000000000 +0200
@@ -0,0 +1,38 @@
+XEN NOTICE
+==========
@@ -45,7 +45,7 @@ Acked-by: jbeulich@novell.com
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/interface/arch-x86/cpuid.h 2011-03-17 13:50:24.000000000 +0100
++++ head-2011-10-07/include/xen/interface/arch-x86/cpuid.h 2011-03-17 13:50:24.000000000 +0100
@@ -0,0 +1,68 @@
+/******************************************************************************
+ * arch-x86/cpuid.h
@@ -116,8 +116,8 @@ Acked-by: jbeulich@novell.com
+
+#endif /* __XEN_PUBLIC_ARCH_X86_CPUID_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/interface/arch-x86/hvm/save.h 2011-05-23 10:40:00.000000000 +0200
-@@ -0,0 +1,588 @@
++++ head-2011-10-07/include/xen/interface/arch-x86/hvm/save.h 2011-10-07 10:44:29.000000000 +0200
+@@ -0,0 +1,593 @@
+/*
+ * Structure definitions for HVM state that is held by Xen and must
+ * be saved along with the domain's memory and device-model state.
@@ -667,18 +667,6 @@ Acked-by: jbeulich@novell.com
+DECLARE_HVM_SAVE_TYPE(MTRR, 14, struct hvm_hw_mtrr);
+
+/*
-+ * Viridian hypervisor context.
-+ */
-+
-+struct hvm_viridian_context {
-+ uint64_t hypercall_gpa;
-+ uint64_t guest_os_id;
-+};
-+
-+DECLARE_HVM_SAVE_TYPE(VIRIDIAN, 15, struct hvm_viridian_context);
-+
-+
-+/*
+ * The save area of XSAVE/XRSTOR.
+ */
+
@@ -700,14 +688,31 @@ Acked-by: jbeulich@novell.com
+
+#define CPU_XSAVE_CODE 16
+
++/*
++ * Viridian hypervisor context.
++ */
++
++struct hvm_viridian_domain_context {
++ uint64_t hypercall_gpa;
++ uint64_t guest_os_id;
++};
++
++DECLARE_HVM_SAVE_TYPE(VIRIDIAN_DOMAIN, 15, struct hvm_viridian_domain_context);
++
++struct hvm_viridian_vcpu_context {
++ uint64_t apic_assist;
++};
++
++DECLARE_HVM_SAVE_TYPE(VIRIDIAN_VCPU, 17, struct hvm_viridian_vcpu_context);
++
+/*
+ * Largest type-code in use
+ */
-+#define HVM_SAVE_CODE_MAX 16
++#define HVM_SAVE_CODE_MAX 17
+
+#endif /* __XEN_PUBLIC_HVM_SAVE_X86_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/interface/arch-x86/xen-mca.h 2010-08-31 09:24:21.000000000 +0200
++++ head-2011-10-07/include/xen/interface/arch-x86/xen-mca.h 2010-08-31 09:24:21.000000000 +0200
@@ -0,0 +1,440 @@
+/******************************************************************************
+ * arch-x86/mca.h
@@ -1150,7 +1155,7 @@ Acked-by: jbeulich@novell.com
+
+#endif /* __XEN_PUBLIC_ARCH_X86_MCA_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/interface/arch-x86/xen-x86_32.h 2011-05-23 10:40:00.000000000 +0200
++++ head-2011-10-07/include/xen/interface/arch-x86/xen-x86_32.h 2011-05-23 10:40:00.000000000 +0200
@@ -0,0 +1,171 @@
+/******************************************************************************
+ * xen-x86_32.h
@@ -1324,7 +1329,7 @@ Acked-by: jbeulich@novell.com
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/interface/arch-x86/xen-x86_64.h 2011-05-23 10:40:00.000000000 +0200
++++ head-2011-10-07/include/xen/interface/arch-x86/xen-x86_64.h 2011-05-23 10:40:00.000000000 +0200
@@ -0,0 +1,202 @@
+/******************************************************************************
+ * xen-x86_64.h
@@ -1529,7 +1534,7 @@ Acked-by: jbeulich@novell.com
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/interface/arch-x86/xen.h 2011-03-17 13:50:24.000000000 +0100
++++ head-2011-10-07/include/xen/interface/arch-x86/xen.h 2011-03-17 13:50:24.000000000 +0100
@@ -0,0 +1,201 @@
+/******************************************************************************
+ * arch-x86/xen.h
@@ -1733,7 +1738,7 @@ Acked-by: jbeulich@novell.com
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/interface/arch-x86_32.h 2007-06-12 13:14:19.000000000 +0200
++++ head-2011-10-07/include/xen/interface/arch-x86_32.h 2007-06-12 13:14:19.000000000 +0200
@@ -0,0 +1,27 @@
+/******************************************************************************
+ * arch-x86_32.h
@@ -1763,7 +1768,7 @@ Acked-by: jbeulich@novell.com
+
+#include "arch-x86/xen.h"
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/interface/arch-x86_64.h 2007-06-12 13:14:19.000000000 +0200
++++ head-2011-10-07/include/xen/interface/arch-x86_64.h 2007-06-12 13:14:19.000000000 +0200
@@ -0,0 +1,27 @@
+/******************************************************************************
+ * arch-x86_64.h
@@ -1793,7 +1798,7 @@ Acked-by: jbeulich@novell.com
+
+#include "arch-x86/xen.h"
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/interface/dom0_ops.h 2007-06-12 13:14:19.000000000 +0200
++++ head-2011-10-07/include/xen/interface/dom0_ops.h 2007-06-12 13:14:19.000000000 +0200
@@ -0,0 +1,120 @@
+/******************************************************************************
+ * dom0_ops.h
@@ -1916,8 +1921,8 @@ Acked-by: jbeulich@novell.com
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/interface/domctl.h 2011-08-08 12:54:10.000000000 +0200
-@@ -0,0 +1,969 @@
++++ head-2011-10-07/include/xen/interface/domctl.h 2011-10-07 10:44:29.000000000 +0200
+@@ -0,0 +1,973 @@
+/******************************************************************************
+ * domctl.h
+ *
@@ -1955,7 +1960,7 @@ Acked-by: jbeulich@novell.com
+#include "xen.h"
+#include "grant_table.h"
+
-+#define XEN_DOMCTL_INTERFACE_VERSION 0x00000007
++#define XEN_DOMCTL_INTERFACE_VERSION 0x00000008
+
+/*
+ * NB. xen_domctl.domain is an IN/OUT parameter for this operation.
@@ -2015,6 +2020,7 @@ Acked-by: jbeulich@novell.com
+ uint64_aligned_t tot_pages;
+ uint64_aligned_t max_pages;
+ uint64_aligned_t shr_pages;
++ uint64_aligned_t paged_pages;
+ uint64_aligned_t shared_info_frame; /* GMFN of shared_info struct */
+ uint64_aligned_t cpu_time;
+ uint32_t nr_online_vcpus; /* Number of VCPUs currently online. */
@@ -2375,15 +2381,15 @@ Acked-by: jbeulich@novell.com
+/* XEN_DOMCTL_test_assign_device */
+/* XEN_DOMCTL_deassign_device */
+struct xen_domctl_assign_device {
-+ uint32_t machine_bdf; /* machine PCI ID of assigned device */
++ uint32_t machine_sbdf; /* machine PCI ID of assigned device */
+};
+typedef struct xen_domctl_assign_device xen_domctl_assign_device_t;
+DEFINE_XEN_GUEST_HANDLE(xen_domctl_assign_device_t);
+
-+/* Retrieve sibling devices infomation of machine_bdf */
++/* Retrieve sibling devices infomation of machine_sbdf */
+/* XEN_DOMCTL_get_device_group */
+struct xen_domctl_get_device_group {
-+ uint32_t machine_bdf; /* IN */
++ uint32_t machine_sbdf; /* IN */
+ uint32_t max_sdevs; /* IN */
+ uint32_t num_sdevs; /* OUT */
+ XEN_GUEST_HANDLE_64(uint32) sdev_array; /* OUT */
@@ -2628,20 +2634,18 @@ Acked-by: jbeulich@novell.com
+
+/* XEN_DOMCTL_mem_event_op */
+
-+/* Add and remove memory handlers */
-+#define XEN_DOMCTL_MEM_EVENT_OP_ENABLE 0
-+#define XEN_DOMCTL_MEM_EVENT_OP_DISABLE 1
-+
+/*
++* Domain memory paging
+ * Page memory in and out.
+ */
+#define XEN_DOMCTL_MEM_EVENT_OP_PAGING 1
+
-+/* Domain memory paging */
-+#define XEN_DOMCTL_MEM_EVENT_OP_PAGING_NOMINATE 0
-+#define XEN_DOMCTL_MEM_EVENT_OP_PAGING_EVICT 1
-+#define XEN_DOMCTL_MEM_EVENT_OP_PAGING_PREP 2
-+#define XEN_DOMCTL_MEM_EVENT_OP_PAGING_RESUME 3
++#define XEN_DOMCTL_MEM_EVENT_OP_PAGING_ENABLE 0
++#define XEN_DOMCTL_MEM_EVENT_OP_PAGING_DISABLE 1
++#define XEN_DOMCTL_MEM_EVENT_OP_PAGING_NOMINATE 2
++#define XEN_DOMCTL_MEM_EVENT_OP_PAGING_EVICT 3
++#define XEN_DOMCTL_MEM_EVENT_OP_PAGING_PREP 4
++#define XEN_DOMCTL_MEM_EVENT_OP_PAGING_RESUME 5
+
+/*
+ * Access permissions.
@@ -2654,11 +2658,14 @@ Acked-by: jbeulich@novell.com
+ * ACCESS_RESUME mode for the following domctl.
+ */
+#define XEN_DOMCTL_MEM_EVENT_OP_ACCESS 2
-+#define XEN_DOMCTL_MEM_EVENT_OP_ACCESS_RESUME 0
++
++#define XEN_DOMCTL_MEM_EVENT_OP_ACCESS_ENABLE 0
++#define XEN_DOMCTL_MEM_EVENT_OP_ACCESS_DISABLE 1
++#define XEN_DOMCTL_MEM_EVENT_OP_ACCESS_RESUME 2
+
+struct xen_domctl_mem_event_op {
-+ uint32_t op; /* XEN_DOMCTL_MEM_EVENT_OP_* */
-+ uint32_t mode; /* XEN_DOMCTL_MEM_EVENT_ENABLE_* */
++ uint32_t op; /* XEN_DOMCTL_MEM_EVENT_OP_*_* */
++ uint32_t mode; /* XEN_DOMCTL_MEM_EVENT_OP_* */
+
+ /* OP_ENABLE */
+ uint64_aligned_t shared_addr; /* IN: Virtual address of shared page */
@@ -2675,14 +2682,16 @@ Acked-by: jbeulich@novell.com
+ */
+/* XEN_DOMCTL_mem_sharing_op */
+
-+#define XEN_DOMCTL_MEM_SHARING_OP_CONTROL 0
-+#define XEN_DOMCTL_MEM_SHARING_OP_NOMINATE_GFN 1
-+#define XEN_DOMCTL_MEM_SHARING_OP_NOMINATE_GREF 2
-+#define XEN_DOMCTL_MEM_SHARING_OP_SHARE 3
-+#define XEN_DOMCTL_MEM_SHARING_OP_RESUME 4
-+#define XEN_DOMCTL_MEM_SHARING_OP_DEBUG_GFN 5
-+#define XEN_DOMCTL_MEM_SHARING_OP_DEBUG_MFN 6
-+#define XEN_DOMCTL_MEM_SHARING_OP_DEBUG_GREF 7
++#define XEN_DOMCTL_MEM_EVENT_OP_SHARING 3
++
++#define XEN_DOMCTL_MEM_EVENT_OP_SHARING_CONTROL 0
++#define XEN_DOMCTL_MEM_EVENT_OP_SHARING_NOMINATE_GFN 1
++#define XEN_DOMCTL_MEM_EVENT_OP_SHARING_NOMINATE_GREF 2
++#define XEN_DOMCTL_MEM_EVENT_OP_SHARING_SHARE 3
++#define XEN_DOMCTL_MEM_EVENT_OP_SHARING_RESUME 4
++#define XEN_DOMCTL_MEM_EVENT_OP_SHARING_DEBUG_GFN 5
++#define XEN_DOMCTL_MEM_EVENT_OP_SHARING_DEBUG_MFN 6
++#define XEN_DOMCTL_MEM_EVENT_OP_SHARING_DEBUG_GREF 7
+
+#define XEN_DOMCTL_MEM_SHARING_S_HANDLE_INVALID (-10)
+#define XEN_DOMCTL_MEM_SHARING_C_HANDLE_INVALID (-9)
@@ -2888,7 +2897,7 @@ Acked-by: jbeulich@novell.com
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/interface/hvm/e820.h 2007-06-12 13:14:19.000000000 +0200
++++ head-2011-10-07/include/xen/interface/hvm/e820.h 2007-06-12 13:14:19.000000000 +0200
@@ -0,0 +1,34 @@
+
+/*
@@ -2925,7 +2934,7 @@ Acked-by: jbeulich@novell.com
+
+#endif /* __XEN_PUBLIC_HVM_E820_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/interface/hvm/hvm_info_table.h 2010-05-07 11:10:48.000000000 +0200
++++ head-2011-10-07/include/xen/interface/hvm/hvm_info_table.h 2010-05-07 11:10:48.000000000 +0200
@@ -0,0 +1,75 @@
+/******************************************************************************
+ * hvm/hvm_info_table.h
@@ -3003,7 +3012,7 @@ Acked-by: jbeulich@novell.com
+
+#endif /* __XEN_PUBLIC_HVM_HVM_INFO_TABLE_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/interface/hvm/ioreq.h 2011-03-17 13:50:24.000000000 +0100
++++ head-2011-10-07/include/xen/interface/hvm/ioreq.h 2011-03-17 13:50:24.000000000 +0100
@@ -0,0 +1,140 @@
+/*
+ * ioreq.h: I/O request definitions for device models
@@ -3146,7 +3155,7 @@ Acked-by: jbeulich@novell.com
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/interface/hvm/save.h 2011-08-08 12:54:10.000000000 +0200
++++ head-2011-10-07/include/xen/interface/hvm/save.h 2011-08-08 12:54:10.000000000 +0200
@@ -0,0 +1,111 @@
+/*
+ * hvm/save.h
@@ -3260,7 +3269,7 @@ Acked-by: jbeulich@novell.com
+
+#endif /* __XEN_PUBLIC_HVM_SAVE_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/interface/io/fsif.h 2009-06-23 09:28:21.000000000 +0200
++++ head-2011-10-07/include/xen/interface/io/fsif.h 2009-06-23 09:28:21.000000000 +0200
@@ -0,0 +1,192 @@
+/******************************************************************************
+ * fsif.h
@@ -3455,7 +3464,7 @@ Acked-by: jbeulich@novell.com
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/interface/io/tpmif.h 2007-06-12 13:14:19.000000000 +0200
++++ head-2011-10-07/include/xen/interface/io/tpmif.h 2007-06-12 13:14:19.000000000 +0200
@@ -0,0 +1,77 @@
+/******************************************************************************
+ * tpmif.h
@@ -3535,7 +3544,7 @@ Acked-by: jbeulich@novell.com
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/interface/io/usbif.h 2010-02-24 13:13:46.000000000 +0100
++++ head-2011-10-07/include/xen/interface/io/usbif.h 2010-02-24 13:13:46.000000000 +0100
@@ -0,0 +1,151 @@
+/*
+ * usbif.h
@@ -3689,7 +3698,7 @@ Acked-by: jbeulich@novell.com
+
+#endif /* __XEN_PUBLIC_IO_USBIF_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/interface/io/vscsiif.h 2008-07-21 11:00:33.000000000 +0200
++++ head-2011-10-07/include/xen/interface/io/vscsiif.h 2008-07-21 11:00:33.000000000 +0200
@@ -0,0 +1,105 @@
+/******************************************************************************
+ * vscsiif.h
@@ -3797,7 +3806,7 @@ Acked-by: jbeulich@novell.com
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/interface/kexec.h 2008-11-25 12:22:34.000000000 +0100
++++ head-2011-10-07/include/xen/interface/kexec.h 2008-11-25 12:22:34.000000000 +0100
@@ -0,0 +1,168 @@
+/******************************************************************************
+ * kexec.h - Public portion
@@ -3968,7 +3977,7 @@ Acked-by: jbeulich@novell.com
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/interface/mem_event.h 2011-08-08 12:54:10.000000000 +0200
++++ head-2011-10-07/include/xen/interface/mem_event.h 2011-08-08 12:54:10.000000000 +0200
@@ -0,0 +1,87 @@
+/******************************************************************************
+ * mem_event.h
@@ -4058,7 +4067,7 @@ Acked-by: jbeulich@novell.com
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/interface/nmi.h 2009-06-23 09:28:21.000000000 +0200
++++ head-2011-10-07/include/xen/interface/nmi.h 2009-06-23 09:28:21.000000000 +0200
@@ -0,0 +1,80 @@
+/******************************************************************************
+ * nmi.h
@@ -4141,8 +4150,8 @@ Acked-by: jbeulich@novell.com
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/interface/platform.h 2011-08-08 12:54:10.000000000 +0200
-@@ -0,0 +1,488 @@
++++ head-2011-10-07/include/xen/interface/platform.h 2011-10-07 10:44:29.000000000 +0200
+@@ -0,0 +1,514 @@
+/******************************************************************************
+ * platform.h
+ *
@@ -4268,6 +4277,9 @@ Acked-by: jbeulich@novell.com
+#define XEN_EFI_get_variable 6
+#define XEN_EFI_set_variable 7
+#define XEN_EFI_get_next_variable_name 8
++#define XEN_EFI_query_variable_info 9
++#define XEN_EFI_query_capsule_capabilities 10
++#define XEN_EFI_update_capsule 11
+struct xenpf_efi_runtime_call {
+ uint32_t function;
+ /*
@@ -4325,6 +4337,26 @@ Acked-by: jbeulich@novell.com
+ XEN_GUEST_HANDLE(void) name; /* UCS-2/UTF-16 string */
+ struct xenpf_efi_guid vendor_guid;
+ } get_next_variable_name;
++
++ struct {
++ uint32_t attr;
++ uint64_t max_store_size;
++ uint64_t remain_store_size;
++ uint64_t max_size;
++ } query_variable_info;
++
++ struct {
++ XEN_GUEST_HANDLE(void) capsule_header_array;
++ unsigned long capsule_count;
++ uint64_t max_capsule_size;
++ unsigned int reset_type;
++ } query_capsule_capabilities;
++
++ struct {
++ XEN_GUEST_HANDLE(void) capsule_header_array;
++ unsigned long capsule_count;
++ uint64_t sg_list; /* machine address */
++ } update_capsule;
+ } u;
+};
+typedef struct xenpf_efi_runtime_call xenpf_efi_runtime_call_t;
@@ -4339,6 +4371,7 @@ Acked-by: jbeulich@novell.com
+#define XEN_FW_EFI_CONFIG_TABLE 1
+#define XEN_FW_EFI_VENDOR 2
+#define XEN_FW_EFI_MEM_INFO 3
++#define XEN_FW_EFI_RT_VERSION 4
+struct xenpf_firmware_info {
+ /* IN variables. */
+ uint32_t type;
@@ -4449,6 +4482,7 @@ Acked-by: jbeulich@novell.com
+#define XEN_PM_CX 0
+#define XEN_PM_PX 1
+#define XEN_PM_TX 2
++#define XEN_PM_PDC 3
+
+/* Px sub info type */
+#define XEN_PX_PCT 1
@@ -4546,6 +4580,7 @@ Acked-by: jbeulich@novell.com
+ union {
+ struct xen_processor_power power;/* Cx: _CST/_CSD */
+ struct xen_processor_performance perf; /* Px: _PPC/_PCT/_PSS/_PSD */
++ XEN_GUEST_HANDLE(uint32) pdc; /* _PDC */
+ } u;
+};
+typedef struct xenpf_set_processor_pminfo xenpf_set_processor_pminfo_t;
@@ -4632,8 +4667,8 @@ Acked-by: jbeulich@novell.com
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/interface/sysctl.h 2011-05-23 10:40:00.000000000 +0200
-@@ -0,0 +1,637 @@
++++ head-2011-10-07/include/xen/interface/sysctl.h 2011-10-07 10:44:29.000000000 +0200
+@@ -0,0 +1,638 @@
+/******************************************************************************
+ * sysctl.h
+ *
@@ -5035,6 +5070,7 @@ Acked-by: jbeulich@novell.com
+#define PG_OFFLINE_OFFLINED (0x1UL << 1)
+#define PG_OFFLINE_PENDING (0x1UL << 2)
+#define PG_OFFLINE_FAILED (0x1UL << 3)
++#define PG_OFFLINE_AGAIN (0x1UL << 4)
+
+#define PG_ONLINE_FAILED PG_OFFLINE_FAILED
+#define PG_ONLINE_ONLINED PG_OFFLINE_OFFLINED
@@ -5272,7 +5308,7 @@ Acked-by: jbeulich@novell.com
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/interface/tmem.h 2011-05-23 10:40:00.000000000 +0200
++++ head-2011-10-07/include/xen/interface/tmem.h 2011-05-23 10:40:00.000000000 +0200
@@ -0,0 +1,148 @@
+/******************************************************************************
+ * tmem.h
@@ -5423,7 +5459,7 @@ Acked-by: jbeulich@novell.com
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/interface/trace.h 2011-08-08 12:54:10.000000000 +0200
++++ head-2011-10-07/include/xen/interface/trace.h 2011-08-08 12:54:10.000000000 +0200
@@ -0,0 +1,241 @@
+/******************************************************************************
+ * include/public/trace.h
@@ -5667,7 +5703,7 @@ Acked-by: jbeulich@novell.com
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/interface/xen-compat.h 2010-01-04 11:56:34.000000000 +0100
++++ head-2011-10-07/include/xen/interface/xen-compat.h 2010-01-04 11:56:34.000000000 +0100
@@ -0,0 +1,44 @@
+/******************************************************************************
+ * xen-compat.h
@@ -5714,7 +5750,7 @@ Acked-by: jbeulich@novell.com
+
+#endif /* __XEN_PUBLIC_XEN_COMPAT_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/interface/xenoprof.h 2010-08-31 09:24:21.000000000 +0200
++++ head-2011-10-07/include/xen/interface/xenoprof.h 2010-08-31 09:24:21.000000000 +0200
@@ -0,0 +1,152 @@
+/******************************************************************************
+ * xenoprof.h
@@ -5869,7 +5905,7 @@ Acked-by: jbeulich@novell.com
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/interface/xsm/acm.h 2010-01-04 11:56:34.000000000 +0100
++++ head-2011-10-07/include/xen/interface/xsm/acm.h 2010-01-04 11:56:34.000000000 +0100
@@ -0,0 +1,223 @@
+/*
+ * acm.h: Xen access control module interface defintions
@@ -6095,7 +6131,7 @@ Acked-by: jbeulich@novell.com
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/interface/xsm/acm_ops.h 2007-10-22 13:39:15.000000000 +0200
++++ head-2011-10-07/include/xen/interface/xsm/acm_ops.h 2007-10-22 13:39:15.000000000 +0200
@@ -0,0 +1,159 @@
+/*
+ * acm_ops.h: Xen access control module hypervisor commands
@@ -6257,7 +6293,7 @@ Acked-by: jbeulich@novell.com
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/interface/xsm/flask_op.h 2011-05-23 10:40:00.000000000 +0200
++++ head-2011-10-07/include/xen/interface/xsm/flask_op.h 2011-05-23 10:40:00.000000000 +0200
@@ -0,0 +1,61 @@
+/*
+ * This file contains the flask_op hypercall commands and definitions.
diff --git a/patches.xen/xen3-auto-xen-arch.diff b/patches.xen/xen3-auto-xen-arch.diff
index 41c9f05f7a..380b1a178c 100644
--- a/patches.xen/xen3-auto-xen-arch.diff
+++ b/patches.xen/xen3-auto-xen-arch.diff
@@ -1,5 +1,5 @@
Subject: xen3 xen-arch
-From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1105:f4f25124b1b6)
+From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1116:40e33b2fce94)
Patch-mainline: n/a
Acked-by: jbeulich@novell.com
@@ -135,7 +135,7 @@ for reference, prefixed with the version the removal occured):
3.0/drivers/hwmon/pkgtemp-xen.c (added in 2.6.36)
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/kernel/acpi/processor_extcntl_xen.c 2010-03-22 12:00:53.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/acpi/processor_extcntl_xen.c 2010-03-22 12:00:53.000000000 +0100
@@ -0,0 +1,208 @@
+/*
+ * processor_extcntl_xen.c - interface to notify Xen
@@ -346,7 +346,7 @@ for reference, prefixed with the version the removal occured):
+}
+EXPORT_SYMBOL(arch_acpi_processor_init_extcntl);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/kernel/apic/apic-xen.c 2007-06-12 13:12:48.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/apic/apic-xen.c 2007-06-12 13:12:48.000000000 +0200
@@ -0,0 +1,155 @@
+/*
+ * Local APIC handling, local APIC timers
@@ -504,7 +504,7 @@ for reference, prefixed with the version the removal occured):
+ return 0;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/kernel/cpu/common-xen.c 2009-05-19 09:16:41.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/cpu/common-xen.c 2009-05-19 09:16:41.000000000 +0200
@@ -0,0 +1,745 @@
+#include <linux/init.h>
+#include <linux/string.h>
@@ -1252,7 +1252,7 @@ for reference, prefixed with the version the removal occured):
+}
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/kernel/cpu/mcheck/mce_dom0.c 2009-10-01 11:00:47.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/cpu/mcheck/mce_dom0.c 2009-10-01 11:00:47.000000000 +0200
@@ -0,0 +1,134 @@
+#include <linux/init.h>
+#include <linux/types.h>
@@ -1389,7 +1389,7 @@ for reference, prefixed with the version the removal occured):
+}
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/kernel/cpu/mtrr/main-xen.c 2008-01-28 12:24:18.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/cpu/mtrr/main-xen.c 2008-01-28 12:24:18.000000000 +0100
@@ -0,0 +1,198 @@
+#include <linux/init.h>
+#include <linux/proc_fs.h>
@@ -1590,7 +1590,7 @@ for reference, prefixed with the version the removal occured):
+
+subsys_initcall(mtrr_init);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/kernel/entry_32-xen.S 2009-05-19 09:16:41.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/entry_32-xen.S 2009-05-19 09:16:41.000000000 +0200
@@ -0,0 +1,1242 @@
+/*
+ * linux/arch/i386/entry.S
@@ -2835,7 +2835,7 @@ for reference, prefixed with the version the removal occured):
+
+syscall_table_size=(.-sys_call_table)
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/kernel/fixup.c 2008-01-28 12:24:18.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/fixup.c 2008-01-28 12:24:18.000000000 +0100
@@ -0,0 +1,88 @@
+/******************************************************************************
+ * fixup.c
@@ -2926,7 +2926,7 @@ for reference, prefixed with the version the removal occured):
+}
+__initcall(fixup_init);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/kernel/head_32-xen.S 2011-08-08 12:54:10.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/head_32-xen.S 2011-08-08 12:54:10.000000000 +0200
@@ -0,0 +1,231 @@
+
+
@@ -3160,7 +3160,7 @@ for reference, prefixed with the version the removal occured):
+ ELFNOTE(Xen, XEN_ELFNOTE_LOADER, .asciz, "generic")
+ ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long, 1)
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/kernel/io_apic_32-xen.c 2009-03-18 10:39:31.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/io_apic_32-xen.c 2009-03-18 10:39:31.000000000 +0100
@@ -0,0 +1,2786 @@
+/*
+ * Intel IO-APIC support for multi-Pentium hosts.
@@ -5949,7 +5949,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif /* CONFIG_ACPI */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/kernel/ioport_32-xen.c 2008-01-28 12:24:19.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/ioport_32-xen.c 2008-01-28 12:24:19.000000000 +0100
@@ -0,0 +1,123 @@
+/*
+ * linux/arch/i386/kernel/ioport.c
@@ -6075,7 +6075,7 @@ for reference, prefixed with the version the removal occured):
+ return 0;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/kernel/ldt_32-xen.c 2007-06-12 13:12:48.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/ldt_32-xen.c 2007-06-12 13:12:48.000000000 +0200
@@ -0,0 +1,270 @@
+/*
+ * linux/kernel/ldt.c
@@ -6348,7 +6348,7 @@ for reference, prefixed with the version the removal occured):
+ return ret;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/kernel/microcode-xen.c 2007-06-12 13:12:48.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/microcode-xen.c 2007-06-12 13:12:48.000000000 +0200
@@ -0,0 +1,144 @@
+/*
+ * Intel CPU Microcode Update Driver for Linux
@@ -6495,7 +6495,7 @@ for reference, prefixed with the version the removal occured):
+module_exit(microcode_exit)
+MODULE_ALIAS_MISCDEV(MICROCODE_MINOR);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/kernel/mpparse_32-xen.c 2007-06-12 13:12:48.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/mpparse_32-xen.c 2007-06-12 13:12:48.000000000 +0200
@@ -0,0 +1,1185 @@
+/*
+ * Intel Multiprocessor Specification 1.1 and 1.4
@@ -7683,7 +7683,7 @@ for reference, prefixed with the version the removal occured):
+#endif /* CONFIG_X86_IO_APIC */
+#endif /* CONFIG_ACPI */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/kernel/pci-dma-xen.c 2009-11-06 10:23:23.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/pci-dma-xen.c 2009-11-06 10:23:23.000000000 +0100
@@ -0,0 +1,406 @@
+/*
+ * Dynamic DMA mapping support.
@@ -8092,7 +8092,7 @@ for reference, prefixed with the version the removal occured):
+}
+EXPORT_SYMBOL(dma_sync_single_for_device);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/kernel/process_32-xen.c 2008-07-21 11:00:32.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/process_32-xen.c 2008-07-21 11:00:32.000000000 +0200
@@ -0,0 +1,877 @@
+/*
+ * linux/arch/i386/kernel/process.c
@@ -8972,7 +8972,7 @@ for reference, prefixed with the version the removal occured):
+ return sp & ~0xf;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/kernel/setup_32-xen.c 2008-04-22 15:41:51.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/setup_32-xen.c 2008-04-22 15:41:51.000000000 +0200
@@ -0,0 +1,1919 @@
+/*
+ * linux/arch/i386/kernel/setup.c
@@ -10894,7 +10894,7 @@ for reference, prefixed with the version the removal occured):
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/kernel/smp_32-xen.c 2007-12-10 08:47:31.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/smp_32-xen.c 2007-12-10 08:47:31.000000000 +0100
@@ -0,0 +1,605 @@
+/*
+ * Intel SMP support routines.
@@ -11502,7 +11502,7 @@ for reference, prefixed with the version the removal occured):
+}
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/kernel/time-xen.c 2010-08-31 09:24:21.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/time-xen.c 2010-08-31 09:24:21.000000000 +0200
@@ -0,0 +1,1242 @@
+/*
+ * linux/arch/i386/kernel/time.c
@@ -12747,7 +12747,7 @@ for reference, prefixed with the version the removal occured):
+}
+__initcall(xen_sysctl_init);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/kernel/traps_32-xen.c 2008-04-02 12:34:02.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/traps_32-xen.c 2008-04-02 12:34:02.000000000 +0200
@@ -0,0 +1,1190 @@
+/*
+ * linux/arch/i386/traps.c
@@ -13940,7 +13940,7 @@ for reference, prefixed with the version the removal occured):
+__setup("call_trace=", call_trace_setup);
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/mach-xen/Makefile 2007-06-12 13:12:48.000000000 +0200
++++ head-2011-10-07/arch/x86/mach-xen/Makefile 2007-06-12 13:12:48.000000000 +0200
@@ -0,0 +1,5 @@
+#
+# Makefile for the linux kernel.
@@ -13948,7 +13948,7 @@ for reference, prefixed with the version the removal occured):
+
+obj-y := setup.o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/mach-xen/setup.c 2011-09-07 14:16:54.000000000 +0200
++++ head-2011-10-07/arch/x86/mach-xen/setup.c 2011-09-07 14:16:54.000000000 +0200
@@ -0,0 +1,158 @@
+/*
+ * Machine specific setup for generic
@@ -14109,7 +14109,7 @@ for reference, prefixed with the version the removal occured):
+#endif
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/lib/scrub.c 2008-02-08 12:30:51.000000000 +0100
++++ head-2011-10-07/arch/x86/lib/scrub.c 2008-02-08 12:30:51.000000000 +0100
@@ -0,0 +1,21 @@
+#include <asm/cpufeature.h>
+#include <asm/page.h>
@@ -14133,7 +14133,7 @@ for reference, prefixed with the version the removal occured):
+ clear_page(v);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/mm/fault_32-xen.c 2010-09-23 15:39:04.000000000 +0200
++++ head-2011-10-07/arch/x86/mm/fault_32-xen.c 2010-09-23 15:39:04.000000000 +0200
@@ -0,0 +1,792 @@
+/*
+ * linux/arch/i386/mm/fault.c
@@ -14928,7 +14928,7 @@ for reference, prefixed with the version the removal occured):
+}
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/mm/highmem_32-xen.c 2008-10-29 09:55:56.000000000 +0100
++++ head-2011-10-07/arch/x86/mm/highmem_32-xen.c 2008-10-29 09:55:56.000000000 +0100
@@ -0,0 +1,183 @@
+#include <linux/highmem.h>
+#include <linux/module.h>
@@ -15114,7 +15114,7 @@ for reference, prefixed with the version the removal occured):
+EXPORT_SYMBOL(clear_highpage);
+EXPORT_SYMBOL(copy_highpage);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/mm/hypervisor.c 2011-08-08 12:54:10.000000000 +0200
++++ head-2011-10-07/arch/x86/mm/hypervisor.c 2011-08-08 12:54:10.000000000 +0200
@@ -0,0 +1,651 @@
+/******************************************************************************
+ * mm/hypervisor.c
@@ -15768,7 +15768,7 @@ for reference, prefixed with the version the removal occured):
+ return !rc;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/mm/init_32-xen.c 2008-10-29 09:55:56.000000000 +0100
++++ head-2011-10-07/arch/x86/mm/init_32-xen.c 2008-10-29 09:55:56.000000000 +0100
@@ -0,0 +1,840 @@
+/*
+ * linux/arch/i386/mm/init.c
@@ -16611,7 +16611,7 @@ for reference, prefixed with the version the removal occured):
+#endif
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/mm/ioremap-xen.c 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/arch/x86/mm/ioremap-xen.c 2011-04-11 13:43:15.000000000 +0200
@@ -0,0 +1,424 @@
+/*
+ * arch/i386/mm/ioremap.c
@@ -17038,7 +17038,7 @@ for reference, prefixed with the version the removal occured):
+ }
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/mm/pgtable_32-xen.c 2010-09-23 15:39:04.000000000 +0200
++++ head-2011-10-07/arch/x86/mm/pgtable_32-xen.c 2010-09-23 15:39:04.000000000 +0200
@@ -0,0 +1,738 @@
+/*
+ * linux/arch/i386/mm/pgtable.c
@@ -17779,7 +17779,7 @@ for reference, prefixed with the version the removal occured):
+ mm_unpin(mm);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/oprofile/xenoprof.c 2008-01-28 12:24:19.000000000 +0100
++++ head-2011-10-07/arch/x86/oprofile/xenoprof.c 2008-01-28 12:24:19.000000000 +0100
@@ -0,0 +1,179 @@
+/**
+ * @file xenoprof.c
@@ -17961,7 +17961,7 @@ for reference, prefixed with the version the removal occured):
+ xenoprofile_exit();
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/pci/pcifront.c 2009-03-18 10:39:31.000000000 +0100
++++ head-2011-10-07/arch/x86/pci/pcifront.c 2009-03-18 10:39:31.000000000 +0100
@@ -0,0 +1,57 @@
+/*
+ * PCI Frontend Stub - puts some "dummy" functions in to the Linux x86 PCI core
@@ -18021,7 +18021,7 @@ for reference, prefixed with the version the removal occured):
+
+arch_initcall(pcifront_x86_stub_init);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/ia32/ia32entry-xen.S 2008-04-02 12:34:02.000000000 +0200
++++ head-2011-10-07/arch/x86/ia32/ia32entry-xen.S 2008-04-02 12:34:02.000000000 +0200
@@ -0,0 +1,666 @@
+/*
+ * Compatibility mode system call entry point for x86-64.
@@ -18690,7 +18690,7 @@ for reference, prefixed with the version the removal occured):
+ .quad compat_sys_move_pages
+ia32_syscall_end:
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/kernel/e820_64-xen.c 2009-12-04 08:45:56.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/e820_64-xen.c 2009-12-04 08:45:56.000000000 +0100
@@ -0,0 +1,800 @@
+/*
+ * Handle the memory map.
@@ -19493,7 +19493,7 @@ for reference, prefixed with the version the removal occured):
+ pci_mem_start, gapstart, gapsize);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/kernel/early_printk-xen.c 2007-06-12 13:13:01.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/early_printk-xen.c 2007-06-12 13:13:01.000000000 +0200
@@ -0,0 +1,302 @@
+#include <linux/console.h>
+#include <linux/kernel.h>
@@ -19798,8 +19798,8 @@ for reference, prefixed with the version the removal occured):
+
+__setup("earlyprintk=", setup_early_printk);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/kernel/entry_64-xen.S 2009-06-23 09:28:21.000000000 +0200
-@@ -0,0 +1,1317 @@
++++ head-2011-10-07/arch/x86/kernel/entry_64-xen.S 2011-10-07 10:44:29.000000000 +0200
+@@ -0,0 +1,1320 @@
+/*
+ * linux/arch/x86_64/entry.S
+ *
@@ -19955,6 +19955,7 @@ for reference, prefixed with the version the removal occured):
+ * with rax, r11, and rcx being taken care of in the hypercall stub.
+ */
+ .macro HYPERVISOR_IRET flag
++ .if \flag == 0 # return from syscall always uses the hypercall
+ testb $3,1*8(%rsp)
+ jnz 2f
+ testl $NMI_MASK,2*8(%rsp)
@@ -19967,6 +19968,7 @@ for reference, prefixed with the version the removal occured):
+ orl $3,1*8(%rsp)
+ orl $3,4*8(%rsp)
+1: iretq
++ .endif
+
+2: /* Slow iret via hypervisor. */
+ andl $~NMI_MASK, 2*8(%rsp)
@@ -20050,7 +20052,7 @@ for reference, prefixed with the version the removal occured):
+
+ENTRY(system_call)
+ _frame (RIP-0x10)
-+ SAVE_ARGS -8,0
++ SAVE_ARGS -8,1
+ movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
+ GET_THREAD_INFO(%rcx)
+ testl $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SECCOMP),threadinfo_flags(%rcx)
@@ -20081,8 +20083,9 @@ for reference, prefixed with the version the removal occured):
+ * sysretq will re-enable interrupts:
+ */
+ TRACE_IRQS_ON
-+ XEN_UNBLOCK_EVENTS(%rsi)
-+ RESTORE_ARGS 0,8,0
++ RESTORE_ARGS 0,8,1,1
++ xor %ecx,%ecx
++ xor %r11,%r11
+ HYPERVISOR_IRET VGCF_IN_SYSCALL
+
+ /* Handle reschedules */
@@ -21118,7 +21121,7 @@ for reference, prefixed with the version the removal occured):
+ENDPROC(arch_unwind_init_running)
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/kernel/head_64-xen.S 2011-08-08 12:54:10.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/head_64-xen.S 2011-08-08 12:54:10.000000000 +0200
@@ -0,0 +1,233 @@
+/*
+ * linux/arch/x86_64/kernel/head.S -- start in 32bit and switch to 64bit
@@ -21354,7 +21357,7 @@ for reference, prefixed with the version the removal occured):
+ ELFNOTE(Xen, XEN_ELFNOTE_LOADER, .asciz, "generic")
+ ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long, 1)
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/kernel/head64-xen.c 2011-08-08 12:54:10.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/head64-xen.c 2011-08-08 12:54:10.000000000 +0200
@@ -0,0 +1,159 @@
+/*
+ * linux/arch/x86_64/kernel/head64.c -- prepare to run common code
@@ -21516,7 +21519,7 @@ for reference, prefixed with the version the removal occured):
+ start_kernel();
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/kernel/io_apic_64-xen.c 2009-03-18 10:39:31.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/io_apic_64-xen.c 2009-03-18 10:39:31.000000000 +0100
@@ -0,0 +1,2270 @@
+/*
+ * Intel IO-APIC support for multi-Pentium hosts.
@@ -23789,7 +23792,7 @@ for reference, prefixed with the version the removal occured):
+#endif
+#endif /* !CONFIG_XEN */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/kernel/ioport_64-xen.c 2008-01-28 12:24:19.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/ioport_64-xen.c 2008-01-28 12:24:19.000000000 +0100
@@ -0,0 +1,100 @@
+/*
+ * linux/arch/x86_64/kernel/ioport.c
@@ -23892,7 +23895,7 @@ for reference, prefixed with the version the removal occured):
+ return 0;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/kernel/ldt_64-xen.c 2007-06-12 13:13:01.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/ldt_64-xen.c 2007-06-12 13:13:01.000000000 +0200
@@ -0,0 +1,282 @@
+/*
+ * linux/arch/x86_64/kernel/ldt.c
@@ -24177,7 +24180,7 @@ for reference, prefixed with the version the removal occured):
+ return ret;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/kernel/mpparse_64-xen.c 2007-06-12 13:13:01.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/mpparse_64-xen.c 2007-06-12 13:13:01.000000000 +0200
@@ -0,0 +1,1011 @@
+/*
+ * Intel Multiprocessor Specification 1.1 and 1.4
@@ -25191,7 +25194,7 @@ for reference, prefixed with the version the removal occured):
+#endif /*CONFIG_X86_IO_APIC*/
+#endif /*CONFIG_ACPI*/
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/kernel/process_64-xen.c 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/process_64-xen.c 2011-04-11 13:43:15.000000000 +0200
@@ -0,0 +1,847 @@
+/*
+ * linux/arch/x86-64/kernel/process.c
@@ -26041,7 +26044,7 @@ for reference, prefixed with the version the removal occured):
+ return sp & ~0xf;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/kernel/setup_64-xen.c 2010-10-05 09:58:12.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/setup_64-xen.c 2010-10-05 09:58:12.000000000 +0200
@@ -0,0 +1,1656 @@
+/*
+ * linux/arch/x86-64/kernel/setup.c
@@ -27700,7 +27703,7 @@ for reference, prefixed with the version the removal occured):
+device_initcall(add_pcspkr);
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/kernel/setup64-xen.c 2008-01-28 12:24:19.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/setup64-xen.c 2008-01-28 12:24:19.000000000 +0100
@@ -0,0 +1,367 @@
+/*
+ * X86-64 specific CPU setup.
@@ -28070,7 +28073,7 @@ for reference, prefixed with the version the removal occured):
+ raw_local_save_flags(kernel_eflags);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/kernel/smp_64-xen.c 2008-04-02 12:34:02.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/smp_64-xen.c 2008-04-02 12:34:02.000000000 +0200
@@ -0,0 +1,575 @@
+/*
+ * Intel SMP support routines.
@@ -28648,7 +28651,7 @@ for reference, prefixed with the version the removal occured):
+#endif
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/kernel/traps_64-xen.c 2008-04-02 12:34:02.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/traps_64-xen.c 2008-04-02 12:34:02.000000000 +0200
@@ -0,0 +1,1173 @@
+/*
+ * linux/arch/x86-64/traps.c
@@ -29824,7 +29827,7 @@ for reference, prefixed with the version the removal occured):
+__setup("call_trace=", call_trace_setup);
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/kernel/vsyscall_64-xen.c 2007-06-18 08:38:13.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/vsyscall_64-xen.c 2007-06-18 08:38:13.000000000 +0200
@@ -0,0 +1,227 @@
+/*
+ * linux/arch/x86_64/kernel/vsyscall.c
@@ -30054,7 +30057,7 @@ for reference, prefixed with the version the removal occured):
+
+__initcall(vsyscall_init);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/kernel/xen_entry_64.S 2008-04-02 12:34:02.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/xen_entry_64.S 2008-04-02 12:34:02.000000000 +0200
@@ -0,0 +1,36 @@
+/*
+ * Copied from arch/xen/i386/kernel/entry.S
@@ -30093,8 +30096,8 @@ for reference, prefixed with the version the removal occured):
+ XEN_PUT_VCPU_INFO(reg)
+#define XEN_TEST_PENDING(reg) testb $0xFF,evtchn_upcall_pending(reg)
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/mm/fault_64-xen.c 2010-09-23 15:39:04.000000000 +0200
-@@ -0,0 +1,730 @@
++++ head-2011-10-07/arch/x86/mm/fault_64-xen.c 2011-10-07 10:44:29.000000000 +0200
+@@ -0,0 +1,731 @@
+/*
+ * linux/arch/x86-64/mm/fault.c
+ *
@@ -30243,7 +30246,8 @@ for reference, prefixed with the version the removal occured):
+ /* Could check the LDT for lm, but for now it's good
+ enough to assume that long mode only uses well known
+ segments or kernel. */
-+ scan_more = (!user_mode(regs)) || (regs->cs == __USER_CS);
++ scan_more = (!user_mode(regs)) || (regs->cs == __USER_CS)
++ || (regs->cs == FLAT_USER_CS64);
+ break;
+
+ case 0x60:
@@ -30672,8 +30676,8 @@ for reference, prefixed with the version the removal occured):
+ these addresses are not reachable. Just detect this
+ case and return. Any code segment in LDT is
+ compatibility mode. */
-+ if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) &&
-+ (address >> 32))
++ if ((regs->cs == __USER32_CS || regs->cs == FLAT_USER_CS32 ||
++ (regs->cs & (1<<2))) && (address >> 32))
+ return;
+
+ if (exception_trace && unhandled_signal(tsk, SIGSEGV)) {
@@ -30826,7 +30830,7 @@ for reference, prefixed with the version the removal occured):
+}
+__setup("pagefaulttrace", enable_pagefaulttrace);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/mm/init_64-xen.c 2011-08-08 12:54:10.000000000 +0200
++++ head-2011-10-07/arch/x86/mm/init_64-xen.c 2011-08-08 12:54:10.000000000 +0200
@@ -0,0 +1,1244 @@
+/*
+ * linux/arch/x86_64/mm/init.c
@@ -32073,7 +32077,7 @@ for reference, prefixed with the version the removal occured):
+ return (addr >= VSYSCALL_START) && (addr < VSYSCALL_END);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/mm/pageattr_64-xen.c 2009-03-18 10:39:31.000000000 +0100
++++ head-2011-10-07/arch/x86/mm/pageattr_64-xen.c 2009-03-18 10:39:31.000000000 +0100
@@ -0,0 +1,508 @@
+/*
+ * Copyright 2002 Andi Kleen, SuSE Labs.
@@ -32584,8 +32588,8 @@ for reference, prefixed with the version the removal occured):
+EXPORT_SYMBOL(change_page_attr);
+EXPORT_SYMBOL(global_flush_tlb);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/pci/msi-xen.c 2009-12-04 08:45:56.000000000 +0100
-@@ -0,0 +1,910 @@
++++ head-2011-10-07/drivers/pci/msi-xen.c 2011-10-07 10:44:29.000000000 +0200
+@@ -0,0 +1,928 @@
+/*
+ * File: msi.c
+ * Purpose: PCI Message Signaled Interrupt (MSI)
@@ -32613,6 +32617,11 @@ for reference, prefixed with the version the removal occured):
+#include "msi.h"
+
+static int pci_msi_enable = 1;
++#if CONFIG_XEN_COMPAT < 0x040200
++static int pci_seg_supported = 1;
++#else
++#define pci_seg_supported 1
++#endif
+
+static struct msi_ops *msi_ops;
+
@@ -32798,21 +32807,34 @@ for reference, prefixed with the version the removal occured):
+ int entry_nr, u64 table_base)
+{
+ struct physdev_map_pirq map_irq;
-+ int rc;
++ int rc = -EINVAL;
+ domid_t domid = DOMID_SELF;
+
+ domid = msi_get_dev_owner(dev);
+
+ map_irq.domid = domid;
-+ map_irq.type = MAP_PIRQ_TYPE_MSI;
++ map_irq.type = MAP_PIRQ_TYPE_MSI_SEG;
+ map_irq.index = -1;
+ map_irq.pirq = pirq < 0 ? -1 : evtchn_get_xen_pirq(pirq);
-+ map_irq.bus = dev->bus->number;
++ map_irq.bus = dev->bus->number | (pci_domain_nr(dev->bus) << 16);
+ map_irq.devfn = dev->devfn;
+ map_irq.entry_nr = entry_nr;
+ map_irq.table_base = table_base;
+
-+ if ((rc = HYPERVISOR_physdev_op(PHYSDEVOP_map_pirq, &map_irq)))
++ if (pci_seg_supported)
++ rc = HYPERVISOR_physdev_op(PHYSDEVOP_map_pirq, &map_irq);
++#if CONFIG_XEN_COMPAT < 0x040200
++ if (rc == -EINVAL && !pci_domain_nr(dev->bus)) {
++ map_irq.type = MAP_PIRQ_TYPE_MSI;
++ map_irq.index = -1;
++ map_irq.pirq = -1;
++ map_irq.bus = dev->bus->number;
++ rc = HYPERVISOR_physdev_op(PHYSDEVOP_map_pirq, &map_irq);
++ if (rc != -EINVAL)
++ pci_seg_supported = 0;
++ }
++#endif
++ if (rc)
+ printk(KERN_WARNING "map irq failed\n");
+
+ if (rc < 0)
@@ -33497,7 +33519,7 @@ for reference, prefixed with the version the removal occured):
+#endif
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/include/mach-xen/asm/agp.h 2007-06-22 09:08:06.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/agp.h 2007-06-22 09:08:06.000000000 +0200
@@ -0,0 +1,44 @@
+#ifndef AGP_H
+#define AGP_H 1
@@ -33544,7 +33566,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/include/mach-xen/asm/desc_32.h 2008-01-28 12:24:19.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/desc_32.h 2008-01-28 12:24:19.000000000 +0100
@@ -0,0 +1,166 @@
+#ifndef __ARCH_DESC_H
+#define __ARCH_DESC_H
@@ -33713,7 +33735,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/include/mach-xen/asm/fixmap_32.h 2007-06-12 13:14:02.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/fixmap_32.h 2007-06-12 13:14:02.000000000 +0200
@@ -0,0 +1,155 @@
+/*
+ * fixmap.h: compile-time virtual memory allocation
@@ -33871,7 +33893,7 @@ for reference, prefixed with the version the removal occured):
+#endif /* !__ASSEMBLY__ */
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/include/mach-xen/asm/gnttab_dma.h 2007-08-06 15:10:49.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/gnttab_dma.h 2007-08-06 15:10:49.000000000 +0200
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2007 Herbert Xu <herbert@gondor.apana.org.au>
@@ -33915,7 +33937,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif /* _ASM_I386_GNTTAB_DMA_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/include/mach-xen/asm/highmem.h 2008-10-29 09:55:56.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/highmem.h 2008-10-29 09:55:56.000000000 +0100
@@ -0,0 +1,97 @@
+/*
+ * highmem.h: virtual kernel memory mappings for high memory
@@ -34015,7 +34037,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif /* _ASM_HIGHMEM_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/include/mach-xen/asm/hypercall_32.h 2009-06-23 09:28:21.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/hypercall_32.h 2009-06-23 09:28:21.000000000 +0200
@@ -0,0 +1,415 @@
+/******************************************************************************
+ * hypercall.h
@@ -34433,7 +34455,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif /* __HYPERCALL_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/include/mach-xen/asm/hypervisor.h 2009-07-13 14:25:35.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/hypervisor.h 2009-07-13 14:25:35.000000000 +0200
@@ -0,0 +1,263 @@
+/******************************************************************************
+ * hypervisor.h
@@ -34699,7 +34721,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif /* __HYPERVISOR_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/include/mach-xen/asm/irqflags_32.h 2007-06-12 13:14:02.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/irqflags_32.h 2007-06-12 13:14:02.000000000 +0200
@@ -0,0 +1,127 @@
+/*
+ * include/asm-i386/irqflags.h
@@ -34829,7 +34851,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/include/mach-xen/asm/maddr_32.h 2011-08-08 12:54:10.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/maddr_32.h 2011-08-08 12:54:10.000000000 +0200
@@ -0,0 +1,193 @@
+#ifndef _I386_MADDR_H
+#define _I386_MADDR_H
@@ -35025,7 +35047,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif /* _I386_MADDR_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/include/mach-xen/asm/mmu_context_32.h 2007-06-12 13:14:02.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/mmu_context_32.h 2007-06-12 13:14:02.000000000 +0200
@@ -0,0 +1,108 @@
+#ifndef __I386_SCHED_H
+#define __I386_SCHED_H
@@ -35136,7 +35158,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/include/mach-xen/asm/pgalloc_32.h 2008-07-21 11:00:33.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/pgalloc_32.h 2008-07-21 11:00:33.000000000 +0200
@@ -0,0 +1,59 @@
+#ifndef _I386_PGALLOC_H
+#define _I386_PGALLOC_H
@@ -35198,7 +35220,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif /* _I386_PGALLOC_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/include/mach-xen/asm/pgtable-3level-defs.h 2007-06-12 13:14:02.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/pgtable-3level-defs.h 2007-06-12 13:14:02.000000000 +0200
@@ -0,0 +1,24 @@
+#ifndef _I386_PGTABLE_3LEVEL_DEFS_H
+#define _I386_PGTABLE_3LEVEL_DEFS_H
@@ -35225,7 +35247,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif /* _I386_PGTABLE_3LEVEL_DEFS_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/include/mach-xen/asm/pgtable-3level.h 2008-04-02 12:34:02.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/pgtable-3level.h 2008-04-02 12:34:02.000000000 +0200
@@ -0,0 +1,211 @@
+#ifndef _I386_PGTABLE_3LEVEL_H
+#define _I386_PGTABLE_3LEVEL_H
@@ -35439,7 +35461,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif /* _I386_PGTABLE_3LEVEL_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-04-11 13:43:15.000000000 +0200
@@ -0,0 +1,547 @@
+#ifndef _I386_PGTABLE_H
+#define _I386_PGTABLE_H
@@ -35989,7 +36011,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif /* _I386_PGTABLE_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/include/mach-xen/asm/processor_32.h 2008-01-28 12:24:19.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/processor_32.h 2008-01-28 12:24:19.000000000 +0100
@@ -0,0 +1,743 @@
+/*
+ * include/asm-i386/processor.h
@@ -36735,7 +36757,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif /* __ASM_I386_PROCESSOR_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/include/mach-xen/asm/smp_32.h 2007-06-12 13:14:02.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/smp_32.h 2007-06-12 13:14:02.000000000 +0200
@@ -0,0 +1,103 @@
+#ifndef __ASM_SMP_H
+#define __ASM_SMP_H
@@ -36841,7 +36863,7 @@ for reference, prefixed with the version the removal occured):
+#endif
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/include/mach-xen/asm/synch_bitops.h 2008-04-02 12:34:02.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/synch_bitops.h 2008-04-02 12:34:02.000000000 +0200
@@ -0,0 +1,126 @@
+#ifndef __XEN_SYNCH_BITOPS_H__
+#define __XEN_SYNCH_BITOPS_H__
@@ -36970,7 +36992,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif /* __XEN_SYNCH_BITOPS_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/include/mach-xen/asm/system_32.h 2007-06-12 13:14:02.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/system_32.h 2007-06-12 13:14:02.000000000 +0200
@@ -0,0 +1,488 @@
+#ifndef __ASM_SYSTEM_H
+#define __ASM_SYSTEM_H
@@ -37461,7 +37483,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/include/mach-xen/asm/tlbflush_32.h 2007-11-26 16:59:25.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/tlbflush_32.h 2007-11-26 16:59:25.000000000 +0100
@@ -0,0 +1,101 @@
+#ifndef _I386_TLBFLUSH_H
+#define _I386_TLBFLUSH_H
@@ -37565,7 +37587,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif /* _I386_TLBFLUSH_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/include/mach-xen/asm/vga.h 2007-06-12 13:14:02.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/vga.h 2007-06-12 13:14:02.000000000 +0200
@@ -0,0 +1,20 @@
+/*
+ * Access to VGA videoram
@@ -37588,7 +37610,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/include/mach-xen/asm/xenoprof.h 2007-06-12 13:14:02.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/xenoprof.h 2007-06-12 13:14:02.000000000 +0200
@@ -0,0 +1,48 @@
+/******************************************************************************
+ * asm-i386/mach-xen/asm/xenoprof.h
@@ -37639,7 +37661,7 @@ for reference, prefixed with the version the removal occured):
+#endif /* CONFIG_XEN */
+#endif /* __ASM_XENOPROF_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/include/mach-xen/irq_vectors.h 2008-09-25 13:55:32.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/irq_vectors.h 2008-09-25 13:55:32.000000000 +0200
@@ -0,0 +1,125 @@
+/*
+ * This file should contain #defines for all of the interrupt vector
@@ -37767,7 +37789,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif /* _ASM_IRQ_VECTORS_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/include/mach-xen/asm/mach_traps.h 2007-06-12 13:14:02.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/mach_traps.h 2007-06-12 13:14:02.000000000 +0200
@@ -0,0 +1,33 @@
+/*
+ * include/asm-xen/asm-i386/mach-xen/mach_traps.h
@@ -37803,7 +37825,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif /* !_MACH_TRAPS_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/include/mach-xen/asm/desc_64.h 2008-01-28 12:24:19.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/desc_64.h 2008-01-28 12:24:19.000000000 +0100
@@ -0,0 +1,265 @@
+/* Written 2000 by Andi Kleen */
+#ifndef __ARCH_DESC_H
@@ -38071,7 +38093,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/include/mach-xen/asm/fixmap_64.h 2007-06-12 13:14:13.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/fixmap_64.h 2007-06-12 13:14:13.000000000 +0200
@@ -0,0 +1,112 @@
+/*
+ * fixmap.h: compile-time virtual memory allocation
@@ -38186,7 +38208,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/include/mach-xen/asm/hypercall_64.h 2009-06-23 09:28:21.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/hypercall_64.h 2009-06-23 09:28:21.000000000 +0200
@@ -0,0 +1,422 @@
+/******************************************************************************
+ * hypercall.h
@@ -38611,7 +38633,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif /* __HYPERCALL_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/include/mach-xen/asm/irqflags_64.h 2007-06-12 13:14:13.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/irqflags_64.h 2007-06-12 13:14:13.000000000 +0200
@@ -0,0 +1,139 @@
+/*
+ * include/asm-x86_64/irqflags.h
@@ -38753,7 +38775,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/include/mach-xen/asm/maddr_64.h 2011-08-08 12:54:10.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/maddr_64.h 2011-08-08 12:54:10.000000000 +0200
@@ -0,0 +1,161 @@
+#ifndef _X86_64_MADDR_H
+#define _X86_64_MADDR_H
@@ -38917,7 +38939,7 @@ for reference, prefixed with the version the removal occured):
+#endif /* _X86_64_MADDR_H */
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/include/mach-xen/asm/mmu_context_64.h 2007-06-12 13:14:13.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/mmu_context_64.h 2007-06-12 13:14:13.000000000 +0200
@@ -0,0 +1,136 @@
+#ifndef __X86_64_MMU_CONTEXT_H
+#define __X86_64_MMU_CONTEXT_H
@@ -39056,7 +39078,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/include/mach-xen/asm/pgalloc_64.h 2010-09-23 15:39:04.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/pgalloc_64.h 2010-09-23 15:39:04.000000000 +0200
@@ -0,0 +1,210 @@
+#ifndef _X86_64_PGALLOC_H
+#define _X86_64_PGALLOC_H
@@ -39269,7 +39291,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif /* _X86_64_PGALLOC_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-04-11 13:43:15.000000000 +0200
@@ -0,0 +1,580 @@
+#ifndef _X86_64_PGTABLE_H
+#define _X86_64_PGTABLE_H
@@ -39852,7 +39874,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif /* _X86_64_PGTABLE_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/include/mach-xen/asm/processor_64.h 2008-03-06 08:54:32.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/processor_64.h 2008-03-06 08:54:32.000000000 +0100
@@ -0,0 +1,502 @@
+/*
+ * include/asm-x86_64/processor.h
@@ -40357,7 +40379,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif /* __ASM_X86_64_PROCESSOR_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/include/mach-xen/asm/smp_64.h 2007-06-12 13:14:13.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/smp_64.h 2007-06-12 13:14:13.000000000 +0200
@@ -0,0 +1,150 @@
+#ifndef __ASM_SMP_H
+#define __ASM_SMP_H
@@ -40510,7 +40532,7 @@ for reference, prefixed with the version the removal occured):
+#endif
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/include/mach-xen/asm/system_64.h 2007-11-26 16:59:25.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/system_64.h 2007-11-26 16:59:25.000000000 +0100
@@ -0,0 +1,256 @@
+#ifndef __ASM_SYSTEM_H
+#define __ASM_SYSTEM_H
@@ -40769,7 +40791,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/include/mach-xen/asm/tlbflush_64.h 2007-11-26 16:59:25.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/tlbflush_64.h 2007-11-26 16:59:25.000000000 +0100
@@ -0,0 +1,103 @@
+#ifndef _X8664_TLBFLUSH_H
+#define _X8664_TLBFLUSH_H
@@ -40875,7 +40897,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif /* _X8664_TLBFLUSH_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/include/mach-xen/asm/xor_64.h 2007-06-12 13:14:13.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/xor_64.h 2007-06-12 13:14:13.000000000 +0200
@@ -0,0 +1,328 @@
+/*
+ * x86-64 changes / gcc fixes from Andi Kleen.
@@ -41206,7 +41228,7 @@ for reference, prefixed with the version the removal occured):
+ deals with a load to a line that is being prefetched. */
+#define XOR_SELECT_TEMPLATE(FASTEST) (&xor_block_sse)
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/include/mach-xen/setup_arch_post.h 2007-06-12 13:14:13.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/setup_arch_post.h 2007-06-12 13:14:13.000000000 +0200
@@ -0,0 +1,63 @@
+/**
+ * machine_specific_* - Hooks for machine specific setup.
@@ -41272,7 +41294,7 @@ for reference, prefixed with the version the removal occured):
+#endif
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/x86/include/mach-xen/setup_arch_pre.h 2007-06-12 13:14:13.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/setup_arch_pre.h 2007-06-12 13:14:13.000000000 +0200
@@ -0,0 +1,5 @@
+/* Hook to call BIOS initialisation function */
+
@@ -41280,7 +41302,7 @@ for reference, prefixed with the version the removal occured):
+
+static void __init machine_specific_arch_setup(void);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/blkif.h 2008-07-21 11:00:33.000000000 +0200
++++ head-2011-10-07/include/xen/blkif.h 2008-07-21 11:00:33.000000000 +0200
@@ -0,0 +1,123 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -41406,7 +41428,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif /* __XEN_BLKIF_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/compat_ioctl.h 2010-01-18 15:23:12.000000000 +0100
++++ head-2011-10-07/include/xen/compat_ioctl.h 2010-01-18 15:23:12.000000000 +0100
@@ -0,0 +1,75 @@
+/*
+ * This program is free software; you can redistribute it and/or
@@ -41484,7 +41506,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif /* __LINUX_XEN_COMPAT_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/cpu_hotplug.h 2007-08-16 18:07:01.000000000 +0200
++++ head-2011-10-07/include/xen/cpu_hotplug.h 2007-08-16 18:07:01.000000000 +0200
@@ -0,0 +1,41 @@
+#ifndef __XEN_CPU_HOTPLUG_H__
+#define __XEN_CPU_HOTPLUG_H__
@@ -41528,7 +41550,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif /* __XEN_CPU_HOTPLUG_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/driver_util.h 2007-06-12 13:14:19.000000000 +0200
++++ head-2011-10-07/include/xen/driver_util.h 2007-06-12 13:14:19.000000000 +0200
@@ -0,0 +1,14 @@
+
+#ifndef __ASM_XEN_DRIVER_UTIL_H__
@@ -41545,7 +41567,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif /* __ASM_XEN_DRIVER_UTIL_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/firmware.h 2007-07-02 08:16:19.000000000 +0200
++++ head-2011-10-07/include/xen/firmware.h 2007-07-02 08:16:19.000000000 +0200
@@ -0,0 +1,10 @@
+#ifndef __XEN_FIRMWARE_H__
+#define __XEN_FIRMWARE_H__
@@ -41558,7 +41580,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif /* __XEN_FIRMWARE_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/gnttab.h 2010-09-23 15:39:04.000000000 +0200
++++ head-2011-10-07/include/xen/gnttab.h 2010-09-23 15:39:04.000000000 +0200
@@ -0,0 +1,202 @@
+/******************************************************************************
+ * gnttab.h
@@ -41763,7 +41785,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif /* __ASM_GNTTAB_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/hypercall.h 2008-01-28 12:24:19.000000000 +0100
++++ head-2011-10-07/include/xen/hypercall.h 2008-01-28 12:24:19.000000000 +0100
@@ -0,0 +1,30 @@
+#ifndef __XEN_HYPERCALL_H__
+#define __XEN_HYPERCALL_H__
@@ -41796,7 +41818,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif /* __XEN_HYPERCALL_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/hypervisor_sysfs.h 2007-06-22 09:08:06.000000000 +0200
++++ head-2011-10-07/include/xen/hypervisor_sysfs.h 2007-06-22 09:08:06.000000000 +0200
@@ -0,0 +1,30 @@
+/*
+ * copyright (c) 2006 IBM Corporation
@@ -41829,7 +41851,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif /* _HYP_SYSFS_H_ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/pcifront.h 2007-06-18 08:38:13.000000000 +0200
++++ head-2011-10-07/include/xen/pcifront.h 2007-06-18 08:38:13.000000000 +0200
@@ -0,0 +1,83 @@
+/*
+ * PCI Frontend - arch-dependendent declarations
@@ -41915,7 +41937,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif /* __XEN_ASM_PCIFRONT_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/public/evtchn.h 2007-06-12 13:14:19.000000000 +0200
++++ head-2011-10-07/include/xen/public/evtchn.h 2007-06-12 13:14:19.000000000 +0200
@@ -0,0 +1,88 @@
+/******************************************************************************
+ * evtchn.h
@@ -42006,7 +42028,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif /* __LINUX_PUBLIC_EVTCHN_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/public/gntdev.h 2008-04-02 12:34:02.000000000 +0200
++++ head-2011-10-07/include/xen/public/gntdev.h 2008-04-02 12:34:02.000000000 +0200
@@ -0,0 +1,119 @@
+/******************************************************************************
+ * gntdev.h
@@ -42128,7 +42150,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif /* __LINUX_PUBLIC_GNTDEV_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/public/privcmd.h 2010-01-18 15:23:12.000000000 +0100
++++ head-2011-10-07/include/xen/public/privcmd.h 2010-01-18 15:23:12.000000000 +0100
@@ -0,0 +1,89 @@
+/******************************************************************************
+ * privcmd.h
@@ -42220,7 +42242,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif /* __LINUX_PUBLIC_PRIVCMD_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/public/xenbus.h 2009-05-29 10:25:53.000000000 +0200
++++ head-2011-10-07/include/xen/public/xenbus.h 2009-05-29 10:25:53.000000000 +0200
@@ -0,0 +1,56 @@
+/******************************************************************************
+ * xenbus.h
@@ -42279,7 +42301,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif /* __LINUX_PUBLIC_XENBUS_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/xen_proc.h 2007-06-12 13:14:19.000000000 +0200
++++ head-2011-10-07/include/xen/xen_proc.h 2007-06-12 13:14:19.000000000 +0200
@@ -0,0 +1,12 @@
+
+#ifndef __ASM_XEN_PROC_H__
@@ -42294,7 +42316,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif /* __ASM_XEN_PROC_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/xencons.h 2007-10-15 09:39:38.000000000 +0200
++++ head-2011-10-07/include/xen/xencons.h 2007-10-15 09:39:38.000000000 +0200
@@ -0,0 +1,17 @@
+#ifndef __ASM_XENCONS_H__
+#define __ASM_XENCONS_H__
@@ -42314,7 +42336,7 @@ for reference, prefixed with the version the removal occured):
+
+#endif /* __ASM_XENCONS_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/include/xen/xenoprof.h 2007-06-12 13:14:19.000000000 +0200
++++ head-2011-10-07/include/xen/xenoprof.h 2007-06-12 13:14:19.000000000 +0200
@@ -0,0 +1,42 @@
+/******************************************************************************
+ * xen/xenoprof.h
@@ -42359,7 +42381,7 @@ for reference, prefixed with the version the removal occured):
+#endif /* CONFIG_XEN */
+#endif /* __XEN_XENOPROF_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/lib/swiotlb-xen.c 2010-09-16 13:31:46.000000000 +0200
++++ head-2011-10-07/lib/swiotlb-xen.c 2010-09-16 13:31:46.000000000 +0200
@@ -0,0 +1,765 @@
+/*
+ * Dynamic DMA mapping support.
@@ -43127,7 +43149,7 @@ for reference, prefixed with the version the removal occured):
+EXPORT_SYMBOL(swiotlb_dma_mapping_error);
+EXPORT_SYMBOL(swiotlb_dma_supported);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/mm/tmem-xen.c 2011-05-23 10:40:00.000000000 +0200
++++ head-2011-10-07/mm/tmem-xen.c 2011-05-23 10:40:00.000000000 +0200
@@ -0,0 +1,42 @@
+/*
+ * Xen implementation for transcendent memory (tmem)
@@ -43172,7 +43194,7 @@ for reference, prefixed with the version the removal occured):
+ return rc;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/scripts/Makefile.xen.awk 2007-08-06 15:10:49.000000000 +0200
++++ head-2011-10-07/scripts/Makefile.xen.awk 2007-08-06 15:10:49.000000000 +0200
@@ -0,0 +1,34 @@
+BEGIN {
+ is_rule = 0
diff --git a/patches.xen/xen3-auto-xen-drivers.diff b/patches.xen/xen3-auto-xen-drivers.diff
index 5183b313b6..f517072efb 100644
--- a/patches.xen/xen3-auto-xen-drivers.diff
+++ b/patches.xen/xen3-auto-xen-drivers.diff
@@ -1,5 +1,5 @@
Subject: xen3 xen-drivers
-From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1105:f4f25124b1b6)
+From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1116:40e33b2fce94)
Patch-mainline: n/a
Acked-by: jbeulich@novell.com
@@ -30,12 +30,12 @@ and in case upstream wants to take the forward porting patches:
3.1/drivers/xen/pciback/xenbus.c
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/balloon/Makefile 2007-06-12 13:13:44.000000000 +0200
++++ head-2011-10-07/drivers/xen/balloon/Makefile 2007-06-12 13:13:44.000000000 +0200
@@ -0,0 +1,2 @@
+
+obj-y := balloon.o sysfs.o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/balloon/balloon.c 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/drivers/xen/balloon/balloon.c 2011-04-11 13:43:15.000000000 +0200
@@ -0,0 +1,753 @@
+/******************************************************************************
+ * balloon.c
@@ -791,7 +791,7 @@ and in case upstream wants to take the forward porting patches:
+
+MODULE_LICENSE("Dual BSD/GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/balloon/common.h 2009-06-09 15:01:37.000000000 +0200
++++ head-2011-10-07/drivers/xen/balloon/common.h 2009-06-09 15:01:37.000000000 +0200
@@ -0,0 +1,56 @@
+/******************************************************************************
+ * balloon/common.h
@@ -850,7 +850,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* __XEN_BALLOON_COMMON_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/balloon/sysfs.c 2009-06-09 15:01:37.000000000 +0200
++++ head-2011-10-07/drivers/xen/balloon/sysfs.c 2009-06-09 15:01:37.000000000 +0200
@@ -0,0 +1,167 @@
+/******************************************************************************
+ * balloon/sysfs.c
@@ -1020,14 +1020,14 @@ and in case upstream wants to take the forward porting patches:
+ unregister_balloon(&balloon_sysdev);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/blkback/Makefile 2009-06-09 15:01:37.000000000 +0200
++++ head-2011-10-07/drivers/xen/blkback/Makefile 2009-06-09 15:01:37.000000000 +0200
@@ -0,0 +1,4 @@
+obj-$(CONFIG_XEN_BLKDEV_BACKEND) := blkbk.o
+obj-$(CONFIG_XEN_BLKBACK_PAGEMAP) += blkback-pagemap.o
+
+blkbk-y := blkback.o xenbus.o interface.o vbd.o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/blkback/blkback.c 2011-09-22 14:33:35.000000000 +0200
++++ head-2011-10-07/drivers/xen/blkback/blkback.c 2011-09-22 14:33:35.000000000 +0200
@@ -0,0 +1,672 @@
+/******************************************************************************
+ * arch/xen/drivers/blkif/backend/main.c
@@ -1702,7 +1702,7 @@ and in case upstream wants to take the forward porting patches:
+
+MODULE_LICENSE("Dual BSD/GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/blkback/blkback-pagemap.c 2009-06-09 15:01:37.000000000 +0200
++++ head-2011-10-07/drivers/xen/blkback/blkback-pagemap.c 2009-06-09 15:01:37.000000000 +0200
@@ -0,0 +1,96 @@
+#include <linux/module.h>
+#include "blkback-pagemap.h"
@@ -1801,7 +1801,7 @@ and in case upstream wants to take the forward porting patches:
+
+MODULE_LICENSE("Dual BSD/GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/blkback/blkback-pagemap.h 2009-06-09 15:01:37.000000000 +0200
++++ head-2011-10-07/drivers/xen/blkback/blkback-pagemap.h 2009-06-09 15:01:37.000000000 +0200
@@ -0,0 +1,37 @@
+#ifndef _BLKBACK_PAGEMAP_H_
+#define _BLKBACK_PAGEMAP_H_
@@ -1841,7 +1841,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/blkback/common.h 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/drivers/xen/blkback/common.h 2011-04-11 13:43:15.000000000 +0200
@@ -0,0 +1,145 @@
+/*
+ * This program is free software; you can redistribute it and/or
@@ -1989,7 +1989,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* __BLKIF__BACKEND__COMMON_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/blkback/interface.c 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/drivers/xen/blkback/interface.c 2011-04-11 13:43:15.000000000 +0200
@@ -0,0 +1,144 @@
+/******************************************************************************
+ * arch/xen/drivers/blkif/backend/interface.c
@@ -2136,7 +2136,7 @@ and in case upstream wants to take the forward porting patches:
+ 0, 0, NULL, NULL);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/blkback/vbd.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-10-07/drivers/xen/blkback/vbd.c 2011-06-30 15:37:44.000000000 +0200
@@ -0,0 +1,169 @@
+/******************************************************************************
+ * blkback/vbd.c
@@ -2308,7 +2308,7 @@ and in case upstream wants to take the forward porting patches:
+ xenbus_transaction_end(xbt, 1);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/blkback/xenbus.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-10-07/drivers/xen/blkback/xenbus.c 2011-06-30 15:37:44.000000000 +0200
@@ -0,0 +1,559 @@
+/* Xenbus code for blkif backend
+ Copyright (C) 2005 Rusty Russell <rusty@rustcorp.com.au>
@@ -2870,7 +2870,7 @@ and in case upstream wants to take the forward porting patches:
+ xenbus_register_backend(&blkback);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/blkfront/Makefile 2007-06-12 13:13:44.000000000 +0200
++++ head-2011-10-07/drivers/xen/blkfront/Makefile 2007-06-12 13:13:44.000000000 +0200
@@ -0,0 +1,5 @@
+
+obj-$(CONFIG_XEN_BLKDEV_FRONTEND) := xenblk.o
@@ -2878,7 +2878,7 @@ and in case upstream wants to take the forward porting patches:
+xenblk-objs := blkfront.o vbd.o
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/blkfront/blkfront.c 2011-07-15 11:19:50.000000000 +0200
++++ head-2011-10-07/drivers/xen/blkfront/blkfront.c 2011-07-15 11:19:50.000000000 +0200
@@ -0,0 +1,965 @@
+/******************************************************************************
+ * blkfront.c
@@ -3846,7 +3846,7 @@ and in case upstream wants to take the forward porting patches:
+
+MODULE_LICENSE("Dual BSD/GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/blkfront/block.h 2010-02-24 13:13:46.000000000 +0100
++++ head-2011-10-07/drivers/xen/blkfront/block.h 2010-02-24 13:13:46.000000000 +0100
@@ -0,0 +1,160 @@
+/******************************************************************************
+ * block.h
@@ -4009,7 +4009,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* __XEN_DRIVERS_BLOCK_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/blkfront/vbd.c 2010-01-18 15:23:12.000000000 +0100
++++ head-2011-10-07/drivers/xen/blkfront/vbd.c 2010-01-18 15:23:12.000000000 +0100
@@ -0,0 +1,553 @@
+/******************************************************************************
+ * vbd.c
@@ -4565,7 +4565,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* CONFIG_SYSFS */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/blktap/Makefile 2007-06-12 13:13:44.000000000 +0200
++++ head-2011-10-07/drivers/xen/blktap/Makefile 2007-06-12 13:13:44.000000000 +0200
@@ -0,0 +1,5 @@
+LINUXINCLUDE += -I../xen/include/public/io
+
@@ -4573,7 +4573,7 @@ and in case upstream wants to take the forward porting patches:
+
+xenblktap-y := xenbus.o interface.o blktap.o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/blktap/blktap.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-10-07/drivers/xen/blktap/blktap.c 2011-06-30 15:37:44.000000000 +0200
@@ -0,0 +1,1746 @@
+/******************************************************************************
+ * drivers/xen/blktap/blktap.c
@@ -6322,7 +6322,7 @@ and in case upstream wants to take the forward porting patches:
+
+MODULE_LICENSE("Dual BSD/GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/blktap/common.h 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/drivers/xen/blktap/common.h 2011-04-11 13:43:15.000000000 +0200
@@ -0,0 +1,114 @@
+/*
+ * This program is free software; you can redistribute it and/or
@@ -6439,7 +6439,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* __BLKIF__BACKEND__COMMON_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/blktap/interface.c 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/drivers/xen/blktap/interface.c 2011-04-11 13:43:15.000000000 +0200
@@ -0,0 +1,140 @@
+/******************************************************************************
+ * drivers/xen/blktap/interface.c
@@ -6582,7 +6582,7 @@ and in case upstream wants to take the forward porting patches:
+ 0, 0, NULL, NULL);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/blktap/xenbus.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-10-07/drivers/xen/blktap/xenbus.c 2011-06-30 15:37:44.000000000 +0200
@@ -0,0 +1,507 @@
+/* drivers/xen/blktap/xenbus.c
+ *
@@ -7092,13 +7092,13 @@ and in case upstream wants to take the forward porting patches:
+ xenbus_register_backend(&blktap);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/blktap2/Makefile 2009-05-29 10:25:53.000000000 +0200
++++ head-2011-10-07/drivers/xen/blktap2/Makefile 2009-05-29 10:25:53.000000000 +0200
@@ -0,0 +1,3 @@
+obj-$(CONFIG_XEN_BLKDEV_TAP2) := blktap.o
+
+blktap-objs := control.o ring.o wait_queue.o device.o request.o sysfs.o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/blktap2/blktap.h 2010-02-24 13:13:46.000000000 +0100
++++ head-2011-10-07/drivers/xen/blktap2/blktap.h 2010-02-24 13:13:46.000000000 +0100
@@ -0,0 +1,254 @@
+#ifndef _BLKTAP_H_
+#define _BLKTAP_H_
@@ -7355,7 +7355,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/blktap2/control.c 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/drivers/xen/blktap2/control.c 2011-04-11 13:43:15.000000000 +0200
@@ -0,0 +1,277 @@
+#include <linux/module.h>
+#include <linux/miscdevice.h>
@@ -7635,7 +7635,7 @@ and in case upstream wants to take the forward porting patches:
+module_exit(blktap_exit);
+MODULE_LICENSE("Dual BSD/GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/blktap2/device.c 2010-11-25 09:36:37.000000000 +0100
++++ head-2011-10-07/drivers/xen/blktap2/device.c 2010-11-25 09:36:37.000000000 +0100
@@ -0,0 +1,1191 @@
+#include <linux/fs.h>
+#include <linux/blkdev.h>
@@ -8829,7 +8829,7 @@ and in case upstream wants to take the forward porting patches:
+ BTERR("blktap device unregister failed\n");
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/blktap2/request.c 2010-01-04 11:56:34.000000000 +0100
++++ head-2011-10-07/drivers/xen/blktap2/request.c 2010-01-04 11:56:34.000000000 +0100
@@ -0,0 +1,296 @@
+#include <linux/spinlock.h>
+#include <xen/balloon.h>
@@ -9128,7 +9128,7 @@ and in case upstream wants to take the forward porting patches:
+ return err;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/blktap2/ring.c 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/drivers/xen/blktap2/ring.c 2011-04-11 13:43:15.000000000 +0200
@@ -0,0 +1,610 @@
+#include <linux/module.h>
+#include <linux/signal.h>
@@ -9741,7 +9741,7 @@ and in case upstream wants to take the forward porting patches:
+ return 0;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/blktap2/sysfs.c 2011-03-02 12:00:16.000000000 +0100
++++ head-2011-10-07/drivers/xen/blktap2/sysfs.c 2011-03-02 12:00:16.000000000 +0100
@@ -0,0 +1,425 @@
+#include <linux/types.h>
+#include <linux/device.h>
@@ -10169,7 +10169,7 @@ and in case upstream wants to take the forward porting patches:
+ return 0;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/blktap2/wait_queue.c 2009-05-29 10:25:53.000000000 +0200
++++ head-2011-10-07/drivers/xen/blktap2/wait_queue.c 2009-05-29 10:25:53.000000000 +0200
@@ -0,0 +1,40 @@
+#include <linux/list.h>
+#include <linux/spinlock.h>
@@ -10212,11 +10212,11 @@ and in case upstream wants to take the forward porting patches:
+ spin_unlock_irqrestore(&deferred_work_lock, flags);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/char/Makefile 2007-07-10 09:42:30.000000000 +0200
++++ head-2011-10-07/drivers/xen/char/Makefile 2007-07-10 09:42:30.000000000 +0200
@@ -0,0 +1 @@
+obj-$(CONFIG_XEN_DEVMEM) := mem.o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/char/mem.c 2007-08-06 15:10:49.000000000 +0200
++++ head-2011-10-07/drivers/xen/char/mem.c 2007-08-06 15:10:49.000000000 +0200
@@ -0,0 +1,190 @@
+/*
+ * Originally from linux/drivers/char/mem.c
@@ -10409,12 +10409,12 @@ and in case upstream wants to take the forward porting patches:
+ .open = open_mem,
+};
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/console/Makefile 2007-06-12 13:13:44.000000000 +0200
++++ head-2011-10-07/drivers/xen/console/Makefile 2007-06-12 13:13:44.000000000 +0200
@@ -0,0 +1,2 @@
+
+obj-y := console.o xencons_ring.o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/console/console.c 2009-03-18 10:39:31.000000000 +0100
++++ head-2011-10-07/drivers/xen/console/console.c 2009-03-18 10:39:31.000000000 +0100
@@ -0,0 +1,753 @@
+/******************************************************************************
+ * console.c
@@ -11170,7 +11170,7 @@ and in case upstream wants to take the forward porting patches:
+
+MODULE_LICENSE("Dual BSD/GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/console/xencons_ring.c 2007-06-12 13:13:44.000000000 +0200
++++ head-2011-10-07/drivers/xen/console/xencons_ring.c 2007-06-12 13:13:44.000000000 +0200
@@ -0,0 +1,143 @@
+/*
+ * This program is free software; you can redistribute it and/or
@@ -11316,7 +11316,7 @@ and in case upstream wants to take the forward porting patches:
+ (void)xencons_ring_init();
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/core/Makefile 2008-07-21 11:00:33.000000000 +0200
++++ head-2011-10-07/drivers/xen/core/Makefile 2008-07-21 11:00:33.000000000 +0200
@@ -0,0 +1,14 @@
+#
+# Makefile for the linux kernel.
@@ -11333,7 +11333,7 @@ and in case upstream wants to take the forward porting patches:
+obj-$(CONFIG_KEXEC) += machine_kexec.o
+obj-$(CONFIG_XEN_XENCOMM) += xencomm.o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/core/cpu_hotplug.c 2011-01-24 12:06:05.000000000 +0100
++++ head-2011-10-07/drivers/xen/core/cpu_hotplug.c 2011-01-24 12:06:05.000000000 +0100
@@ -0,0 +1,179 @@
+#include <linux/init.h>
+#include <linux/kernel.h>
@@ -11515,7 +11515,7 @@ and in case upstream wants to take the forward porting patches:
+ xenbus_allowed_cpumask = cpu_present_map;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/core/evtchn.c 2010-11-25 09:36:37.000000000 +0100
++++ head-2011-10-07/drivers/xen/core/evtchn.c 2010-11-25 09:36:37.000000000 +0100
@@ -0,0 +1,1204 @@
+/******************************************************************************
+ * evtchn.c
@@ -12722,7 +12722,7 @@ and in case upstream wants to take the forward porting patches:
+ }
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/core/firmware.c 2007-06-22 09:08:06.000000000 +0200
++++ head-2011-10-07/drivers/xen/core/firmware.c 2007-06-22 09:08:06.000000000 +0200
@@ -0,0 +1,74 @@
+#include <linux/kernel.h>
+#include <linux/errno.h>
@@ -12799,7 +12799,7 @@ and in case upstream wants to take the forward porting patches:
+#endif
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/core/gnttab.c 2010-09-23 15:39:04.000000000 +0200
++++ head-2011-10-07/drivers/xen/core/gnttab.c 2010-09-23 15:39:04.000000000 +0200
@@ -0,0 +1,773 @@
+/******************************************************************************
+ * gnttab.c
@@ -13575,7 +13575,7 @@ and in case upstream wants to take the forward porting patches:
+core_initcall(gnttab_init);
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/core/hypervisor_sysfs.c 2007-07-10 09:42:30.000000000 +0200
++++ head-2011-10-07/drivers/xen/core/hypervisor_sysfs.c 2007-07-10 09:42:30.000000000 +0200
@@ -0,0 +1,57 @@
+/*
+ * copyright (c) 2006 IBM Corporation
@@ -13635,7 +13635,7 @@ and in case upstream wants to take the forward porting patches:
+
+device_initcall(hypervisor_subsys_init);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/core/machine_kexec.c 2009-07-13 14:25:35.000000000 +0200
++++ head-2011-10-07/drivers/xen/core/machine_kexec.c 2009-07-13 14:25:35.000000000 +0200
@@ -0,0 +1,230 @@
+/*
+ * drivers/xen/core/machine_kexec.c
@@ -13868,7 +13868,7 @@ and in case upstream wants to take the forward porting patches:
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/core/machine_reboot.c 2011-01-24 12:06:05.000000000 +0100
++++ head-2011-10-07/drivers/xen/core/machine_reboot.c 2011-01-24 12:06:05.000000000 +0100
@@ -0,0 +1,242 @@
+#include <linux/version.h>
+#include <linux/kernel.h>
@@ -14113,7 +14113,7 @@ and in case upstream wants to take the forward porting patches:
+ return 0;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/core/reboot.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-10-07/drivers/xen/core/reboot.c 2011-06-30 15:37:44.000000000 +0200
@@ -0,0 +1,338 @@
+#define __KERNEL_SYSCALLS__
+#include <linux/version.h>
@@ -14454,7 +14454,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* !defined(CONFIG_XEN) */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/core/smpboot.c 2010-11-08 17:27:03.000000000 +0100
++++ head-2011-10-07/drivers/xen/core/smpboot.c 2010-11-08 17:27:03.000000000 +0100
@@ -0,0 +1,456 @@
+/*
+ * Xen SMP booting functions
@@ -14913,7 +14913,7 @@ and in case upstream wants to take the forward porting patches:
+}
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/core/xen_proc.c 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/drivers/xen/core/xen_proc.c 2011-04-11 13:43:15.000000000 +0200
@@ -0,0 +1,25 @@
+
+#include <linux/module.h>
@@ -14941,7 +14941,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/core/xen_sysfs.c 2009-05-29 10:25:53.000000000 +0200
++++ head-2011-10-07/drivers/xen/core/xen_sysfs.c 2009-05-29 10:25:53.000000000 +0200
@@ -0,0 +1,427 @@
+/*
+ * copyright (c) 2006 IBM Corporation
@@ -15371,12 +15371,12 @@ and in case upstream wants to take the forward porting patches:
+module_init(hyper_sysfs_init);
+module_exit(hyper_sysfs_exit);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/fbfront/Makefile 2007-06-12 13:13:45.000000000 +0200
++++ head-2011-10-07/drivers/xen/fbfront/Makefile 2007-06-12 13:13:45.000000000 +0200
@@ -0,0 +1,2 @@
+obj-$(CONFIG_XEN_FRAMEBUFFER) := xenfb.o
+obj-$(CONFIG_XEN_KEYBOARD) += xenkbd.o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/fbfront/xenfb.c 2011-03-02 12:00:16.000000000 +0100
++++ head-2011-10-07/drivers/xen/fbfront/xenfb.c 2011-03-02 12:00:16.000000000 +0100
@@ -0,0 +1,890 @@
+/*
+ * linux/drivers/video/xenfb.c -- Xen para-virtual frame buffer device
@@ -16269,8 +16269,8 @@ and in case upstream wants to take the forward porting patches:
+
+MODULE_LICENSE("GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/fbfront/xenkbd.c 2011-05-23 10:40:00.000000000 +0200
-@@ -0,0 +1,367 @@
++++ head-2011-10-07/drivers/xen/fbfront/xenkbd.c 2011-10-07 10:44:29.000000000 +0200
+@@ -0,0 +1,368 @@
+/*
+ * linux/drivers/input/keyboard/xenkbd.c -- Xen para-virtual input device
+ *
@@ -16443,6 +16443,7 @@ and in case upstream wants to take the forward porting patches:
+ __set_bit(REL_Y, ptr->relbit);
+ }
+ __set_bit(REL_WHEEL, ptr->relbit);
++ __set_bit(EV_REL, ptr->evbit);
+
+ __set_bit(EV_KEY, ptr->evbit);
+ for (i = BTN_LEFT; i <= BTN_TASK; i++)
@@ -16639,11 +16640,11 @@ and in case upstream wants to take the forward porting patches:
+
+MODULE_LICENSE("GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/gntdev/Makefile 2008-01-07 13:19:18.000000000 +0100
++++ head-2011-10-07/drivers/xen/gntdev/Makefile 2008-01-07 13:19:18.000000000 +0100
@@ -0,0 +1 @@
+obj-$(CONFIG_XEN_GRANT_DEV) := gntdev.o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/gntdev/gntdev.c 2011-01-03 12:43:21.000000000 +0100
++++ head-2011-10-07/drivers/xen/gntdev/gntdev.c 2011-01-03 12:43:21.000000000 +0100
@@ -0,0 +1,1038 @@
+/******************************************************************************
+ * gntdev.c
@@ -17684,7 +17685,7 @@ and in case upstream wants to take the forward porting patches:
+ return 0;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/netback/Makefile 2007-07-12 08:54:23.000000000 +0200
++++ head-2011-10-07/drivers/xen/netback/Makefile 2007-07-12 08:54:23.000000000 +0200
@@ -0,0 +1,5 @@
+obj-$(CONFIG_XEN_NETDEV_BACKEND) := netbk.o
+obj-$(CONFIG_XEN_NETDEV_LOOPBACK) += netloop.o
@@ -17692,7 +17693,7 @@ and in case upstream wants to take the forward porting patches:
+netbk-y := netback.o xenbus.o interface.o accel.o
+netloop-y := loopback.o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/netback/accel.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-10-07/drivers/xen/netback/accel.c 2011-06-30 15:37:44.000000000 +0200
@@ -0,0 +1,269 @@
+/******************************************************************************
+ * drivers/xen/netback/accel.c
@@ -17964,7 +17965,7 @@ and in case upstream wants to take the forward porting patches:
+ INIT_LIST_HEAD(&accelerators_list);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/netback/common.h 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/drivers/xen/netback/common.h 2011-04-11 13:43:15.000000000 +0200
@@ -0,0 +1,217 @@
+/******************************************************************************
+ * arch/xen/drivers/netif/backend/common.h
@@ -18184,7 +18185,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* __NETIF__BACKEND__COMMON_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/netback/interface.c 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/drivers/xen/netback/interface.c 2011-04-11 13:43:15.000000000 +0200
@@ -0,0 +1,381 @@
+/******************************************************************************
+ * arch/xen/drivers/netif/backend/interface.c
@@ -18568,7 +18569,7 @@ and in case upstream wants to take the forward porting patches:
+ free_netdev(netif->dev);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/netback/loopback.c 2011-01-03 12:43:21.000000000 +0100
++++ head-2011-10-07/drivers/xen/netback/loopback.c 2011-01-03 12:43:21.000000000 +0100
@@ -0,0 +1,309 @@
+/******************************************************************************
+ * netback/loopback.c
@@ -18880,7 +18881,7 @@ and in case upstream wants to take the forward porting patches:
+
+MODULE_LICENSE("Dual BSD/GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/netback/netback.c 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/drivers/xen/netback/netback.c 2011-04-11 13:43:15.000000000 +0200
@@ -0,0 +1,1702 @@
+/******************************************************************************
+ * drivers/xen/netback/netback.c
@@ -20585,7 +20586,7 @@ and in case upstream wants to take the forward porting patches:
+
+MODULE_LICENSE("Dual BSD/GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/netback/xenbus.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-10-07/drivers/xen/netback/xenbus.c 2011-06-30 15:37:44.000000000 +0200
@@ -0,0 +1,455 @@
+/* Xenbus code for netif backend
+ Copyright (C) 2005 Rusty Russell <rusty@rustcorp.com.au>
@@ -21043,14 +21044,14 @@ and in case upstream wants to take the forward porting patches:
+ xenbus_register_backend(&netback);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/netfront/Makefile 2007-07-12 08:54:23.000000000 +0200
++++ head-2011-10-07/drivers/xen/netfront/Makefile 2007-07-12 08:54:23.000000000 +0200
@@ -0,0 +1,4 @@
+
+obj-$(CONFIG_XEN_NETDEV_FRONTEND) := xennet.o
+
+xennet-objs := netfront.o accel.o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/netfront/accel.c 2009-05-04 10:01:03.000000000 +0200
++++ head-2011-10-07/drivers/xen/netfront/accel.c 2009-05-04 10:01:03.000000000 +0200
@@ -0,0 +1,827 @@
+/******************************************************************************
+ * Virtual network driver for conversing with remote driver backends.
@@ -21880,7 +21881,7 @@ and in case upstream wants to take the forward porting patches:
+}
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/netfront/netfront.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-10-07/drivers/xen/netfront/netfront.c 2011-06-30 15:37:44.000000000 +0200
@@ -0,0 +1,2261 @@
+/******************************************************************************
+ * Virtual network driver for conversing with remote driver backends.
@@ -24144,7 +24145,7 @@ and in case upstream wants to take the forward porting patches:
+
+MODULE_LICENSE("Dual BSD/GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/netfront/netfront.h 2010-02-24 13:13:46.000000000 +0100
++++ head-2011-10-07/drivers/xen/netfront/netfront.h 2010-02-24 13:13:46.000000000 +0100
@@ -0,0 +1,274 @@
+/******************************************************************************
+ * Virtual network driver for conversing with remote driver backends.
@@ -24421,7 +24422,7 @@ and in case upstream wants to take the forward porting patches:
+ struct xenbus_device *dev);
+#endif /* NETFRONT_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/xen-pciback/controller.c 2009-03-18 10:39:32.000000000 +0100
++++ head-2011-10-07/drivers/xen/xen-pciback/controller.c 2009-03-18 10:39:32.000000000 +0100
@@ -0,0 +1,443 @@
+/*
+ * Copyright (C) 2007 Hewlett-Packard Development Company, L.P.
@@ -24867,7 +24868,7 @@ and in case upstream wants to take the forward porting patches:
+}
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/xen-pciback/slot.c 2009-03-18 10:39:32.000000000 +0100
++++ head-2011-10-07/drivers/xen/xen-pciback/slot.c 2009-03-18 10:39:32.000000000 +0100
@@ -0,0 +1,187 @@
+/*
+ * PCI Backend - Provides a Virtual PCI bus (with real devices)
@@ -25057,7 +25058,7 @@ and in case upstream wants to take the forward porting patches:
+
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/pcifront/Makefile 2007-06-12 13:13:45.000000000 +0200
++++ head-2011-10-07/drivers/xen/pcifront/Makefile 2007-06-12 13:13:45.000000000 +0200
@@ -0,0 +1,7 @@
+obj-y += pcifront.o
+
@@ -25067,7 +25068,7 @@ and in case upstream wants to take the forward porting patches:
+EXTRA_CFLAGS += -DDEBUG
+endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/pcifront/pci.c 2007-06-12 13:13:45.000000000 +0200
++++ head-2011-10-07/drivers/xen/pcifront/pci.c 2007-06-12 13:13:45.000000000 +0200
@@ -0,0 +1,46 @@
+/*
+ * PCI Frontend Operations - ensure only one PCI frontend runs at a time
@@ -25116,7 +25117,7 @@ and in case upstream wants to take the forward porting patches:
+ spin_unlock(&pcifront_dev_lock);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/pcifront/pci_op.c 2010-11-25 09:36:37.000000000 +0100
++++ head-2011-10-07/drivers/xen/pcifront/pci_op.c 2010-11-25 09:36:37.000000000 +0100
@@ -0,0 +1,670 @@
+/*
+ * PCI Frontend Operations - Communicates with frontend
@@ -25789,7 +25790,7 @@ and in case upstream wants to take the forward porting patches:
+ return IRQ_HANDLED;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/pcifront/pcifront.h 2010-10-05 09:58:12.000000000 +0200
++++ head-2011-10-07/drivers/xen/pcifront/pcifront.h 2010-10-05 09:58:12.000000000 +0200
@@ -0,0 +1,56 @@
+/*
+ * PCI Frontend - Common data structures & function declarations
@@ -25848,7 +25849,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* __XEN_PCIFRONT_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/pcifront/xenbus.c 2010-10-05 09:58:12.000000000 +0200
++++ head-2011-10-07/drivers/xen/pcifront/xenbus.c 2010-10-05 09:58:12.000000000 +0200
@@ -0,0 +1,483 @@
+/*
+ * PCI Frontend Xenbus Setup - handles setup with backend (imports page/evtchn)
@@ -26334,13 +26335,13 @@ and in case upstream wants to take the forward porting patches:
+/* Initialize after the Xen PCI Frontend Stub is initialized */
+subsys_initcall(pcifront_init);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/privcmd/Makefile 2007-07-10 09:42:30.000000000 +0200
++++ head-2011-10-07/drivers/xen/privcmd/Makefile 2007-07-10 09:42:30.000000000 +0200
@@ -0,0 +1,3 @@
+
+obj-y += privcmd.o
+obj-$(CONFIG_COMPAT) += compat_privcmd.o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/privcmd/compat_privcmd.c 2010-01-27 14:01:48.000000000 +0100
++++ head-2011-10-07/drivers/xen/privcmd/compat_privcmd.c 2010-01-27 14:01:48.000000000 +0100
@@ -0,0 +1,144 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
@@ -26487,7 +26488,7 @@ and in case upstream wants to take the forward porting patches:
+ return ret;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/privcmd/privcmd.c 2010-01-27 14:01:48.000000000 +0100
++++ head-2011-10-07/drivers/xen/privcmd/privcmd.c 2010-01-27 14:01:48.000000000 +0100
@@ -0,0 +1,491 @@
+/******************************************************************************
+ * privcmd.c
@@ -26981,14 +26982,14 @@ and in case upstream wants to take the forward porting patches:
+
+__initcall(privcmd_init);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/scsiback/Makefile 2008-07-21 11:00:33.000000000 +0200
++++ head-2011-10-07/drivers/xen/scsiback/Makefile 2008-07-21 11:00:33.000000000 +0200
@@ -0,0 +1,4 @@
+obj-$(CONFIG_XEN_SCSI_BACKEND) := xen-scsibk.o
+
+xen-scsibk-y := interface.o scsiback.o xenbus.o translate.o emulate.o
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/scsiback/common.h 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/drivers/xen/scsiback/common.h 2011-04-11 13:43:15.000000000 +0200
@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) 2008, FUJITSU Limited
@@ -27167,7 +27168,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* __SCSIIF__BACKEND__COMMON_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/scsiback/emulate.c 2011-09-22 14:33:35.000000000 +0200
++++ head-2011-10-07/drivers/xen/scsiback/emulate.c 2011-09-22 14:33:35.000000000 +0200
@@ -0,0 +1,482 @@
+/*
+ * Xen SCSI backend driver
@@ -27652,7 +27653,7 @@ and in case upstream wants to take the forward porting patches:
+ return;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/scsiback/interface.c 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/drivers/xen/scsiback/interface.c 2011-04-11 13:43:15.000000000 +0200
@@ -0,0 +1,141 @@
+/*
+ * interface management.
@@ -27796,7 +27797,7 @@ and in case upstream wants to take the forward porting patches:
+ kmem_cache_destroy(scsiback_cachep);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/scsiback/scsiback.c 2011-09-22 14:33:35.000000000 +0200
++++ head-2011-10-07/drivers/xen/scsiback/scsiback.c 2011-09-22 14:33:35.000000000 +0200
@@ -0,0 +1,748 @@
+/*
+ * Xen SCSI backend driver
@@ -28547,7 +28548,7 @@ and in case upstream wants to take the forward porting patches:
+MODULE_DESCRIPTION("Xen SCSI backend driver");
+MODULE_LICENSE("Dual BSD/GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/scsiback/translate.c 2008-07-21 11:00:33.000000000 +0200
++++ head-2011-10-07/drivers/xen/scsiback/translate.c 2008-07-21 11:00:33.000000000 +0200
@@ -0,0 +1,168 @@
+/*
+ * Xen SCSI backend driver
@@ -28718,7 +28719,7 @@ and in case upstream wants to take the forward porting patches:
+
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/scsiback/xenbus.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-10-07/drivers/xen/scsiback/xenbus.c 2011-06-30 15:37:44.000000000 +0200
@@ -0,0 +1,377 @@
+/*
+ * Xen SCSI backend driver
@@ -29098,13 +29099,13 @@ and in case upstream wants to take the forward porting patches:
+ xenbus_unregister_driver(&scsiback);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/scsifront/Makefile 2008-07-21 11:00:33.000000000 +0200
++++ head-2011-10-07/drivers/xen/scsifront/Makefile 2008-07-21 11:00:33.000000000 +0200
@@ -0,0 +1,3 @@
+
+obj-$(CONFIG_XEN_SCSI_FRONTEND) := xenscsi.o
+xenscsi-objs := scsifront.o xenbus.o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/scsifront/common.h 2010-02-24 13:13:46.000000000 +0100
++++ head-2011-10-07/drivers/xen/scsifront/common.h 2010-02-24 13:13:46.000000000 +0100
@@ -0,0 +1,135 @@
+/*
+ * Xen SCSI frontend driver
@@ -29242,7 +29243,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* __XEN_DRIVERS_SCSIFRONT_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/scsifront/scsifront.c 2011-02-02 12:19:11.000000000 +0100
++++ head-2011-10-07/drivers/xen/scsifront/scsifront.c 2011-02-02 12:19:11.000000000 +0100
@@ -0,0 +1,516 @@
+/*
+ * Xen SCSI frontend driver
@@ -29761,7 +29762,7 @@ and in case upstream wants to take the forward porting patches:
+MODULE_DESCRIPTION("Xen SCSI frontend driver");
+MODULE_LICENSE("GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/scsifront/xenbus.c 2011-02-02 12:19:11.000000000 +0100
++++ head-2011-10-07/drivers/xen/scsifront/xenbus.c 2011-02-02 12:19:11.000000000 +0100
@@ -0,0 +1,426 @@
+/*
+ * Xen SCSI frontend driver
@@ -30190,7 +30191,7 @@ and in case upstream wants to take the forward porting patches:
+}
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netback/Makefile 2010-01-18 15:23:12.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netback/Makefile 2010-01-18 15:23:12.000000000 +0100
@@ -0,0 +1,12 @@
+EXTRA_CFLAGS += -Idrivers/xen/sfc_netback -Idrivers/xen/sfc_netutil -Idrivers/xen/netback -Idrivers/net/sfc -Idrivers/net/sfc/sfc_resource
+EXTRA_CFLAGS += -D__ci_driver__
@@ -30205,7 +30206,7 @@ and in case upstream wants to take the forward porting patches:
+
+sfc_netback-objs := accel.o accel_fwd.o accel_msg.o accel_solarflare.o accel_xenbus.o accel_debugfs.o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netback/accel.c 2009-04-07 13:58:48.000000000 +0200
++++ head-2011-10-07/drivers/xen/sfc_netback/accel.c 2009-04-07 13:58:48.000000000 +0200
@@ -0,0 +1,147 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -30355,7 +30356,7 @@ and in case upstream wants to take the forward porting patches:
+
+MODULE_LICENSE("GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netback/accel.h 2010-01-18 15:23:12.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netback/accel.h 2010-01-18 15:23:12.000000000 +0100
@@ -0,0 +1,391 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -30749,7 +30750,7 @@ and in case upstream wants to take the forward porting patches:
+
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netback/accel_debugfs.c 2008-02-26 10:54:11.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netback/accel_debugfs.c 2008-02-26 10:54:11.000000000 +0100
@@ -0,0 +1,148 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -30900,7 +30901,7 @@ and in case upstream wants to take the forward porting patches:
+
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netback/accel_fwd.c 2008-04-02 12:34:02.000000000 +0200
++++ head-2011-10-07/drivers/xen/sfc_netback/accel_fwd.c 2008-04-02 12:34:02.000000000 +0200
@@ -0,0 +1,420 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -31323,7 +31324,7 @@ and in case upstream wants to take the forward porting patches:
+ return;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netback/accel_msg.c 2008-02-20 09:32:49.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netback/accel_msg.c 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,392 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -31718,7 +31719,7 @@ and in case upstream wants to take the forward porting patches:
+ return;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netback/accel_solarflare.c 2010-01-18 15:23:12.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netback/accel_solarflare.c 2010-01-18 15:23:12.000000000 +0100
@@ -0,0 +1,1293 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -33014,7 +33015,7 @@ and in case upstream wants to take the forward porting patches:
+ spin_unlock_irqrestore(&accel_hw_priv->filter_lock, flags);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netback/accel_solarflare.h 2008-02-20 09:32:49.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netback/accel_solarflare.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,88 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -33105,7 +33106,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* NETBACK_ACCEL_SOLARFLARE_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netback/accel_xenbus.c 2010-01-04 11:56:34.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netback/accel_xenbus.c 2010-01-04 11:56:34.000000000 +0100
@@ -0,0 +1,833 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -33941,7 +33942,7 @@ and in case upstream wants to take the forward porting patches:
+ XenbusStateClosing);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netback/ci/compat.h 2008-02-20 09:32:49.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netback/ci/compat.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,53 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -33997,7 +33998,7 @@ and in case upstream wants to take the forward porting patches:
+
+/*! \cidoxg_end */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netback/ci/compat/gcc.h 2008-02-20 09:32:49.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netback/ci/compat/gcc.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,158 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -34158,7 +34159,7 @@ and in case upstream wants to take the forward porting patches:
+
+/*! \cidoxg_end */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netback/ci/compat/gcc_x86.h 2008-02-20 09:32:49.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netback/ci/compat/gcc_x86.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,115 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -34276,7 +34277,7 @@ and in case upstream wants to take the forward porting patches:
+
+/*! \cidoxg_end */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netback/ci/compat/primitive.h 2008-02-20 09:32:49.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netback/ci/compat/primitive.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,77 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -34356,7 +34357,7 @@ and in case upstream wants to take the forward porting patches:
+
+/*! \cidoxg_end */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netback/ci/compat/sysdep.h 2008-02-20 09:32:49.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netback/ci/compat/sysdep.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,166 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -34525,7 +34526,7 @@ and in case upstream wants to take the forward porting patches:
+
+/*! \cidoxg_end */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netback/ci/compat/utils.h 2008-02-20 09:32:49.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netback/ci/compat/utils.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,269 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -34797,7 +34798,7 @@ and in case upstream wants to take the forward porting patches:
+#endif /* __CI_COMPAT_UTILS_H__ */
+/*! \cidoxg_end */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netback/ci/compat/x86.h 2008-02-20 09:32:49.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netback/ci/compat/x86.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,48 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -34848,7 +34849,7 @@ and in case upstream wants to take the forward porting patches:
+
+/*! \cidoxg_end */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netback/ci/compat/x86_64.h 2008-02-20 09:32:49.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netback/ci/compat/x86_64.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,54 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -34905,7 +34906,7 @@ and in case upstream wants to take the forward porting patches:
+#endif /* __CI_COMPAT_X86_64_H__ */
+/*! \cidoxg_end */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netback/ci/tools/config.h 2008-02-20 09:32:49.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netback/ci/tools/config.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,49 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -34957,7 +34958,7 @@ and in case upstream wants to take the forward porting patches:
+#endif /* __CI_TOOLS_CONFIG_H__ */
+/*! \cidoxg_end */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netback/ci/tools/debug.h 2008-02-20 09:32:49.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netback/ci/tools/debug.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,336 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -35296,7 +35297,7 @@ and in case upstream wants to take the forward porting patches:
+
+/*! \cidoxg_end */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netback/ci/tools/log.h 2009-04-07 13:58:48.000000000 +0200
++++ head-2011-10-07/drivers/xen/sfc_netback/ci/tools/log.h 2009-04-07 13:58:48.000000000 +0200
@@ -0,0 +1,269 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -35568,7 +35569,7 @@ and in case upstream wants to take the forward porting patches:
+#endif /* __CI_TOOLS_LOG_H__ */
+/*! \cidoxg_end */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netback/ci/tools/platform/gcc_x86.h 2009-04-07 13:58:48.000000000 +0200
++++ head-2011-10-07/drivers/xen/sfc_netback/ci/tools/platform/gcc_x86.h 2009-04-07 13:58:48.000000000 +0200
@@ -0,0 +1,370 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -35941,7 +35942,7 @@ and in case upstream wants to take the forward porting patches:
+
+/*! \cidoxg_end */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netback/ci/tools/platform/linux_kernel.h 2008-02-20 09:32:49.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netback/ci/tools/platform/linux_kernel.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,362 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -36306,7 +36307,7 @@ and in case upstream wants to take the forward porting patches:
+#endif /* __CI_TOOLS_LINUX_KERNEL_H__ */
+/*! \cidoxg_end */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netback/ci/tools/sysdep.h 2008-02-20 09:32:49.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netback/ci/tools/sysdep.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,132 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -36441,7 +36442,7 @@ and in case upstream wants to take the forward porting patches:
+
+/*! \cidoxg_end */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netfront/Makefile 2008-02-26 10:54:11.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netfront/Makefile 2008-02-26 10:54:11.000000000 +0100
@@ -0,0 +1,11 @@
+EXTRA_CFLAGS += -Idrivers/xen/sfc_netfront -Idrivers/xen/sfc_netutil -Idrivers/xen/netfront
+EXTRA_CFLAGS += -D__ci_driver__
@@ -36455,7 +36456,7 @@ and in case upstream wants to take the forward porting patches:
+
+sfc_netfront-objs := accel_msg.o accel_bufs.o accel_netfront.o accel_vi.o accel_xenbus.o accel_tso.o accel_ssr.o accel_debugfs.o falcon_event.o falcon_vi.o pt_tx.o vi_init.o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netfront/accel.h 2009-04-07 13:58:48.000000000 +0200
++++ head-2011-10-07/drivers/xen/sfc_netfront/accel.h 2009-04-07 13:58:48.000000000 +0200
@@ -0,0 +1,495 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -36953,7 +36954,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* NETFRONT_ACCEL_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netfront/accel_bufs.c 2008-02-26 10:54:12.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netfront/accel_bufs.c 2008-02-26 10:54:12.000000000 +0100
@@ -0,0 +1,393 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -37349,7 +37350,7 @@ and in case upstream wants to take the forward porting patches:
+ return was_empty;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netfront/accel_bufs.h 2008-02-20 09:32:49.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netfront/accel_bufs.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,181 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -37533,7 +37534,7 @@ and in case upstream wants to take the forward porting patches:
+#endif /* NETFRONT_ACCEL_BUFS_H */
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netfront/accel_debugfs.c 2009-04-07 13:58:48.000000000 +0200
++++ head-2011-10-07/drivers/xen/sfc_netfront/accel_debugfs.c 2009-04-07 13:58:48.000000000 +0200
@@ -0,0 +1,227 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -37763,7 +37764,7 @@ and in case upstream wants to take the forward porting patches:
+ return 0;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netfront/accel_msg.c 2009-04-07 13:58:48.000000000 +0200
++++ head-2011-10-07/drivers/xen/sfc_netfront/accel_msg.c 2009-04-07 13:58:48.000000000 +0200
@@ -0,0 +1,564 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -38330,7 +38331,7 @@ and in case upstream wants to take the forward porting patches:
+ &lock_state, vnic->msg_channel_irq);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netfront/accel_netfront.c 2009-04-07 13:58:48.000000000 +0200
++++ head-2011-10-07/drivers/xen/sfc_netfront/accel_netfront.c 2009-04-07 13:58:48.000000000 +0200
@@ -0,0 +1,328 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -38661,7 +38662,7 @@ and in case upstream wants to take the forward porting patches:
+MODULE_LICENSE("GPL");
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netfront/accel_ssr.c 2008-02-20 09:32:49.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netfront/accel_ssr.c 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,308 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -38972,7 +38973,7 @@ and in case upstream wants to take the forward porting patches:
+ return 0;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netfront/accel_ssr.h 2008-02-20 09:32:49.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netfront/accel_ssr.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,88 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -39063,7 +39064,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* NETFRONT_ACCEL_SSR_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netfront/accel_tso.c 2008-02-26 10:54:12.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netfront/accel_tso.c 2008-02-26 10:54:12.000000000 +0100
@@ -0,0 +1,511 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -39577,7 +39578,7 @@ and in case upstream wants to take the forward porting patches:
+
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netfront/accel_tso.h 2008-02-20 09:32:49.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netfront/accel_tso.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,57 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -39637,7 +39638,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* NETFRONT_ACCEL_TSO_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-10-07/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 15:37:44.000000000 +0200
@@ -0,0 +1,1204 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -40844,7 +40845,7 @@ and in case upstream wants to take the forward porting patches:
+ return 1;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netfront/accel_xenbus.c 2008-02-20 09:32:49.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netfront/accel_xenbus.c 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,776 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -41623,7 +41624,7 @@ and in case upstream wants to take the forward porting patches:
+ return 0;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netfront/ef_vi_falcon.h 2009-04-07 13:58:48.000000000 +0200
++++ head-2011-10-07/drivers/xen/sfc_netfront/ef_vi_falcon.h 2009-04-07 13:58:48.000000000 +0200
@@ -0,0 +1,172 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -41798,7 +41799,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* __EF_VI_FALCON_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netfront/ef_vi_falcon_core.h 2008-02-20 09:32:49.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netfront/ef_vi_falcon_core.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,1075 @@
+
+#define EFVI_FALCON_EXTENDED_P_BAR 1
@@ -42876,7 +42877,7 @@ and in case upstream wants to take the forward porting patches:
+ #define EE_VPD_CYC_DAT_LBN 0
+ #define EE_VPD_CYC_DAT_WIDTH 32
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netfront/ef_vi_falcon_desc.h 2008-02-20 09:32:49.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netfront/ef_vi_falcon_desc.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,43 @@
+//////////////---- Descriptors C Headers ----//////////////
+// Receive Kernel IP Descriptor
@@ -42922,7 +42923,7 @@ and in case upstream wants to take the forward porting patches:
+ #define TX_USR_BYTE_OFS_LBN 0
+ #define TX_USR_BYTE_OFS_WIDTH 13
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netfront/ef_vi_falcon_event.h 2008-02-20 09:32:49.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netfront/ef_vi_falcon_event.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,123 @@
+//////////////---- Events Format C Header ----//////////////
+//////////////---- Event entry ----//////////////
@@ -43048,7 +43049,7 @@ and in case upstream wants to take the forward porting patches:
+ #define DRV_GEN_EV_DATA_LBN 0
+ #define DRV_GEN_EV_DATA_WIDTH 60
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netfront/ef_vi_internal.h 2008-02-20 09:32:49.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netfront/ef_vi_internal.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,256 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -43307,7 +43308,7 @@ and in case upstream wants to take the forward porting patches:
+#endif /* __CI_EF_VI_INTERNAL_H__ */
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netfront/etherfabric/ef_vi.h 2009-04-07 13:58:48.000000000 +0200
++++ head-2011-10-07/drivers/xen/sfc_netfront/etherfabric/ef_vi.h 2009-04-07 13:58:48.000000000 +0200
@@ -0,0 +1,647 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -43957,7 +43958,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* __EFAB_EF_VI_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netfront/falcon_event.c 2009-04-07 13:58:48.000000000 +0200
++++ head-2011-10-07/drivers/xen/sfc_netfront/falcon_event.c 2009-04-07 13:58:48.000000000 +0200
@@ -0,0 +1,346 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -44306,7 +44307,7 @@ and in case upstream wants to take the forward porting patches:
+
+/*! \cidoxg_end */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netfront/falcon_vi.c 2009-04-07 13:58:48.000000000 +0200
++++ head-2011-10-07/drivers/xen/sfc_netfront/falcon_vi.c 2009-04-07 13:58:48.000000000 +0200
@@ -0,0 +1,473 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -44782,7 +44783,7 @@ and in case upstream wants to take the forward porting patches:
+
+/*! \cidoxg_end */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netfront/pt_tx.c 2008-02-20 09:32:49.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netfront/pt_tx.c 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,91 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -44876,7 +44877,7 @@ and in case upstream wants to take the forward porting patches:
+
+/*! \cidoxg_end */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netfront/sysdep.h 2009-04-07 13:58:48.000000000 +0200
++++ head-2011-10-07/drivers/xen/sfc_netfront/sysdep.h 2009-04-07 13:58:48.000000000 +0200
@@ -0,0 +1,185 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -45064,7 +45065,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* __CI_CIUL_SYSDEP_LINUX_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netfront/vi_init.c 2008-02-20 09:32:49.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netfront/vi_init.c 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,183 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -45250,7 +45251,7 @@ and in case upstream wants to take the forward porting patches:
+ vm->tx_bell = (char*) io_mmap + (TX_DESC_UPD_REG_KER_OFST & 4095);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netutil/Makefile 2008-02-26 10:54:12.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netutil/Makefile 2008-02-26 10:54:12.000000000 +0100
@@ -0,0 +1,11 @@
+EXTRA_CFLAGS += -Idrivers/xen/sfc_netutil
+EXTRA_CFLAGS += -Werror
@@ -45264,7 +45265,7 @@ and in case upstream wants to take the forward porting patches:
+sfc_netutil-objs := accel_cuckoo_hash.o accel_msg_iface.o accel_util.o
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netutil/accel_cuckoo_hash.c 2008-02-20 09:32:49.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netutil/accel_cuckoo_hash.c 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,651 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -45918,7 +45919,7 @@ and in case upstream wants to take the forward porting patches:
+EXPORT_SYMBOL_GPL(cuckoo_hash_dump);
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netutil/accel_cuckoo_hash.h 2008-02-20 09:32:49.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netutil/accel_cuckoo_hash.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,227 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -46148,7 +46149,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* NET_ACCEL_CUCKOO_HASH_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netutil/accel_msg_iface.c 2008-02-20 09:32:49.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netutil/accel_msg_iface.c 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,301 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -46452,7 +46453,7 @@ and in case upstream wants to take the forward porting patches:
+}
+EXPORT_SYMBOL_GPL(net_accel_msg_complete_send_notify);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netutil/accel_msg_iface.h 2010-01-18 15:23:12.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netutil/accel_msg_iface.h 2010-01-18 15:23:12.000000000 +0100
@@ -0,0 +1,415 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -46870,7 +46871,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* NET_ACCEL_MSG_IFACE_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netutil/accel_shared_fifo.h 2008-02-20 09:32:49.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netutil/accel_shared_fifo.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,127 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -47000,7 +47001,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* NET_ACCEL_SHARED_FIFO_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netutil/accel_util.c 2010-09-23 15:39:04.000000000 +0200
++++ head-2011-10-07/drivers/xen/sfc_netutil/accel_util.c 2010-09-23 15:39:04.000000000 +0200
@@ -0,0 +1,336 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -47339,7 +47340,7 @@ and in case upstream wants to take the forward porting patches:
+
+MODULE_LICENSE("GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/sfc_netutil/accel_util.h 2008-02-20 09:32:49.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netutil/accel_util.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,127 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -47469,14 +47470,14 @@ and in case upstream wants to take the forward porting patches:
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/tpmback/Makefile 2007-06-12 13:13:45.000000000 +0200
++++ head-2011-10-07/drivers/xen/tpmback/Makefile 2007-06-12 13:13:45.000000000 +0200
@@ -0,0 +1,4 @@
+
+obj-$(CONFIG_XEN_TPMDEV_BACKEND) += tpmbk.o
+
+tpmbk-y += tpmback.o interface.o xenbus.o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/tpmback/common.h 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/drivers/xen/tpmback/common.h 2011-04-11 13:43:15.000000000 +0200
@@ -0,0 +1,95 @@
+/******************************************************************************
+ * drivers/xen/tpmback/common.h
@@ -47574,7 +47575,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* __TPMIF__BACKEND__COMMON_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/tpmback/interface.c 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/drivers/xen/tpmback/interface.c 2011-04-11 13:43:15.000000000 +0200
@@ -0,0 +1,131 @@
+ /*****************************************************************************
+ * drivers/xen/tpmback/interface.c
@@ -47708,7 +47709,7 @@ and in case upstream wants to take the forward porting patches:
+ kmem_cache_destroy(tpmif_cachep);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/tpmback/tpmback.c 2010-09-23 15:39:04.000000000 +0200
++++ head-2011-10-07/drivers/xen/tpmback/tpmback.c 2010-09-23 15:39:04.000000000 +0200
@@ -0,0 +1,939 @@
+/******************************************************************************
+ * drivers/xen/tpmback/tpmback.c
@@ -48650,7 +48651,7 @@ and in case upstream wants to take the forward porting patches:
+
+MODULE_LICENSE("Dual BSD/GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/tpmback/xenbus.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-10-07/drivers/xen/tpmback/xenbus.c 2011-06-30 15:37:44.000000000 +0200
@@ -0,0 +1,273 @@
+/* Xenbus code for tpmif backend
+ Copyright (C) 2005 IBM Corporation
@@ -48926,14 +48927,14 @@ and in case upstream wants to take the forward porting patches:
+ xenbus_unregister_driver(&tpmback);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/usbback/Makefile 2009-04-07 13:58:49.000000000 +0200
++++ head-2011-10-07/drivers/xen/usbback/Makefile 2009-04-07 13:58:49.000000000 +0200
@@ -0,0 +1,4 @@
+obj-$(CONFIG_XEN_USB_BACKEND) := usbbk.o
+
+usbbk-y := usbstub.o xenbus.o interface.o usbback.o
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/usbback/interface.c 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/drivers/xen/usbback/interface.c 2011-04-11 13:43:15.000000000 +0200
@@ -0,0 +1,190 @@
+/*
+ * interface.c
@@ -49126,7 +49127,7 @@ and in case upstream wants to take the forward porting patches:
+ kfree(usbif);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/usbback/usbback.c 2011-09-22 14:33:35.000000000 +0200
++++ head-2011-10-07/drivers/xen/usbback/usbback.c 2011-09-22 14:33:35.000000000 +0200
@@ -0,0 +1,1160 @@
+/*
+ * usbback.c
@@ -50289,7 +50290,7 @@ and in case upstream wants to take the forward porting patches:
+MODULE_DESCRIPTION("Xen USB backend driver (usbback)");
+MODULE_LICENSE("Dual BSD/GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/usbback/usbback.h 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/drivers/xen/usbback/usbback.h 2011-04-11 13:43:15.000000000 +0200
@@ -0,0 +1,166 @@
+/*
+ * usbback.h
@@ -50458,7 +50459,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* __XEN_USBBACK_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/usbback/usbstub.c 2011-03-02 12:00:16.000000000 +0100
++++ head-2011-10-07/drivers/xen/usbback/usbstub.c 2011-03-02 12:00:16.000000000 +0100
@@ -0,0 +1,324 @@
+/*
+ * usbstub.c
@@ -50785,7 +50786,7 @@ and in case upstream wants to take the forward porting patches:
+ usb_deregister(&usbback_usb_driver);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/usbback/xenbus.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-10-07/drivers/xen/usbback/xenbus.c 2011-06-30 15:37:44.000000000 +0200
@@ -0,0 +1,337 @@
+/*
+ * xenbus.c
@@ -51125,7 +51126,7 @@ and in case upstream wants to take the forward porting patches:
+ xenbus_unregister_driver(&usbback_driver);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/usbfront/Makefile 2009-10-15 11:45:41.000000000 +0200
++++ head-2011-10-07/drivers/xen/usbfront/Makefile 2009-10-15 11:45:41.000000000 +0200
@@ -0,0 +1,11 @@
+obj-$(CONFIG_XEN_USB_FRONTEND) := xen-hcd.o
+
@@ -51139,7 +51140,7 @@ and in case upstream wants to take the forward porting patches:
+EXTRA_CFLAGS += -DXENHCD_PM
+endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/usbfront/usbfront-dbg.c 2009-10-15 11:45:41.000000000 +0200
++++ head-2011-10-07/drivers/xen/usbfront/usbfront-dbg.c 2009-10-15 11:45:41.000000000 +0200
@@ -0,0 +1,100 @@
+/*
+ * usbfront-dbg.c
@@ -51242,7 +51243,7 @@ and in case upstream wants to take the forward porting patches:
+ class_device_remove_file(cldev, &class_device_attr_statistics);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/usbfront/usbfront-hcd.c 2009-10-15 11:45:41.000000000 +0200
++++ head-2011-10-07/drivers/xen/usbfront/usbfront-hcd.c 2009-10-15 11:45:41.000000000 +0200
@@ -0,0 +1,231 @@
+/*
+ * usbfront-hcd.c
@@ -51476,7 +51477,7 @@ and in case upstream wants to take the forward porting patches:
+#endif
+};
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/usbfront/usbfront-hub.c 2009-10-15 11:45:41.000000000 +0200
++++ head-2011-10-07/drivers/xen/usbfront/usbfront-hub.c 2009-10-15 11:45:41.000000000 +0200
@@ -0,0 +1,471 @@
+/*
+ * usbfront-hub.c
@@ -51950,7 +51951,7 @@ and in case upstream wants to take the forward porting patches:
+ return ret;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/usbfront/usbfront-q.c 2009-10-15 11:45:41.000000000 +0200
++++ head-2011-10-07/drivers/xen/usbfront/usbfront-q.c 2009-10-15 11:45:41.000000000 +0200
@@ -0,0 +1,541 @@
+/*
+ * usbfront-q.c
@@ -52494,7 +52495,7 @@ and in case upstream wants to take the forward porting patches:
+ return IRQ_HANDLED;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/usbfront/usbfront.h 2009-10-15 11:45:41.000000000 +0200
++++ head-2011-10-07/drivers/xen/usbfront/usbfront.h 2009-10-15 11:45:41.000000000 +0200
@@ -0,0 +1,203 @@
+/*
+ * usbfront.h
@@ -52700,7 +52701,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* __XEN_USBFRONT_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/usbfront/xenbus.c 2010-03-31 09:56:02.000000000 +0200
++++ head-2011-10-07/drivers/xen/usbfront/xenbus.c 2010-03-31 09:56:02.000000000 +0200
@@ -0,0 +1,417 @@
+/*
+ * xenbus.c
@@ -53120,7 +53121,7 @@ and in case upstream wants to take the forward porting patches:
+MODULE_DESCRIPTION("Xen USB Virtual Host Controller driver (usbfront)");
+MODULE_LICENSE("Dual BSD/GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/util.c 2007-07-10 09:42:30.000000000 +0200
++++ head-2011-10-07/drivers/xen/util.c 2007-07-10 09:42:30.000000000 +0200
@@ -0,0 +1,65 @@
+#include <linux/mm.h>
+#include <linux/module.h>
@@ -53188,7 +53189,7 @@ and in case upstream wants to take the forward porting patches:
+EXPORT_SYMBOL_GPL(free_vm_area);
+#endif /* CONFIG_X86 */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/xenbus/xenbus_backend_client.c 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/drivers/xen/xenbus/xenbus_backend_client.c 2011-04-11 13:43:15.000000000 +0200
@@ -0,0 +1,106 @@
+/******************************************************************************
+ * Backend-client-facing interface for the Xenbus driver. In other words, the
@@ -53297,7 +53298,7 @@ and in case upstream wants to take the forward porting patches:
+
+MODULE_LICENSE("Dual BSD/GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/xenbus/xenbus_dev.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-10-07/drivers/xen/xenbus/xenbus_dev.c 2011-06-30 15:37:44.000000000 +0200
@@ -0,0 +1,497 @@
+/*
+ * xenbus_dev.c
@@ -53797,7 +53798,7 @@ and in case upstream wants to take the forward porting patches:
+ return 0;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/xen/xenoprof/xenoprofile.c 2010-01-07 09:38:29.000000000 +0100
++++ head-2011-10-07/drivers/xen/xenoprof/xenoprofile.c 2010-01-07 09:38:29.000000000 +0100
@@ -0,0 +1,587 @@
+/**
+ * @file xenoprofile.c
diff --git a/patches.xen/xen3-auto-xen-kconfig.diff b/patches.xen/xen3-auto-xen-kconfig.diff
index 63b904fa6d..e57ecf6ebf 100644
--- a/patches.xen/xen3-auto-xen-kconfig.diff
+++ b/patches.xen/xen3-auto-xen-kconfig.diff
@@ -1,10 +1,10 @@
Subject: xen3 xen-kconfig
-From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1105:f4f25124b1b6)
+From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1116:40e33b2fce94)
Patch-mainline: n/a
Acked-by: jbeulich@novell.com
---- head-2011-09-23.orig/arch/x86/Kconfig 2011-09-23 09:35:34.000000000 +0200
-+++ head-2011-09-23/arch/x86/Kconfig 2011-09-07 14:37:06.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/Kconfig 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/arch/x86/Kconfig 2011-09-07 14:37:06.000000000 +0200
@@ -89,6 +89,7 @@ config ARCH_DEFCONFIG
config GENERIC_CMOS_UPDATE
@@ -344,8 +344,8 @@ Acked-by: jbeulich@novell.com
+source "drivers/xen/Kconfig"
+
source "lib/Kconfig"
---- head-2011-09-23.orig/arch/x86/Kconfig.cpu 2011-09-23 09:35:34.000000000 +0200
-+++ head-2011-09-23/arch/x86/Kconfig.cpu 2011-09-07 14:37:08.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/Kconfig.cpu 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/arch/x86/Kconfig.cpu 2011-09-07 14:37:08.000000000 +0200
@@ -341,7 +341,7 @@ config X86_PPRO_FENCE
config X86_F00F_BUG
@@ -363,8 +363,8 @@ Acked-by: jbeulich@novell.com
config X86_CMPXCHG64
def_bool y
---- head-2011-09-23.orig/arch/x86/Kconfig.debug 2011-09-23 09:35:34.000000000 +0200
-+++ head-2011-09-23/arch/x86/Kconfig.debug 2011-06-30 15:35:42.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/Kconfig.debug 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/arch/x86/Kconfig.debug 2011-06-30 15:35:42.000000000 +0200
@@ -119,7 +119,7 @@ config DEBUG_NX_TEST
config DOUBLEFAULT
default y
@@ -374,8 +374,8 @@ Acked-by: jbeulich@novell.com
---help---
This option allows trapping of rare doublefault exceptions that
would otherwise cause a system to silently reboot. Disabling this
---- head-2011-09-23.orig/drivers/acpi/Kconfig 2011-09-23 09:35:34.000000000 +0200
-+++ head-2011-09-23/drivers/acpi/Kconfig 2011-09-23 09:45:08.000000000 +0200
+--- head-2011-10-07.orig/drivers/acpi/Kconfig 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/acpi/Kconfig 2011-09-23 09:45:08.000000000 +0200
@@ -318,6 +318,7 @@ config ACPI_PCI_SLOT
config X86_PM_TIMER
bool "Power Management Timer Support" if EXPERT
@@ -398,8 +398,8 @@ Acked-by: jbeulich@novell.com
+ depends on (X86 || IA64) && XEN
+ default y
endif # ACPI
---- head-2011-09-23.orig/drivers/char/Kconfig 2011-09-23 09:35:34.000000000 +0200
-+++ head-2011-09-23/drivers/char/Kconfig 2011-04-13 11:17:33.000000000 +0200
+--- head-2011-10-07.orig/drivers/char/Kconfig 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/char/Kconfig 2011-04-13 11:17:33.000000000 +0200
@@ -534,7 +534,7 @@ config MAX_RAW_DEVS
config HPET
bool "HPET - High Precision Event Timer" if (X86 || IA64)
@@ -409,9 +409,9 @@ Acked-by: jbeulich@novell.com
help
If you say Y here, you will have a miscdevice named "/dev/hpet/". Each
open selects one of the timers supported by the HPET. The timers are
---- head-2011-09-23.orig/drivers/char/tpm/Kconfig 2011-09-23 09:35:34.000000000 +0200
-+++ head-2011-09-23/drivers/char/tpm/Kconfig 2011-04-13 11:17:33.000000000 +0200
-@@ -60,4 +60,13 @@ config TCG_INFINEON
+--- head-2011-10-07.orig/drivers/char/tpm/Kconfig 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/char/tpm/Kconfig 2011-10-07 10:47:16.000000000 +0200
+@@ -61,4 +61,13 @@ config TCG_INFINEON
Further information on this driver and the supported hardware
can be found at http://www.trust.rub.de/projects/linux-device-driver-infineon-tpm/
@@ -425,8 +425,8 @@ Acked-by: jbeulich@novell.com
+ will be called tpm_xenu.
+
endif # TCG_TPM
---- head-2011-09-23.orig/drivers/cpufreq/Kconfig 2011-09-23 09:35:34.000000000 +0200
-+++ head-2011-09-23/drivers/cpufreq/Kconfig 2011-06-30 15:36:01.000000000 +0200
+--- head-2011-10-07.orig/drivers/cpufreq/Kconfig 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/cpufreq/Kconfig 2011-06-30 15:36:01.000000000 +0200
@@ -2,6 +2,7 @@ menu "CPU Frequency scaling"
config CPU_FREQ
@@ -435,8 +435,8 @@ Acked-by: jbeulich@novell.com
help
CPU Frequency scaling allows you to change the clock speed of
CPUs on the fly. This is a nice method to save power, because
---- head-2011-09-23.orig/drivers/tty/serial/Kconfig 2011-09-23 09:35:34.000000000 +0200
-+++ head-2011-09-23/drivers/tty/serial/Kconfig 2011-04-13 11:17:33.000000000 +0200
+--- head-2011-10-07.orig/drivers/tty/serial/Kconfig 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/tty/serial/Kconfig 2011-04-13 11:17:33.000000000 +0200
@@ -9,6 +9,7 @@ menu "Serial drivers"
# The new 8250/16550 serial drivers
config SERIAL_8250
@@ -445,8 +445,8 @@ Acked-by: jbeulich@novell.com
select SERIAL_CORE
---help---
This selects whether you want to include the driver for the standard
---- head-2011-09-23.orig/drivers/xen/Kconfig 2011-09-23 09:35:34.000000000 +0200
-+++ head-2011-09-23/drivers/xen/Kconfig 2011-09-07 14:36:47.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/Kconfig 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/xen/Kconfig 2011-09-07 14:36:47.000000000 +0200
@@ -1,8 +1,357 @@
+#
+# This Kconfig describe xen options
@@ -830,8 +830,8 @@ Acked-by: jbeulich@novell.com
If in doubt, say yes.
config XEN_DEV_EVTCHN
---- head-2011-09-23.orig/fs/Kconfig 2011-09-23 09:35:34.000000000 +0200
-+++ head-2011-09-23/fs/Kconfig 2011-06-30 15:36:20.000000000 +0200
+--- head-2011-10-07.orig/fs/Kconfig 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/fs/Kconfig 2011-06-30 15:36:20.000000000 +0200
@@ -165,6 +165,7 @@ config HUGETLBFS
bool "HugeTLB file system support"
depends on X86 || IA64 || SPARC64 || (S390 && 64BIT) || \
@@ -840,8 +840,8 @@ Acked-by: jbeulich@novell.com
help
hugetlbfs is a filesystem backing for HugeTLB pages, based on
ramfs. For architectures that support it, say Y here and read
---- head-2011-09-23.orig/kernel/Kconfig.preempt 2011-09-23 09:35:34.000000000 +0200
-+++ head-2011-09-23/kernel/Kconfig.preempt 2011-09-07 14:36:35.000000000 +0200
+--- head-2011-10-07.orig/kernel/Kconfig.preempt 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/kernel/Kconfig.preempt 2011-09-07 14:36:35.000000000 +0200
@@ -36,6 +36,7 @@ config PREEMPT_VOLUNTARY
config PREEMPT
diff --git a/patches.xen/xen3-fixup-xen b/patches.xen/xen3-fixup-xen
index 14e4b1b55e..6797d5395b 100644
--- a/patches.xen/xen3-fixup-xen
+++ b/patches.xen/xen3-fixup-xen
@@ -1,11 +1,11 @@
Subject: Fix Xen build wrt. Xen files coming from mainline.
-From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1105:f4f25124b1b6)
+From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1116:40e33b2fce94)
Patch-mainline: n/a
Acked-by: jbeulich@novell.com
---- head-2011-09-07.orig/drivers/xen/Makefile 2011-09-07 13:56:36.000000000 +0200
-+++ head-2011-09-07/drivers/xen/Makefile 2011-01-31 15:14:12.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/Makefile 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/xen/Makefile 2011-01-31 15:14:12.000000000 +0100
@@ -1,27 +1,28 @@
-obj-y += grant-table.o features.o events.o manage.o balloon.o
+obj-y += core/
@@ -60,8 +60,8 @@ Acked-by: jbeulich@novell.com
+obj-$(CONFIG_XEN_NETDEV_ACCEL_SFC_UTIL) += sfc_netutil/
+obj-$(CONFIG_XEN_NETDEV_ACCEL_SFC_FRONTEND) += sfc_netfront/
+obj-$(CONFIG_XEN_NETDEV_ACCEL_SFC_BACKEND) += sfc_netback/
---- head-2011-09-07.orig/drivers/xen/xenbus/Makefile 2011-03-15 02:20:32.000000000 +0100
-+++ head-2011-09-07/drivers/xen/xenbus/Makefile 2011-02-02 17:06:11.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/xenbus/Makefile 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/xen/xenbus/Makefile 2011-02-02 17:06:11.000000000 +0100
@@ -1,12 +1,9 @@
-obj-y += xenbus.o
+obj-y += xenbus_client.o xenbus_comms.o xenbus_xs.o xenbus_probe.o
@@ -82,8 +82,8 @@ Acked-by: jbeulich@novell.com
+xenbus-$(CONFIG_XEN_BACKEND) += xenbus_probe_backend.o
+obj-y += $(xenbus-y) $(xenbus-m)
+obj-$(CONFIG_XEN_XENBUS_DEV) += xenbus_dev.o
---- head-2011-09-07.orig/drivers/xen/xenbus/xenbus_client.c 2011-01-05 01:50:19.000000000 +0100
-+++ head-2011-09-07/drivers/xen/xenbus/xenbus_client.c 2011-06-30 15:37:44.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/xenbus/xenbus_client.c 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/xen/xenbus/xenbus_client.c 2011-06-30 15:37:44.000000000 +0200
@@ -31,14 +31,17 @@
*/
@@ -639,8 +639,8 @@ Acked-by: jbeulich@novell.com
result = XenbusStateUnknown;
return result;
---- head-2011-09-07.orig/drivers/xen/xenbus/xenbus_comms.c 2008-10-10 00:13:53.000000000 +0200
-+++ head-2011-09-07/drivers/xen/xenbus/xenbus_comms.c 2011-04-11 13:43:15.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/xenbus/xenbus_comms.c 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/xen/xenbus/xenbus_comms.c 2011-04-11 13:43:15.000000000 +0200
@@ -34,25 +34,55 @@
#include <linux/interrupt.h>
#include <linux/sched.h>
@@ -771,8 +771,8 @@ Acked-by: jbeulich@novell.com
+
return 0;
}
---- head-2011-09-07.orig/drivers/xen/xenbus/xenbus_comms.h 2007-10-09 22:31:38.000000000 +0200
-+++ head-2011-09-07/drivers/xen/xenbus/xenbus_comms.h 2011-04-11 13:43:15.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/xenbus/xenbus_comms.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/xen/xenbus/xenbus_comms.h 2011-04-11 13:43:15.000000000 +0200
@@ -43,4 +43,27 @@ int xs_input_avail(void);
extern struct xenstore_domain_interface *xen_store_interface;
extern int xen_store_evtchn;
@@ -801,8 +801,8 @@ Acked-by: jbeulich@novell.com
+#endif
+
#endif /* _XENBUS_COMMS_H */
---- head-2011-09-07.orig/drivers/xen/xenbus/xenbus_probe.c 2011-09-07 13:56:36.000000000 +0200
-+++ head-2011-09-07/drivers/xen/xenbus/xenbus_probe.c 2011-09-07 15:18:10.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/xenbus/xenbus_probe.c 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/xen/xenbus/xenbus_probe.c 2011-10-07 10:44:29.000000000 +0200
@@ -4,6 +4,7 @@
* Copyright (C) 2005 Rusty Russell, IBM Corporation
* Copyright (C) 2005 Mike Wray, Hewlett-Packard
@@ -1177,14 +1177,14 @@ Acked-by: jbeulich@novell.com
+int xenbus_register_frontend(struct xenbus_driver *drv)
+{
+ int ret;
-
-- return driver_register(&drv->driver);
++
+ drv->read_otherend_details = read_backend_details;
+
+ ret = xenbus_register_driver_common(drv, &xenbus_frontend);
+ if (ret)
+ return ret;
-+
+
+- return driver_register(&drv->driver);
+ /* If this driver is loaded as a module wait for devices to attach. */
+ wait_for_devices(drv);
+
@@ -1404,11 +1404,9 @@ Acked-by: jbeulich@novell.com
printk(KERN_WARNING
- "xenbus: suspend %s failed: %i\n", dev_name(dev), err);
+ "xenbus: suspend %s failed: %i\n", dev->bus_id, err);
- return 0;
- }
--EXPORT_SYMBOL_GPL(xenbus_dev_suspend);
-
--int xenbus_dev_resume(struct device *dev)
++ return 0;
++}
++
+static int suspend_cancel_dev(struct device *dev, void *data)
+{
+ int err = 0;
@@ -1427,9 +1425,11 @@ Acked-by: jbeulich@novell.com
+ printk(KERN_WARNING
+ "xenbus: suspend_cancel %s failed: %i\n",
+ dev->bus_id, err);
-+ return 0;
-+}
-+
+ return 0;
+ }
+-EXPORT_SYMBOL_GPL(xenbus_dev_suspend);
+
+-int xenbus_dev_resume(struct device *dev)
+static int resume_dev(struct device *dev, void *data)
{
int err;
@@ -1536,80 +1536,108 @@ Acked-by: jbeulich@novell.com
EXPORT_SYMBOL_GPL(register_xenstore_notifier);
void unregister_xenstore_notifier(struct notifier_block *nb)
-@@ -660,51 +860,269 @@ void unregister_xenstore_notifier(struct
+@@ -660,51 +860,297 @@ void unregister_xenstore_notifier(struct
blocking_notifier_chain_unregister(&xenstore_chain, nb);
}
EXPORT_SYMBOL_GPL(unregister_xenstore_notifier);
+#endif
+
+-void xenbus_probe(struct work_struct *unused)
++#ifndef CONFIG_XEN
++static DECLARE_WAIT_QUEUE_HEAD(backend_state_wq);
++static int backend_state;
+
-+#ifdef CONFIG_CRASH_DUMP
-+static DECLARE_WAIT_QUEUE_HEAD(be_state_wq);
-+static int be_state;
++static void xenbus_reset_backend_state_changed(struct xenbus_watch *w,
++ const char **v, unsigned int l)
+ {
+- xenstored_ready = 1;
++ if (xenbus_scanf(XBT_NIL, v[XS_WATCH_PATH], "", "%i", &backend_state) != 1)
++ backend_state = XenbusStateUnknown;
++ printk(KERN_DEBUG "XENBUS: backend %s %s\n",
++ v[XS_WATCH_PATH], xenbus_strstate(backend_state));
++ wake_up(&backend_state_wq);
++}
+
-+static void xenbus_reset_state_changed(struct xenbus_watch *w, const char **v, unsigned int l)
++static void xenbus_reset_wait_for_backend(char *be, int expected)
+{
-+ if (xenbus_scanf(XBT_NIL, v[XS_WATCH_PATH], "", "%i", &be_state) != 1)
-+ be_state = XenbusStateUnknown;
-+ printk(KERN_INFO "XENBUS: %s %s\n", v[XS_WATCH_PATH], xenbus_strstate(be_state));
-+ wake_up(&be_state_wq);
++ long timeout;
++ timeout = wait_event_interruptible_timeout(backend_state_wq,
++ backend_state == expected, 5 * HZ);
++ if (timeout <= 0)
++ printk(KERN_INFO "XENBUS: backend %s timed out.\n", be);
+}
+
-+static int xenbus_reset_check_final(int *st)
++/*
++ * Reset frontend if it is in Connected or Closed state.
++ * Wait for backend to catch up.
++ * State Connected happens during kdump, Closed after kexec.
++ */
++static void xenbus_reset_frontend(char *fe, char *be, int be_state)
+{
-+ return *st == XenbusStateInitialising || *st == XenbusStateInitWait;
-+}
-
--void xenbus_probe(struct work_struct *unused)
-+static void xenbus_reset_frontend_state(char *backend, char *frontend)
- {
-- xenstored_ready = 1;
-+ struct xenbus_watch watch;
++ struct xenbus_watch be_watch;
++
++ printk(KERN_DEBUG "XENBUS: backend %s %s\n",
++ be, xenbus_strstate(be_state));
+
-+ memset(&watch, 0, sizeof(watch));
-+ watch.node = kasprintf(GFP_NOIO | __GFP_HIGH, "%s/state", backend);
-+ if (!watch.node)
++ memset(&be_watch, 0, sizeof(be_watch));
++ be_watch.node = kasprintf(GFP_NOIO | __GFP_HIGH, "%s/state", be);
++ if (!be_watch.node)
+ return;
+
-+ watch.callback = xenbus_reset_state_changed;
-+ be_state = XenbusStateUnknown;
++ be_watch.callback = xenbus_reset_backend_state_changed;
++ backend_state = XenbusStateUnknown;
+
-+ printk(KERN_INFO "XENBUS: triggering reconnect on %s\n", backend);
-+ register_xenbus_watch(&watch);
++ printk(KERN_INFO "XENBUS: triggering reconnect on %s\n", be);
++ register_xenbus_watch(&be_watch);
+
-+ xenbus_printf(XBT_NIL, frontend, "state", "%d", XenbusStateClosing);
-+ wait_event_interruptible(be_state_wq, be_state == XenbusStateClosing);
++ /* fall through to forward backend to state XenbusStateInitialising */
++ switch (be_state) {
++ case XenbusStateConnected:
++ xenbus_printf(XBT_NIL, fe, "state", "%d", XenbusStateClosing);
++ xenbus_reset_wait_for_backend(be, XenbusStateClosing);
+
-+ xenbus_printf(XBT_NIL, frontend, "state", "%d", XenbusStateClosed);
-+ wait_event_interruptible(be_state_wq, be_state == XenbusStateClosed);
++ case XenbusStateClosing:
++ xenbus_printf(XBT_NIL, fe, "state", "%d", XenbusStateClosed);
++ xenbus_reset_wait_for_backend(be, XenbusStateClosed);
+
-+ xenbus_printf(XBT_NIL, frontend, "state", "%d", XenbusStateInitialising);
-+ wait_event_interruptible(be_state_wq, xenbus_reset_check_final(&be_state));
++ case XenbusStateClosed:
++ xenbus_printf(XBT_NIL, fe, "state", "%d", XenbusStateInitialising);
++ xenbus_reset_wait_for_backend(be, XenbusStateInitWait);
++ }
+
-+ unregister_xenbus_watch(&watch);
-+ printk(KERN_INFO "XENBUS: reconnect done on %s\n", backend);
-+ kfree(watch.node);
++ unregister_xenbus_watch(&be_watch);
++ printk(KERN_INFO "XENBUS: reconnect done on %s\n", be);
++ kfree(be_watch.node);
+}
+
-+static void xenbus_reset_check_state(char *class, char *dev)
++static void xenbus_check_frontend(char *class, char *dev)
+{
-+ int state, err;
++ int be_state, fe_state, err;
+ char *backend, *frontend;
+
+ frontend = kasprintf(GFP_NOIO | __GFP_HIGH, "device/%s/%s", class, dev);
+ if (!frontend)
+ return;
+
-+ err = xenbus_scanf(XBT_NIL, frontend, "state", "%i", &state);
-+ /* frontend connected? */
-+ if (err == 1 && state == XenbusStateConnected) {
++ err = xenbus_scanf(XBT_NIL, frontend, "state", "%i", &fe_state);
++ if (err != 1)
++ goto out;
++
++ switch (fe_state) {
++ case XenbusStateConnected:
++ case XenbusStateClosed:
++ printk(KERN_DEBUG "XENBUS: frontend %s %s\n",
++ frontend, xenbus_strstate(fe_state));
+ backend = xenbus_read(XBT_NIL, frontend, "backend", NULL);
+ if (!backend || IS_ERR(backend))
+ goto out;
-+ err = xenbus_scanf(XBT_NIL, backend, "state", "%i", &state);
-+ /* backend connected? */
-+ if (err == 1 && state == XenbusStateConnected)
-+ xenbus_reset_frontend_state(backend, frontend);
++ err = xenbus_scanf(XBT_NIL, backend, "state", "%i", &be_state);
++ if (err == 1)
++ xenbus_reset_frontend(frontend, backend, be_state);
+ kfree(backend);
++ break;
++ default:
++ break;
+ }
+out:
+ kfree(frontend);
@@ -1630,7 +1658,7 @@ Acked-by: jbeulich@novell.com
+ if (IS_ERR(dev))
+ continue;
+ for (j = 0; j < dev_n; j++)
-+ xenbus_reset_check_state(devclass[i], dev[j]);
++ xenbus_check_frontend(devclass[i], dev[j]);
+ kfree(dev);
+ }
+ kfree(devclass);
@@ -1641,11 +1669,11 @@ Acked-by: jbeulich@novell.com
+{
+ BUG_ON(!is_xenstored_ready());
+
-+#ifdef CONFIG_CRASH_DUMP
-+ /* reset devices in XenbusStateConnected state */
-+ if (!is_initial_xendomain() && reset_devices)
-+ xenbus_reset_state();
++#ifndef CONFIG_XEN
++ /* reset devices in Connected or Closed state */
++ xenbus_reset_state();
+#endif
++
+ /* Enumerate devices in xenstore and watch for changes. */
+ xenbus_probe_devices(&xenbus_frontend);
+ register_xenbus_watch(&fe_watch);
@@ -1716,8 +1744,7 @@ Acked-by: jbeulich@novell.com
+ *eof = 1;
+ return len;
+}
-
--static int __init xenbus_init(void)
++
+static int xsd_port_read(char *page, char **start, off_t off,
+ int count, int *eof, void *data)
+{
@@ -1773,7 +1800,8 @@ Acked-by: jbeulich@novell.com
+ goto fail1;
+
+ return 0;
-+
+
+-static int __init xenbus_init(void)
+fail1:
+ rc2 = xb_free_port(xen_store_evtchn);
+ if (rc2 != 0)
@@ -1823,7 +1851,7 @@ Acked-by: jbeulich@novell.com
xen_store_mfn = xen_start_info->store_mfn =
pfn_to_mfn(virt_to_phys((void *)page) >>
-@@ -712,63 +1130,226 @@ static int __init xenbus_init(void)
+@@ -712,63 +1158,226 @@ static int __init xenbus_init(void)
/* Next allocate a local port which xenstored can bind to */
alloc_unbound.dom = DOMID_SELF;
@@ -1912,13 +1940,13 @@ Acked-by: jbeulich@novell.com
+ }
}
+ xenbus_backend_device_register();
-+
+
+-#ifdef CONFIG_XEN_COMPAT_XENFS
+ if (!is_initial_xendomain())
+ xenbus_probe(NULL);
+
+ return 0;
-
--#ifdef CONFIG_XEN_COMPAT_XENFS
++
+ err:
/*
- * Create xenfs mountpoint in /proc for compatibility with
@@ -2080,8 +2108,8 @@ Acked-by: jbeulich@novell.com
+ return bus_for_each_dev(&xenbus_frontend.bus, NULL, arg, fn);
+}
+EXPORT_SYMBOL_GPL(xenbus_for_each_frontend);
---- head-2011-09-07.orig/drivers/xen/xenbus/xenbus_probe.h 2011-09-07 13:56:36.000000000 +0200
-+++ head-2011-09-07/drivers/xen/xenbus/xenbus_probe.h 2011-09-07 15:18:14.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/xenbus/xenbus_probe.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/xen/xenbus/xenbus_probe.h 2011-09-07 15:18:14.000000000 +0200
@@ -34,47 +34,47 @@
#ifndef _XENBUS_PROBE_H
#define _XENBUS_PROBE_H
@@ -2153,8 +2181,8 @@ Acked-by: jbeulich@novell.com
+extern void dev_changed(const char *node, struct xen_bus_type *bus);
#endif
---- head-2011-09-07.orig/drivers/xen/xenbus/xenbus_probe_backend.c 2011-09-07 13:56:36.000000000 +0200
-+++ head-2011-09-07/drivers/xen/xenbus/xenbus_probe_backend.c 2011-09-07 15:18:19.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/xenbus/xenbus_probe_backend.c 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/xen/xenbus/xenbus_probe_backend.c 2011-09-07 15:18:19.000000000 +0200
@@ -33,7 +33,7 @@
#define DPRINTK(fmt, args...) \
@@ -2464,8 +2492,8 @@ Acked-by: jbeulich@novell.com
}
-subsys_initcall(xenbus_probe_backend_init);
+EXPORT_SYMBOL_GPL(xenbus_for_each_backend);
---- head-2011-09-07.orig/drivers/xen/xenbus/xenbus_xs.c 2010-10-20 22:30:22.000000000 +0200
-+++ head-2011-09-07/drivers/xen/xenbus/xenbus_xs.c 2011-06-30 15:37:44.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/xenbus/xenbus_xs.c 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/drivers/xen/xenbus/xenbus_xs.c 2011-10-07 10:44:29.000000000 +0200
@@ -47,6 +47,14 @@
#include <xen/xenbus.h>
#include "xenbus_comms.h"
@@ -2537,7 +2565,35 @@ Acked-by: jbeulich@novell.com
return ret;
}
-@@ -657,6 +664,8 @@ void unregister_xenbus_watch(struct xenb
+@@ -620,6 +627,17 @@ static struct xenbus_watch *find_watch(c
+ return NULL;
+ }
+
++static void xs_reset_watches(void)
++{
++#ifndef CONFIG_XEN
++ int err;
++
++ err = xs_error(xs_single(XBT_NIL, XS_RESET_WATCHES, "", NULL));
++ if (err && err != -EEXIST)
++ printk(KERN_WARNING "xs_reset_watches failed: %d\n", err);
++#endif
++}
++
+ /* Register callback to watch this node. */
+ int register_xenbus_watch(struct xenbus_watch *watch)
+ {
+@@ -638,8 +656,7 @@ int register_xenbus_watch(struct xenbus_
+
+ err = xs_watch(watch->node, token);
+
+- /* Ignore errors due to multiple registration. */
+- if ((err != 0) && (err != -EEXIST)) {
++ if (err) {
+ spin_lock(&watches_lock);
+ list_del(&watch->list);
+ spin_unlock(&watches_lock);
+@@ -657,6 +674,8 @@ void unregister_xenbus_watch(struct xenb
char token[sizeof(watch) * 2 + 1];
int err;
@@ -2546,7 +2602,7 @@ Acked-by: jbeulich@novell.com
sprintf(token, "%lX", (long)watch);
down_read(&xs_state.watch_mutex);
-@@ -674,11 +683,6 @@ void unregister_xenbus_watch(struct xenb
+@@ -674,11 +693,6 @@ void unregister_xenbus_watch(struct xenb
up_read(&xs_state.watch_mutex);
@@ -2558,7 +2614,7 @@ Acked-by: jbeulich@novell.com
/* Cancel pending watch events. */
spin_lock(&watch_events_lock);
list_for_each_entry_safe(msg, tmp, &watch_events, list) {
-@@ -690,8 +694,11 @@ void unregister_xenbus_watch(struct xenb
+@@ -690,8 +704,11 @@ void unregister_xenbus_watch(struct xenb
}
spin_unlock(&watch_events_lock);
@@ -2571,7 +2627,7 @@ Acked-by: jbeulich@novell.com
}
EXPORT_SYMBOL_GPL(unregister_xenbus_watch);
-@@ -708,8 +715,6 @@ void xs_resume(void)
+@@ -708,8 +725,6 @@ void xs_resume(void)
struct xenbus_watch *watch;
char token[sizeof(watch) * 2 + 1];
@@ -2580,7 +2636,7 @@ Acked-by: jbeulich@novell.com
mutex_unlock(&xs_state.response_mutex);
mutex_unlock(&xs_state.request_mutex);
transaction_resume();
-@@ -731,11 +736,30 @@ void xs_suspend_cancel(void)
+@@ -731,11 +746,30 @@ void xs_suspend_cancel(void)
mutex_unlock(&xs_state.transaction_mutex);
}
@@ -2611,7 +2667,7 @@ Acked-by: jbeulich@novell.com
for (;;) {
wait_event_interruptible(watch_events_waitq,
!list_empty(&watch_events));
-@@ -751,17 +775,29 @@ static int xenwatch_thread(void *unused)
+@@ -751,17 +785,29 @@ static int xenwatch_thread(void *unused)
list_del(ent);
spin_unlock(&watch_events_lock);
@@ -2650,7 +2706,7 @@ Acked-by: jbeulich@novell.com
}
return 0;
-@@ -855,6 +891,7 @@ static int xenbus_thread(void *unused)
+@@ -855,6 +901,7 @@ static int xenbus_thread(void *unused)
{
int err;
@@ -2658,7 +2714,7 @@ Acked-by: jbeulich@novell.com
for (;;) {
err = process_msg();
if (err)
-@@ -869,7 +906,6 @@ static int xenbus_thread(void *unused)
+@@ -869,7 +916,6 @@ static int xenbus_thread(void *unused)
int xs_init(void)
{
@@ -2666,7 +2722,7 @@ Acked-by: jbeulich@novell.com
struct task_struct *task;
INIT_LIST_HEAD(&xs_state.reply_list);
-@@ -883,11 +919,6 @@ int xs_init(void)
+@@ -883,11 +929,6 @@ int xs_init(void)
atomic_set(&xs_state.transaction_count, 0);
init_waitqueue_head(&xs_state.transaction_wq);
@@ -2678,8 +2734,17 @@ Acked-by: jbeulich@novell.com
task = kthread_run(xenwatch_thread, NULL, "xenwatch");
if (IS_ERR(task))
return PTR_ERR(task);
---- head-2011-09-07.orig/include/xen/balloon.h 2011-09-07 13:56:40.000000000 +0200
-+++ head-2011-09-07/include/xen/balloon.h 2007-06-12 13:14:19.000000000 +0200
+@@ -897,5 +938,8 @@ int xs_init(void)
+ if (IS_ERR(task))
+ return PTR_ERR(task);
+
++ /* shutdown watches for kexec boot */
++ xs_reset_watches();
++
+ return 0;
+ }
+--- head-2011-10-07.orig/include/xen/balloon.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/include/xen/balloon.h 2007-06-12 13:14:19.000000000 +0200
@@ -1,39 +1,57 @@
/******************************************************************************
- * Xen balloon functionality
@@ -2773,8 +2838,8 @@ Acked-by: jbeulich@novell.com
+#define balloon_unlock(__flags) spin_unlock_irqrestore(&balloon_lock, __flags)
+
+#endif /* __ASM_BALLOON_H__ */
---- head-2011-09-07.orig/include/xen/evtchn.h 2009-09-10 00:13:59.000000000 +0200
-+++ head-2011-09-07/include/xen/evtchn.h 2011-01-31 15:14:12.000000000 +0100
+--- head-2011-10-07.orig/include/xen/evtchn.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/include/xen/evtchn.h 2011-01-31 15:14:12.000000000 +0100
@@ -1,7 +1,11 @@
+#if defined(CONFIG_PARAVIRT_XEN) || !defined(__KERNEL__)
+#include "public/evtchn.h"
@@ -2950,8 +3015,8 @@ Acked-by: jbeulich@novell.com
-#endif /* __LINUX_PUBLIC_EVTCHN_H__ */
+#endif /* __ASM_EVTCHN_H__ */
+#endif /* CONFIG_PARAVIRT_XEN */
---- head-2011-09-07.orig/include/xen/hvm.h 2010-10-20 22:30:22.000000000 +0200
-+++ head-2011-09-07/include/xen/hvm.h 2011-01-31 15:14:12.000000000 +0100
+--- head-2011-10-07.orig/include/xen/hvm.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/include/xen/hvm.h 2011-01-31 15:14:12.000000000 +0100
@@ -3,9 +3,8 @@
#define XEN_HVM_H__
@@ -2981,8 +3046,8 @@ Acked-by: jbeulich@novell.com
- HVM_CALLBACK_VIA_TYPE_SHIFT | (x))
-
#endif /* XEN_HVM_H__ */
---- head-2011-09-07.orig/include/xen/interface/callback.h 2008-10-10 00:13:53.000000000 +0200
-+++ head-2011-09-07/include/xen/interface/callback.h 2011-01-31 15:14:12.000000000 +0100
+--- head-2011-10-07.orig/include/xen/interface/callback.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/include/xen/interface/callback.h 2011-01-31 15:14:12.000000000 +0100
@@ -86,6 +86,8 @@ struct callback_register {
uint16_t flags;
xen_callback_t address;
@@ -3005,8 +3070,8 @@ Acked-by: jbeulich@novell.com
+#endif
#endif /* __XEN_PUBLIC_CALLBACK_H__ */
---- head-2011-09-07.orig/include/xen/interface/elfnote.h 2011-05-19 06:06:34.000000000 +0200
-+++ head-2011-09-07/include/xen/interface/elfnote.h 2011-08-08 12:54:10.000000000 +0200
+--- head-2011-10-07.orig/include/xen/interface/elfnote.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/include/xen/interface/elfnote.h 2011-08-08 12:54:10.000000000 +0200
@@ -3,6 +3,24 @@
*
* Definitions used for the Xen ELF notes.
@@ -3160,8 +3225,8 @@ Acked-by: jbeulich@novell.com
#endif /* __XEN_PUBLIC_ELFNOTE_H__ */
/*
---- head-2011-09-07.orig/include/xen/interface/event_channel.h 2009-03-24 00:12:14.000000000 +0100
-+++ head-2011-09-07/include/xen/interface/event_channel.h 2011-01-31 15:14:12.000000000 +0100
+--- head-2011-10-07.orig/include/xen/interface/event_channel.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/include/xen/interface/event_channel.h 2011-01-31 15:14:12.000000000 +0100
@@ -3,6 +3,24 @@
*
* Event channels between domains.
@@ -3491,8 +3556,8 @@ Acked-by: jbeulich@novell.com
+DEFINE_XEN_GUEST_HANDLE(evtchn_op_t);
#endif /* __XEN_PUBLIC_EVENT_CHANNEL_H__ */
---- head-2011-09-07.orig/include/xen/interface/features.h 2011-01-05 01:50:19.000000000 +0100
-+++ head-2011-09-07/include/xen/interface/features.h 2011-08-08 12:54:10.000000000 +0200
+--- head-2011-10-07.orig/include/xen/interface/features.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/include/xen/interface/features.h 2011-08-08 12:54:10.000000000 +0200
@@ -3,6 +3,24 @@
*
* Feature flags, reported by XENVER_get_features.
@@ -3546,8 +3611,8 @@ Acked-by: jbeulich@novell.com
#define XENFEAT_NR_SUBMAPS 1
---- head-2011-09-07.orig/include/xen/interface/grant_table.h 2010-10-20 22:30:22.000000000 +0200
-+++ head-2011-09-07/include/xen/interface/grant_table.h 2011-01-31 15:14:12.000000000 +0100
+--- head-2011-10-07.orig/include/xen/interface/grant_table.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/include/xen/interface/grant_table.h 2011-01-31 15:14:12.000000000 +0100
@@ -85,12 +85,26 @@
*/
@@ -3955,8 +4020,8 @@ Acked-by: jbeulich@novell.com
}
#endif /* __XEN_PUBLIC_GRANT_TABLE_H__ */
---- head-2011-09-07.orig/include/xen/interface/hvm/hvm_op.h 2010-10-20 22:30:22.000000000 +0200
-+++ head-2011-09-07/include/xen/interface/hvm/hvm_op.h 2011-08-08 12:54:10.000000000 +0200
+--- head-2011-10-07.orig/include/xen/interface/hvm/hvm_op.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/include/xen/interface/hvm/hvm_op.h 2011-08-08 12:54:10.000000000 +0200
@@ -21,6 +21,9 @@
#ifndef __XEN_PUBLIC_HVM_HVM_OP_H__
#define __XEN_PUBLIC_HVM_HVM_OP_H__
@@ -4202,8 +4267,8 @@ Acked-by: jbeulich@novell.com
+#endif /* defined(__XEN__) || defined(__XEN_TOOLS__) */
+
#endif /* __XEN_PUBLIC_HVM_HVM_OP_H__ */
---- head-2011-09-07.orig/include/xen/interface/hvm/params.h 2010-10-20 22:30:22.000000000 +0200
-+++ head-2011-09-07/include/xen/interface/hvm/params.h 2011-08-08 12:54:10.000000000 +0200
+--- head-2011-10-07.orig/include/xen/interface/hvm/params.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/include/xen/interface/hvm/params.h 2011-08-08 12:54:10.000000000 +0200
@@ -33,11 +33,17 @@
* val[63:56] == 1: val[55:0] is a delivery PCI INTx line, as follows:
* Domain = val[47:32], Bus = val[31:16],
@@ -4283,8 +4348,8 @@ Acked-by: jbeulich@novell.com
+#define HVM_NR_PARAMS 26
#endif /* __XEN_PUBLIC_HVM_PARAMS_H__ */
---- head-2011-09-07.orig/include/xen/interface/io/blkif.h 2011-07-22 04:17:23.000000000 +0200
-+++ head-2011-09-07/include/xen/interface/io/blkif.h 2011-07-01 16:32:10.000000000 +0200
+--- head-2011-10-07.orig/include/xen/interface/io/blkif.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/include/xen/interface/io/blkif.h 2011-07-01 16:32:10.000000000 +0200
@@ -3,6 +3,24 @@
*
* Unified block-device I/O interface for Xen guest OSes.
@@ -4442,8 +4507,8 @@ Acked-by: jbeulich@novell.com
/*
* STATUS RETURN CODES.
---- head-2011-09-07.orig/include/xen/interface/io/console.h 2007-10-09 22:31:38.000000000 +0200
-+++ head-2011-09-07/include/xen/interface/io/console.h 2011-01-31 15:14:12.000000000 +0100
+--- head-2011-10-07.orig/include/xen/interface/io/console.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/include/xen/interface/io/console.h 2011-01-31 15:14:12.000000000 +0100
@@ -3,6 +3,24 @@
*
* Console I/O interface for Xen guest OSes.
@@ -4469,8 +4534,8 @@ Acked-by: jbeulich@novell.com
* Copyright (c) 2005, Keir Fraser
*/
---- head-2011-09-07.orig/include/xen/interface/io/fbif.h 2008-10-10 00:13:53.000000000 +0200
-+++ head-2011-09-07/include/xen/interface/io/fbif.h 2011-01-31 15:14:12.000000000 +0100
+--- head-2011-10-07.orig/include/xen/interface/io/fbif.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/include/xen/interface/io/fbif.h 2011-01-31 15:14:12.000000000 +0100
@@ -41,12 +41,13 @@
*/
#define XENFB_TYPE_UPDATE 2
@@ -4635,8 +4700,8 @@ Acked-by: jbeulich@novell.com
};
/*
---- head-2011-09-07.orig/include/xen/interface/io/kbdif.h 2008-10-10 00:13:53.000000000 +0200
-+++ head-2011-09-07/include/xen/interface/io/kbdif.h 2011-01-31 15:14:12.000000000 +0100
+--- head-2011-10-07.orig/include/xen/interface/io/kbdif.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/include/xen/interface/io/kbdif.h 2011-01-31 15:14:12.000000000 +0100
@@ -45,34 +45,38 @@
*/
#define XENKBD_TYPE_POS 4
@@ -4744,8 +4809,8 @@ Acked-by: jbeulich@novell.com
};
#endif
---- head-2011-09-07.orig/include/xen/interface/io/netif.h 2011-05-19 06:06:34.000000000 +0200
-+++ head-2011-09-07/include/xen/interface/io/netif.h 2011-01-31 15:14:12.000000000 +0100
+--- head-2011-10-07.orig/include/xen/interface/io/netif.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/include/xen/interface/io/netif.h 2011-01-31 15:14:12.000000000 +0100
@@ -3,6 +3,24 @@
*
* Unified network-device I/O interface for Xen guest OSes.
@@ -4988,8 +5053,8 @@ Acked-by: jbeulich@novell.com
+#define NETIF_RSP_NULL 1
#endif
---- head-2011-09-07.orig/include/xen/interface/io/protocols.h 2008-07-13 23:51:29.000000000 +0200
-+++ head-2011-09-07/include/xen/interface/io/protocols.h 2011-01-31 15:14:12.000000000 +0100
+--- head-2011-10-07.orig/include/xen/interface/io/protocols.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/include/xen/interface/io/protocols.h 2011-01-31 15:14:12.000000000 +0100
@@ -1,10 +1,31 @@
+/******************************************************************************
+ * protocols.h
@@ -5032,8 +5097,8 @@ Acked-by: jbeulich@novell.com
#else
# error arch fixup needed here
#endif
---- head-2011-09-07.orig/include/xen/interface/io/ring.h 2011-01-05 01:50:19.000000000 +0100
-+++ head-2011-09-07/include/xen/interface/io/ring.h 2011-01-31 15:14:12.000000000 +0100
+--- head-2011-10-07.orig/include/xen/interface/io/ring.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/include/xen/interface/io/ring.h 2011-01-31 15:14:12.000000000 +0100
@@ -3,16 +3,42 @@
*
* Shared producer-consumer ring macros.
@@ -5419,8 +5484,8 @@ Acked-by: jbeulich@novell.com
} while (0)
#endif /* __XEN_PUBLIC_IO_RING_H__ */
---- head-2011-09-07.orig/include/xen/interface/io/xenbus.h 2011-01-05 01:50:19.000000000 +0100
-+++ head-2011-09-07/include/xen/interface/io/xenbus.h 2011-01-31 15:14:12.000000000 +0100
+--- head-2011-10-07.orig/include/xen/interface/io/xenbus.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/include/xen/interface/io/xenbus.h 2011-01-31 15:14:12.000000000 +0100
@@ -36,6 +36,7 @@ enum xenbus_state
XenbusStateReconfigured = 8
@@ -5429,8 +5494,8 @@ Acked-by: jbeulich@novell.com
#endif /* _XEN_PUBLIC_IO_XENBUS_H */
---- head-2011-09-07.orig/include/xen/interface/io/xs_wire.h 2007-10-09 22:31:38.000000000 +0200
-+++ head-2011-09-07/include/xen/interface/io/xs_wire.h 2011-01-31 15:14:12.000000000 +0100
+--- head-2011-10-07.orig/include/xen/interface/io/xs_wire.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/include/xen/interface/io/xs_wire.h 2011-10-07 10:44:29.000000000 +0200
@@ -1,6 +1,25 @@
/*
* Details of the "wire" protocol between Xen Store Daemon and client
@@ -5457,7 +5522,7 @@ Acked-by: jbeulich@novell.com
* Copyright (C) 2005 Rusty Russell IBM Corporation
*/
-@@ -26,7 +45,10 @@ enum xsd_sockmsg_type
+@@ -26,7 +45,11 @@ enum xsd_sockmsg_type
XS_SET_PERMS,
XS_WATCH_EVENT,
XS_ERROR,
@@ -5465,11 +5530,12 @@ Acked-by: jbeulich@novell.com
+ XS_IS_DOMAIN_INTRODUCED,
+ XS_RESUME,
+ XS_SET_TARGET,
-+ XS_RESTRICT
++ XS_RESTRICT,
++ XS_RESET_WATCHES
};
#define XS_WRITE_NONE "NONE"
-@@ -39,8 +61,14 @@ struct xsd_errors
+@@ -39,8 +62,14 @@ struct xsd_errors
int errnum;
const char *errstring;
};
@@ -5485,7 +5551,7 @@ Acked-by: jbeulich@novell.com
XSD_ERROR(EINVAL),
XSD_ERROR(EACCES),
XSD_ERROR(EEXIST),
-@@ -56,6 +84,7 @@ static struct xsd_errors xsd_errors[] __
+@@ -56,6 +85,7 @@ static struct xsd_errors xsd_errors[] __
XSD_ERROR(EAGAIN),
XSD_ERROR(EISCONN)
};
@@ -5493,7 +5559,7 @@ Acked-by: jbeulich@novell.com
struct xsd_sockmsg
{
-@@ -84,4 +113,11 @@ struct xenstore_domain_interface {
+@@ -84,4 +114,11 @@ struct xenstore_domain_interface {
XENSTORE_RING_IDX rsp_cons, rsp_prod;
};
@@ -5505,8 +5571,8 @@ Acked-by: jbeulich@novell.com
+#define XENSTORE_REL_PATH_MAX 2048
+
#endif /* _XS_WIRE_H */
---- head-2011-09-07.orig/include/xen/interface/memory.h 2011-01-05 01:50:19.000000000 +0100
-+++ head-2011-09-07/include/xen/interface/memory.h 2011-01-31 15:14:12.000000000 +0100
+--- head-2011-10-07.orig/include/xen/interface/memory.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/include/xen/interface/memory.h 2011-01-31 15:14:12.000000000 +0100
@@ -3,13 +3,31 @@
*
* Memory reservation and information.
@@ -5767,8 +5833,8 @@ Acked-by: jbeulich@novell.com
+#define XENMEM_get_sharing_freed_pages 18
+
#endif /* __XEN_PUBLIC_MEMORY_H__ */
---- head-2011-09-07.orig/include/xen/interface/physdev.h 2011-01-05 01:50:19.000000000 +0100
-+++ head-2011-09-07/include/xen/interface/physdev.h 2011-03-17 13:50:24.000000000 +0100
+--- head-2011-10-07.orig/include/xen/interface/physdev.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/include/xen/interface/physdev.h 2011-10-07 10:44:29.000000000 +0200
@@ -21,6 +21,8 @@
#ifndef __XEN_PUBLIC_PHYSDEV_H__
#define __XEN_PUBLIC_PHYSDEV_H__
@@ -5845,7 +5911,7 @@ Acked-by: jbeulich@novell.com
/*
* Allocate or free a physical upcall vector for the specified IRQ line.
-@@ -105,6 +136,8 @@ struct physdev_irq {
+@@ -105,10 +136,13 @@ struct physdev_irq {
/* IN or OUT */
uint32_t vector;
};
@@ -5854,7 +5920,21 @@ Acked-by: jbeulich@novell.com
#define MAP_PIRQ_TYPE_MSI 0x0
#define MAP_PIRQ_TYPE_GSI 0x1
-@@ -128,6 +161,8 @@ struct physdev_map_pirq {
+ #define MAP_PIRQ_TYPE_UNKNOWN 0x2
++#define MAP_PIRQ_TYPE_MSI_SEG 0x3
+
+ #define PHYSDEVOP_map_pirq 13
+ struct physdev_map_pirq {
+@@ -119,7 +153,7 @@ struct physdev_map_pirq {
+ int index;
+ /* IN or OUT */
+ int pirq;
+- /* IN */
++ /* IN - high 16 bits hold segment for MAP_PIRQ_TYPE_MSI_SEG */
+ int bus;
+ /* IN */
+ int devfn;
+@@ -128,6 +162,8 @@ struct physdev_map_pirq {
/* IN */
uint64_t table_base;
};
@@ -5863,7 +5943,7 @@ Acked-by: jbeulich@novell.com
#define PHYSDEVOP_unmap_pirq 14
struct physdev_unmap_pirq {
-@@ -135,6 +170,8 @@ struct physdev_unmap_pirq {
+@@ -135,6 +171,8 @@ struct physdev_unmap_pirq {
/* IN */
int pirq;
};
@@ -5872,7 +5952,7 @@ Acked-by: jbeulich@novell.com
#define PHYSDEVOP_manage_pci_add 15
#define PHYSDEVOP_manage_pci_remove 16
-@@ -143,6 +180,17 @@ struct physdev_manage_pci {
+@@ -143,6 +181,17 @@ struct physdev_manage_pci {
uint8_t bus;
uint8_t devfn;
};
@@ -5890,7 +5970,7 @@ Acked-by: jbeulich@novell.com
#define PHYSDEVOP_manage_pci_add_ext 20
struct physdev_manage_pci_ext {
-@@ -156,6 +204,8 @@ struct physdev_manage_pci_ext {
+@@ -156,6 +205,8 @@ struct physdev_manage_pci_ext {
uint8_t devfn;
} physfn;
};
@@ -5899,7 +5979,7 @@ Acked-by: jbeulich@novell.com
/*
* Argument to physdev_op_compat() hypercall. Superceded by new physdev_op()
-@@ -171,6 +221,8 @@ struct physdev_op {
+@@ -171,6 +222,8 @@ struct physdev_op {
struct physdev_irq irq_op;
} u;
};
@@ -5908,7 +5988,7 @@ Acked-by: jbeulich@novell.com
#define PHYSDEVOP_setup_gsi 21
struct physdev_setup_gsi {
-@@ -181,12 +233,10 @@ struct physdev_setup_gsi {
+@@ -181,12 +234,10 @@ struct physdev_setup_gsi {
uint8_t polarity;
/* IN */
};
@@ -5924,18 +6004,66 @@ Acked-by: jbeulich@novell.com
/* type is MAP_PIRQ_TYPE_GSI or MAP_PIRQ_TYPE_MSI
* the hypercall returns a free pirq */
-@@ -198,6 +248,9 @@ struct physdev_get_free_pirq {
+@@ -198,6 +249,57 @@ struct physdev_get_free_pirq {
uint32_t pirq;
};
+typedef struct physdev_get_free_pirq physdev_get_free_pirq_t;
+DEFINE_XEN_GUEST_HANDLE(physdev_get_free_pirq_t);
+
++#define XEN_PCI_MMCFG_RESERVED 0x1
++
++#define PHYSDEVOP_pci_mmcfg_reserved 24
++struct physdev_pci_mmcfg_reserved {
++ uint64_t address;
++ uint16_t segment;
++ uint8_t start_bus;
++ uint8_t end_bus;
++ uint32_t flags;
++};
++typedef struct physdev_pci_mmcfg_reserved physdev_pci_mmcfg_reserved_t;
++DEFINE_XEN_GUEST_HANDLE(physdev_pci_mmcfg_reserved_t);
++
++#define XEN_PCI_DEV_EXTFN 0x1
++#define XEN_PCI_DEV_VIRTFN 0x2
++#define XEN_PCI_DEV_PXM 0x4
++
++#define PHYSDEVOP_pci_device_add 25
++struct physdev_pci_device_add {
++ /* IN */
++ uint16_t seg;
++ uint8_t bus;
++ uint8_t devfn;
++ uint32_t flags;
++ struct {
++ uint8_t bus;
++ uint8_t devfn;
++ } physfn;
++#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
++ uint32_t optarr[];
++#elif defined(__GNUC__)
++ uint32_t optarr[0];
++#endif
++};
++typedef struct physdev_pci_device_add physdev_pci_device_add_t;
++DEFINE_XEN_GUEST_HANDLE(physdev_pci_device_add_t);
++
++#define PHYSDEVOP_pci_device_remove 26
++#define PHYSDEVOP_restore_msi_ext 27
++struct physdev_pci_device {
++ /* IN */
++ uint16_t seg;
++ uint8_t bus;
++ uint8_t devfn;
++};
++typedef struct physdev_pci_device physdev_pci_device_t;
++DEFINE_XEN_GUEST_HANDLE(physdev_pci_device_t);
++
/*
* Notify that some PIRQ-bound event channels have been unmasked.
* ** This command is obsolete since interface version 0x00030202 and is **
---- head-2011-09-07.orig/include/xen/interface/sched.h 2011-05-19 06:06:34.000000000 +0200
-+++ head-2011-09-07/include/xen/interface/sched.h 2011-01-31 15:14:12.000000000 +0100
+--- head-2011-10-07.orig/include/xen/interface/sched.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/include/xen/interface/sched.h 2011-01-31 15:14:12.000000000 +0100
@@ -3,6 +3,24 @@
*
* Scheduler state interactions
@@ -6025,8 +6153,8 @@ Acked-by: jbeulich@novell.com
/*
* Reason codes for SCHEDOP_shutdown. These may be interpreted by control
---- head-2011-09-07.orig/include/xen/interface/vcpu.h 2008-07-13 23:51:29.000000000 +0200
-+++ head-2011-09-07/include/xen/interface/vcpu.h 2011-03-17 13:50:24.000000000 +0100
+--- head-2011-10-07.orig/include/xen/interface/vcpu.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/include/xen/interface/vcpu.h 2011-03-17 13:50:24.000000000 +0100
@@ -27,11 +27,13 @@
#ifndef __XEN_PUBLIC_VCPU_H__
#define __XEN_PUBLIC_VCPU_H__
@@ -6262,8 +6390,8 @@ Acked-by: jbeulich@novell.com
+DEFINE_XEN_GUEST_HANDLE(vcpu_register_time_memory_area_t);
#endif /* __XEN_PUBLIC_VCPU_H__ */
---- head-2011-09-07.orig/include/xen/interface/version.h 2009-09-10 00:13:59.000000000 +0200
-+++ head-2011-09-07/include/xen/interface/version.h 2011-01-31 15:14:12.000000000 +0100
+--- head-2011-10-07.orig/include/xen/interface/version.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/include/xen/interface/version.h 2011-01-31 15:14:12.000000000 +0100
@@ -3,6 +3,24 @@
*
* Xen version, type, and compile information.
@@ -6358,8 +6486,8 @@ Acked-by: jbeulich@novell.com
+typedef char xen_commandline_t[1024];
+
#endif /* __XEN_PUBLIC_VERSION_H__ */
---- head-2011-09-07.orig/include/xen/interface/xen.h 2011-09-07 13:56:40.000000000 +0200
-+++ head-2011-09-07/include/xen/interface/xen.h 2011-09-07 15:18:35.000000000 +0200
+--- head-2011-10-07.orig/include/xen/interface/xen.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/include/xen/interface/xen.h 2011-09-07 15:18:35.000000000 +0200
@@ -3,35 +3,69 @@
*
* Guest OS interface to Xen.
@@ -7225,8 +7353,8 @@ Acked-by: jbeulich@novell.com
+#endif /* defined(__XEN__) || defined(__XEN_TOOLS__) */
+
#endif /* __XEN_PUBLIC_XEN_H__ */
---- head-2011-09-07.orig/include/xen/xenbus.h 2011-09-07 13:56:40.000000000 +0200
-+++ head-2011-09-07/include/xen/xenbus.h 2011-06-30 15:37:44.000000000 +0200
+--- head-2011-10-07.orig/include/xen/xenbus.h 2011-10-07 10:46:17.000000000 +0200
++++ head-2011-10-07/include/xen/xenbus.h 2011-06-30 15:37:44.000000000 +0200
@@ -39,7 +39,7 @@
#include <linux/mutex.h>
#include <linux/completion.h>
diff --git a/patches.xen/xen3-patch-2.6.18 b/patches.xen/xen3-patch-2.6.18
index 3ffca40a4a..94d1f93722 100644
--- a/patches.xen/xen3-patch-2.6.18
+++ b/patches.xen/xen3-patch-2.6.18
@@ -423,29 +423,6 @@ Acked-by: jbeulich@novell.com
timer_name[cpu],
NULL);
if (irq < 0)
---- head-2011-09-07.orig/arch/x86/mm/fault_64-xen.c 2010-09-23 15:39:04.000000000 +0200
-+++ head-2011-09-07/arch/x86/mm/fault_64-xen.c 2011-08-15 10:44:03.000000000 +0200
-@@ -146,7 +146,8 @@ static noinline int is_prefetch(struct p
- /* Could check the LDT for lm, but for now it's good
- enough to assume that long mode only uses well known
- segments or kernel. */
-- scan_more = (!user_mode(regs)) || (regs->cs == __USER_CS);
-+ scan_more = (!user_mode(regs)) || (regs->cs == __USER_CS)
-+ || (regs->cs == FLAT_USER_CS64);
- break;
-
- case 0x60:
-@@ -575,8 +576,8 @@ bad_area_nosemaphore:
- these addresses are not reachable. Just detect this
- case and return. Any code segment in LDT is
- compatibility mode. */
-- if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) &&
-- (address >> 32))
-+ if ((regs->cs == __USER32_CS || regs->cs == FLAT_USER_CS32 ||
-+ (regs->cs & (1<<2))) && (address >> 32))
- return;
-
- if (exception_trace && unhandled_signal(tsk, SIGSEGV)) {
--- head-2011-09-07.orig/arch/x86/pci/irq.c 2011-07-22 04:17:23.000000000 +0200
+++ head-2011-09-07/arch/x86/pci/irq.c 2011-08-09 10:33:29.000000000 +0200
@@ -94,13 +94,18 @@ static struct irq_routing_table * __init
diff --git a/patches.xen/xen3-patch-2.6.19 b/patches.xen/xen3-patch-2.6.19
index 89a413e39c..e686d8b734 100644
--- a/patches.xen/xen3-patch-2.6.19
+++ b/patches.xen/xen3-patch-2.6.19
@@ -8,8 +8,8 @@ Acked-by: jbeulich@novell.com
3.1/arch/x86/kernel/step.c (now using user_64bit_mode())
---- head-2011-09-07.orig/arch/x86/Kconfig 2011-09-07 15:20:13.000000000 +0200
-+++ head-2011-09-07/arch/x86/Kconfig 2011-09-07 15:22:25.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/Kconfig 2011-09-07 15:20:13.000000000 +0200
++++ head-2011-10-07/arch/x86/Kconfig 2011-09-07 15:22:25.000000000 +0200
@@ -551,6 +551,7 @@ config SCHED_OMIT_FRAME_POINTER
menuconfig PARAVIRT_GUEST
@@ -18,8 +18,8 @@ Acked-by: jbeulich@novell.com
---help---
Say Y here to get to see options related to running Linux under
various hypervisors. This option alone does not add any kernel code.
---- head-2011-09-07.orig/arch/x86/kernel/acpi/boot.c 2011-09-07 13:56:42.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/acpi/boot.c 2011-04-13 12:23:45.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/kernel/acpi/boot.c 2011-10-07 16:56:11.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/acpi/boot.c 2011-04-13 12:23:45.000000000 +0200
@@ -70,8 +70,12 @@ int acpi_strict;
u8 acpi_sci_flags __initdata;
@@ -72,8 +72,8 @@ Acked-by: jbeulich@novell.com
static int __init parse_acpi_skip_timer_override(char *arg)
{
acpi_skip_timer_override = 1;
---- head-2011-09-07.orig/arch/x86/kernel/apic/apic-xen.c 2007-06-12 13:12:48.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/apic/apic-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/apic/apic-xen.c 2007-06-12 13:12:48.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/apic/apic-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -54,7 +54,6 @@ static cpumask_t timer_bcast_ipi;
/*
* Knob to control our willingness to enable the local APIC.
@@ -114,8 +114,8 @@ Acked-by: jbeulich@novell.com
#endif
}
}
---- head-2011-09-07.orig/arch/x86/kernel/cpu/common-xen.c 2009-05-19 09:16:41.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/cpu/common-xen.c 2009-05-19 09:16:41.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -43,7 +43,7 @@ struct cpu_dev * cpu_devs[X86_VENDOR_NUM
extern int disable_pse;
@@ -179,8 +179,8 @@ Acked-by: jbeulich@novell.com
/* Clear all 6 debug registers: */
set_debugreg(0, 0);
---- head-2011-09-07.orig/arch/x86/kernel/cpu/mcheck/mce_dom0.c 2011-08-15 10:44:07.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/cpu/mcheck/mce_dom0.c 2011-08-15 10:44:20.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/kernel/cpu/mcheck/mce_dom0.c 2011-08-15 10:44:07.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/cpu/mcheck/mce_dom0.c 2011-08-15 10:44:20.000000000 +0200
@@ -53,8 +53,7 @@ static struct mc_info *g_mi;
/*dom0 mce virq handler, logging physical mce error info*/
@@ -199,8 +199,8 @@ Acked-by: jbeulich@novell.com
+ mce_dom0_interrupt(VIRQ_MCA, NULL);
}
---- head-2011-09-07.orig/arch/x86/kernel/entry_32-xen.S 2009-05-19 09:16:41.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/entry_32-xen.S 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/entry_32-xen.S 2009-05-19 09:16:41.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/entry_32-xen.S 2011-01-31 17:29:16.000000000 +0100
@@ -80,8 +80,12 @@ VM_MASK = 0x00020000
NMI_MASK = 0x80000000
@@ -587,8 +587,8 @@ Acked-by: jbeulich@novell.com
.section .rodata,"a"
#include "syscall_table.S"
---- head-2011-09-07.orig/arch/x86/kernel/head_32-xen.S 2011-08-08 12:54:10.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/head_32-xen.S 2011-08-09 10:35:35.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/kernel/head_32-xen.S 2011-08-08 12:54:10.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/head_32-xen.S 2011-08-09 10:35:35.000000000 +0200
@@ -63,7 +63,7 @@ ENTRY(startup_32)
movl %eax,%gs
cld # gcc2 wants the direction flag cleared at all times
@@ -598,8 +598,8 @@ Acked-by: jbeulich@novell.com
jmp start_kernel
#define HYPERCALL_PAGE_OFFSET 0x1000
---- head-2011-09-07.orig/arch/x86/kernel/io_apic_32-xen.c 2009-03-18 10:39:31.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/io_apic_32-xen.c 2009-03-18 10:39:31.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -31,6 +31,9 @@
#include <linux/acpi.h>
#include <linux/module.h>
@@ -1679,8 +1679,8 @@ Acked-by: jbeulich@novell.com
+ return 0;
+}
+early_param("noapic", parse_noapic);
---- head-2011-09-07.orig/arch/x86/kernel/ldt_32-xen.c 2007-06-12 13:12:48.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/ldt_32-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/ldt_32-xen.c 2007-06-12 13:12:48.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/ldt_32-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * linux/kernel/ldt.c
@@ -1688,8 +1688,8 @@ Acked-by: jbeulich@novell.com
*
* Copyright (C) 1992 Krishna Balasubramanian and Linus Torvalds
* Copyright (C) 1999 Ingo Molnar <mingo@redhat.com>
---- head-2011-09-07.orig/arch/x86/kernel/microcode-xen.c 2007-06-12 13:12:48.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/microcode-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/microcode-xen.c 2007-06-12 13:12:48.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/microcode-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -2,6 +2,7 @@
* Intel CPU Microcode Update Driver for Linux
*
@@ -1825,8 +1825,8 @@ Acked-by: jbeulich@novell.com
module_init(microcode_init)
module_exit(microcode_exit)
-MODULE_ALIAS_MISCDEV(MICROCODE_MINOR);
---- head-2011-09-07.orig/arch/x86/kernel/mpparse_32-xen.c 2007-06-12 13:12:48.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/mpparse_32-xen.c 2007-06-12 13:12:48.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -30,6 +30,7 @@
#include <asm/io_apic.h>
@@ -1993,8 +1993,8 @@ Acked-by: jbeulich@novell.com
/*
* Mapping between Global System Interrups, which
* represent all possible interrupts, and IRQs
---- head-2011-09-07.orig/arch/x86/kernel/pci-dma-xen.c 2009-11-06 10:23:23.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/pci-dma-xen.c 2009-11-06 10:23:23.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -110,8 +110,7 @@ dma_map_sg(struct device *hwdev, struct
{
int i, rc;
@@ -2053,8 +2053,8 @@ Acked-by: jbeulich@novell.com
if (swiotlb)
swiotlb_unmap_single(dev, dma_addr, size, direction);
else
---- head-2011-09-07.orig/arch/x86/kernel/process_32-xen.c 2008-07-21 11:00:32.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/process_32-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/process_32-xen.c 2008-07-21 11:00:32.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/process_32-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -37,6 +37,7 @@
#include <linux/kallsyms.h>
#include <linux/ptrace.h>
@@ -2144,8 +2144,8 @@ Acked-by: jbeulich@novell.com
sp -= get_random_int() % 8192;
return sp & ~0xf;
}
---- head-2011-09-07.orig/arch/x86/kernel/setup_32-xen.c 2008-04-22 15:41:51.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/setup_32-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/setup_32-xen.c 2008-04-22 15:41:51.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/setup_32-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -56,6 +56,7 @@
#include <asm/apic.h>
#include <asm/e820.h>
@@ -2720,8 +2720,8 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_ACPI
acpi_boot_init();
---- head-2011-09-07.orig/arch/x86/kernel/smp_32-xen.c 2007-12-10 08:47:31.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/smp_32-xen.c 2007-12-10 08:47:31.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -279,8 +279,7 @@ static inline void leave_mm (unsigned lo
* 2) Leave the mm if we are in the lazy tlb mode.
*/
@@ -2821,8 +2821,8 @@ Acked-by: jbeulich@novell.com
+ return 0;
+}
+EXPORT_SYMBOL(smp_call_function_single);
---- head-2011-09-07.orig/arch/x86/kernel/time-xen.c 2011-07-12 11:09:48.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/time-xen.c 2011-07-12 11:10:26.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/kernel/time-xen.c 2011-07-12 11:09:48.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/time-xen.c 2011-07-12 11:10:26.000000000 +0200
@@ -88,7 +88,6 @@ int pit_latch_buggy; /* ext
unsigned long vxtime_hz = PIT_TICK_RATE;
struct vxtime_data __vxtime __section_vxtime; /* for vsyscalls */
@@ -3006,8 +3006,8 @@ Acked-by: jbeulich@novell.com
if ((hpet_enable() >= 0) && hpet_use_timer) {
printk("Using HPET for base-timer\n");
---- head-2011-09-07.orig/arch/x86/kernel/traps_32-xen.c 2008-04-02 12:34:02.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/traps_32-xen.c 2008-04-02 12:34:02.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -28,6 +28,7 @@
#include <linux/kprobes.h>
#include <linux/kexec.h>
@@ -3454,8 +3454,8 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_KPROBES
fastcall void __kprobes do_int3(struct pt_regs *regs, long error_code)
{
---- head-2011-09-07.orig/arch/x86/mach-xen/setup.c 2011-09-07 14:16:54.000000000 +0200
-+++ head-2011-09-07/arch/x86/mach-xen/setup.c 2011-08-09 10:35:06.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/mach-xen/setup.c 2011-09-07 14:16:54.000000000 +0200
++++ head-2011-10-07/arch/x86/mach-xen/setup.c 2011-08-09 10:35:06.000000000 +0200
@@ -102,8 +102,10 @@ void __init pre_setup_arch_hook(void)
setup_xen_features();
@@ -3469,8 +3469,8 @@ Acked-by: jbeulich@novell.com
if (HYPERVISOR_memory_op(XENMEM_machphys_mapping, &mapping) == 0) {
machine_to_phys_mapping = (unsigned long *)mapping.v_start;
---- head-2011-09-07.orig/arch/x86/mm/fault_32-xen.c 2010-09-23 15:39:04.000000000 +0200
-+++ head-2011-09-07/arch/x86/mm/fault_32-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/mm/fault_32-xen.c 2010-09-23 15:39:04.000000000 +0200
++++ head-2011-10-07/arch/x86/mm/fault_32-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -27,21 +27,24 @@
#include <asm/uaccess.h>
#include <asm/desc.h>
@@ -3557,8 +3557,8 @@ Acked-by: jbeulich@novell.com
yield();
down_read(&mm->mmap_sem);
goto survive;
---- head-2011-09-07.orig/arch/x86/mm/highmem_32-xen.c 2008-10-29 09:55:56.000000000 +0100
-+++ head-2011-09-07/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/mm/highmem_32-xen.c 2008-10-29 09:55:56.000000000 +0100
++++ head-2011-10-07/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -38,11 +38,9 @@ static void *__kmap_atomic(struct page *
idx = type + KM_TYPE_NR*smp_processor_id();
@@ -3625,8 +3625,8 @@ Acked-by: jbeulich@novell.com
return (void*) vaddr;
}
---- head-2011-09-07.orig/arch/x86/mm/hypervisor.c 2011-08-08 12:54:10.000000000 +0200
-+++ head-2011-09-07/arch/x86/mm/hypervisor.c 2011-08-09 10:35:46.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/mm/hypervisor.c 2011-08-08 12:54:10.000000000 +0200
++++ head-2011-10-07/arch/x86/mm/hypervisor.c 2011-08-09 10:35:46.000000000 +0200
@@ -31,6 +31,7 @@
*/
@@ -3962,8 +3962,8 @@ Acked-by: jbeulich@novell.com
if (++i == MAX_BATCHED_FULL_PTES) {
if ((rc = HYPERVISOR_mmu_update(
&u[0], i, NULL, DOMID_SELF)) != 0)
---- head-2011-09-07.orig/arch/x86/mm/init_32-xen.c 2008-10-29 09:55:56.000000000 +0100
-+++ head-2011-09-07/arch/x86/mm/init_32-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/mm/init_32-xen.c 2008-10-29 09:55:56.000000000 +0100
++++ head-2011-10-07/arch/x86/mm/init_32-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -313,8 +313,7 @@ static void __init permanent_kmaps_init(
static void __meminit free_new_highpage(struct page *page, int pfn)
{
@@ -4142,8 +4142,8 @@ Acked-by: jbeulich@novell.com
unsigned long start_pfn = start >> PAGE_SHIFT;
unsigned long nr_pages = size >> PAGE_SHIFT;
---- head-2011-09-07.orig/arch/x86/mm/ioremap-xen.c 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-09-07/arch/x86/mm/ioremap-xen.c 2011-02-07 15:37:37.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/mm/ioremap-xen.c 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/arch/x86/mm/ioremap-xen.c 2011-02-07 15:37:37.000000000 +0100
@@ -12,7 +12,7 @@
#include <linux/init.h>
#include <linux/slab.h>
@@ -4191,8 +4191,8 @@ Acked-by: jbeulich@novell.com
vunmap((void __force *) addr);
return NULL;
}
---- head-2011-09-07.orig/arch/x86/mm/pgtable_32-xen.c 2010-09-23 15:39:04.000000000 +0200
-+++ head-2011-09-07/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/mm/pgtable_32-xen.c 2010-09-23 15:39:04.000000000 +0200
++++ head-2011-10-07/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -68,7 +68,9 @@ void show_mem(void)
printk(KERN_INFO "%lu pages writeback\n",
global_page_state(NR_WRITEBACK));
@@ -4248,8 +4248,8 @@ Acked-by: jbeulich@novell.com
}
pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
---- head-2011-09-07.orig/arch/x86/ia32/ia32entry-xen.S 2008-04-02 12:34:02.000000000 +0200
-+++ head-2011-09-07/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/ia32/ia32entry-xen.S 2008-04-02 12:34:02.000000000 +0200
++++ head-2011-10-07/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:29:16.000000000 +0100
@@ -83,6 +83,7 @@
*/
ENTRY(ia32_sysenter_target)
@@ -4299,8 +4299,8 @@ Acked-by: jbeulich@novell.com
.quad compat_sys_move_pages
+ .quad sys_getcpu
ia32_syscall_end:
---- head-2011-09-07.orig/arch/x86/kernel/Makefile 2011-09-07 15:20:17.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/Makefile 2011-09-07 15:22:22.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/kernel/Makefile 2011-09-07 15:20:17.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/Makefile 2011-09-07 15:22:22.000000000 +0200
@@ -104,7 +104,7 @@ obj-$(CONFIG_X86_XEN) += fixup.o
###
# 64 bit specific files
@@ -4319,8 +4319,8 @@ Acked-by: jbeulich@novell.com
+ smpboot_$(BITS).o tsc_$(BITS).o
+disabled-obj-$(CONFIG_XEN_UNPRIVILEGED_GUEST) += mpparse_64.o
%/head_$(BITS).o %/head_$(BITS).s: $(if $(CONFIG_XEN),EXTRA_AFLAGS,dummy) :=
---- head-2011-09-07.orig/arch/x86/kernel/e820_64-xen.c 2009-12-04 08:45:56.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/e820_64-xen.c 2009-12-04 08:45:56.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -16,6 +16,7 @@
#include <linux/string.h>
#include <linux/kexec.h>
@@ -4812,8 +4812,8 @@ Acked-by: jbeulich@novell.com
}
unsigned long pci_mem_start = 0xaeedbabe;
---- head-2011-09-07.orig/arch/x86/kernel/early_printk-xen.c 2007-06-12 13:13:01.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/early_printk-xen.c 2007-06-12 13:13:01.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -244,20 +244,16 @@ void early_printk(const char *fmt, ...)
static int __initdata keep_early;
@@ -4860,8 +4860,8 @@ Acked-by: jbeulich@novell.com
}
-__setup("earlyprintk=", setup_early_printk);
---- head-2011-09-07.orig/arch/x86/kernel/entry_64-xen.S 2009-06-23 09:28:21.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/entry_64-xen.S 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/entry_64-xen.S 2011-10-07 10:44:29.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/entry_64-xen.S 2011-10-07 11:17:17.000000000 +0200
@@ -4,9 +4,6 @@
* Copyright (C) 1991, 1992 Linus Torvalds
* Copyright (C) 2000, 2001, 2002 Andi Kleen SuSE Labs
@@ -4911,7 +4911,7 @@ Acked-by: jbeulich@novell.com
CFI_DEF_CFA rsp,SS+8 - \adj*ARGOFFSET
.else
CFI_DEF_CFA_OFFSET SS+8 - \adj*ARGOFFSET
-@@ -207,6 +215,7 @@ END(ret_from_fork)
+@@ -209,6 +217,7 @@ END(ret_from_fork)
*/
.macro _frame ref
CFI_STARTPROC simple
@@ -4919,7 +4919,7 @@ Acked-by: jbeulich@novell.com
CFI_DEF_CFA rsp,SS+8-\ref
/*CFI_REL_OFFSET ss,SS-\ref*/
CFI_REL_OFFSET rsp,RSP-\ref
-@@ -334,6 +343,8 @@ tracesys:
+@@ -337,6 +346,8 @@ tracesys:
LOAD_ARGS ARGOFFSET /* reload args from stack in case ptrace changed it */
RESTORE_REST
cmpq $__NR_syscall_max,%rax
@@ -4928,7 +4928,7 @@ Acked-by: jbeulich@novell.com
ja 1f
movq %r10,%rcx /* fixup for C */
call *sys_call_table(,%rax,8)
-@@ -349,6 +360,7 @@ END(system_call)
+@@ -352,6 +363,7 @@ END(system_call)
*/
ENTRY(int_ret_from_sys_call)
CFI_STARTPROC simple
@@ -4936,7 +4936,7 @@ Acked-by: jbeulich@novell.com
CFI_DEF_CFA rsp,SS+8-ARGOFFSET
/*CFI_REL_OFFSET ss,SS-ARGOFFSET*/
CFI_REL_OFFSET rsp,RSP-ARGOFFSET
-@@ -583,8 +595,7 @@ retint_signal:
+@@ -586,8 +598,7 @@ retint_signal:
#ifdef CONFIG_PREEMPT
/* Returning to kernel space. Check if we need preemption */
/* rcx: threadinfo. interrupts off. */
@@ -4946,7 +4946,7 @@ Acked-by: jbeulich@novell.com
cmpl $0,threadinfo_preempt_count(%rcx)
jnz retint_restore_args
bt $TIF_NEED_RESCHED,threadinfo_flags(%rcx)
-@@ -644,7 +655,6 @@ ENTRY(call_function_interrupt)
+@@ -647,7 +658,6 @@ ENTRY(call_function_interrupt)
END(call_function_interrupt)
#endif
@@ -4954,7 +4954,7 @@ Acked-by: jbeulich@novell.com
ENTRY(apic_timer_interrupt)
apicinterrupt LOCAL_TIMER_VECTOR,smp_apic_timer_interrupt
END(apic_timer_interrupt)
-@@ -656,7 +666,6 @@ END(error_interrupt)
+@@ -659,7 +669,6 @@ END(error_interrupt)
ENTRY(spurious_interrupt)
apicinterrupt SPURIOUS_APIC_VECTOR,smp_spurious_interrupt
END(spurious_interrupt)
@@ -4962,7 +4962,7 @@ Acked-by: jbeulich@novell.com
#endif /* !CONFIG_XEN */
/*
-@@ -755,7 +764,9 @@ paranoid_exit\trace:
+@@ -758,7 +767,9 @@ paranoid_exit\trace:
testl $3,CS(%rsp)
jnz paranoid_userspace\trace
paranoid_swapgs\trace:
@@ -4972,7 +4972,7 @@ Acked-by: jbeulich@novell.com
swapgs
paranoid_restore\trace:
RESTORE_ALL 8
-@@ -802,7 +813,7 @@ paranoid_schedule\trace:
+@@ -805,7 +816,7 @@ paranoid_schedule\trace:
* Exception entry point. This expects an error code/orig_rax on the stack
* and the exception handler in %rax.
*/
@@ -4981,7 +4981,7 @@ Acked-by: jbeulich@novell.com
_frame RDI
CFI_REL_OFFSET rax,0
/* rdi slot contains rax, oldrax contains error code */
-@@ -896,7 +907,7 @@ error_kernelspace:
+@@ -899,7 +910,7 @@ error_kernelspace:
jmp error_sti
#endif
CFI_ENDPROC
@@ -4990,7 +4990,7 @@ Acked-by: jbeulich@novell.com
ENTRY(hypervisor_callback)
zeroentry do_hypervisor_callback
-@@ -936,26 +947,6 @@ ENTRY(do_hypervisor_callback) # do_hyp
+@@ -939,26 +950,6 @@ ENTRY(do_hypervisor_callback) # do_hyp
CFI_ENDPROC
END(do_hypervisor_callback)
@@ -5017,7 +5017,7 @@ Acked-by: jbeulich@novell.com
ALIGN
restore_all_enable_events:
CFI_DEFAULT_STACK adj=1
-@@ -1121,7 +1112,7 @@ ENDPROC(child_rip)
+@@ -1124,7 +1115,7 @@ ENDPROC(child_rip)
* do_sys_execve asm fallback arguments:
* rdi: name, rsi: argv, rdx: envp, fake frame on the stack
*/
@@ -5026,7 +5026,7 @@ Acked-by: jbeulich@novell.com
CFI_STARTPROC
FAKE_STACK_FRAME $0
SAVE_ALL
-@@ -1135,12 +1126,11 @@ ENTRY(execve)
+@@ -1138,12 +1129,11 @@ ENTRY(execve)
UNFAKE_STACK_FRAME
ret
CFI_ENDPROC
@@ -5041,7 +5041,7 @@ Acked-by: jbeulich@novell.com
ENTRY(coprocessor_error)
zeroentry do_coprocessor_error
-@@ -1162,25 +1152,25 @@ KPROBE_ENTRY(debug)
+@@ -1165,25 +1155,25 @@ KPROBE_ENTRY(debug)
zeroentry do_debug
/* paranoidexit
CFI_ENDPROC */
@@ -5084,7 +5084,7 @@ Acked-by: jbeulich@novell.com
KPROBE_ENTRY(int3)
/* INTR_FRAME
-@@ -1189,8 +1179,7 @@ KPROBE_ENTRY(int3)
+@@ -1192,8 +1182,7 @@ KPROBE_ENTRY(int3)
zeroentry do_int3
/* jmp paranoid_exit1
CFI_ENDPROC */
@@ -5094,7 +5094,7 @@ Acked-by: jbeulich@novell.com
ENTRY(overflow)
zeroentry do_overflow
-@@ -1241,8 +1230,7 @@ END(stack_segment)
+@@ -1244,8 +1233,7 @@ END(stack_segment)
KPROBE_ENTRY(general_protection)
errorentry do_general_protection
@@ -5104,8 +5104,8 @@ Acked-by: jbeulich@novell.com
ENTRY(alignment_check)
errorentry do_alignment_check
---- head-2011-09-07.orig/arch/x86/kernel/head_64-xen.S 2011-08-08 12:54:10.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/head_64-xen.S 2011-08-09 10:35:37.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/kernel/head_64-xen.S 2011-08-08 12:54:10.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/head_64-xen.S 2011-08-09 10:35:37.000000000 +0200
@@ -5,9 +5,6 @@
* Copyright (C) 2000 Pavel Machek <pavel@suse.cz>
* Copyright (C) 2000 Karsten Keil <kkeil@suse.de>
@@ -5125,8 +5125,8 @@ Acked-by: jbeulich@novell.com
gdt_end:
/* asm/segment.h:GDT_ENTRIES must match this */
/* This should be a multiple of the cache line size */
---- head-2011-09-07.orig/arch/x86/kernel/head64-xen.c 2011-08-08 12:54:10.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/head64-xen.c 2011-08-09 10:35:40.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/kernel/head64-xen.c 2011-08-08 12:54:10.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/head64-xen.c 2011-08-09 10:35:40.000000000 +0200
@@ -7,6 +7,9 @@
* Modified for Xen.
*/
@@ -5218,8 +5218,8 @@ Acked-by: jbeulich@novell.com
- setup_boot_cpu_data();
start_kernel();
}
---- head-2011-09-07.orig/arch/x86/kernel/io_apic_64-xen.c 2009-03-18 10:39:31.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/io_apic_64-xen.c 2009-03-18 10:39:31.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -26,9 +26,12 @@
#include <linux/delay.h>
#include <linux/sched.h>
@@ -6919,8 +6919,8 @@ Acked-by: jbeulich@novell.com
spin_unlock_irqrestore(&ioapic_lock, flags);
return 0;
---- head-2011-09-07.orig/arch/x86/kernel/ioport_64-xen.c 2008-01-28 12:24:19.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/ioport_64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/ioport_64-xen.c 2008-01-28 12:24:19.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/ioport_64-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -58,6 +58,7 @@ asmlinkage long sys_ioperm(unsigned long
memset(bitmap, 0xff, IO_BITMAP_BYTES);
@@ -6929,8 +6929,8 @@ Acked-by: jbeulich@novell.com
set_xen_guest_handle(set_iobitmap.bitmap, (char *)bitmap);
set_iobitmap.nr_ports = IO_BITMAP_BITS;
---- head-2011-09-07.orig/arch/x86/kernel/mpparse_64-xen.c 2007-06-12 13:13:01.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/mpparse_64-xen.c 2007-06-12 13:13:01.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -41,8 +41,7 @@ int acpi_found_madt;
* Various Linux-internal data structures created from the
* MP-table.
@@ -7544,8 +7544,8 @@ Acked-by: jbeulich@novell.com
-
-#endif /*CONFIG_X86_IO_APIC*/
#endif /*CONFIG_ACPI*/
---- head-2011-09-07.orig/arch/x86/kernel/process_64-xen.c 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/process_64-xen.c 2011-02-02 08:30:50.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/process_64-xen.c 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/process_64-xen.c 2011-02-02 08:30:50.000000000 +0100
@@ -88,25 +88,24 @@ void idle_notifier_unregister(struct not
}
EXPORT_SYMBOL(idle_notifier_unregister);
@@ -7752,8 +7752,8 @@ Acked-by: jbeulich@novell.com
sp -= get_random_int() % 8192;
return sp & ~0xf;
}
---- head-2011-09-07.orig/arch/x86/kernel/setup_64-xen.c 2010-10-05 09:58:12.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/setup_64-xen.c 2010-10-05 09:58:12.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -88,9 +88,6 @@ extern struct edid_info edid_info;
shared_info_t *HYPERVISOR_shared_info = (shared_info_t *)empty_zero_page;
EXPORT_SYMBOL(HYPERVISOR_shared_info);
@@ -8190,8 +8190,8 @@ Acked-by: jbeulich@novell.com
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* VIA/Cyrix/Centaur-defined */
---- head-2011-09-07.orig/arch/x86/kernel/setup64-xen.c 2011-01-31 17:02:29.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/setup64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/setup64-xen.c 2011-01-31 17:02:29.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/setup64-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -31,7 +31,7 @@
#include <asm/hypervisor.h>
#endif
@@ -8285,8 +8285,8 @@ Acked-by: jbeulich@novell.com
orig_ist->ist[v] = t->ist[v] = (unsigned long)estacks;
}
---- head-2011-09-07.orig/arch/x86/kernel/smp_64-xen.c 2008-04-02 12:34:02.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/smp_64-xen.c 2008-04-02 12:34:02.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -381,9 +381,8 @@ int smp_call_function_single (int cpu, v
/* prevent preemption and reschedule on another processor */
int me = get_cpu();
@@ -8348,8 +8348,8 @@ Acked-by: jbeulich@novell.com
- return 0; /* Should not happen */
-#endif
-}
---- head-2011-09-07.orig/arch/x86/kernel/traps_64-xen.c 2008-04-02 12:34:02.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/traps_64-xen.c 2008-04-02 12:34:02.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -23,6 +23,7 @@
#include <linux/delay.h>
#include <linux/spinlock.h>
@@ -8805,8 +8805,8 @@ Acked-by: jbeulich@novell.com
-__setup("call_trace=", call_trace_setup);
+early_param("call_trace", call_trace_setup);
#endif
---- head-2011-09-07.orig/arch/x86/kernel/vsyscall_64-xen.c 2007-06-18 08:38:13.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/vsyscall_64-xen.c 2007-06-18 08:38:13.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -26,6 +26,10 @@
#include <linux/seqlock.h>
#include <linux/jiffies.h>
@@ -9000,8 +9000,8 @@ Acked-by: jbeulich@novell.com
return 0;
}
---- head-2011-09-07.orig/arch/x86/mm/fault_64-xen.c 2011-08-15 10:44:03.000000000 +0200
-+++ head-2011-09-07/arch/x86/mm/fault_64-xen.c 2011-07-26 09:24:01.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/mm/fault_64-xen.c 2011-10-07 10:44:29.000000000 +0200
++++ head-2011-10-07/arch/x86/mm/fault_64-xen.c 2011-07-26 09:24:01.000000000 +0200
@@ -40,8 +40,7 @@
#define PF_RSVD (1<<3)
#define PF_INSTR (1<<4)
@@ -9139,8 +9139,8 @@ Acked-by: jbeulich@novell.com
pgd_page_table(unlock, page);
}
spin_unlock(&pgd_lock);
---- head-2011-09-07.orig/arch/x86/mm/init_64-xen.c 2011-08-08 12:54:10.000000000 +0200
-+++ head-2011-09-07/arch/x86/mm/init_64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/mm/init_64-xen.c 2011-08-08 12:54:10.000000000 +0200
++++ head-2011-10-07/arch/x86/mm/init_64-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -61,8 +61,6 @@ EXPORT_SYMBOL(__kernel_page_user);
int after_bootmem;
@@ -9453,8 +9453,8 @@ Acked-by: jbeulich@novell.com
}
int kern_addr_valid(unsigned long addr)
---- head-2011-09-07.orig/arch/x86/mm/pageattr_64-xen.c 2009-03-18 10:39:31.000000000 +0100
-+++ head-2011-09-07/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/mm/pageattr_64-xen.c 2009-03-18 10:39:31.000000000 +0100
++++ head-2011-10-07/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -377,8 +377,8 @@ static void revert_page(unsigned long ad
BUG_ON(pud_none(*pud));
pmd = pmd_offset(pud, address);
@@ -9519,8 +9519,8 @@ Acked-by: jbeulich@novell.com
}
}
up_write(&init_mm.mmap_sem);
---- head-2011-09-07.orig/drivers/char/tpm/tpm_xen.c 2011-01-31 14:53:38.000000000 +0100
-+++ head-2011-09-07/drivers/char/tpm/tpm_xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/char/tpm/tpm_xen.c 2011-01-31 14:53:38.000000000 +0100
++++ head-2011-10-07/drivers/char/tpm/tpm_xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -85,8 +85,7 @@ static struct tpm_private *my_priv;
/* local function prototypes */
@@ -9540,8 +9540,8 @@ Acked-by: jbeulich@novell.com
{
struct tpm_private *tp = tpm_priv;
unsigned long flags;
---- head-2011-09-07.orig/drivers/pci/Kconfig 2011-01-31 14:32:40.000000000 +0100
-+++ head-2011-09-07/drivers/pci/Kconfig 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/pci/Kconfig 2011-01-31 14:32:40.000000000 +0100
++++ head-2011-10-07/drivers/pci/Kconfig 2011-01-31 17:29:16.000000000 +0100
@@ -86,7 +86,7 @@ config XEN_PCIDEV_FE_DEBUG
config HT_IRQ
bool "Interrupts on hypertransport devices"
@@ -9551,8 +9551,8 @@ Acked-by: jbeulich@novell.com
help
This allows native hypertransport devices to use interrupts.
---- head-2011-09-07.orig/drivers/pci/msi-xen.c 2009-12-04 08:45:56.000000000 +0100
-+++ head-2011-09-07/drivers/pci/msi-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/pci/msi-xen.c 2011-10-07 10:44:29.000000000 +0200
++++ head-2011-10-07/drivers/pci/msi-xen.c 2011-10-07 16:57:06.000000000 +0200
@@ -6,6 +6,7 @@
* Copyright (C) Tom Long Nguyen (tom.l.nguyen@intel.com)
*/
@@ -9569,9 +9569,9 @@ Acked-by: jbeulich@novell.com
#include <xen/evtchn.h>
-@@ -26,14 +28,6 @@
-
- static int pci_msi_enable = 1;
+@@ -31,14 +33,6 @@ static int pci_seg_supported = 1;
+ #define pci_seg_supported 1
+ #endif
-static struct msi_ops *msi_ops;
-
@@ -9584,7 +9584,7 @@ Acked-by: jbeulich@novell.com
static LIST_HEAD(msi_dev_head);
DEFINE_SPINLOCK(msi_dev_lock);
-@@ -481,9 +475,9 @@ void pci_restore_msix_state(struct pci_d
+@@ -499,9 +493,9 @@ void pci_restore_msix_state(struct pci_d
* @dev: pointer to the pci_dev data structure of MSI device function
*
* Setup the MSI capability structure of device function with a single
@@ -9596,7 +9596,7 @@ Acked-by: jbeulich@novell.com
**/
static int msi_capability_init(struct pci_dev *dev)
{
-@@ -497,11 +491,11 @@ static int msi_capability_init(struct pc
+@@ -515,11 +509,11 @@ static int msi_capability_init(struct pc
if (pirq < 0)
return -EBUSY;
@@ -9609,7 +9609,7 @@ Acked-by: jbeulich@novell.com
return 0;
}
-@@ -512,8 +506,8 @@ static int msi_capability_init(struct pc
+@@ -530,8 +524,8 @@ static int msi_capability_init(struct pc
* @nvec: number of @entries
*
* Setup the MSI-X capability structure of device function with a
@@ -9620,7 +9620,7 @@ Acked-by: jbeulich@novell.com
**/
static int msix_capability_init(struct pci_dev *dev,
struct msix_entry *entries, int nvec)
-@@ -562,12 +556,18 @@ static int msix_capability_init(struct p
+@@ -580,12 +574,18 @@ static int msix_capability_init(struct p
}
if (i != nvec) {
@@ -9640,7 +9640,7 @@ Acked-by: jbeulich@novell.com
}
enable_msi_mode(dev, pos, PCI_CAP_ID_MSIX);
-@@ -577,11 +577,40 @@ static int msix_capability_init(struct p
+@@ -595,11 +595,40 @@ static int msix_capability_init(struct p
}
/**
@@ -9682,7 +9682,7 @@ Acked-by: jbeulich@novell.com
* MSI mode enabled on its hardware device function. A return of zero
* indicates the successful setup of an entry zero with the new MSI
* vector or non-zero for otherwise.
-@@ -589,19 +618,11 @@ static int msix_capability_init(struct p
+@@ -607,19 +636,11 @@ static int msix_capability_init(struct p
extern int pci_frontend_enable_msi(struct pci_dev *dev);
int pci_enable_msi(struct pci_dev* dev)
{
@@ -9701,11 +9701,11 @@ Acked-by: jbeulich@novell.com
- if (bus->bus_flags & PCI_BUS_FLAGS_NO_MSI)
- return -EINVAL;
+ if (pci_msi_supported(dev) < 0)
-+ return -EINVAL;
++ return -EINVAL;
status = msi_init();
if (status < 0)
-@@ -631,10 +652,10 @@ int pci_enable_msi(struct pci_dev* dev)
+@@ -649,10 +670,10 @@ int pci_enable_msi(struct pci_dev* dev)
if (!pos)
return -EINVAL;
@@ -9718,7 +9718,7 @@ Acked-by: jbeulich@novell.com
pci_name(dev));
dev->irq = temp;
return -EINVAL;
-@@ -699,37 +720,29 @@ void pci_disable_msi(struct pci_dev* dev
+@@ -717,37 +738,29 @@ void pci_disable_msi(struct pci_dev* dev
* pci_enable_msix - configure device's MSI-X capability structure
* @dev: pointer to the pci_dev data structure of MSI-X device function
* @entries: pointer to an array of MSI-X entries
@@ -9761,7 +9761,7 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_XEN_PCIDEV_FRONTEND
if (!is_initial_xendomain()) {
struct msi_pirq_entry *pirq_entry;
-@@ -793,7 +806,7 @@ int pci_enable_msix(struct pci_dev* dev,
+@@ -811,7 +824,7 @@ int pci_enable_msix(struct pci_dev* dev,
/* Check whether driver already requested for MSI vector */
if (dev->msi_enabled) {
printk(KERN_INFO "PCI: %s: Can't enable MSI-X. "
@@ -9770,7 +9770,7 @@ Acked-by: jbeulich@novell.com
pci_name(dev));
dev->irq = temp;
return -EINVAL;
-@@ -861,11 +874,11 @@ void pci_disable_msix(struct pci_dev* de
+@@ -879,11 +892,11 @@ void pci_disable_msix(struct pci_dev* de
}
/**
@@ -9784,8 +9784,8 @@ Acked-by: jbeulich@novell.com
* allocated for this device function, are reclaimed to unused state,
* which may be used later on.
**/
---- head-2011-09-07.orig/drivers/xen/Kconfig 2011-02-24 14:05:09.000000000 +0100
-+++ head-2011-09-07/drivers/xen/Kconfig 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/Kconfig 2011-02-24 14:05:09.000000000 +0100
++++ head-2011-10-07/drivers/xen/Kconfig 2011-01-31 17:29:16.000000000 +0100
@@ -332,6 +332,10 @@ endmenu
config HAVE_IRQ_IGNORE_UNHANDLED
def_bool y
@@ -9797,8 +9797,8 @@ Acked-by: jbeulich@novell.com
config NO_IDLE_HZ
def_bool y
---- head-2011-09-07.orig/drivers/xen/balloon/balloon.c 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-09-07/drivers/xen/balloon/balloon.c 2011-03-23 08:48:06.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/balloon/balloon.c 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/drivers/xen/balloon/balloon.c 2011-03-23 08:48:06.000000000 +0100
@@ -37,6 +37,7 @@
#include <linux/sched.h>
#include <linux/errno.h>
@@ -9996,8 +9996,8 @@ Acked-by: jbeulich@novell.com
bs.driver_pages--;
balloon_unlock(flags);
---- head-2011-09-07.orig/drivers/xen/blkback/blkback.c 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-09-07/drivers/xen/blkback/blkback.c 2011-04-11 14:28:25.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/blkback/blkback.c 2011-09-22 14:33:35.000000000 +0200
++++ head-2011-10-07/drivers/xen/blkback/blkback.c 2011-04-11 14:28:25.000000000 +0200
@@ -297,7 +297,7 @@ static void blkif_notify_work(blkif_t *b
wake_up(&blkif->wq);
}
@@ -10007,8 +10007,8 @@ Acked-by: jbeulich@novell.com
{
blkif_notify_work(dev_id);
return IRQ_HANDLED;
---- head-2011-09-07.orig/drivers/xen/blkback/common.h 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-09-07/drivers/xen/blkback/common.h 2011-04-11 14:28:27.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/blkback/common.h 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/drivers/xen/blkback/common.h 2011-04-11 14:28:27.000000000 +0200
@@ -136,7 +136,7 @@ void blkif_interface_init(void);
void blkif_xenbus_init(void);
@@ -10018,8 +10018,8 @@ Acked-by: jbeulich@novell.com
int blkif_schedule(void *arg);
int blkback_barrier(struct xenbus_transaction xbt,
---- head-2011-09-07.orig/drivers/xen/blkfront/blkfront.c 2011-07-15 11:19:50.000000000 +0200
-+++ head-2011-09-07/drivers/xen/blkfront/blkfront.c 2011-07-21 12:07:37.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/blkfront/blkfront.c 2011-07-15 11:19:50.000000000 +0200
++++ head-2011-10-07/drivers/xen/blkfront/blkfront.c 2011-07-21 12:07:37.000000000 +0200
@@ -70,9 +70,9 @@ static int setup_blkring(struct xenbus_d
static void kick_pending_request_queues(struct blkfront_info *);
@@ -10081,8 +10081,8 @@ Acked-by: jbeulich@novell.com
}
int blkfront_is_ready(struct xenbus_device *dev)
---- head-2011-09-07.orig/drivers/xen/blktap/blktap.c 2011-06-30 15:37:44.000000000 +0200
-+++ head-2011-09-07/drivers/xen/blktap/blktap.c 2011-06-30 16:02:41.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/blktap/blktap.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-10-07/drivers/xen/blktap/blktap.c 2011-06-30 16:02:41.000000000 +0200
@@ -1258,7 +1258,7 @@ static void blkif_notify_work(blkif_t *b
wake_up(&blkif->wq);
}
@@ -10092,8 +10092,8 @@ Acked-by: jbeulich@novell.com
{
blkif_notify_work(dev_id);
return IRQ_HANDLED;
---- head-2011-09-07.orig/drivers/xen/blktap/common.h 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-09-07/drivers/xen/blktap/common.h 2011-04-11 14:28:19.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/blktap/common.h 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/drivers/xen/blktap/common.h 2011-04-11 14:28:19.000000000 +0200
@@ -105,7 +105,7 @@ void tap_blkif_interface_init(void);
void tap_blkif_xenbus_init(void);
@@ -10103,8 +10103,8 @@ Acked-by: jbeulich@novell.com
int tap_blkif_schedule(void *arg);
int dom_to_devid(domid_t domid, int xenbus_id, blkif_t *blkif);
---- head-2011-09-07.orig/drivers/xen/blktap2/sysfs.c 2011-03-02 12:00:16.000000000 +0100
-+++ head-2011-09-07/drivers/xen/blktap2/sysfs.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/blktap2/sysfs.c 2011-03-02 12:00:16.000000000 +0100
++++ head-2011-10-07/drivers/xen/blktap2/sysfs.c 2011-01-31 17:29:16.000000000 +0100
@@ -150,7 +150,7 @@ blktap_sysfs_pause_device(struct class_d
err = blktap_device_pause(tap);
if (!err) {
@@ -10193,8 +10193,8 @@ Acked-by: jbeulich@novell.com
- return 0;
+ return err;
}
---- head-2011-09-07.orig/drivers/xen/console/console.c 2011-01-31 17:02:29.000000000 +0100
-+++ head-2011-09-07/drivers/xen/console/console.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/console/console.c 2011-01-31 17:02:29.000000000 +0100
++++ head-2011-10-07/drivers/xen/console/console.c 2011-01-31 17:29:16.000000000 +0100
@@ -360,7 +360,7 @@ static struct tty_struct *xencons_tty;
static int xencons_priv_irq;
static char x_char;
@@ -10240,8 +10240,8 @@ Acked-by: jbeulich@novell.com
.open = xencons_open,
.close = xencons_close,
.write = xencons_write,
---- head-2011-09-07.orig/drivers/xen/console/xencons_ring.c 2007-06-12 13:13:44.000000000 +0200
-+++ head-2011-09-07/drivers/xen/console/xencons_ring.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/console/xencons_ring.c 2007-06-12 13:13:44.000000000 +0200
++++ head-2011-10-07/drivers/xen/console/xencons_ring.c 2011-01-31 17:29:16.000000000 +0100
@@ -83,7 +83,7 @@ int xencons_ring_send(const char *data,
return sent;
}
@@ -10260,8 +10260,8 @@ Acked-by: jbeulich@novell.com
cons++;
}
---- head-2011-09-07.orig/drivers/xen/core/evtchn.c 2010-11-25 09:36:37.000000000 +0100
-+++ head-2011-09-07/drivers/xen/core/evtchn.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/core/evtchn.c 2010-11-25 09:36:37.000000000 +0100
++++ head-2011-10-07/drivers/xen/core/evtchn.c 2011-01-31 17:29:16.000000000 +0100
@@ -539,7 +539,7 @@ static void unbind_from_irq(unsigned int
int bind_caller_port_to_irqhandler(
@@ -10541,8 +10541,8 @@ Acked-by: jbeulich@novell.com
+ handle_fasteoi_irq, "fasteoi");
}
}
---- head-2011-09-07.orig/drivers/xen/core/gnttab.c 2010-09-23 15:39:04.000000000 +0200
-+++ head-2011-09-07/drivers/xen/core/gnttab.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/core/gnttab.c 2010-09-23 15:39:04.000000000 +0200
++++ head-2011-10-07/drivers/xen/core/gnttab.c 2011-01-31 17:29:16.000000000 +0100
@@ -510,6 +510,7 @@ static void gnttab_page_free(struct page
BUG_ON(order);
ClearPageForeign(page);
@@ -10560,8 +10560,8 @@ Acked-by: jbeulich@novell.com
*pagep = new_page;
SetPageForeign(page, gnttab_page_free);
---- head-2011-09-07.orig/drivers/xen/core/reboot.c 2011-06-30 15:37:44.000000000 +0200
-+++ head-2011-09-07/drivers/xen/core/reboot.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/core/reboot.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-10-07/drivers/xen/core/reboot.c 2011-01-31 17:29:16.000000000 +0100
@@ -1,4 +1,3 @@
-#define __KERNEL_SYSCALLS__
#include <linux/version.h>
@@ -10593,8 +10593,8 @@ Acked-by: jbeulich@novell.com
{
switch_shutdown_state(SHUTDOWN_SUSPEND);
return IRQ_HANDLED;
---- head-2011-09-07.orig/drivers/xen/core/smpboot.c 2011-01-31 17:01:49.000000000 +0100
-+++ head-2011-09-07/drivers/xen/core/smpboot.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/core/smpboot.c 2011-01-31 17:01:49.000000000 +0100
++++ head-2011-10-07/drivers/xen/core/smpboot.c 2011-01-31 17:29:16.000000000 +0100
@@ -25,8 +25,8 @@
#include <xen/cpu_hotplug.h>
#include <xen/xenbus.h>
@@ -10615,8 +10615,8 @@ Acked-by: jbeulich@novell.com
#endif
void __init prefill_possible_map(void)
---- head-2011-09-07.orig/drivers/xen/fbfront/xenfb.c 2011-03-02 12:00:16.000000000 +0100
-+++ head-2011-09-07/drivers/xen/fbfront/xenfb.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/fbfront/xenfb.c 2011-03-02 12:00:16.000000000 +0100
++++ head-2011-10-07/drivers/xen/fbfront/xenfb.c 2011-01-31 17:29:16.000000000 +0100
@@ -524,8 +524,7 @@ static struct fb_ops xenfb_fb_ops = {
.fb_set_par = xenfb_set_par,
};
@@ -10627,8 +10627,8 @@ Acked-by: jbeulich@novell.com
{
/*
* No in events recognized, simply ignore them all.
---- head-2011-09-07.orig/drivers/xen/fbfront/xenkbd.c 2011-05-23 10:40:00.000000000 +0200
-+++ head-2011-09-07/drivers/xen/fbfront/xenkbd.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/fbfront/xenkbd.c 2011-10-07 10:44:29.000000000 +0200
++++ head-2011-10-07/drivers/xen/fbfront/xenkbd.c 2011-01-31 17:29:16.000000000 +0100
@@ -46,7 +46,7 @@ static void xenkbd_disconnect_backend(st
* to do that.
*/
@@ -10638,8 +10638,8 @@ Acked-by: jbeulich@novell.com
{
struct xenkbd_info *info = dev_id;
struct xenkbd_page *page = info->page;
---- head-2011-09-07.orig/drivers/xen/gntdev/gntdev.c 2011-01-03 12:43:21.000000000 +0100
-+++ head-2011-09-07/drivers/xen/gntdev/gntdev.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/gntdev/gntdev.c 2011-01-03 12:43:21.000000000 +0100
++++ head-2011-10-07/drivers/xen/gntdev/gntdev.c 2011-01-31 17:29:16.000000000 +0100
@@ -744,9 +744,6 @@ static pte_t gntdev_clear_pte(struct vm_
BUG();
}
@@ -10679,8 +10679,8 @@ Acked-by: jbeulich@novell.com
}
return copy;
---- head-2011-09-07.orig/drivers/xen/netback/accel.c 2011-06-30 15:37:44.000000000 +0200
-+++ head-2011-09-07/drivers/xen/netback/accel.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/netback/accel.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-10-07/drivers/xen/netback/accel.c 2011-01-31 17:29:16.000000000 +0100
@@ -65,7 +65,7 @@ static int match_accelerator(struct xenb
if (IS_ERR(eth_name)) {
@@ -10690,8 +10690,8 @@ Acked-by: jbeulich@novell.com
__FUNCTION__, PTR_ERR(eth_name));
return 0;
} else {
---- head-2011-09-07.orig/drivers/xen/netback/common.h 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-09-07/drivers/xen/netback/common.h 2011-04-11 14:28:08.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/netback/common.h 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/drivers/xen/netback/common.h 2011-04-11 14:28:08.000000000 +0200
@@ -92,6 +92,7 @@ typedef struct netif_st {
/* Statistics */
@@ -10709,8 +10709,8 @@ Acked-by: jbeulich@novell.com
static inline int netbk_can_queue(struct net_device *dev)
{
---- head-2011-09-07.orig/drivers/xen/netback/interface.c 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-09-07/drivers/xen/netback/interface.c 2011-04-11 14:28:07.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/netback/interface.c 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/drivers/xen/netback/interface.c 2011-04-11 14:28:07.000000000 +0200
@@ -172,6 +172,7 @@ static const struct netif_stat {
u16 offset;
} netbk_stats[] = {
@@ -10719,8 +10719,8 @@ Acked-by: jbeulich@novell.com
};
static int netbk_get_stats_count(struct net_device *dev)
---- head-2011-09-07.orig/drivers/xen/netback/loopback.c 2011-01-03 12:43:21.000000000 +0100
-+++ head-2011-09-07/drivers/xen/netback/loopback.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/netback/loopback.c 2011-01-03 12:43:21.000000000 +0100
++++ head-2011-10-07/drivers/xen/netback/loopback.c 2011-01-31 17:29:16.000000000 +0100
@@ -152,16 +152,6 @@ static int loopback_start_xmit(struct sk
np->stats.rx_bytes += skb->len;
np->stats.rx_packets++;
@@ -10738,8 +10738,8 @@ Acked-by: jbeulich@novell.com
skb->pkt_type = PACKET_HOST; /* overridden by eth_type_trans() */
skb->protocol = eth_type_trans(skb, dev);
skb->dev = dev;
---- head-2011-09-07.orig/drivers/xen/netback/netback.c 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-09-07/drivers/xen/netback/netback.c 2011-04-11 14:28:01.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/netback/netback.c 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/drivers/xen/netback/netback.c 2011-04-11 14:28:01.000000000 +0200
@@ -41,6 +41,7 @@
#include <xen/evtchn.h>
#include <xen/gnttab.h>
@@ -10827,8 +10827,8 @@ Acked-by: jbeulich@novell.com
{
struct list_head *ent;
netif_t *netif;
---- head-2011-09-07.orig/drivers/xen/netfront/netfront.c 2011-06-30 15:37:44.000000000 +0200
-+++ head-2011-09-07/drivers/xen/netfront/netfront.c 2011-06-30 16:02:48.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/netfront/netfront.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-10-07/drivers/xen/netfront/netfront.c 2011-06-30 16:02:48.000000000 +0200
@@ -63,6 +63,7 @@
#include <asm/uaccess.h>
#include <xen/interface/grant_table.h>
@@ -10970,8 +10970,8 @@ Acked-by: jbeulich@novell.com
};
#ifdef CONFIG_SYSFS
---- head-2011-09-07.orig/drivers/xen/netfront/netfront.h 2010-02-24 13:13:46.000000000 +0100
-+++ head-2011-09-07/drivers/xen/netfront/netfront.h 2011-02-09 15:35:17.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/netfront/netfront.h 2010-02-24 13:13:46.000000000 +0100
++++ head-2011-10-07/drivers/xen/netfront/netfront.h 2011-02-09 15:35:17.000000000 +0100
@@ -150,6 +150,7 @@ struct netfront_info {
struct net_device *netdev;
@@ -10980,8 +10980,8 @@ Acked-by: jbeulich@novell.com
struct netif_tx_front_ring tx;
struct netif_rx_front_ring rx;
---- head-2011-09-07.orig/drivers/xen/pcifront/pcifront.h 2010-10-05 09:58:12.000000000 +0200
-+++ head-2011-09-07/drivers/xen/pcifront/pcifront.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/pcifront/pcifront.h 2010-10-05 09:58:12.000000000 +0200
++++ head-2011-10-07/drivers/xen/pcifront/pcifront.h 2011-01-31 17:29:16.000000000 +0100
@@ -51,6 +51,6 @@ void pcifront_free_roots(struct pcifront
void pcifront_do_aer( void *data);
@@ -10990,8 +10990,8 @@ Acked-by: jbeulich@novell.com
+irqreturn_t pcifront_handler_aer(int irq, void *dev);
#endif /* __XEN_PCIFRONT_H__ */
---- head-2011-09-07.orig/drivers/xen/pcifront/pci_op.c 2010-11-25 09:36:37.000000000 +0100
-+++ head-2011-09-07/drivers/xen/pcifront/pci_op.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/pcifront/pci_op.c 2010-11-25 09:36:37.000000000 +0100
++++ head-2011-10-07/drivers/xen/pcifront/pci_op.c 2011-01-31 17:29:16.000000000 +0100
@@ -662,7 +662,7 @@ void pcifront_do_aer(void *data)
}
@@ -11001,8 +11001,8 @@ Acked-by: jbeulich@novell.com
{
struct pcifront_device *pdev = dev;
schedule_pcifront_aer_op(pdev);
---- head-2011-09-07.orig/drivers/xen/privcmd/compat_privcmd.c 2010-01-27 14:01:48.000000000 +0100
-+++ head-2011-09-07/drivers/xen/privcmd/compat_privcmd.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/privcmd/compat_privcmd.c 2010-01-27 14:01:48.000000000 +0100
++++ head-2011-10-07/drivers/xen/privcmd/compat_privcmd.c 2011-01-31 17:29:16.000000000 +0100
@@ -18,7 +18,6 @@
* Authors: Jimi Xenidis <jimix@watson.ibm.com>
*/
@@ -11011,8 +11011,8 @@ Acked-by: jbeulich@novell.com
#include <linux/compat.h>
#include <linux/ioctl.h>
#include <linux/syscalls.h>
---- head-2011-09-07.orig/drivers/xen/privcmd/privcmd.c 2010-01-27 14:01:48.000000000 +0100
-+++ head-2011-09-07/drivers/xen/privcmd/privcmd.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/privcmd/privcmd.c 2010-01-27 14:01:48.000000000 +0100
++++ head-2011-10-07/drivers/xen/privcmd/privcmd.c 2011-01-31 17:29:16.000000000 +0100
@@ -71,43 +71,16 @@ static long privcmd_ioctl(struct file *f
if (copy_from_user(&hypercall, udata, sizeof(hypercall)))
return -EFAULT;
@@ -11073,8 +11073,8 @@ Acked-by: jbeulich@novell.com
vma->vm_ops = &privcmd_vm_ops;
vma->vm_private_data = NULL;
---- head-2011-09-07.orig/drivers/xen/scsiback/common.h 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-09-07/drivers/xen/scsiback/common.h 2011-04-11 14:27:49.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/scsiback/common.h 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/drivers/xen/scsiback/common.h 2011-04-11 14:27:49.000000000 +0200
@@ -138,7 +138,7 @@ typedef struct {
#define VSCSI_TYPE_HOST 1
@@ -11084,8 +11084,8 @@ Acked-by: jbeulich@novell.com
int scsiback_init_sring(struct vscsibk_info *, grant_ref_t, evtchn_port_t);
int scsiback_schedule(void *data);
---- head-2011-09-07.orig/drivers/xen/scsiback/scsiback.c 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-09-07/drivers/xen/scsiback/scsiback.c 2011-04-11 14:27:51.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/scsiback/scsiback.c 2011-09-22 14:33:35.000000000 +0200
++++ head-2011-10-07/drivers/xen/scsiback/scsiback.c 2011-04-11 14:27:51.000000000 +0200
@@ -461,7 +461,7 @@ void scsiback_cmd_exec(pending_req_t *pe
write = (data_dir == DMA_TO_DEVICE);
rq = blk_get_request(pending_req->sdev->request_queue, write, GFP_KERNEL);
@@ -11104,8 +11104,8 @@ Acked-by: jbeulich@novell.com
{
scsiback_notify_work((struct vscsibk_info *)dev_id);
return IRQ_HANDLED;
---- head-2011-09-07.orig/drivers/xen/scsifront/common.h 2010-02-24 13:13:46.000000000 +0100
-+++ head-2011-09-07/drivers/xen/scsifront/common.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/scsifront/common.h 2010-02-24 13:13:46.000000000 +0100
++++ head-2011-10-07/drivers/xen/scsifront/common.h 2011-01-31 17:29:16.000000000 +0100
@@ -128,7 +128,7 @@ struct vscsifrnt_info {
int scsifront_xenbus_init(void);
void scsifront_xenbus_unregister(void);
@@ -11115,8 +11115,8 @@ Acked-by: jbeulich@novell.com
int scsifront_cmd_done(struct vscsifrnt_info *info);
---- head-2011-09-07.orig/drivers/xen/scsifront/scsifront.c 2011-02-02 12:19:11.000000000 +0100
-+++ head-2011-09-07/drivers/xen/scsifront/scsifront.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/scsifront/scsifront.c 2011-02-02 12:19:11.000000000 +0100
++++ head-2011-10-07/drivers/xen/scsifront/scsifront.c 2011-01-31 17:29:16.000000000 +0100
@@ -100,7 +100,7 @@ static void scsifront_do_request(struct
notify_remote_via_irq(irq);
}
@@ -11126,8 +11126,8 @@ Acked-by: jbeulich@novell.com
{
scsifront_notify_work((struct vscsifrnt_info *)dev_id);
return IRQ_HANDLED;
---- head-2011-09-07.orig/drivers/xen/sfc_netback/accel_xenbus.c 2010-01-04 11:56:34.000000000 +0100
-+++ head-2011-09-07/drivers/xen/sfc_netback/accel_xenbus.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/sfc_netback/accel_xenbus.c 2010-01-04 11:56:34.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netback/accel_xenbus.c 2011-01-31 17:29:16.000000000 +0100
@@ -69,8 +69,7 @@ static void unlink_bend(struct netback_a
@@ -11148,8 +11148,8 @@ Acked-by: jbeulich@novell.com
{
VPRINTK("netirq %d from device %s\n", irq,
((struct xenbus_device *)context)->nodename);
---- head-2011-09-07.orig/drivers/xen/sfc_netfront/accel.h 2009-04-07 13:58:48.000000000 +0200
-+++ head-2011-09-07/drivers/xen/sfc_netfront/accel.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/sfc_netfront/accel.h 2009-04-07 13:58:48.000000000 +0200
++++ head-2011-10-07/drivers/xen/sfc_netfront/accel.h 2011-01-31 17:29:16.000000000 +0100
@@ -467,10 +467,8 @@ void netfront_accel_msg_tx_fastpath(netf
u32 ip, u16 port, u8 protocol);
@@ -11163,8 +11163,8 @@ Acked-by: jbeulich@novell.com
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
extern void netfront_accel_msg_from_bend(struct work_struct *context);
---- head-2011-09-07.orig/drivers/xen/sfc_netfront/accel_msg.c 2009-04-07 13:58:48.000000000 +0200
-+++ head-2011-09-07/drivers/xen/sfc_netfront/accel_msg.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/sfc_netfront/accel_msg.c 2009-04-07 13:58:48.000000000 +0200
++++ head-2011-10-07/drivers/xen/sfc_netfront/accel_msg.c 2011-01-31 17:29:16.000000000 +0100
@@ -488,8 +488,7 @@ void netfront_accel_msg_from_bend(void *
}
@@ -11185,8 +11185,8 @@ Acked-by: jbeulich@novell.com
{
netfront_accel_vnic *vnic = (netfront_accel_vnic *)context;
struct net_device *net_dev = vnic->net_dev;
---- head-2011-09-07.orig/drivers/xen/sfc_netfront/accel_tso.c 2008-02-26 10:54:12.000000000 +0100
-+++ head-2011-09-07/drivers/xen/sfc_netfront/accel_tso.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/sfc_netfront/accel_tso.c 2008-02-26 10:54:12.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netfront/accel_tso.c 2011-01-31 17:29:16.000000000 +0100
@@ -363,7 +363,7 @@ int netfront_accel_enqueue_skb_tso(netfr
tso_check_safe(skb);
@@ -11196,8 +11196,8 @@ Acked-by: jbeulich@novell.com
EPRINTK("Trying to TSO send a packet without HW checksum\n");
tso_start(&state, skb);
---- head-2011-09-07.orig/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 15:37:44.000000000 +0200
-+++ head-2011-09-07/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 16:03:00.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-10-07/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 16:03:00.000000000 +0200
@@ -463,7 +463,7 @@ netfront_accel_enqueue_skb_multi(netfron
frag_i = -1;
@@ -11216,8 +11216,8 @@ Acked-by: jbeulich@novell.com
/* Set to zero to encourage falcon to work it out for us */
*(u16*)(skb->h.raw + skb->csum) = 0;
}
---- head-2011-09-07.orig/drivers/xen/tpmback/common.h 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-09-07/drivers/xen/tpmback/common.h 2011-04-11 14:27:26.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/tpmback/common.h 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/drivers/xen/tpmback/common.h 2011-04-11 14:27:26.000000000 +0200
@@ -71,7 +71,7 @@ void tpmif_deschedule_work(tpmif_t * tpm
void tpmif_xenbus_init(void);
void tpmif_xenbus_exit(void);
@@ -11227,8 +11227,8 @@ Acked-by: jbeulich@novell.com
long int tpmback_get_instance(struct backend_info *bi);
---- head-2011-09-07.orig/drivers/xen/tpmback/tpmback.c 2010-09-23 15:39:04.000000000 +0200
-+++ head-2011-09-07/drivers/xen/tpmback/tpmback.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/tpmback/tpmback.c 2010-09-23 15:39:04.000000000 +0200
++++ head-2011-10-07/drivers/xen/tpmback/tpmback.c 2011-01-31 17:29:16.000000000 +0100
@@ -497,7 +497,7 @@ static ssize_t vtpm_op_read(struct file
list_del(&pak->next);
write_unlock_irqrestore(&dataex.pak_lock, flags);
@@ -11247,8 +11247,8 @@ Acked-by: jbeulich@novell.com
{
tpmif_t *tpmif = (tpmif_t *) dev_id;
---- head-2011-09-07.orig/drivers/xen/usbback/usbback.c 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-09-07/drivers/xen/usbback/usbback.c 2011-04-11 14:27:33.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/usbback/usbback.c 2011-09-22 14:33:35.000000000 +0200
++++ head-2011-10-07/drivers/xen/usbback/usbback.c 2011-04-11 14:27:33.000000000 +0200
@@ -290,7 +290,7 @@ static void usbbk_notify_work(usbif_t *u
wake_up(&usbif->wq);
}
@@ -11267,8 +11267,8 @@ Acked-by: jbeulich@novell.com
{
pending_req_t *pending_req = (pending_req_t *)urb->context;
---- head-2011-09-07.orig/drivers/xen/usbback/usbback.h 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-09-07/drivers/xen/usbback/usbback.h 2011-04-11 14:27:35.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/usbback/usbback.h 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/drivers/xen/usbback/usbback.h 2011-04-11 14:27:35.000000000 +0200
@@ -151,7 +151,7 @@ int portid_add(const char *busid,
int portid_remove(const domid_t domid,
const unsigned int handle,
@@ -11278,8 +11278,8 @@ Acked-by: jbeulich@novell.com
int usbbk_schedule(void *arg);
struct usbstub *find_attached_device(usbif_t *usbif, int port);
void usbbk_attach_device(usbif_t *usbif, struct usbstub *stub);
---- head-2011-09-07.orig/drivers/xen/usbback/usbstub.c 2011-03-02 12:00:16.000000000 +0100
-+++ head-2011-09-07/drivers/xen/usbback/usbstub.c 2011-03-11 10:54:35.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/usbback/usbstub.c 2011-03-02 12:00:16.000000000 +0100
++++ head-2011-10-07/drivers/xen/usbback/usbstub.c 2011-03-11 10:54:35.000000000 +0100
@@ -283,7 +283,7 @@ static ssize_t usbstub_show_portids(stru
static DRIVER_ATTR(port_ids, S_IRUSR, usbstub_show_portids, NULL);
@@ -11307,8 +11307,8 @@ Acked-by: jbeulich@novell.com
&driver_attr_port_ids);
usb_deregister(&usbback_usb_driver);
}
---- head-2011-09-07.orig/drivers/xen/usbfront/usbfront.h 2009-10-15 11:45:41.000000000 +0200
-+++ head-2011-09-07/drivers/xen/usbfront/usbfront.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/usbfront/usbfront.h 2009-10-15 11:45:41.000000000 +0200
++++ head-2011-10-07/drivers/xen/usbfront/usbfront.h 2011-01-31 17:29:16.000000000 +0100
@@ -195,7 +195,7 @@ timer_action(struct usbfront_info *info,
extern struct kmem_cache *xenhcd_urbp_cachep;
extern struct hc_driver xen_usb20_hc_driver;
@@ -11318,8 +11318,8 @@ Acked-by: jbeulich@novell.com
void xenhcd_rhport_state_change(struct usbfront_info *info,
int port, enum usb_device_speed speed);
int xenhcd_schedule(void *arg);
---- head-2011-09-07.orig/drivers/xen/usbfront/usbfront-dbg.c 2009-10-15 11:45:41.000000000 +0200
-+++ head-2011-09-07/drivers/xen/usbfront/usbfront-dbg.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/usbfront/usbfront-dbg.c 2009-10-15 11:45:41.000000000 +0200
++++ head-2011-10-07/drivers/xen/usbfront/usbfront-dbg.c 2011-01-31 17:29:16.000000000 +0100
@@ -90,7 +90,9 @@ static CLASS_DEVICE_ATTR(statistics, S_I
static inline void create_debug_file(struct usbfront_info *info)
{
@@ -11331,8 +11331,8 @@ Acked-by: jbeulich@novell.com
}
static inline void remove_debug_file(struct usbfront_info *info)
---- head-2011-09-07.orig/drivers/xen/usbfront/usbfront-q.c 2009-10-15 11:45:41.000000000 +0200
-+++ head-2011-09-07/drivers/xen/usbfront/usbfront-q.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/usbfront/usbfront-q.c 2009-10-15 11:45:41.000000000 +0200
++++ head-2011-10-07/drivers/xen/usbfront/usbfront-q.c 2011-01-31 17:29:16.000000000 +0100
@@ -236,7 +236,7 @@ __acquires(info->lock)
COUNT(info->stats.complete);
}
@@ -11351,8 +11351,8 @@ Acked-by: jbeulich@novell.com
{
xenhcd_notify_work((struct usbfront_info *) dev_id);
return IRQ_HANDLED;
---- head-2011-09-07.orig/drivers/xen/xenbus/xenbus_comms.c 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-09-07/drivers/xen/xenbus/xenbus_comms.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/xenbus/xenbus_comms.c 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/drivers/xen/xenbus/xenbus_comms.c 2011-01-31 17:29:16.000000000 +0100
@@ -54,7 +54,7 @@ static DECLARE_WORK(probe_work, xenbus_p
static DECLARE_WAIT_QUEUE_HEAD(xb_waitq);
@@ -11362,8 +11362,8 @@ Acked-by: jbeulich@novell.com
{
int old, new;
---- head-2011-09-07.orig/drivers/xen/xenoprof/xenoprofile.c 2010-01-07 09:38:29.000000000 +0100
-+++ head-2011-09-07/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/xenoprof/xenoprofile.c 2010-01-07 09:38:29.000000000 +0100
++++ head-2011-10-07/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 17:29:16.000000000 +0100
@@ -194,8 +194,7 @@ done:
oprofile_add_domain_switch(COORDINATOR_DOMAIN);
}
@@ -11374,8 +11374,8 @@ Acked-by: jbeulich@novell.com
{
struct xenoprof_buf * buf;
static unsigned long flag;
---- head-2011-09-07.orig/include/asm-generic/pgtable.h 2011-04-13 11:25:29.000000000 +0200
-+++ head-2011-09-07/include/asm-generic/pgtable.h 2011-03-11 10:54:24.000000000 +0100
+--- head-2011-10-07.orig/include/asm-generic/pgtable.h 2011-04-13 11:25:29.000000000 +0200
++++ head-2011-10-07/include/asm-generic/pgtable.h 2011-03-11 10:54:24.000000000 +0100
@@ -157,7 +157,7 @@ static inline void pmdp_set_wrprotect(st
#endif
@@ -11385,8 +11385,8 @@ Acked-by: jbeulich@novell.com
#endif
#ifndef __HAVE_ARCH_PMDP_SPLITTING_FLUSH
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/desc_32.h 2008-01-28 12:24:19.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/desc_32.h 2008-01-28 12:24:19.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:29:16.000000000 +0100
@@ -32,52 +32,110 @@ static inline struct desc_struct *get_cp
return (struct desc_struct *)per_cpu(cpu_gdt_descr, cpu).address;
}
@@ -11547,8 +11547,8 @@ Acked-by: jbeulich@novell.com
static inline void clear_LDT(void)
{
int cpu = get_cpu();
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2007-06-12 13:14:02.000000000 +0200
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2007-06-12 13:14:02.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:29:16.000000000 +0100
@@ -55,7 +55,7 @@ enum fixed_addresses {
#ifdef CONFIG_X86_LOCAL_APIC
FIX_APIC_BASE, /* local (CPU) APIC) -- required for SMP or not */
@@ -11570,8 +11570,8 @@ Acked-by: jbeulich@novell.com
#define set_fixmap(idx, phys) \
__set_fixmap(idx, phys, PAGE_KERNEL)
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/hypercall_32.h 2009-06-23 09:28:21.000000000 +0200
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/hypercall_32.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/hypercall_32.h 2009-06-23 09:28:21.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/hypercall_32.h 2011-01-31 17:29:16.000000000 +0100
@@ -128,6 +128,23 @@
__res; \
})
@@ -11642,8 +11642,8 @@ Acked-by: jbeulich@novell.com
return _hypercall3(int, grant_table_op, cmd, uop, count);
}
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/hypercall_64.h 2009-06-23 09:28:21.000000000 +0200
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/hypercall_64.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/hypercall_64.h 2009-06-23 09:28:21.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/hypercall_64.h 2011-01-31 17:29:16.000000000 +0100
@@ -135,6 +135,23 @@
__res; \
})
@@ -11713,8 +11713,8 @@ Acked-by: jbeulich@novell.com
return _hypercall3(int, grant_table_op, cmd, uop, count);
}
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2009-07-13 14:25:35.000000000 +0200
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/hypervisor.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2009-07-13 14:25:35.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/hypervisor.h 2011-01-31 17:29:16.000000000 +0100
@@ -44,6 +44,7 @@
#include <xen/interface/sched.h>
#include <xen/interface/nmi.h>
@@ -11785,8 +11785,8 @@ Acked-by: jbeulich@novell.com
static inline int
HYPERVISOR_yield(
void)
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2008-04-02 12:34:02.000000000 +0200
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2008-04-02 12:34:02.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:29:16.000000000 +0100
@@ -53,7 +53,6 @@ static inline int pte_exec_kernel(pte_t
* not possible, use pte_get_and_clear to obtain the old pte
* value and then use set_pte to update it. -ben
@@ -11843,8 +11843,8 @@ Acked-by: jbeulich@novell.com
static inline int pte_same(pte_t a, pte_t b)
{
return a.pte_low == b.pte_low && a.pte_high == b.pte_high;
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:37:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:37:16.000000000 +0100
@@ -260,31 +260,89 @@ static inline pte_t pte_mkhuge(pte_t pte
# include <asm/pgtable-2level.h>
#endif
@@ -12055,8 +12055,8 @@ Acked-by: jbeulich@novell.com
#include <asm-generic/pgtable.h>
#endif /* _I386_PGTABLE_H */
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:02:29.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:02:29.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:29:16.000000000 +0100
@@ -146,6 +146,18 @@ static inline void detect_ht(struct cpui
#define X86_EFLAGS_VIP 0x00100000 /* Virtual Interrupt Pending */
#define X86_EFLAGS_ID 0x00200000 /* CPUID detection flag */
@@ -12168,8 +12168,8 @@ Acked-by: jbeulich@novell.com
/* from system description table in BIOS. Mostly for MCA use, but
others may find it useful. */
extern unsigned int machine_id;
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/smp_32.h 2007-06-12 13:14:02.000000000 +0200
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/smp_32.h 2007-06-12 13:14:02.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:29:16.000000000 +0100
@@ -79,25 +79,36 @@ static inline int hard_smp_processor_id(
return GET_APIC_ID(*(unsigned long *)(APIC_BASE+APIC_ID));
}
@@ -12214,8 +12214,8 @@ Acked-by: jbeulich@novell.com
+#endif
+
#endif
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/system_32.h 2007-06-12 13:14:02.000000000 +0200
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/system_32.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/system_32.h 2007-06-12 13:14:02.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/system_32.h 2011-01-31 17:29:16.000000000 +0100
@@ -267,6 +267,9 @@ static inline unsigned long __xchg(unsig
#define cmpxchg(ptr,o,n)\
((__typeof__(*(ptr)))__cmpxchg((ptr),(unsigned long)(o),\
@@ -12266,8 +12266,8 @@ Acked-by: jbeulich@novell.com
#ifndef CONFIG_X86_CMPXCHG
/*
* Building a kernel capable running on 80386. It may be necessary to
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/tlbflush_32.h 2007-11-26 16:59:25.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/tlbflush_32.h 2007-11-26 16:59:25.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:29:16.000000000 +0100
@@ -8,8 +8,6 @@
#define __flush_tlb_global() xen_tlb_flush()
#define __flush_tlb_all() xen_tlb_flush()
@@ -12277,8 +12277,8 @@ Acked-by: jbeulich@novell.com
#define cpu_has_invlpg (boot_cpu_data.x86 > 3)
#define __flush_tlb_single(addr) xen_invlpg(addr)
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2007-06-12 13:14:13.000000000 +0200
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2007-06-12 13:14:13.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:29:16.000000000 +0100
@@ -41,7 +41,7 @@ enum fixed_addresses {
#ifdef CONFIG_X86_LOCAL_APIC
FIX_APIC_BASE, /* local (CPU) APIC) -- required for SMP or not */
@@ -12288,8 +12288,8 @@ Acked-by: jbeulich@novell.com
FIX_IO_APIC_BASE_0,
FIX_IO_APIC_BASE_END = FIX_IO_APIC_BASE_0 + MAX_IO_APICS-1,
#endif
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-02-07 15:37:14.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-02-07 15:37:14.000000000 +0100
@@ -44,12 +44,9 @@ extern unsigned long __supported_pte_mas
#define swapper_pg_dir init_level4_pgt
@@ -12468,8 +12468,8 @@ Acked-by: jbeulich@novell.com
#define __HAVE_ARCH_PTEP_GET_AND_CLEAR
#define __HAVE_ARCH_PTEP_GET_AND_CLEAR_FULL
#define __HAVE_ARCH_PTEP_CLEAR_FLUSH
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/processor_64.h 2008-03-06 08:54:32.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/processor_64.h 2008-03-06 08:54:32.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:29:16.000000000 +0100
@@ -484,6 +484,8 @@ static inline void __mwait(unsigned long
: :"a" (eax), "c" (ecx));
}
@@ -12479,8 +12479,8 @@ Acked-by: jbeulich@novell.com
#define stack_current() \
({ \
struct thread_info *ti; \
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/smp_64.h 2007-06-12 13:14:13.000000000 +0200
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/smp_64.h 2007-06-12 13:14:13.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:29:16.000000000 +0100
@@ -4,15 +4,12 @@
/*
* We need the APIC definitions automatically as part of 'smp.h'
@@ -12586,8 +12586,8 @@ Acked-by: jbeulich@novell.com
+#endif /* !CONFIG_SMP */
#endif
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/system_64.h 2007-11-26 16:59:25.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/system_64.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/system_64.h 2007-11-26 16:59:25.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/system_64.h 2011-01-31 17:29:16.000000000 +0100
@@ -24,6 +24,7 @@
#define __EXTRA_CLOBBER \
,"rcx","rbx","rdx","r8","r9","r10","r11","r12","r13","r14","r15"
@@ -12596,8 +12596,8 @@ Acked-by: jbeulich@novell.com
#define switch_to(prev,next,last) \
asm volatile(SAVE_CONTEXT \
"movq %%rsp,%P[threadrsp](%[prev])\n\t" /* save RSP */ \
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/tlbflush_64.h 2007-11-26 16:59:25.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/tlbflush_64.h 2007-11-26 16:59:25.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:29:16.000000000 +0100
@@ -12,9 +12,6 @@
*/
#define __flush_tlb_global() xen_tlb_flush()
@@ -12608,8 +12608,8 @@ Acked-by: jbeulich@novell.com
#define __flush_tlb_all() __flush_tlb_global()
#define __flush_tlb_one(addr) xen_invlpg((unsigned long)addr)
---- head-2011-09-07.orig/include/xen/evtchn.h 2011-01-31 15:14:12.000000000 +0100
-+++ head-2011-09-07/include/xen/evtchn.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/include/xen/evtchn.h 2011-01-31 15:14:12.000000000 +0100
++++ head-2011-10-07/include/xen/evtchn.h 2011-01-31 17:29:16.000000000 +0100
@@ -57,34 +57,34 @@
*/
int bind_caller_port_to_irqhandler(
@@ -12651,7 +12651,7 @@ Acked-by: jbeulich@novell.com
const char *devname,
void *dev_id);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-09-07/include/xen/net-util.h 2011-02-09 15:49:42.000000000 +0100
++++ head-2011-10-07/include/xen/net-util.h 2011-02-09 15:49:42.000000000 +0100
@@ -0,0 +1,74 @@
+#ifndef __XEN_NETUTIL_H__
+#define __XEN_NETUTIL_H__
@@ -12727,8 +12727,8 @@ Acked-by: jbeulich@novell.com
+}
+
+#endif /* __XEN_NETUTIL_H__ */
---- head-2011-09-07.orig/include/xen/xencons.h 2007-10-15 09:39:38.000000000 +0200
-+++ head-2011-09-07/include/xen/xencons.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/include/xen/xencons.h 2007-10-15 09:39:38.000000000 +0200
++++ head-2011-10-07/include/xen/xencons.h 2011-01-31 17:29:16.000000000 +0100
@@ -8,7 +8,7 @@ void xencons_force_flush(void);
void xencons_resume(void);
@@ -12738,8 +12738,8 @@ Acked-by: jbeulich@novell.com
void xencons_tx(void);
int xencons_ring_init(void);
---- head-2011-09-07.orig/mm/mprotect.c 2011-06-30 15:38:52.000000000 +0200
-+++ head-2011-09-07/mm/mprotect.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-10-07.orig/mm/mprotect.c 2011-06-30 15:38:52.000000000 +0200
++++ head-2011-10-07/mm/mprotect.c 2011-01-31 17:29:16.000000000 +0100
@@ -97,7 +97,7 @@ static inline void change_pmd_range(stru
}
if (pmd_none_or_clear_bad(pmd))
@@ -12749,8 +12749,8 @@ Acked-by: jbeulich@novell.com
continue;
change_pte_range(vma->vm_mm, pmd, addr, next, newprot,
dirty_accountable);
---- head-2011-09-07.orig/mm/page_alloc.c 2011-06-30 15:38:58.000000000 +0200
-+++ head-2011-09-07/mm/page_alloc.c 2011-09-07 15:22:03.000000000 +0200
+--- head-2011-10-07.orig/mm/page_alloc.c 2011-06-30 15:38:58.000000000 +0200
++++ head-2011-10-07/mm/page_alloc.c 2011-09-07 15:22:03.000000000 +0200
@@ -5184,6 +5184,23 @@ void setup_per_zone_wmarks(void)
spin_unlock_irqrestore(&zone->lock, flags);
}
diff --git a/patches.xen/xen3-patch-2.6.20 b/patches.xen/xen3-patch-2.6.20
index a3e374d434..e84cb3b269 100644
--- a/patches.xen/xen3-patch-2.6.20
+++ b/patches.xen/xen3-patch-2.6.20
@@ -6,8 +6,8 @@ Automatically created from "patches.kernel.org/patch-2.6.20" by xen-port-patches
Acked-by: jbeulich@novell.com
---- head-2011-09-07.orig/arch/x86/Kconfig 2011-09-07 15:22:25.000000000 +0200
-+++ head-2011-09-07/arch/x86/Kconfig 2011-09-07 15:22:38.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/Kconfig 2011-09-07 15:22:25.000000000 +0200
++++ head-2011-10-07/arch/x86/Kconfig 2011-09-07 15:22:38.000000000 +0200
@@ -1631,6 +1631,7 @@ config PHYSICAL_START
config RELOCATABLE
@@ -26,8 +26,8 @@ Acked-by: jbeulich@novell.com
default "0x1000000"
range 0x2000 0x1000000
---help---
---- head-2011-09-07.orig/arch/x86/kernel/asm-offsets_32.c 2011-04-13 11:32:32.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/asm-offsets_32.c 2011-04-13 12:30:12.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/kernel/asm-offsets_32.c 2011-04-13 11:32:32.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/asm-offsets_32.c 2011-04-13 12:30:12.000000000 +0200
@@ -64,6 +64,11 @@ void foo(void)
DEFINE(SYSENTER_stack_sp0, 0);
#endif
@@ -40,8 +40,8 @@ Acked-by: jbeulich@novell.com
#if defined(CONFIG_LGUEST) || defined(CONFIG_LGUEST_GUEST) || defined(CONFIG_LGUEST_MODULE)
BLANK();
OFFSET(LGUEST_DATA_irq_enabled, lguest_data, irq_enabled);
---- head-2011-09-07.orig/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -22,6 +22,7 @@
#define phys_pkg_id(a,b) a
#endif
@@ -439,8 +439,8 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_HOTPLUG_CPU
void __cpuinit cpu_uninit(void)
{
---- head-2011-09-07.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2008-01-28 12:24:18.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2008-01-28 12:24:18.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -12,7 +12,7 @@
static DEFINE_MUTEX(mtrr_mutex);
@@ -461,7 +461,7 @@ Acked-by: jbeulich@novell.com
struct xen_platform_op op;
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-09-07/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -0,0 +1,1002 @@
+#include <linux/kernel.h>
+#include <linux/types.h>
@@ -1465,8 +1465,8 @@ Acked-by: jbeulich@novell.com
+ return 0;
+}
+early_param("memmap", parse_memmap);
---- head-2011-09-07.orig/arch/x86/kernel/entry_32-xen.S 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/entry_32-xen.S 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/entry_32-xen.S 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/entry_32-xen.S 2011-01-31 17:32:16.000000000 +0100
@@ -30,12 +30,13 @@
* 18(%esp) - %eax
* 1C(%esp) - %ds
@@ -2237,8 +2237,8 @@ Acked-by: jbeulich@novell.com
ENTRY(fixup_4gb_segment)
RING0_EC_FRAME
pushl $do_fixup_4gb_segment
---- head-2011-09-07.orig/arch/x86/kernel/head_32-xen.S 2011-08-09 10:35:35.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/head_32-xen.S 2011-08-09 10:36:13.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/kernel/head_32-xen.S 2011-08-09 10:35:35.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/head_32-xen.S 2011-08-09 10:36:13.000000000 +0200
@@ -9,6 +9,7 @@
#include <asm/cache.h>
#include <asm/thread_info.h>
@@ -2355,8 +2355,8 @@ Acked-by: jbeulich@novell.com
.ascii ",FEATURES=writable_page_tables"
.ascii "|writable_descriptor_tables"
.ascii "|auto_translated_physmap"
---- head-2011-09-07.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -34,6 +34,7 @@
#include <linux/pci.h>
#include <linux/msi.h>
@@ -2549,8 +2549,8 @@ Acked-by: jbeulich@novell.com
set_native_irq_info(irq, TARGET_CPUS);
spin_unlock_irqrestore(&ioapic_lock, flags);
---- head-2011-09-07.orig/arch/x86/kernel/ldt_32-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/ldt_32-xen.c 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/ldt_32-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/ldt_32-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -177,16 +177,14 @@ static int read_default_ldt(void __user
{
int err;
@@ -2569,8 +2569,8 @@ Acked-by: jbeulich@novell.com
err = -EFAULT;
return err;
---- head-2011-09-07.orig/arch/x86/kernel/microcode-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/microcode-xen.c 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/microcode-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/microcode-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -1,7 +1,7 @@
/*
* Intel CPU Microcode Update Driver for Linux
@@ -2598,8 +2598,8 @@ Acked-by: jbeulich@novell.com
return 0;
}
---- head-2011-09-07.orig/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -36,7 +36,7 @@
/* Have we found an MP table */
@@ -2649,8 +2649,8 @@ Acked-by: jbeulich@novell.com
{
struct mpc_config_processor processor;
int boot_cpu = 0;
---- head-2011-09-07.orig/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -273,7 +273,7 @@ EXPORT_SYMBOL(dma_free_coherent);
int dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,
dma_addr_t device_addr, size_t size, int flags)
@@ -2686,8 +2686,8 @@ Acked-by: jbeulich@novell.com
return 0;
}
EXPORT_SYMBOL(dma_declare_coherent_memory);
---- head-2011-09-07.orig/arch/x86/kernel/process_32-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/process_32-xen.c 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/process_32-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/process_32-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -60,6 +60,7 @@
#include <asm/tlbflush.h>
@@ -2812,8 +2812,8 @@ Acked-by: jbeulich@novell.com
return prev_p;
}
---- head-2011-09-07.orig/arch/x86/kernel/setup_32-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/setup_32-xen.c 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/setup_32-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/setup_32-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -76,9 +76,6 @@
#include <xen/interface/kexec.h>
#endif
@@ -3900,8 +3900,8 @@ Acked-by: jbeulich@novell.com
if (is_initial_xendomain()) {
#ifdef CONFIG_VT
---- head-2011-09-07.orig/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -659,6 +659,10 @@ int smp_call_function_single(int cpu, vo
put_cpu();
return -EBUSY;
@@ -3913,8 +3913,8 @@ Acked-by: jbeulich@novell.com
spin_lock_bh(&call_lock);
__smp_call_function_single(cpu, func, info, nonatomic, wait);
spin_unlock_bh(&call_lock);
---- head-2011-09-07.orig/arch/x86/kernel/time-xen.c 2011-07-12 11:10:26.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/time-xen.c 2011-07-12 11:10:37.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/kernel/time-xen.c 2011-07-12 11:10:26.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/time-xen.c 2011-07-12 11:10:37.000000000 +0200
@@ -60,6 +60,7 @@
#include <asm/uaccess.h>
#include <asm/processor.h>
@@ -3970,8 +3970,8 @@ Acked-by: jbeulich@novell.com
}
#endif
---- head-2011-09-07.orig/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -29,6 +29,8 @@
#include <linux/kexec.h>
#include <linux/unwind.h>
@@ -4308,8 +4308,8 @@ Acked-by: jbeulich@novell.com
-}
-__setup("call_trace=", call_trace_setup);
-#endif
---- head-2011-09-07.orig/arch/x86/kernel/vmlinux.lds.S 2011-09-07 13:57:00.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/vmlinux.lds.S 2011-09-07 15:22:44.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/kernel/vmlinux.lds.S 2011-10-07 10:46:16.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/vmlinux.lds.S 2011-09-07 15:22:44.000000000 +0200
@@ -83,6 +83,10 @@ SECTIONS
{
#ifdef CONFIG_X86_32
@@ -4321,8 +4321,8 @@ Acked-by: jbeulich@novell.com
phys_startup_32 = startup_32 - LOAD_OFFSET;
#else
. = __START_KERNEL;
---- head-2011-09-07.orig/arch/x86/kvm/Kconfig 2011-09-07 13:56:13.000000000 +0200
-+++ head-2011-09-07/arch/x86/kvm/Kconfig 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kvm/Kconfig 2011-10-07 10:46:16.000000000 +0200
++++ head-2011-10-07/arch/x86/kvm/Kconfig 2011-01-31 17:32:16.000000000 +0100
@@ -7,6 +7,7 @@ source "virt/kvm/Kconfig"
menuconfig VIRTUALIZATION
bool "Virtualization"
@@ -4331,8 +4331,8 @@ Acked-by: jbeulich@novell.com
default y
---help---
Say Y here to get to see options for using your Linux host to run other
---- head-2011-09-07.orig/arch/x86/mm/fault_32-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/mm/fault_32-xen.c 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/mm/fault_32-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/mm/fault_32-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -22,9 +22,9 @@
#include <linux/highmem.h>
#include <linux/module.h>
@@ -4377,8 +4377,8 @@ Acked-by: jbeulich@novell.com
break;
prefetch = (instr_lo == 0xF) &&
(opcode == 0x0D || opcode == 0x18);
---- head-2011-09-07.orig/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -32,7 +32,7 @@ static void *__kmap_atomic(struct page *
unsigned long vaddr;
@@ -4433,8 +4433,8 @@ Acked-by: jbeulich@novell.com
idx = type + KM_TYPE_NR*smp_processor_id();
vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
---- head-2011-09-07.orig/arch/x86/mm/init_32-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/mm/init_32-xen.c 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/mm/init_32-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/mm/init_32-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -233,8 +233,6 @@ static inline int page_kills_ppro(unsign
#endif
@@ -4495,8 +4495,8 @@ Acked-by: jbeulich@novell.com
void __init pgtable_cache_init(void)
{
---- head-2011-09-07.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -203,7 +203,7 @@ void pte_free(struct page *pte)
__free_page(pte);
}
@@ -4524,9 +4524,9 @@ Acked-by: jbeulich@novell.com
{
unsigned long flags; /* can be called from interrupt context */
---- head-2011-09-07.orig/arch/x86/kernel/entry_64-xen.S 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/entry_64-xen.S 2011-01-31 17:32:16.000000000 +0100
-@@ -261,7 +261,6 @@ ENTRY(system_call)
+--- head-2011-10-07.orig/arch/x86/kernel/entry_64-xen.S 2011-10-07 11:17:17.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/entry_64-xen.S 2011-10-07 11:18:32.000000000 +0200
+@@ -263,7 +263,6 @@ ENTRY(system_call)
movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
GET_THREAD_INFO(%rcx)
testl $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SECCOMP),threadinfo_flags(%rcx)
@@ -4534,7 +4534,7 @@ Acked-by: jbeulich@novell.com
jnz tracesys
cmpq $__NR_syscall_max,%rax
ja badsys
-@@ -272,7 +271,6 @@ ENTRY(system_call)
+@@ -274,7 +273,6 @@ ENTRY(system_call)
* Syscall return path ending with SYSRET (fast path)
* Has incomplete stack frame and undefined top of stack.
*/
@@ -4542,7 +4542,7 @@ Acked-by: jbeulich@novell.com
ret_from_sys_call:
movl $_TIF_ALLWORK_MASK,%edi
/* edi: flagmask */
-@@ -282,8 +280,8 @@ sysret_check:
+@@ -284,8 +282,8 @@ sysret_check:
TRACE_IRQS_OFF
movl threadinfo_flags(%rcx),%edx
andl %edi,%edx
@@ -4552,8 +4552,8 @@ Acked-by: jbeulich@novell.com
/*
* sysretq will re-enable interrupts:
*/
-@@ -292,10 +290,10 @@ sysret_check:
- RESTORE_ARGS 0,8,0
+@@ -295,10 +293,10 @@ sysret_check:
+ xor %r11,%r11
HYPERVISOR_IRET VGCF_IN_SYSCALL
+ CFI_RESTORE_STATE
@@ -4564,7 +4564,7 @@ Acked-by: jbeulich@novell.com
bt $TIF_NEED_RESCHED,%edx
jnc sysret_signal
TRACE_IRQS_ON
-@@ -334,7 +332,6 @@ badsys:
+@@ -337,7 +335,6 @@ badsys:
/* Do syscall tracing */
tracesys:
@@ -4572,7 +4572,7 @@ Acked-by: jbeulich@novell.com
SAVE_REST
movq $-ENOSYS,RAX(%rsp)
FIXUP_TOP_OF_STACK %rdi
-@@ -350,32 +347,13 @@ tracesys:
+@@ -353,32 +350,13 @@ tracesys:
call *sys_call_table(,%rax,8)
1: movq %rax,RAX-ARGOFFSET(%rsp)
/* Use IRET because user could have changed frame */
@@ -4608,7 +4608,7 @@ Acked-by: jbeulich@novell.com
XEN_BLOCK_EVENTS(%rsi)
TRACE_IRQS_OFF
testb $3,CS-ARGOFFSET(%rsp)
-@@ -428,8 +406,6 @@ int_very_careful:
+@@ -431,8 +409,6 @@ int_very_careful:
popq %rdi
CFI_ADJUST_CFA_OFFSET -8
andl $~(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SINGLESTEP),%edi
@@ -4617,7 +4617,7 @@ Acked-by: jbeulich@novell.com
jmp int_restore_rest
int_signal:
-@@ -445,7 +421,7 @@ int_restore_rest:
+@@ -448,7 +424,7 @@ int_restore_rest:
TRACE_IRQS_OFF
jmp int_with_check
CFI_ENDPROC
@@ -4626,7 +4626,7 @@ Acked-by: jbeulich@novell.com
/*
* Certain special system calls that need to save a complete full stack frame.
-@@ -1270,36 +1246,3 @@ ENTRY(call_softirq)
+@@ -1273,36 +1249,3 @@ ENTRY(call_softirq)
ret
CFI_ENDPROC
ENDPROC(call_softirq)
@@ -4663,8 +4663,8 @@ Acked-by: jbeulich@novell.com
- CFI_ENDPROC
-ENDPROC(arch_unwind_init_running)
-#endif
---- head-2011-09-07.orig/arch/x86/kernel/head64-xen.c 2011-08-09 10:35:40.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/head64-xen.c 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/head64-xen.c 2011-08-09 10:35:40.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/head64-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -101,7 +101,10 @@ void __init x86_64_start_kernel(char * r
}
@@ -4677,8 +4677,8 @@ Acked-by: jbeulich@novell.com
set_intr_gate(i, early_idt_handler);
asm volatile("lidt %0" :: "m" (idt_descr));
#endif
---- head-2011-09-07.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -202,14 +202,20 @@ static struct IO_APIC_route_entry ioapic
* the interrupt, and we need to make sure the entry is fully populated
* before that happens.
@@ -4871,8 +4871,8 @@ Acked-by: jbeulich@novell.com
}
}
---- head-2011-09-07.orig/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -35,8 +35,6 @@
int smp_found_config;
unsigned int __initdata maxcpus = NR_CPUS;
@@ -4882,8 +4882,8 @@ Acked-by: jbeulich@novell.com
/*
* Various Linux-internal data structures created from the
* MP-table.
---- head-2011-09-07.orig/arch/x86/kernel/process_64-xen.c 2011-02-02 08:30:50.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/process_64-xen.c 2011-02-02 08:30:59.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/process_64-xen.c 2011-02-02 08:30:50.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/process_64-xen.c 2011-02-02 08:30:59.000000000 +0100
@@ -118,29 +118,23 @@ void exit_idle(void)
static void poll_idle (void)
{
@@ -4938,8 +4938,8 @@ Acked-by: jbeulich@novell.com
enter_idle();
idle();
/* In many cases the interrupt that ended idle
---- head-2011-09-07.orig/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -574,8 +574,7 @@ void __init setup_arch(char **cmdline_p)
if (LOADER_TYPE && INITRD_START) {
if (INITRD_START + INITRD_SIZE <= (end_pfn << PAGE_SHIFT)) {
@@ -4992,8 +4992,8 @@ Acked-by: jbeulich@novell.com
c->x86_max_cores = intel_num_cpu_cores(c);
srat_detect_node();
---- head-2011-09-07.orig/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -384,12 +384,17 @@ int smp_call_function_single (int cpu, v
put_cpu();
return 0;
@@ -5012,8 +5012,8 @@ Acked-by: jbeulich@novell.com
/*
* this function sends a 'generic call function' IPI to all other CPUs
---- head-2011-09-07.orig/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -30,9 +30,10 @@
#include <linux/kprobes.h>
#include <linux/kexec.h>
@@ -5239,8 +5239,8 @@ Acked-by: jbeulich@novell.com
-}
-early_param("call_trace", call_trace_setup);
-#endif
---- head-2011-09-07.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -42,6 +42,7 @@
#include <asm/topology.h>
@@ -5282,8 +5282,8 @@ Acked-by: jbeulich@novell.com
__set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_page0, PAGE_KERNEL_VSYSCALL);
}
---- head-2011-09-07.orig/arch/x86/mm/fault_64-xen.c 2011-07-26 09:24:01.000000000 +0200
-+++ head-2011-09-07/arch/x86/mm/fault_64-xen.c 2011-07-26 09:27:24.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/mm/fault_64-xen.c 2011-07-26 09:24:01.000000000 +0200
++++ head-2011-10-07/arch/x86/mm/fault_64-xen.c 2011-07-26 09:27:24.000000000 +0200
@@ -23,9 +23,9 @@
#include <linux/compiler.h>
#include <linux/module.h>
@@ -5331,8 +5331,8 @@ Acked-by: jbeulich@novell.com
}
void dump_pagetable(unsigned long address)
---- head-2011-09-07.orig/arch/x86/mm/init_64-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/mm/init_64-xen.c 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/mm/init_64-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/mm/init_64-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -1164,14 +1164,15 @@ static __init int x8664_sysctl_init(void
__initcall(x8664_sysctl_init);
#endif
@@ -5352,8 +5352,8 @@ Acked-by: jbeulich@novell.com
};
struct vm_area_struct *get_gate_vma(struct task_struct *tsk)
---- head-2011-09-07.orig/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -330,34 +330,40 @@ static struct page *split_large_page(uns
return base;
}
@@ -5440,9 +5440,9 @@ Acked-by: jbeulich@novell.com
}
}
---- head-2011-09-07.orig/drivers/pci/msi-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/drivers/pci/msi-xen.c 2011-01-31 17:32:16.000000000 +0100
-@@ -273,10 +273,8 @@ void disable_msi_mode(struct pci_dev *de
+--- head-2011-10-07.orig/drivers/pci/msi-xen.c 2011-10-07 11:17:59.000000000 +0200
++++ head-2011-10-07/drivers/pci/msi-xen.c 2011-10-07 11:18:20.000000000 +0200
+@@ -291,10 +291,8 @@ void disable_msi_mode(struct pci_dev *de
pci_write_config_word(dev, msi_control_reg(pos), control);
dev->msix_enabled = 0;
}
@@ -5455,7 +5455,7 @@ Acked-by: jbeulich@novell.com
}
static void enable_msi_mode(struct pci_dev *dev, int pos, int type)
-@@ -294,10 +292,8 @@ static void enable_msi_mode(struct pci_d
+@@ -312,10 +310,8 @@ static void enable_msi_mode(struct pci_d
pci_write_config_word(dev, msi_control_reg(pos), control);
dev->msix_enabled = 1;
}
@@ -5468,8 +5468,8 @@ Acked-by: jbeulich@novell.com
}
#ifdef CONFIG_PM
---- head-2011-09-07.orig/drivers/xen/balloon/balloon.c 2011-03-23 08:48:06.000000000 +0100
-+++ head-2011-09-07/drivers/xen/balloon/balloon.c 2011-03-23 08:51:42.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/balloon/balloon.c 2011-03-23 08:48:06.000000000 +0100
++++ head-2011-10-07/drivers/xen/balloon/balloon.c 2011-03-23 08:51:42.000000000 +0100
@@ -106,8 +106,8 @@ static unsigned long __read_mostly total
static LIST_HEAD(ballooned_pages);
@@ -5490,8 +5490,8 @@ Acked-by: jbeulich@novell.com
{
int need_sleep = 0;
long credit;
---- head-2011-09-07.orig/drivers/xen/blkback/blkback.c 2011-04-11 14:28:25.000000000 +0200
-+++ head-2011-09-07/drivers/xen/blkback/blkback.c 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/blkback/blkback.c 2011-04-11 14:28:25.000000000 +0200
++++ head-2011-10-07/drivers/xen/blkback/blkback.c 2011-01-31 17:32:16.000000000 +0100
@@ -37,6 +37,7 @@
#include <linux/spinlock.h>
@@ -5500,8 +5500,8 @@ Acked-by: jbeulich@novell.com
#include <linux/list.h>
#include <linux/delay.h>
#include <xen/balloon.h>
---- head-2011-09-07.orig/drivers/xen/blkback/interface.c 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-09-07/drivers/xen/blkback/interface.c 2011-04-11 14:29:25.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/blkback/interface.c 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/drivers/xen/blkback/interface.c 2011-04-11 14:29:25.000000000 +0200
@@ -35,7 +35,7 @@
#include <linux/kthread.h>
#include <linux/vmalloc.h>
@@ -5511,8 +5511,8 @@ Acked-by: jbeulich@novell.com
blkif_t *blkif_alloc(domid_t domid)
{
---- head-2011-09-07.orig/drivers/xen/blkfront/blkfront.c 2011-07-21 12:07:37.000000000 +0200
-+++ head-2011-09-07/drivers/xen/blkfront/blkfront.c 2011-06-30 16:03:31.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/blkfront/blkfront.c 2011-07-21 12:07:37.000000000 +0200
++++ head-2011-10-07/drivers/xen/blkfront/blkfront.c 2011-06-30 16:03:31.000000000 +0200
@@ -71,7 +71,7 @@ static int setup_blkring(struct xenbus_d
static void kick_pending_request_queues(struct blkfront_info *);
@@ -5543,8 +5543,8 @@ Acked-by: jbeulich@novell.com
spin_lock_irq(&blkif_io_lock);
if (info->connected == BLKIF_STATE_CONNECTED)
kick_pending_request_queues(info);
---- head-2011-09-07.orig/drivers/xen/blktap/blktap.c 2011-06-30 16:02:41.000000000 +0200
-+++ head-2011-09-07/drivers/xen/blktap/blktap.c 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/blktap/blktap.c 2011-06-30 16:02:41.000000000 +0200
++++ head-2011-10-07/drivers/xen/blktap/blktap.c 2011-01-31 17:32:16.000000000 +0100
@@ -40,6 +40,7 @@
#include <linux/spinlock.h>
@@ -5553,8 +5553,8 @@ Acked-by: jbeulich@novell.com
#include <linux/list.h>
#include <asm/hypervisor.h>
#include "common.h"
---- head-2011-09-07.orig/drivers/xen/blktap/interface.c 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-09-07/drivers/xen/blktap/interface.c 2011-04-11 14:29:39.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/blktap/interface.c 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/drivers/xen/blktap/interface.c 2011-04-11 14:29:39.000000000 +0200
@@ -35,7 +35,7 @@
#include <xen/evtchn.h>
#include <linux/vmalloc.h>
@@ -5564,8 +5564,8 @@ Acked-by: jbeulich@novell.com
blkif_t *tap_alloc_blkif(domid_t domid)
{
---- head-2011-09-07.orig/drivers/xen/char/mem.c 2007-08-06 15:10:49.000000000 +0200
-+++ head-2011-09-07/drivers/xen/char/mem.c 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/char/mem.c 2007-08-06 15:10:49.000000000 +0200
++++ head-2011-10-07/drivers/xen/char/mem.c 2011-01-31 17:32:16.000000000 +0100
@@ -157,7 +157,7 @@ static loff_t memory_lseek(struct file *
{
loff_t ret;
@@ -5584,8 +5584,8 @@ Acked-by: jbeulich@novell.com
return ret;
}
---- head-2011-09-07.orig/drivers/xen/console/console.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/drivers/xen/console/console.c 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/console/console.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/drivers/xen/console/console.c 2011-01-31 17:32:16.000000000 +0100
@@ -85,11 +85,6 @@ static int xc_num = -1;
#define XEN_HVC_MAJOR 229
#define XEN_HVC_MINOR 0
@@ -5620,8 +5620,8 @@ Acked-by: jbeulich@novell.com
if (buf[i] == '\x0f') { /* ^O */
if (!sysrq_requested) {
sysrq_requested = jiffies;
---- head-2011-09-07.orig/drivers/xen/core/reboot.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/drivers/xen/core/reboot.c 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/core/reboot.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/drivers/xen/core/reboot.c 2011-01-31 17:32:16.000000000 +0100
@@ -33,8 +33,8 @@ static int suspend_cancelled;
/* Can we leave APs online when we suspend? */
static int fast_suspend;
@@ -5657,8 +5657,8 @@ Acked-by: jbeulich@novell.com
{
int err;
---- head-2011-09-07.orig/drivers/xen/core/smpboot.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/drivers/xen/core/smpboot.c 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/core/smpboot.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/drivers/xen/core/smpboot.c 2011-01-31 17:32:16.000000000 +0100
@@ -158,7 +158,12 @@ static void xen_smp_intr_exit(unsigned i
void __cpuinit cpu_bringup(void)
@@ -5711,8 +5711,8 @@ Acked-by: jbeulich@novell.com
#ifdef __x86_64__
cpu_pda(cpu)->pcurrent = idle;
cpu_pda(cpu)->cpunumber = cpu;
---- head-2011-09-07.orig/drivers/xen/fbfront/xenfb.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/drivers/xen/fbfront/xenfb.c 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/fbfront/xenfb.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/drivers/xen/fbfront/xenfb.c 2011-01-31 17:32:16.000000000 +0100
@@ -25,6 +25,7 @@
#include <linux/vmalloc.h>
#include <linux/mm.h>
@@ -5721,8 +5721,8 @@ Acked-by: jbeulich@novell.com
#include <asm/hypervisor.h>
#include <xen/evtchn.h>
#include <xen/interface/io/fbif.h>
---- head-2011-09-07.orig/drivers/xen/netback/loopback.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/drivers/xen/netback/loopback.c 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/netback/loopback.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/drivers/xen/netback/loopback.c 2011-01-31 17:32:16.000000000 +0100
@@ -54,6 +54,7 @@
#include <net/dst.h>
#include <net/xfrm.h> /* secpath_reset() */
@@ -5731,8 +5731,8 @@ Acked-by: jbeulich@novell.com
static int nloopbacks = -1;
module_param(nloopbacks, int, 0);
---- head-2011-09-07.orig/drivers/xen/pcifront/pci_op.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/drivers/xen/pcifront/pci_op.c 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/pcifront/pci_op.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/drivers/xen/pcifront/pci_op.c 2011-01-31 17:32:16.000000000 +0100
@@ -634,9 +634,9 @@ static pci_ers_result_t pcifront_common_
}
@@ -5745,8 +5745,8 @@ Acked-by: jbeulich@novell.com
int cmd = pdev->sh_info->aer_op.cmd;
pci_channel_state_t state =
(pci_channel_state_t)pdev->sh_info->aer_op.err;
---- head-2011-09-07.orig/drivers/xen/pcifront/pcifront.h 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/drivers/xen/pcifront/pcifront.h 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/pcifront/pcifront.h 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/drivers/xen/pcifront/pcifront.h 2011-01-31 17:32:16.000000000 +0100
@@ -49,7 +49,7 @@ int pcifront_rescan_root(struct pcifront
unsigned int domain, unsigned int bus);
void pcifront_free_roots(struct pcifront_device *pdev);
@@ -5756,8 +5756,8 @@ Acked-by: jbeulich@novell.com
irqreturn_t pcifront_handler_aer(int irq, void *dev);
---- head-2011-09-07.orig/drivers/xen/pcifront/xenbus.c 2010-10-05 09:58:12.000000000 +0200
-+++ head-2011-09-07/drivers/xen/pcifront/xenbus.c 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/pcifront/xenbus.c 2010-10-05 09:58:12.000000000 +0200
++++ head-2011-10-07/drivers/xen/pcifront/xenbus.c 2011-01-31 17:32:16.000000000 +0100
@@ -50,7 +50,7 @@ static struct pcifront_device *alloc_pde
pdev->gnt_ref = INVALID_GRANT_REF;
pdev->irq = -1;
@@ -5767,8 +5767,8 @@ Acked-by: jbeulich@novell.com
dev_dbg(&xdev->dev, "Allocated pdev @ 0x%p pdev->sh_info @ 0x%p\n",
pdev, pdev->sh_info);
---- head-2011-09-07.orig/drivers/xen/scsiback/interface.c 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-09-07/drivers/xen/scsiback/interface.c 2011-04-11 14:30:02.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/scsiback/interface.c 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/drivers/xen/scsiback/interface.c 2011-04-11 14:30:02.000000000 +0200
@@ -41,7 +41,7 @@
#include <linux/vmalloc.h>
@@ -5778,8 +5778,8 @@ Acked-by: jbeulich@novell.com
struct vscsibk_info *vscsibk_info_alloc(domid_t domid)
{
---- head-2011-09-07.orig/drivers/xen/scsiback/scsiback.c 2011-04-11 14:27:51.000000000 +0200
-+++ head-2011-09-07/drivers/xen/scsiback/scsiback.c 2011-04-11 14:30:08.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/scsiback/scsiback.c 2011-04-11 14:27:51.000000000 +0200
++++ head-2011-10-07/drivers/xen/scsiback/scsiback.c 2011-04-11 14:30:08.000000000 +0200
@@ -343,13 +343,11 @@ static int scsiback_merge_bio(struct req
if (!rq->bio)
@@ -5795,8 +5795,8 @@ Acked-by: jbeulich@novell.com
}
return 0;
---- head-2011-09-07.orig/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 16:03:00.000000000 +0200
-+++ head-2011-09-07/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 16:03:44.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 16:03:00.000000000 +0200
++++ head-2011-10-07/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 16:03:44.000000000 +0200
@@ -465,7 +465,7 @@ netfront_accel_enqueue_skb_multi(netfron
if (skb->ip_summed == CHECKSUM_PARTIAL) {
@@ -5815,8 +5815,8 @@ Acked-by: jbeulich@novell.com
}
NETFRONT_ACCEL_PKTBUFF_FOR_EACH_FRAGMENT
(skb, idx, frag_data, frag_len, {
---- head-2011-09-07.orig/drivers/xen/tpmback/interface.c 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-09-07/drivers/xen/tpmback/interface.c 2011-04-11 14:30:27.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/tpmback/interface.c 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/drivers/xen/tpmback/interface.c 2011-04-11 14:30:27.000000000 +0200
@@ -18,7 +18,7 @@
#include <xen/evtchn.h>
#include <xen/gnttab.h>
@@ -5826,8 +5826,8 @@ Acked-by: jbeulich@novell.com
int num_frontends = 0;
LIST_HEAD(tpmif_list);
---- head-2011-09-07.orig/drivers/xen/usbback/usbback.c 2011-04-11 14:27:33.000000000 +0200
-+++ head-2011-09-07/drivers/xen/usbback/usbback.c 2011-04-11 14:30:35.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/usbback/usbback.c 2011-04-11 14:27:33.000000000 +0200
++++ head-2011-10-07/drivers/xen/usbback/usbback.c 2011-04-11 14:30:35.000000000 +0200
@@ -536,9 +536,10 @@ struct set_interface_request {
struct work_struct work;
};
@@ -5894,8 +5894,8 @@ Acked-by: jbeulich@novell.com
usb_get_dev(udev);
schedule_work(&req->work);
---- head-2011-09-07.orig/drivers/xen/xenbus/xenbus_comms.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/drivers/xen/xenbus/xenbus_comms.c 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/xenbus/xenbus_comms.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/drivers/xen/xenbus/xenbus_comms.c 2011-01-31 17:32:16.000000000 +0100
@@ -49,8 +49,8 @@
static int xenbus_irq;
@@ -5907,9 +5907,9 @@ Acked-by: jbeulich@novell.com
static DECLARE_WAIT_QUEUE_HEAD(xb_waitq);
---- head-2011-09-07.orig/drivers/xen/xenbus/xenbus_probe.c 2011-09-07 15:18:10.000000000 +0200
-+++ head-2011-09-07/drivers/xen/xenbus/xenbus_probe.c 2011-06-30 16:03:51.000000000 +0200
-@@ -955,7 +955,7 @@ static void xenbus_reset_state(void)
+--- head-2011-10-07.orig/drivers/xen/xenbus/xenbus_probe.c 2011-10-07 10:44:29.000000000 +0200
++++ head-2011-10-07/drivers/xen/xenbus/xenbus_probe.c 2011-10-07 11:18:25.000000000 +0200
+@@ -983,7 +983,7 @@ static void xenbus_reset_state(void)
}
#endif
@@ -5918,8 +5918,8 @@ Acked-by: jbeulich@novell.com
{
BUG_ON(!is_xenstored_ready());
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:32:16.000000000 +0100
@@ -4,8 +4,6 @@
#include <asm/ldt.h>
#include <asm/segment.h>
@@ -6105,8 +6105,8 @@ Acked-by: jbeulich@novell.com
#endif /* !__ASSEMBLY__ */
#endif
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:32:16.000000000 +0100
@@ -13,13 +13,16 @@
#ifndef _ASM_FIXMAP_H
#define _ASM_FIXMAP_H
@@ -6125,8 +6125,8 @@ Acked-by: jbeulich@novell.com
#ifndef __ASSEMBLY__
#include <linux/kernel.h>
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/highmem.h 2008-10-29 09:55:56.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/highmem.h 2008-10-29 09:55:56.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 17:32:16.000000000 +0100
@@ -85,7 +85,7 @@ static inline void clear_user_highpage(s
void copy_highpage(struct page *to, struct page *from);
@@ -6136,8 +6136,8 @@ Acked-by: jbeulich@novell.com
{
copy_highpage(to, from);
}
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/hypervisor.h 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/hypervisor.h 2011-01-31 17:32:16.000000000 +0100
@@ -47,15 +47,6 @@
#include <asm/percpu.h>
#include <asm/ptrace.h>
@@ -6154,8 +6154,8 @@ Acked-by: jbeulich@novell.com
extern shared_info_t *HYPERVISOR_shared_info;
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/irqflags_32.h 2007-06-12 13:14:02.000000000 +0200
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/irqflags_32.h 2007-06-12 13:14:02.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:32:16.000000000 +0100
@@ -22,9 +22,6 @@
#define __raw_local_save_flags() (current_vcpu_info()->evtchn_upcall_mask)
@@ -6250,8 +6250,8 @@ Acked-by: jbeulich@novell.com
#endif /* __ASSEMBLY__ */
/*
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2007-06-12 13:14:02.000000000 +0200
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2007-06-12 13:14:02.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:32:16.000000000 +0100
@@ -27,14 +27,13 @@ static inline void enter_lazy_tlb(struct
static inline void __prepare_arch_switch(void)
{
@@ -6291,8 +6291,8 @@ Acked-by: jbeulich@novell.com
static inline void activate_mm(struct mm_struct *prev, struct mm_struct *next)
{
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:32:16.000000000 +0100
@@ -1,8 +1,6 @@
#ifndef _I386_PGTABLE_3LEVEL_H
#define _I386_PGTABLE_3LEVEL_H
@@ -6391,8 +6391,8 @@ Acked-by: jbeulich@novell.com
#define __pte_mfn(_pte) (((_pte).pte_low >> PAGE_SHIFT) | \
((_pte).pte_high << (32-PAGE_SHIFT)))
#define pte_mfn(_pte) ((_pte).pte_low & _PAGE_PRESENT ? \
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:37:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:37:16.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-01-31 17:32:16.000000000 +0100
@@ -38,14 +38,14 @@ struct vm_area_struct;
#define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))
extern unsigned long empty_zero_page[1024];
@@ -6441,8 +6441,8 @@ Acked-by: jbeulich@novell.com
#define __HAVE_ARCH_PTEP_GET_AND_CLEAR_FULL
#define ptep_get_and_clear_full(mm, addr, ptep, full) \
((full) ? ({ \
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:32:16.000000000 +0100
@@ -20,6 +20,7 @@
#include <linux/threads.h>
#include <asm/percpu.h>
@@ -6721,8 +6721,8 @@ Acked-by: jbeulich@novell.com
+extern void secondary_cpu_init(void);
+
#endif /* __ASM_I386_PROCESSOR_H */
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:32:16.000000000 +0100
@@ -8,6 +8,7 @@
#include <linux/kernel.h>
#include <linux/threads.h>
@@ -6740,8 +6740,8 @@ Acked-by: jbeulich@novell.com
extern cpumask_t cpu_possible_map;
#define cpu_callin_map cpu_possible_map
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/system_32.h 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/system_32.h 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/system_32.h 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/system_32.h 2011-01-31 17:32:16.000000000 +0100
@@ -139,17 +139,17 @@ __asm__ __volatile__ ("movw %%dx,%1\n\t"
#define write_cr4(x) \
__asm__ __volatile__("movl %0,%%cr4": :"r" (x))
@@ -6766,8 +6766,8 @@ Acked-by: jbeulich@novell.com
static inline unsigned long get_limit(unsigned long segment)
{
unsigned long __limit;
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/desc_64.h 2008-01-28 12:24:19.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/desc_64.h 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/desc_64.h 2008-01-28 12:24:19.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/desc_64.h 2011-01-31 17:32:16.000000000 +0100
@@ -9,62 +9,11 @@
#include <linux/string.h>
@@ -6832,8 +6832,8 @@ Acked-by: jbeulich@novell.com
extern struct desc_ptr idt_descr, cpu_gdt_descr[NR_CPUS];
extern struct desc_struct cpu_gdt_table[GDT_ENTRIES];
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-02-07 15:37:14.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-02-07 15:37:14.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-01-31 17:32:16.000000000 +0100
@@ -237,19 +237,18 @@ extern unsigned int __kernel_page_user;
static inline unsigned long pgd_bad(pgd_t pgd)
@@ -6873,8 +6873,8 @@ Acked-by: jbeulich@novell.com
#define pfn_pmd(nr,prot) (__pmd(((nr) << PAGE_SHIFT) | pgprot_val(prot)))
#define pmd_pfn(x) ((pmd_val(x) & __PHYSICAL_MASK) >> PAGE_SHIFT)
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:32:16.000000000 +0100
@@ -484,6 +484,14 @@ static inline void __mwait(unsigned long
: :"a" (eax), "c" (ecx));
}
@@ -6890,8 +6890,8 @@ Acked-by: jbeulich@novell.com
extern void mwait_idle_with_hints(unsigned long eax, unsigned long ecx);
#define stack_current() \
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:32:16.000000000 +0100
@@ -88,11 +88,6 @@ extern u8 x86_cpu_to_log_apicid[NR_CPUS]
extern u8 bios_cpu_apicid[];
@@ -6918,8 +6918,8 @@ Acked-by: jbeulich@novell.com
#endif /* !CONFIG_SMP */
#endif
---- head-2011-09-07.orig/include/xen/net-util.h 2011-02-09 15:49:42.000000000 +0100
-+++ head-2011-09-07/include/xen/net-util.h 2011-02-09 15:50:19.000000000 +0100
+--- head-2011-10-07.orig/include/xen/net-util.h 2011-02-09 15:49:42.000000000 +0100
++++ head-2011-10-07/include/xen/net-util.h 2011-02-09 15:50:19.000000000 +0100
@@ -39,12 +39,12 @@ static inline int skb_checksum_setup(str
switch (iph->protocol) {
@@ -6944,8 +6944,8 @@ Acked-by: jbeulich@novell.com
goto out;
if (csum) {
---- head-2011-09-07.orig/kernel/kexec.c 2011-04-28 11:08:43.000000000 +0200
-+++ head-2011-09-07/kernel/kexec.c 2011-04-28 11:09:21.000000000 +0200
+--- head-2011-10-07.orig/kernel/kexec.c 2011-04-28 11:08:43.000000000 +0200
++++ head-2011-10-07/kernel/kexec.c 2011-04-28 11:09:21.000000000 +0200
@@ -372,7 +372,7 @@ static struct page *kimage_alloc_pages(g
if (limit == ~0UL)
address_bits = BITS_PER_LONG;
diff --git a/patches.xen/xen3-patch-2.6.21 b/patches.xen/xen3-patch-2.6.21
index 6be716aca2..0d5057f02c 100644
--- a/patches.xen/xen3-patch-2.6.21
+++ b/patches.xen/xen3-patch-2.6.21
@@ -6,8 +6,8 @@ Automatically created from "patches.kernel.org/patch-2.6.21" by xen-port-patches
Acked-by: jbeulich@novell.com
---- head-2011-09-07.orig/arch/x86/Kconfig 2011-09-07 15:22:38.000000000 +0200
-+++ head-2011-09-07/arch/x86/Kconfig 2011-09-07 15:25:17.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/Kconfig 2011-09-07 15:22:38.000000000 +0200
++++ head-2011-10-07/arch/x86/Kconfig 2011-09-07 15:25:17.000000000 +0200
@@ -92,9 +92,11 @@ config GENERIC_CMOS_UPDATE
config CLOCKSOURCE_WATCHDOG
@@ -29,8 +29,8 @@ Acked-by: jbeulich@novell.com
config LOCKDEP_SUPPORT
def_bool y
---- head-2011-09-07.orig/arch/x86/kernel/Makefile 2011-09-07 15:22:22.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/Makefile 2011-09-07 15:24:50.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/kernel/Makefile 2011-09-07 15:22:22.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/Makefile 2011-09-07 15:24:50.000000000 +0200
@@ -117,7 +117,7 @@ ifeq ($(CONFIG_X86_64),y)
pci-dma_64-$(CONFIG_XEN) += pci-dma_32.o
endif
@@ -41,8 +41,8 @@ Acked-by: jbeulich@novell.com
+ smpboot_$(BITS).o tsc_$(BITS).o tsc_sync.o
disabled-obj-$(CONFIG_XEN_UNPRIVILEGED_GUEST) += mpparse_64.o
%/head_$(BITS).o %/head_$(BITS).s: $(if $(CONFIG_XEN),EXTRA_AFLAGS,dummy) :=
---- head-2011-09-07.orig/arch/x86/kernel/apic/apic-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/apic/apic-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/apic/apic-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/apic/apic-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -25,6 +25,8 @@
#include <linux/kernel_stat.h>
#include <linux/sysdev.h>
@@ -139,8 +139,8 @@ Acked-by: jbeulich@novell.com
int setup_profiling_timer(unsigned int multiplier)
{
return -EINVAL;
---- head-2011-09-07.orig/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -612,7 +612,7 @@ void __init early_cpu_init(void)
struct pt_regs * __devinit idle_regs(struct pt_regs *regs)
{
@@ -186,8 +186,8 @@ Acked-by: jbeulich@novell.com
/* Clear all 6 debug registers: */
set_debugreg(0, 0);
---- head-2011-09-07.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -14,6 +14,7 @@
#include <asm/pgtable.h>
#include <asm/page.h>
@@ -227,8 +227,8 @@ Acked-by: jbeulich@novell.com
return sum == 0;
}
---- head-2011-09-07.orig/arch/x86/kernel/entry_32-xen.S 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:08:37.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/kernel/entry_32-xen.S 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:08:37.000000000 +0200
@@ -30,7 +30,7 @@
* 18(%esp) - %eax
* 1C(%esp) - %ds
@@ -601,8 +601,8 @@ Acked-by: jbeulich@novell.com
ENTRY(kernel_thread_helper)
pushl $0 # fake return address for unwinder
---- head-2011-09-07.orig/arch/x86/kernel/head_32-xen.S 2011-08-09 10:36:13.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/head_32-xen.S 2011-08-09 10:36:25.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/kernel/head_32-xen.S 2011-08-09 10:36:13.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/head_32-xen.S 2011-08-09 10:36:25.000000000 +0200
@@ -28,6 +28,7 @@
#define X86_CAPABILITY new_cpu_data+CPUINFO_x86_capability
#define X86_VENDOR_ID new_cpu_data+CPUINFO_x86_vendor_id
@@ -635,8 +635,8 @@ Acked-by: jbeulich@novell.com
/* get the PDA pointer */
movl $boot_pda, %eax
---- head-2011-09-07.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -167,7 +167,7 @@ static inline void io_apic_write(unsigne
*/
static inline void io_apic_modify(unsigned int apic, unsigned int reg, unsigned int value)
@@ -787,8 +787,8 @@ Acked-by: jbeulich@novell.com
spin_unlock_irqrestore(&ioapic_lock, flags);
return 0;
---- head-2011-09-07.orig/arch/x86/kernel/microcode-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/microcode-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/microcode-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/microcode-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -108,7 +108,7 @@ static ssize_t microcode_write (struct f
return ret;
}
@@ -798,8 +798,8 @@ Acked-by: jbeulich@novell.com
.owner = THIS_MODULE,
.write = microcode_write,
.open = microcode_open,
---- head-2011-09-07.orig/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -1079,7 +1079,7 @@ int mp_register_gsi(u32 gsi, int trigger
static int gsi_to_irq[MAX_GSI_NUM];
@@ -818,8 +818,8 @@ Acked-by: jbeulich@novell.com
gsi = pci_irq++;
gsi_to_irq[irq] = gsi;
} else {
---- head-2011-09-07.orig/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -308,7 +308,7 @@ int dma_declare_coherent_memory(struct d
return DMA_MEMORY_IO;
@@ -829,8 +829,8 @@ Acked-by: jbeulich@novell.com
out:
if (mem_base)
iounmap(mem_base);
---- head-2011-09-07.orig/arch/x86/kernel/pcspeaker.c 2008-12-25 00:26:37.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/pcspeaker.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/pcspeaker.c 2011-10-07 10:46:16.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/pcspeaker.c 2011-01-31 17:32:22.000000000 +0100
@@ -6,6 +6,11 @@ static __init int add_pcspkr(void)
{
struct platform_device *pd;
@@ -843,8 +843,8 @@ Acked-by: jbeulich@novell.com
pd = platform_device_register_simple("pcspkr", -1, NULL, 0);
return IS_ERR(pd) ? PTR_ERR(pd) : 0;
---- head-2011-09-07.orig/arch/x86/kernel/process_32-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/process_32-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/process_32-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/process_32-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -38,6 +38,7 @@
#include <linux/ptrace.h>
#include <linux/random.h>
@@ -957,8 +957,8 @@ Acked-by: jbeulich@novell.com
return prev_p;
}
---- head-2011-09-07.orig/arch/x86/kernel/setup_32-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/setup_32-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/setup_32-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/setup_32-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -33,7 +33,6 @@
#include <linux/initrd.h>
#include <linux/bootmem.h>
@@ -1048,8 +1048,8 @@ Acked-by: jbeulich@novell.com
- * c-basic-offset:8
- * End:
- */
---- head-2011-09-07.orig/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -335,8 +335,7 @@ static void flush_tlb_others(cpumask_t c
/*
* i'm not happy about this global shared spinlock in the
@@ -1069,8 +1069,8 @@ Acked-by: jbeulich@novell.com
flush_mm = NULL;
flush_va = 0;
---- head-2011-09-07.orig/arch/x86/kernel/time-xen.c 2011-07-12 11:10:37.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/time-xen.c 2011-07-12 11:13:30.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/kernel/time-xen.c 2011-07-12 11:10:37.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/time-xen.c 2011-07-12 11:13:30.000000000 +0200
@@ -50,6 +50,7 @@
#include <linux/kernel_stat.h>
#include <linux/posix-timers.h>
@@ -1605,8 +1605,8 @@ Acked-by: jbeulich@novell.com
return 0;
}
__initcall(xen_sysctl_init);
---- head-2011-09-07.orig/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -100,6 +100,7 @@ asmlinkage void fixup_4gb_segment(void);
asmlinkage void machine_check(void);
@@ -1681,8 +1681,8 @@ Acked-by: jbeulich@novell.com
+ return 1;
+}
+__setup("code_bytes=", code_bytes_setup);
---- head-2011-09-07.orig/arch/x86/mm/fault_32-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/mm/fault_32-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/mm/fault_32-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/mm/fault_32-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -46,43 +46,17 @@ int unregister_page_fault_notifier(struc
}
EXPORT_SYMBOL_GPL(unregister_page_fault_notifier);
@@ -1753,8 +1753,8 @@ Acked-by: jbeulich@novell.com
return;
/* It's safe to allow irq's after cr2 has been saved and the vmalloc
---- head-2011-09-07.orig/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -33,14 +33,16 @@ static void *__kmap_atomic(struct page *
/* even !CONFIG_PREEMPT needs this, for in_atomic in do_page_fault */
@@ -1783,8 +1783,8 @@ Acked-by: jbeulich@novell.com
return (void*) vaddr;
}
---- head-2011-09-07.orig/arch/x86/mm/init_32-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/mm/init_32-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/mm/init_32-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/mm/init_32-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -66,6 +66,7 @@ static pmd_t * __init one_md_table_init(
#ifdef CONFIG_X86_PAE
@@ -1801,8 +1801,8 @@ Acked-by: jbeulich@novell.com
make_lowmem_page_readonly(page_table,
XENFEAT_writable_page_tables);
set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
---- head-2011-09-07.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -149,6 +149,8 @@ void __set_fixmap (enum fixed_addresses
void __init reserve_top_address(unsigned long reserve)
{
@@ -1882,8 +1882,8 @@ Acked-by: jbeulich@novell.com
kmem_cache_free(pmd_cache, pmd);
}
---- head-2011-09-07.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:32:22.000000000 +0100
@@ -465,7 +465,7 @@ ia32_sys_call_table:
.quad sys32_vm86_warning /* vm86old */
.quad compat_sys_wait4
@@ -1908,8 +1908,8 @@ Acked-by: jbeulich@novell.com
.quad sys_getcpu
+ .quad sys_epoll_pwait
ia32_syscall_end:
---- head-2011-09-07.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -90,6 +90,13 @@ static inline int bad_addr(unsigned long
return 1;
}
@@ -1971,9 +1971,9 @@ Acked-by: jbeulich@novell.com
{
if (userdef) {
printk(KERN_INFO "user-defined physical RAM map:\n");
---- head-2011-09-07.orig/arch/x86/kernel/entry_64-xen.S 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/entry_64-xen.S 2011-01-31 17:32:22.000000000 +0100
-@@ -629,6 +629,9 @@ END(invalidate_interrupt\num)
+--- head-2011-10-07.orig/arch/x86/kernel/entry_64-xen.S 2011-10-07 11:18:32.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/entry_64-xen.S 2011-10-07 11:20:12.000000000 +0200
+@@ -632,6 +632,9 @@ END(invalidate_interrupt\num)
ENTRY(call_function_interrupt)
apicinterrupt CALL_FUNCTION_VECTOR,smp_call_function_interrupt
END(call_function_interrupt)
@@ -1983,8 +1983,8 @@ Acked-by: jbeulich@novell.com
#endif
ENTRY(apic_timer_interrupt)
---- head-2011-09-07.orig/arch/x86/kernel/head64-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/head64-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/head64-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/head64-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -45,8 +45,6 @@ static void __init clear_bss(void)
#define OLD_CL_BASE_ADDR 0x90000
#define OLD_CL_OFFSET 0x90022
@@ -2012,8 +2012,8 @@ Acked-by: jbeulich@novell.com
#endif
}
---- head-2011-09-07.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -36,6 +36,7 @@
#include <acpi/acpi_bus.h>
#endif
@@ -2828,8 +2828,8 @@ Acked-by: jbeulich@novell.com
else
set_ioapic_affinity_irq(irq, TARGET_CPUS);
}
---- head-2011-09-07.orig/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -60,9 +60,9 @@ unsigned long mp_lapic_addr = 0;
/* Processor that is doing the boot up */
unsigned int boot_cpu_id = -1U;
@@ -2851,8 +2851,8 @@ Acked-by: jbeulich@novell.com
return gsi;
ioapic = mp_find_ioapic(gsi);
---- head-2011-09-07.orig/arch/x86/kernel/process_64-xen.c 2011-02-02 08:30:59.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/process_64-xen.c 2011-02-02 08:31:05.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/process_64-xen.c 2011-02-02 08:30:59.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/process_64-xen.c 2011-02-02 08:31:05.000000000 +0100
@@ -337,14 +337,17 @@ void load_gs_index(unsigned gs)
void flush_thread(void)
{
@@ -2876,8 +2876,8 @@ Acked-by: jbeulich@novell.com
tsk->thread.debugreg0 = 0;
tsk->thread.debugreg1 = 0;
---- head-2011-09-07.orig/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -141,7 +141,7 @@ EXPORT_SYMBOL_GPL(edid_info);
extern int root_mountflags;
@@ -3151,8 +3151,8 @@ Acked-by: jbeulich@novell.com
-}
-device_initcall(add_pcspkr);
-#endif
---- head-2011-09-07.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -26,6 +26,7 @@
#include <linux/seqlock.h>
#include <linux/jiffies.h>
@@ -3370,8 +3370,8 @@ Acked-by: jbeulich@novell.com
#endif
on_each_cpu(cpu_vsyscall_init, NULL, 0, 1);
hotcpu_notifier(cpu_vsyscall_notifier, 0);
---- head-2011-09-07.orig/arch/x86/mm/fault_64-xen.c 2011-07-26 09:27:24.000000000 +0200
-+++ head-2011-09-07/arch/x86/mm/fault_64-xen.c 2011-07-26 09:27:34.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/mm/fault_64-xen.c 2011-07-26 09:27:24.000000000 +0200
++++ head-2011-10-07/arch/x86/mm/fault_64-xen.c 2011-07-26 09:27:34.000000000 +0200
@@ -56,38 +56,17 @@ int unregister_page_fault_notifier(struc
}
EXPORT_SYMBOL_GPL(unregister_page_fault_notifier);
@@ -3437,8 +3437,8 @@ Acked-by: jbeulich@novell.com
return;
if (likely(regs->eflags & X86_EFLAGS_IF))
---- head-2011-09-07.orig/arch/x86/mm/init_64-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/mm/init_64-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/mm/init_64-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/mm/init_64-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -1145,20 +1145,30 @@ int kern_addr_valid(unsigned long addr)
extern int exception_trace, page_fault_trace;
@@ -3477,8 +3477,8 @@ Acked-by: jbeulich@novell.com
return 0;
}
__initcall(x8664_sysctl_init);
---- head-2011-09-07.orig/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -350,8 +350,8 @@ static void flush_kernel_map(void *arg)
void *adr = page_address(pg);
if (cpu_has_clflush)
@@ -3507,8 +3507,8 @@ Acked-by: jbeulich@novell.com
large_pte = pte_mkhuge(large_pte);
set_pte((pte_t *)pmd, large_pte);
}
---- head-2011-09-07.orig/drivers/acpi/processor_extcntl.c 2011-01-31 14:53:38.000000000 +0100
-+++ head-2011-09-07/drivers/acpi/processor_extcntl.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/drivers/acpi/processor_extcntl.c 2011-01-31 14:53:38.000000000 +0100
++++ head-2011-10-07/drivers/acpi/processor_extcntl.c 2011-01-31 17:32:22.000000000 +0100
@@ -32,9 +32,8 @@
#define ACPI_PROCESSOR_COMPONENT 0x01000000
@@ -3549,8 +3549,8 @@ Acked-by: jbeulich@novell.com
if (ACPI_FAILURE(status))
return status;
---- head-2011-09-07.orig/drivers/char/tpm/tpm_xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/drivers/char/tpm/tpm_xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/drivers/char/tpm/tpm_xen.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/drivers/char/tpm/tpm_xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -481,7 +481,6 @@ static struct xenbus_device_id tpmfront_
static struct xenbus_driver tpmfront = {
@@ -3571,9 +3571,9 @@ Acked-by: jbeulich@novell.com
}
static int tpmif_allocate_tx_buffers(struct tpm_private *tp)
---- head-2011-09-07.orig/drivers/pci/msi-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/drivers/pci/msi-xen.c 2011-01-31 17:32:22.000000000 +0100
-@@ -36,8 +36,6 @@ struct msi_dev_list {
+--- head-2011-10-07.orig/drivers/pci/msi-xen.c 2011-10-07 11:18:20.000000000 +0200
++++ head-2011-10-07/drivers/pci/msi-xen.c 2011-10-07 11:20:08.000000000 +0200
+@@ -41,8 +41,6 @@ struct msi_dev_list {
struct list_head list;
spinlock_t pirq_list_lock;
struct list_head pirq_list_head;
@@ -3582,7 +3582,7 @@ Acked-by: jbeulich@novell.com
/* Store default pre-assigned irq */
unsigned int default_irq;
};
-@@ -46,14 +44,38 @@ struct msi_pirq_entry {
+@@ -51,14 +49,38 @@ struct msi_pirq_entry {
struct list_head list;
int pirq;
int entry_nr;
@@ -3627,7 +3627,7 @@ Acked-by: jbeulich@novell.com
static struct msi_dev_list *get_msi_dev_pirq_list(struct pci_dev *dev)
{
struct msi_dev_list *msi_dev_list, *ret = NULL;
-@@ -163,8 +185,8 @@ static int msi_unmap_pirq(struct pci_dev
+@@ -168,8 +190,8 @@ static int msi_unmap_pirq(struct pci_dev
int rc;
unmap.domid = msi_get_dev_owner(dev);
@@ -3638,7 +3638,7 @@ Acked-by: jbeulich@novell.com
*/
unmap.pirq = (unmap.domid != DOMID_SELF)
? pirq : evtchn_get_xen_pirq(pirq);
-@@ -200,8 +222,7 @@ static u64 find_table_base(struct pci_de
+@@ -205,8 +227,7 @@ static u64 find_table_base(struct pci_de
/*
* Protected by msi_lock
*/
@@ -3647,17 +3647,17 @@ Acked-by: jbeulich@novell.com
+static int msi_map_vector(struct pci_dev *dev, int entry_nr, u64 table_base)
{
struct physdev_map_pirq map_irq;
- int rc;
-@@ -212,7 +233,7 @@ static int msi_map_pirq_to_vector(struct
+ int rc = -EINVAL;
+@@ -217,7 +238,7 @@ static int msi_map_pirq_to_vector(struct
map_irq.domid = domid;
- map_irq.type = MAP_PIRQ_TYPE_MSI;
+ map_irq.type = MAP_PIRQ_TYPE_MSI_SEG;
map_irq.index = -1;
- map_irq.pirq = pirq < 0 ? -1 : evtchn_get_xen_pirq(pirq);
+ map_irq.pirq = -1;
- map_irq.bus = dev->bus->number;
+ map_irq.bus = dev->bus->number | (pci_domain_nr(dev->bus) << 16);
map_irq.devfn = dev->devfn;
map_irq.entry_nr = entry_nr;
-@@ -223,7 +244,7 @@ static int msi_map_pirq_to_vector(struct
+@@ -241,7 +262,7 @@ static int msi_map_pirq_to_vector(struct
if (rc < 0)
return rc;
@@ -3666,7 +3666,7 @@ Acked-by: jbeulich@novell.com
if (rc == 0 && map_irq.pirq < 0)
return -ENOSYS;
-@@ -235,236 +256,35 @@ static int msi_map_pirq_to_vector(struct
+@@ -253,236 +274,52 @@ static int msi_map_pirq_to_vector(struct
* to another domain, and will be 'Linux irq' if it belongs to dom0.
*/
return ((domid != DOMID_SELF) ?
@@ -3778,11 +3778,13 @@ Acked-by: jbeulich@novell.com
- u16 control;
- struct pci_cap_saved_state *save_state;
- u32 *cap;
--
++ int rc = -ENOSYS;
+
- save_state = pci_find_saved_cap(dev, PCI_CAP_ID_MSI);
- pos = pci_find_capability(dev, PCI_CAP_ID_MSI);
- if (!save_state || pos <= 0)
-- return;
++ if (!dev->msi_enabled && !dev->msix_enabled)
+ return;
- cap = &save_state->data[0];
-
- control = cap[i++] >> 16;
@@ -3813,12 +3815,24 @@ Acked-by: jbeulich@novell.com
- pos = pci_find_capability(dev, PCI_CAP_ID_MSIX);
- if (pos <= 0 || dev->no_msi)
- return 0;
--
+
- /* save the capability */
- pci_read_config_word(dev, msi_control_reg(pos), &control);
- if (!(control & PCI_MSIX_FLAGS_ENABLE))
- return 0;
--
++ pci_intx(dev, 0); /* disable intx */
++ if (dev->msi_enabled)
++ msi_set_enable(dev, 0);
++ if (dev->msix_enabled)
++ msix_set_enable(dev, 0);
++
++ if (pci_seg_supported) {
++ struct physdev_pci_device restore = {
++ .seg = pci_domain_nr(dev->bus),
++ .bus = dev->bus->number,
++ .devfn = dev->devfn
++ };
+
- msi_dev_entry = get_msi_dev_pirq_list(dev);
- /* If we failed to map the MSI-X table at pci_enable_msix,
- * We could not support saving them here.
@@ -3831,7 +3845,9 @@ Acked-by: jbeulich@novell.com
- if (!save_state) {
- printk(KERN_ERR "Out of memory in pci_save_msix_state\n");
- return -ENOMEM;
-- }
++ rc = HYPERVISOR_physdev_op(PHYSDEVOP_restore_msi_ext,
++ &restore);
+ }
- *((u16 *)&save_state->data[0]) = control;
-
- spin_lock_irqsave(&msi_dev_entry->pirq_list_lock, flags);
@@ -3874,17 +3890,20 @@ Acked-by: jbeulich@novell.com
- save = *((u16 *)&save_state->data[0]);
- pci_remove_saved_cap(save_state);
- kfree(save_state);
-+ int rc;
-+ struct physdev_restore_msi restore;
-
+-
- pos = pci_find_capability(dev, PCI_CAP_ID_MSIX);
- if (pos <= 0)
-+ if (!dev->msi_enabled && !dev->msix_enabled)
- return;
-
+- return;
+-
- msi_dev_entry = get_msi_dev_pirq_list(dev);
- base = msi_dev_entry->mask_base;
--
++#if CONFIG_XEN_COMPAT < 0x040200
++ if (rc == -ENOSYS && !pci_domain_nr(dev->bus)) {
++ struct physdev_restore_msi restore = {
++ .bus = dev->bus->number,
++ .devfn = dev->devfn
++ };
+
- spin_lock_irqsave(&msi_dev_entry->pirq_list_lock, flags);
- list_for_each_entry(pirq_entry, &msi_dev_entry->pirq_list_head, list) {
- /* route the table */
@@ -3898,27 +3917,22 @@ Acked-by: jbeulich@novell.com
- writel(pirq_entry->data_save,
- base + j * PCI_MSIX_ENTRY_SIZE +
- PCI_MSIX_ENTRY_DATA_OFFSET);
-- }
++ pci_seg_supported = false;
++ rc = HYPERVISOR_physdev_op(PHYSDEVOP_restore_msi, &restore);
+ }
- spin_unlock_irqrestore(&msi_dev_entry->pirq_list_lock, flags);
-+ pci_intx(dev, 0); /* disable intx */
-+ if (dev->msi_enabled)
-+ msi_set_enable(dev, 0);
-+ if (dev->msix_enabled)
-+ msix_set_enable(dev, 0);
-
+-
- pci_write_config_word(dev, msi_control_reg(pos), save);
- enable_msi_mode(dev, pos, PCI_CAP_ID_MSIX);
-+ restore.bus = dev->bus->number;
-+ restore.devfn = dev->devfn;
-+ rc = HYPERVISOR_physdev_op(PHYSDEVOP_restore_msi, &restore);
+-}
+ #endif
+ WARN(rc && rc != -ENOSYS, "restore_msi -> %d\n", rc);
- }
--#endif
++}
+#endif /* CONFIG_PM */
/**
* msi_capability_init - configure device's MSI capability structure
-@@ -480,6 +300,8 @@ static int msi_capability_init(struct pc
+@@ -498,6 +335,8 @@ static int msi_capability_init(struct pc
int pos, pirq;
u16 control;
@@ -3927,7 +3941,7 @@ Acked-by: jbeulich@novell.com
pos = pci_find_capability(dev, PCI_CAP_ID_MSI);
pci_read_config_word(dev, msi_control_reg(pos), &control);
-@@ -488,7 +310,8 @@ static int msi_capability_init(struct pc
+@@ -506,7 +345,8 @@ static int msi_capability_init(struct pc
return -EBUSY;
/* Set MSI enabled bits */
@@ -3937,7 +3951,7 @@ Acked-by: jbeulich@novell.com
dev->msi_enabled = 1;
dev->irq = pirq;
-@@ -509,25 +332,20 @@ static int msix_capability_init(struct p
+@@ -527,25 +367,20 @@ static int msix_capability_init(struct p
struct msix_entry *entries, int nvec)
{
u64 table_base;
@@ -3966,7 +3980,7 @@ Acked-by: jbeulich@novell.com
/* MSI-X Table Initialization */
for (i = 0; i < nvec; i++) {
mapped = 0;
-@@ -566,7 +384,8 @@ static int msix_capability_init(struct p
+@@ -584,7 +419,8 @@ static int msix_capability_init(struct p
return avail;
}
@@ -3976,7 +3990,7 @@ Acked-by: jbeulich@novell.com
dev->msix_enabled = 1;
return 0;
-@@ -651,17 +470,14 @@ int pci_enable_msi(struct pci_dev* dev)
+@@ -669,17 +505,14 @@ int pci_enable_msi(struct pci_dev* dev)
/* Check whether driver already requested for MSI-X irqs */
if (dev->msix_enabled) {
printk(KERN_INFO "PCI: %s: Can't enable MSI. "
@@ -3996,7 +4010,7 @@ Acked-by: jbeulich@novell.com
return status;
}
-@@ -669,7 +485,6 @@ int pci_enable_msi(struct pci_dev* dev)
+@@ -687,7 +520,6 @@ int pci_enable_msi(struct pci_dev* dev)
extern void pci_frontend_disable_msi(struct pci_dev* dev);
void pci_disable_msi(struct pci_dev* dev)
{
@@ -4004,7 +4018,7 @@ Acked-by: jbeulich@novell.com
int pirq;
struct msi_dev_list *msi_dev_entry = get_msi_dev_pirq_list(dev);
-@@ -678,13 +493,11 @@ void pci_disable_msi(struct pci_dev* dev
+@@ -696,13 +528,11 @@ void pci_disable_msi(struct pci_dev* dev
if (!dev)
return;
@@ -4021,7 +4035,7 @@ Acked-by: jbeulich@novell.com
evtchn_map_pirq(dev->irq, 0);
pci_frontend_disable_msi(dev);
dev->irq = msi_dev_entry->default_irq;
-@@ -693,23 +506,15 @@ void pci_disable_msi(struct pci_dev* dev
+@@ -711,23 +541,15 @@ void pci_disable_msi(struct pci_dev* dev
}
#endif
@@ -4048,7 +4062,7 @@ Acked-by: jbeulich@novell.com
}
/**
-@@ -804,7 +609,6 @@ int pci_enable_msix(struct pci_dev* dev,
+@@ -822,7 +644,6 @@ int pci_enable_msix(struct pci_dev* dev,
printk(KERN_INFO "PCI: %s: Can't enable MSI-X. "
"Device already has an MSI irq assigned\n",
pci_name(dev));
@@ -4056,7 +4070,7 @@ Acked-by: jbeulich@novell.com
return -EINVAL;
}
-@@ -812,8 +616,6 @@ int pci_enable_msix(struct pci_dev* dev,
+@@ -830,8 +651,6 @@ int pci_enable_msix(struct pci_dev* dev,
if ( !status )
msi_dev_entry->default_irq = temp;
@@ -4065,7 +4079,7 @@ Acked-by: jbeulich@novell.com
return status;
}
-@@ -821,18 +623,13 @@ int pci_enable_msix(struct pci_dev* dev,
+@@ -839,18 +658,13 @@ int pci_enable_msix(struct pci_dev* dev,
extern void pci_frontend_disable_msix(struct pci_dev* dev);
void pci_disable_msix(struct pci_dev* dev)
{
@@ -4086,7 +4100,7 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_XEN_PCIDEV_FRONTEND
if (!is_initial_xendomain()) {
-@@ -855,18 +652,12 @@ void pci_disable_msix(struct pci_dev* de
+@@ -873,18 +687,12 @@ void pci_disable_msix(struct pci_dev* de
}
#endif
@@ -4108,7 +4122,7 @@ Acked-by: jbeulich@novell.com
}
/**
-@@ -898,8 +689,6 @@ void msi_remove_pci_irq_vectors(struct p
+@@ -916,8 +724,6 @@ void msi_remove_pci_irq_vectors(struct p
kfree(pirq_entry);
}
spin_unlock_irqrestore(&msi_dev_entry->pirq_list_lock, flags);
@@ -4117,8 +4131,8 @@ Acked-by: jbeulich@novell.com
dev->irq = msi_dev_entry->default_irq;
}
---- head-2011-09-07.orig/drivers/xen/balloon/sysfs.c 2009-06-09 15:01:37.000000000 +0200
-+++ head-2011-09-07/drivers/xen/balloon/sysfs.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/balloon/sysfs.c 2009-06-09 15:01:37.000000000 +0200
++++ head-2011-10-07/drivers/xen/balloon/sysfs.c 2011-01-31 17:32:22.000000000 +0100
@@ -34,6 +34,7 @@
#include <linux/stat.h>
#include <linux/string.h>
@@ -4127,8 +4141,8 @@ Acked-by: jbeulich@novell.com
#include "common.h"
#ifdef HAVE_XEN_PLATFORM_COMPAT_H
---- head-2011-09-07.orig/drivers/xen/blkback/xenbus.c 2011-06-30 15:37:44.000000000 +0200
-+++ head-2011-09-07/drivers/xen/blkback/xenbus.c 2011-06-30 16:04:52.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/blkback/xenbus.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-10-07/drivers/xen/blkback/xenbus.c 2011-06-30 16:04:52.000000000 +0200
@@ -545,7 +545,6 @@ static const struct xenbus_device_id blk
static struct xenbus_driver blkback = {
@@ -4145,8 +4159,8 @@ Acked-by: jbeulich@novell.com
+ if (xenbus_register_backend(&blkback))
+ BUG();
}
---- head-2011-09-07.orig/drivers/xen/blkfront/blkfront.c 2011-06-30 16:03:31.000000000 +0200
-+++ head-2011-09-07/drivers/xen/blkfront/blkfront.c 2011-07-21 12:07:52.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/blkfront/blkfront.c 2011-06-30 16:03:31.000000000 +0200
++++ head-2011-10-07/drivers/xen/blkfront/blkfront.c 2011-07-21 12:07:52.000000000 +0200
@@ -940,7 +940,6 @@ MODULE_ALIAS("xen:vbd");
static struct xenbus_driver blkfront = {
@@ -4155,8 +4169,8 @@ Acked-by: jbeulich@novell.com
.ids = blkfront_ids,
.probe = blkfront_probe,
.remove = blkfront_remove,
---- head-2011-09-07.orig/drivers/xen/blktap/xenbus.c 2011-06-30 15:37:44.000000000 +0200
-+++ head-2011-09-07/drivers/xen/blktap/xenbus.c 2011-06-30 16:05:02.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/blktap/xenbus.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-10-07/drivers/xen/blktap/xenbus.c 2011-06-30 16:05:02.000000000 +0200
@@ -493,7 +493,6 @@ static const struct xenbus_device_id blk
static struct xenbus_driver blktap = {
@@ -4173,8 +4187,8 @@ Acked-by: jbeulich@novell.com
+ if (xenbus_register_backend(&blktap))
+ BUG();
}
---- head-2011-09-07.orig/drivers/xen/core/evtchn.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/drivers/xen/core/evtchn.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/core/evtchn.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/drivers/xen/core/evtchn.c 2011-01-31 17:32:22.000000000 +0100
@@ -145,7 +145,7 @@ static void bind_evtchn_to_cpu(unsigned
BUG_ON(!test_bit(chn, s->evtchn_mask));
@@ -4225,8 +4239,8 @@ Acked-by: jbeulich@novell.com
}
static struct irq_chip pirq_chip = {
---- head-2011-09-07.orig/drivers/xen/core/smpboot.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/drivers/xen/core/smpboot.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/core/smpboot.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/drivers/xen/core/smpboot.c 2011-01-31 17:32:22.000000000 +0100
@@ -114,7 +114,7 @@ static int __cpuinit xen_smp_intr_init(u
rc = bind_ipi_to_irqhandler(RESCHEDULE_VECTOR,
cpu,
@@ -4286,8 +4300,8 @@ Acked-by: jbeulich@novell.com
cpu_data[cpu] = boot_cpu_data;
cpu_data[cpu].apicid = apicid;
---- head-2011-09-07.orig/drivers/xen/fbfront/xenfb.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/drivers/xen/fbfront/xenfb.c 2011-02-17 10:08:20.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/fbfront/xenfb.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/drivers/xen/fbfront/xenfb.c 2011-02-17 10:08:20.000000000 +0100
@@ -859,7 +859,6 @@ MODULE_ALIAS("xen:vfb");
static struct xenbus_driver xenfb_driver = {
@@ -4296,9 +4310,9 @@ Acked-by: jbeulich@novell.com
.ids = xenfb_ids,
.probe = xenfb_probe,
.remove = xenfb_remove,
---- head-2011-09-07.orig/drivers/xen/fbfront/xenkbd.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/drivers/xen/fbfront/xenkbd.c 2011-05-23 11:08:11.000000000 +0200
-@@ -336,7 +336,6 @@ MODULE_ALIAS("xen:vkbd");
+--- head-2011-10-07.orig/drivers/xen/fbfront/xenkbd.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/drivers/xen/fbfront/xenkbd.c 2011-10-07 11:20:01.000000000 +0200
+@@ -337,7 +337,6 @@ MODULE_ALIAS("xen:vkbd");
static struct xenbus_driver xenkbd_driver = {
.name = "vkbd",
@@ -4306,8 +4320,8 @@ Acked-by: jbeulich@novell.com
.ids = xenkbd_ids,
.probe = xenkbd_probe,
.remove = xenkbd_remove,
---- head-2011-09-07.orig/drivers/xen/netback/interface.c 2011-04-11 14:28:07.000000000 +0200
-+++ head-2011-09-07/drivers/xen/netback/interface.c 2011-02-17 10:08:03.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/netback/interface.c 2011-04-11 14:28:07.000000000 +0200
++++ head-2011-10-07/drivers/xen/netback/interface.c 2011-02-17 10:08:03.000000000 +0100
@@ -164,7 +164,7 @@ static void netbk_get_drvinfo(struct net
struct ethtool_drvinfo *info)
{
@@ -4317,8 +4331,8 @@ Acked-by: jbeulich@novell.com
}
static const struct netif_stat {
---- head-2011-09-07.orig/drivers/xen/netback/xenbus.c 2011-06-30 15:37:44.000000000 +0200
-+++ head-2011-09-07/drivers/xen/netback/xenbus.c 2011-02-17 10:08:09.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/netback/xenbus.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-10-07/drivers/xen/netback/xenbus.c 2011-02-17 10:08:09.000000000 +0100
@@ -440,7 +440,6 @@ static const struct xenbus_device_id net
static struct xenbus_driver netback = {
@@ -4335,8 +4349,8 @@ Acked-by: jbeulich@novell.com
+ if (xenbus_register_backend(&netback))
+ BUG();
}
---- head-2011-09-07.orig/drivers/xen/netfront/netfront.c 2011-06-30 16:02:48.000000000 +0200
-+++ head-2011-09-07/drivers/xen/netfront/netfront.c 2011-06-30 16:05:07.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/netfront/netfront.c 2011-06-30 16:02:48.000000000 +0200
++++ head-2011-10-07/drivers/xen/netfront/netfront.c 2011-06-30 16:05:07.000000000 +0200
@@ -1815,7 +1815,7 @@ static void netfront_get_drvinfo(struct
struct ethtool_drvinfo *info)
{
@@ -4463,8 +4477,8 @@ Acked-by: jbeulich@novell.com
.ids = netfront_ids,
.probe = netfront_probe,
.remove = __devexit_p(netfront_remove),
---- head-2011-09-07.orig/drivers/xen/pcifront/xenbus.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/drivers/xen/pcifront/xenbus.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/pcifront/xenbus.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/drivers/xen/pcifront/xenbus.c 2011-01-31 17:32:22.000000000 +0100
@@ -464,7 +464,6 @@ MODULE_ALIAS("xen:pci");
static struct xenbus_driver xenbus_pcifront_driver = {
@@ -4473,8 +4487,8 @@ Acked-by: jbeulich@novell.com
.ids = xenpci_ids,
.probe = pcifront_xenbus_probe,
.remove = pcifront_xenbus_remove,
---- head-2011-09-07.orig/drivers/xen/scsiback/xenbus.c 2011-06-30 15:37:44.000000000 +0200
-+++ head-2011-09-07/drivers/xen/scsiback/xenbus.c 2011-06-30 16:05:16.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/scsiback/xenbus.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-10-07/drivers/xen/scsiback/xenbus.c 2011-06-30 16:05:16.000000000 +0200
@@ -359,7 +359,6 @@ static struct xenbus_device_id scsiback_
static struct xenbus_driver scsiback = {
@@ -4483,8 +4497,8 @@ Acked-by: jbeulich@novell.com
.ids = scsiback_ids,
.probe = scsiback_probe,
.remove = scsiback_remove,
---- head-2011-09-07.orig/drivers/xen/scsifront/xenbus.c 2011-02-02 12:19:11.000000000 +0100
-+++ head-2011-09-07/drivers/xen/scsifront/xenbus.c 2011-02-08 10:03:34.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/scsifront/xenbus.c 2011-02-02 12:19:11.000000000 +0100
++++ head-2011-10-07/drivers/xen/scsifront/xenbus.c 2011-02-08 10:03:34.000000000 +0100
@@ -406,7 +406,6 @@ MODULE_ALIAS("xen:vscsi");
static struct xenbus_driver scsifront_driver = {
@@ -4493,8 +4507,8 @@ Acked-by: jbeulich@novell.com
.ids = scsifront_ids,
.probe = scsifront_probe,
.remove = scsifront_remove,
---- head-2011-09-07.orig/drivers/xen/tpmback/common.h 2011-04-11 14:27:26.000000000 +0200
-+++ head-2011-09-07/drivers/xen/tpmback/common.h 2011-04-11 14:32:54.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/tpmback/common.h 2011-04-11 14:27:26.000000000 +0200
++++ head-2011-10-07/drivers/xen/tpmback/common.h 2011-04-11 14:32:54.000000000 +0200
@@ -64,11 +64,11 @@ typedef struct tpmif_st {
void tpmif_disconnect_complete(tpmif_t * tpmif);
@@ -4509,8 +4523,8 @@ Acked-by: jbeulich@novell.com
void tpmif_xenbus_exit(void);
int tpmif_map(tpmif_t *, grant_ref_t, evtchn_port_t);
irqreturn_t tpmif_be_int(int irq, void *dev_id);
---- head-2011-09-07.orig/drivers/xen/tpmback/interface.c 2011-04-11 14:30:27.000000000 +0200
-+++ head-2011-09-07/drivers/xen/tpmback/interface.c 2011-04-11 14:31:42.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/tpmback/interface.c 2011-04-11 14:30:27.000000000 +0200
++++ head-2011-10-07/drivers/xen/tpmback/interface.c 2011-04-11 14:31:42.000000000 +0200
@@ -119,13 +119,14 @@ void tpmif_disconnect_complete(tpmif_t *
free_tpmif(tpmif);
}
@@ -4528,8 +4542,8 @@ Acked-by: jbeulich@novell.com
{
kmem_cache_destroy(tpmif_cachep);
}
---- head-2011-09-07.orig/drivers/xen/tpmback/tpmback.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/drivers/xen/tpmback/tpmback.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/tpmback/tpmback.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/drivers/xen/tpmback/tpmback.c 2011-01-31 17:32:22.000000000 +0100
@@ -918,22 +918,30 @@ static int __init tpmback_init(void)
spin_lock_init(&tpm_schedule_list_lock);
INIT_LIST_HEAD(&tpm_schedule_list);
@@ -4565,8 +4579,8 @@ Acked-by: jbeulich@novell.com
+module_exit(tpmback_exit)
MODULE_LICENSE("Dual BSD/GPL");
---- head-2011-09-07.orig/drivers/xen/tpmback/xenbus.c 2011-06-30 15:37:44.000000000 +0200
-+++ head-2011-09-07/drivers/xen/tpmback/xenbus.c 2011-06-30 16:05:25.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/tpmback/xenbus.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-10-07/drivers/xen/tpmback/xenbus.c 2011-06-30 16:05:25.000000000 +0200
@@ -254,7 +254,6 @@ static const struct xenbus_device_id tpm
static struct xenbus_driver tpmback = {
@@ -4587,8 +4601,8 @@ Acked-by: jbeulich@novell.com
}
void tpmif_xenbus_exit(void)
---- head-2011-09-07.orig/drivers/xen/usbback/xenbus.c 2011-06-30 15:37:44.000000000 +0200
-+++ head-2011-09-07/drivers/xen/usbback/xenbus.c 2011-06-30 16:05:31.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/usbback/xenbus.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-10-07/drivers/xen/usbback/xenbus.c 2011-06-30 16:05:31.000000000 +0200
@@ -319,7 +319,6 @@ static const struct xenbus_device_id usb
static struct xenbus_driver usbback_driver = {
@@ -4597,8 +4611,8 @@ Acked-by: jbeulich@novell.com
.ids = usbback_ids,
.probe = usbback_probe,
.otherend_changed = frontend_changed,
---- head-2011-09-07.orig/drivers/xen/usbfront/xenbus.c 2010-03-31 09:56:02.000000000 +0200
-+++ head-2011-09-07/drivers/xen/usbfront/xenbus.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/usbfront/xenbus.c 2010-03-31 09:56:02.000000000 +0200
++++ head-2011-10-07/drivers/xen/usbfront/xenbus.c 2011-01-31 17:32:22.000000000 +0100
@@ -381,7 +381,6 @@ MODULE_ALIAS("xen:vusb");
static struct xenbus_driver usbfront_driver = {
@@ -4607,8 +4621,8 @@ Acked-by: jbeulich@novell.com
.ids = usbfront_ids,
.probe = usbfront_probe,
.otherend_changed = backend_changed,
---- head-2011-09-07.orig/drivers/xen/xenbus/xenbus_probe.c 2011-06-30 16:03:51.000000000 +0200
-+++ head-2011-09-07/drivers/xen/xenbus/xenbus_probe.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/xenbus/xenbus_probe.c 2011-10-07 11:18:25.000000000 +0200
++++ head-2011-10-07/drivers/xen/xenbus/xenbus_probe.c 2011-01-31 17:32:22.000000000 +0100
@@ -377,7 +377,9 @@ static void xenbus_dev_shutdown(struct d
}
@@ -4659,8 +4673,8 @@ Acked-by: jbeulich@novell.com
void xenbus_unregister_driver(struct xenbus_driver *drv)
{
---- head-2011-09-07.orig/drivers/xen/xenbus/xenbus_probe.h 2011-09-07 15:18:14.000000000 +0200
-+++ head-2011-09-07/drivers/xen/xenbus/xenbus_probe.h 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/xenbus/xenbus_probe.h 2011-09-07 15:18:14.000000000 +0200
++++ head-2011-10-07/drivers/xen/xenbus/xenbus_probe.h 2011-01-31 17:32:22.000000000 +0100
@@ -69,7 +69,9 @@ extern int xenbus_match(struct device *_
extern int xenbus_dev_probe(struct device *_dev);
extern int xenbus_dev_remove(struct device *_dev);
@@ -4672,8 +4686,8 @@ Acked-by: jbeulich@novell.com
extern int xenbus_probe_node(struct xen_bus_type *bus,
const char *type,
const char *nodename);
---- head-2011-09-07.orig/drivers/xen/xenbus/xenbus_probe_backend.c 2011-09-07 15:18:19.000000000 +0200
-+++ head-2011-09-07/drivers/xen/xenbus/xenbus_probe_backend.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/xenbus/xenbus_probe_backend.c 2011-09-07 15:18:19.000000000 +0200
++++ head-2011-10-07/drivers/xen/xenbus/xenbus_probe_backend.c 2011-01-31 17:32:22.000000000 +0100
@@ -172,13 +172,15 @@ static int xenbus_uevent_backend(struct
return 0;
}
@@ -4693,8 +4707,8 @@ Acked-by: jbeulich@novell.com
/* backend/<typename>/<frontend-uuid>/<name> */
static int xenbus_probe_backend_unit(const char *dir,
---- head-2011-09-07.orig/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 17:32:22.000000000 +0100
@@ -235,7 +235,7 @@ static int bind_virq(void)
result = bind_virq_to_irqhandler(VIRQ_XENOPROF,
i,
@@ -4704,8 +4718,8 @@ Acked-by: jbeulich@novell.com
"xenoprof",
NULL);
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:32:22.000000000 +0100
@@ -21,7 +21,7 @@ struct Xgt_desc_struct {
extern struct Xgt_desc_struct idt_descr;
@@ -4715,8 +4729,8 @@ Acked-by: jbeulich@novell.com
static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
{
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/hypervisor.h 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/hypervisor.h 2011-01-31 17:32:22.000000000 +0100
@@ -160,6 +160,19 @@ static inline void arch_leave_lazy_mmu_m
#define arch_use_lazy_mmu_mode() unlikely(__get_cpu_var(xen_lazy_mmu))
#endif
@@ -4746,8 +4760,8 @@ Acked-by: jbeulich@novell.com
HYPERVISOR_shutdown(
unsigned int reason)
{
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:32:22.000000000 +0100
@@ -108,7 +108,7 @@ sysexit_scrit: /**** START OF SYSEXIT CR
sysexit_ecrit: /**** END OF SYSEXIT CRITICAL REGION ****/ ; \
mov $__KERNEL_PDA, %ecx ; \
@@ -4757,8 +4771,8 @@ Acked-by: jbeulich@novell.com
call evtchn_do_upcall ; \
add $4,%esp ; \
jmp ret_from_intr
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:32:22.000000000 +0100
@@ -27,13 +27,13 @@ static inline void enter_lazy_tlb(struct
static inline void __prepare_arch_switch(void)
{
@@ -4786,8 +4800,8 @@ Acked-by: jbeulich@novell.com
static inline void activate_mm(struct mm_struct *prev, struct mm_struct *next)
{
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/pgalloc_32.h 2008-07-21 11:00:33.000000000 +0200
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/pgalloc_32.h 2008-07-21 11:00:33.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 17:32:22.000000000 +0100
@@ -6,12 +6,23 @@
#include <linux/mm.h> /* for struct page */
#include <asm/io.h> /* for phys_to_virt and page_to_pseudophys */
@@ -4827,8 +4841,8 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_X86_PAE
/*
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-01-31 17:32:22.000000000 +0100
@@ -275,6 +275,7 @@ static inline pte_t pte_mkhuge(pte_t pte
*/
#define pte_update(mm, addr, ptep) do { } while (0)
@@ -4868,8 +4882,8 @@ Acked-by: jbeulich@novell.com
#define pte_unmap(pte) kunmap_atomic(pte, KM_PTE0)
#define pte_unmap_nested(pte) kunmap_atomic(pte, KM_PTE1)
#else
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:32:22.000000000 +0100
@@ -431,7 +431,7 @@ struct thread_struct {
.vm86_info = NULL, \
.sysenter_cs = __KERNEL_CS, \
@@ -4890,8 +4904,8 @@ Acked-by: jbeulich@novell.com
set_fs(USER_DS); \
regs->xds = __USER_DS; \
regs->xes = __USER_DS; \
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:32:22.000000000 +0100
@@ -52,6 +52,11 @@ extern void cpu_exit_clear(void);
extern void cpu_uninit(void);
#endif
@@ -4904,8 +4918,8 @@ Acked-by: jbeulich@novell.com
/*
* This function is needed by all SMP systems. It must _always_ be valid
* from the initial startup. We map APIC_BASE very early in page_setup(),
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-01-31 17:32:22.000000000 +0100
@@ -416,15 +416,6 @@ static inline int pmd_large(pmd_t pte) {
#define mk_pte(page, pgprot) pfn_pte(page_to_pfn(page), (pgprot))
#define mk_pte_huge(entry) (__pte_val(entry) |= _PAGE_PRESENT | _PAGE_PSE)
@@ -4922,8 +4936,8 @@ Acked-by: jbeulich@novell.com
/* Change flags of a PTE */
static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
{
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:32:22.000000000 +0100
@@ -7,6 +7,7 @@
#include <linux/threads.h>
#include <linux/cpumask.h>
@@ -4941,8 +4955,8 @@ Acked-by: jbeulich@novell.com
#define NO_PROC_ID 0xFF /* No processor magic marker */
---- head-2011-09-07.orig/include/xen/xenbus.h 2011-06-30 15:37:44.000000000 +0200
-+++ head-2011-09-07/include/xen/xenbus.h 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/include/xen/xenbus.h 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-10-07/include/xen/xenbus.h 2011-01-31 17:32:22.000000000 +0100
@@ -93,8 +93,7 @@ struct xenbus_device_id
/* A xenbus driver. */
@@ -4981,8 +4995,8 @@ Acked-by: jbeulich@novell.com
void xenbus_unregister_driver(struct xenbus_driver *drv);
struct xenbus_transaction
---- head-2011-09-07.orig/lib/swiotlb-xen.c 2010-09-16 13:31:46.000000000 +0200
-+++ head-2011-09-07/lib/swiotlb-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-10-07.orig/lib/swiotlb-xen.c 2010-09-16 13:31:46.000000000 +0200
++++ head-2011-10-07/lib/swiotlb-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -143,8 +143,8 @@ __setup("swiotlb=", setup_io_tlb_npages)
* Statically reserve bounce buffer space and initialize bounce buffer data
* structures for the software IO TLB used to implement the PCI DMA API.
diff --git a/patches.xen/xen3-patch-2.6.22 b/patches.xen/xen3-patch-2.6.22
index 3a9ebf56cd..2988fe2cda 100644
--- a/patches.xen/xen3-patch-2.6.22
+++ b/patches.xen/xen3-patch-2.6.22
@@ -6,8 +6,8 @@ Automatically created from "patches.kernel.org/patch-2.6.22" by xen-port-patches
Acked-by: jbeulich@novell.com
---- head-2011-09-07.orig/arch/x86/Kconfig 2011-09-07 15:25:17.000000000 +0200
-+++ head-2011-09-07/arch/x86/Kconfig 2011-09-07 15:25:51.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/Kconfig 2011-09-07 15:25:17.000000000 +0200
++++ head-2011-10-07/arch/x86/Kconfig 2011-09-07 15:25:51.000000000 +0200
@@ -1633,7 +1633,7 @@ config PHYSICAL_START
config RELOCATABLE
@@ -33,16 +33,16 @@ Acked-by: jbeulich@novell.com
---help---
Find out whether you have a PCI motherboard. PCI is the name of a
bus system, i.e. the way the CPU talks to the other stuff inside
---- head-2011-09-07.orig/arch/x86/kernel/Makefile 2011-09-07 15:24:50.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/Makefile 2011-09-07 15:25:48.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/kernel/Makefile 2011-09-07 15:24:50.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/Makefile 2011-09-07 15:25:48.000000000 +0200
@@ -120,4 +120,4 @@ endif
disabled-obj-$(CONFIG_XEN) := early-quirks.o hpet.o i8253.o i8259_$(BITS).o reboot.o \
smpboot_$(BITS).o tsc_$(BITS).o tsc_sync.o
disabled-obj-$(CONFIG_XEN_UNPRIVILEGED_GUEST) += mpparse_64.o
-%/head_$(BITS).o %/head_$(BITS).s: $(if $(CONFIG_XEN),EXTRA_AFLAGS,dummy) :=
+%/head_64.o %/head_64.s: $(if $(CONFIG_XEN),EXTRA_AFLAGS,dummy) :=
---- head-2011-09-07.orig/arch/x86/kernel/apic/apic-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/apic/apic-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/apic/apic-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/apic/apic-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -19,7 +19,6 @@
#include <linux/mm.h>
#include <linux/delay.h>
@@ -51,8 +51,8 @@ Acked-by: jbeulich@novell.com
#include <linux/interrupt.h>
#include <linux/mc146818rtc.h>
#include <linux/kernel_stat.h>
---- head-2011-09-07.orig/arch/x86/kernel/asm-offsets_32.c 2011-04-13 12:30:12.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/asm-offsets_32.c 2011-04-13 12:31:22.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/kernel/asm-offsets_32.c 2011-04-13 12:30:12.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/asm-offsets_32.c 2011-04-13 12:31:22.000000000 +0200
@@ -64,11 +64,6 @@ void foo(void)
DEFINE(SYSENTER_stack_sp0, 0);
#endif
@@ -65,8 +65,8 @@ Acked-by: jbeulich@novell.com
#if defined(CONFIG_LGUEST) || defined(CONFIG_LGUEST_GUEST) || defined(CONFIG_LGUEST_MODULE)
BLANK();
OFFSET(LGUEST_DATA_irq_enabled, lguest_data, irq_enabled);
---- head-2011-09-07.orig/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -22,16 +22,40 @@
#define phys_pkg_id(a,b) a
#endif
@@ -359,8 +359,8 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_HOTPLUG_CPU
void __cpuinit cpu_uninit(void)
{
---- head-2011-09-07.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -167,7 +167,7 @@ mtrr_del(int reg, unsigned long base, un
EXPORT_SYMBOL(mtrr_add);
EXPORT_SYMBOL(mtrr_del);
@@ -370,8 +370,8 @@ Acked-by: jbeulich@novell.com
{
}
---- head-2011-09-07.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -162,26 +162,27 @@ static struct resource standard_io_resou
static int __init romsignature(const unsigned char *rom)
@@ -499,8 +499,8 @@ Acked-by: jbeulich@novell.com
start = 0x100000ULL;
size = end - start;
}
---- head-2011-09-07.orig/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:08:37.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/entry_32-xen.S 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:08:37.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/entry_32-xen.S 2011-01-31 17:32:29.000000000 +0100
@@ -15,7 +15,7 @@
* I changed all the .align's to 4 (16 byte alignment), as that's faster
* on a 486.
@@ -607,8 +607,8 @@ Acked-by: jbeulich@novell.com
movl %ecx, %fs
UNWIND_ESPFIX_STACK
popl %ecx
---- head-2011-09-07.orig/arch/x86/kernel/head_32-xen.S 2011-08-09 10:36:25.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/head_32-xen.S 2011-08-09 10:37:32.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/kernel/head_32-xen.S 2011-08-09 10:36:25.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/head_32-xen.S 2011-08-09 10:37:32.000000000 +0200
@@ -38,7 +38,8 @@ ENTRY(startup_32)
/* Set up the stack pointer */
movl $(init_thread_union+THREAD_SIZE),%esp
@@ -736,8 +736,8 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_XEN_UNPRIVILEGED_GUEST
# define XEN_DOM0_CAP 0
# define XEN_DOM0_CAP_STR ""
---- head-2011-09-07.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -25,7 +25,6 @@
#include <linux/init.h>
#include <linux/delay.h>
@@ -862,8 +862,8 @@ Acked-by: jbeulich@novell.com
}
void arch_teardown_msi_irq(unsigned int irq)
---- head-2011-09-07.orig/arch/x86/kernel/ioport_32-xen.c 2008-01-28 12:24:19.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/ioport_32-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/ioport_32-xen.c 2008-01-28 12:24:19.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/ioport_32-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -12,10 +12,10 @@
#include <linux/types.h>
#include <linux/ioport.h>
@@ -876,8 +876,8 @@ Acked-by: jbeulich@novell.com
#include <xen/interface/physdev.h>
/* Set EXTENT bits starting at BASE in BITMAP to value TURN_ON. */
---- head-2011-09-07.orig/arch/x86/kernel/ldt_32-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/ldt_32-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/ldt_32-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/ldt_32-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -10,7 +10,6 @@
#include <linux/string.h>
#include <linux/mm.h>
@@ -886,8 +886,8 @@ Acked-by: jbeulich@novell.com
#include <linux/vmalloc.h>
#include <linux/slab.h>
---- head-2011-09-07.orig/arch/x86/kernel/microcode-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/microcode-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/microcode-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/microcode-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -135,7 +135,7 @@ static int __init microcode_dev_init (vo
return 0;
}
@@ -897,8 +897,8 @@ Acked-by: jbeulich@novell.com
{
misc_deregister(&microcode_dev);
}
---- head-2011-09-07.orig/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -18,7 +18,6 @@
#include <linux/acpi.h>
#include <linux/delay.h>
@@ -916,8 +916,8 @@ Acked-by: jbeulich@novell.com
if (!num_processors)
printk(KERN_ERR "SMP mptable: no processors registered!\n");
return num_processors;
---- head-2011-09-07.orig/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -13,6 +13,7 @@
#include <linux/pci.h>
#include <linux/module.h>
@@ -968,8 +968,8 @@ Acked-by: jbeulich@novell.com
dma_addr_t
dma_map_single(struct device *dev, void *ptr, size_t size,
enum dma_data_direction direction)
---- head-2011-09-07.orig/arch/x86/kernel/process_32-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/process_32-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/process_32-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/process_32-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -21,7 +21,6 @@
#include <linux/mm.h>
#include <linux/elfcore.h>
@@ -1067,8 +1067,8 @@ Acked-by: jbeulich@novell.com
return prev_p;
}
---- head-2011-09-07.orig/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -13,7 +13,6 @@
#include <linux/mm.h>
#include <linux/delay.h>
@@ -1389,8 +1389,8 @@ Acked-by: jbeulich@novell.com
- return 0;
-}
-EXPORT_SYMBOL(smp_call_function_single);
---- head-2011-09-07.orig/arch/x86/kernel/time-xen.c 2011-07-12 11:13:30.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/time-xen.c 2011-07-11 11:10:56.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/kernel/time-xen.c 2011-07-12 11:13:30.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/time-xen.c 2011-07-11 11:10:56.000000000 +0200
@@ -79,7 +79,6 @@
#include <asm/i8253.h>
DEFINE_SPINLOCK(i8253_lock);
@@ -1717,8 +1717,8 @@ Acked-by: jbeulich@novell.com
/* No locking required. Interrupts are disabled on all CPUs. */
void time_resume(void)
---- head-2011-09-07.orig/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -52,7 +52,7 @@
#include <asm/unwind.h>
#include <asm/smp.h>
@@ -1829,8 +1829,8 @@ Acked-by: jbeulich@novell.com
unsigned long base = (kesp - uesp) & -THREAD_SIZE;
unsigned long new_kesp = kesp - base;
unsigned long lim_pages = (new_kesp | (THREAD_SIZE - 1)) >> PAGE_SHIFT;
---- head-2011-09-07.orig/arch/x86/mm/fault_32-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-07/arch/x86/mm/fault_32-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/mm/fault_32-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/arch/x86/mm/fault_32-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -14,19 +14,20 @@
#include <linux/mman.h>
#include <linux/mm.h>
@@ -1951,8 +1951,8 @@ Acked-by: jbeulich@novell.com
}
}
-#endif
---- head-2011-09-07.orig/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-07/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -26,7 +26,7 @@ void kunmap(struct page *page)
* However when holding an atomic kmap is is not legal to sleep, so atomic
* kmaps are appropriate for short, tight code paths only.
@@ -1995,8 +1995,8 @@ Acked-by: jbeulich@novell.com
EXPORT_SYMBOL(kunmap_atomic);
EXPORT_SYMBOL(kmap_atomic_to_page);
EXPORT_SYMBOL(clear_highpage);
---- head-2011-09-07.orig/arch/x86/mm/hypervisor.c 2011-08-09 10:35:46.000000000 +0200
-+++ head-2011-09-07/arch/x86/mm/hypervisor.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/mm/hypervisor.c 2011-08-09 10:35:46.000000000 +0200
++++ head-2011-10-07/arch/x86/mm/hypervisor.c 2011-01-31 17:32:29.000000000 +0100
@@ -419,13 +419,13 @@ void xen_tlb_flush_all(void)
}
EXPORT_SYMBOL_GPL(xen_tlb_flush_all);
@@ -2030,8 +2030,8 @@ Acked-by: jbeulich@novell.com
BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
}
EXPORT_SYMBOL_GPL(xen_invlpg_mask);
---- head-2011-09-07.orig/arch/x86/mm/init_32-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-07/arch/x86/mm/init_32-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/mm/init_32-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/arch/x86/mm/init_32-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -22,6 +22,7 @@
#include <linux/init.h>
#include <linux/highmem.h>
@@ -2303,8 +2303,8 @@ Acked-by: jbeulich@novell.com
}
void free_initmem(void)
---- head-2011-09-07.orig/arch/x86/mm/ioremap-xen.c 2011-02-07 15:37:37.000000000 +0100
-+++ head-2011-09-07/arch/x86/mm/ioremap-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/mm/ioremap-xen.c 2011-02-07 15:37:37.000000000 +0100
++++ head-2011-10-07/arch/x86/mm/ioremap-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -13,6 +13,7 @@
#include <linux/slab.h>
#include <linux/module.h>
@@ -2313,8 +2313,8 @@ Acked-by: jbeulich@novell.com
#include <asm/fixmap.h>
#include <asm/cacheflush.h>
#include <asm/tlbflush.h>
---- head-2011-09-07.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-07/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -13,6 +13,7 @@
#include <linux/pagemap.h>
#include <linux/spinlock.h>
@@ -2638,8 +2638,8 @@ Acked-by: jbeulich@novell.com
{
struct task_struct *tsk = current;
---- head-2011-09-07.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-07/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:32:29.000000000 +0100
@@ -431,11 +431,7 @@ ia32_sys_call_table:
.quad sys_symlink
.quad sys_lstat
@@ -2688,8 +2688,8 @@ Acked-by: jbeulich@novell.com
+ .quad compat_sys_timerfd
+ .quad sys_eventfd
+ia32_syscall_end:
---- head-2011-09-07.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -17,6 +17,8 @@
#include <linux/kexec.h>
#include <linux/module.h>
@@ -2749,8 +2749,8 @@ Acked-by: jbeulich@novell.com
if (paddr >= (end_pfn << PAGE_SHIFT))
break;
---- head-2011-09-07.orig/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -11,13 +11,12 @@
#ifdef __i386__
@@ -2815,9 +2815,18 @@ Acked-by: jbeulich@novell.com
- }
-}
-
---- head-2011-09-07.orig/arch/x86/kernel/entry_64-xen.S 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/entry_64-xen.S 2011-01-31 17:32:29.000000000 +0100
-@@ -1249,3 +1249,23 @@ ENTRY(call_softirq)
+--- head-2011-10-07.orig/arch/x86/kernel/entry_64-xen.S 2011-10-07 11:20:12.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/entry_64-xen.S 2011-10-06 11:55:00.000000000 +0200
+@@ -178,7 +178,7 @@ NMI_MASK = 0x80000000
+
+ 2: /* Slow iret via hypervisor. */
+ andl $~NMI_MASK, 2*8(%rsp)
+- pushq $\flag
++ pushq $\flag & VGCF_in_syscall
+ jmp hypercall_page + (__HYPERVISOR_iret * 32)
+ .endm
+
+@@ -1252,3 +1252,24 @@ ENTRY(call_softirq)
ret
CFI_ENDPROC
ENDPROC(call_softirq)
@@ -2837,12 +2846,13 @@ Acked-by: jbeulich@novell.com
+ popq %r11
+ CFI_ADJUST_CFA_OFFSET -8
+ mov $-ENOSYS,%eax
-+ HYPERVISOR_IRET 0
++ # any non-zero value not having VGCF_in_syscall set will do:
++ HYPERVISOR_IRET VGCF_i387_valid
+ CFI_ENDPROC
+ENDPROC(ignore_sysret)
+#endif
---- head-2011-09-07.orig/arch/x86/kernel/head_64-xen.S 2011-08-09 10:35:37.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/head_64-xen.S 2011-08-09 10:37:34.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/kernel/head_64-xen.S 2011-08-09 10:35:37.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/head_64-xen.S 2011-08-09 10:37:34.000000000 +0200
@@ -5,6 +5,7 @@
* Copyright (C) 2000 Pavel Machek <pavel@suse.cz>
* Copyright (C) 2000 Karsten Keil <kkeil@suse.de>
@@ -2937,8 +2947,8 @@ Acked-by: jbeulich@novell.com
.endm
.section __xen_guest
---- head-2011-09-07.orig/arch/x86/kernel/head64-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/head64-xen.c 2011-08-09 10:37:35.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/kernel/head64-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/head64-xen.c 2011-08-09 10:37:35.000000000 +0200
@@ -25,13 +25,21 @@
#include <asm/setup.h>
#include <asm/desc.h>
@@ -3020,8 +3030,8 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_SMP
cpu_set(0, cpu_online_map);
#endif
---- head-2011-09-07.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -25,7 +25,6 @@
#include <linux/init.h>
#include <linux/delay.h>
@@ -3130,8 +3140,8 @@ Acked-by: jbeulich@novell.com
}
void arch_teardown_msi_irq(unsigned int irq)
---- head-2011-09-07.orig/arch/x86/kernel/ioport_64-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/ioport_64-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/ioport_64-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/ioport_64-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -13,10 +13,10 @@
#include <linux/ioport.h>
#include <linux/mm.h>
@@ -3144,8 +3154,8 @@ Acked-by: jbeulich@novell.com
#include <xen/interface/physdev.h>
/* Set EXTENT bits starting at BASE in BITMAP to value TURN_ON. */
---- head-2011-09-07.orig/arch/x86/kernel/ldt_64-xen.c 2007-06-12 13:13:01.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/ldt_64-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/ldt_64-xen.c 2007-06-12 13:13:01.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/ldt_64-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -13,7 +13,6 @@
#include <linux/string.h>
#include <linux/mm.h>
@@ -3154,8 +3164,8 @@ Acked-by: jbeulich@novell.com
#include <linux/vmalloc.h>
#include <linux/slab.h>
---- head-2011-09-07.orig/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -17,7 +17,6 @@
#include <linux/init.h>
#include <linux/delay.h>
@@ -3173,8 +3183,8 @@ Acked-by: jbeulich@novell.com
if (!num_processors)
printk(KERN_ERR "MPTABLE: no processors registered!\n");
return num_processors;
---- head-2011-09-07.orig/arch/x86/kernel/process_64-xen.c 2011-02-02 08:31:05.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/process_64-xen.c 2011-02-02 08:31:39.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/process_64-xen.c 2011-02-02 08:31:05.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/process_64-xen.c 2011-02-02 08:31:39.000000000 +0100
@@ -39,6 +39,7 @@
#include <linux/random.h>
#include <linux/notifier.h>
@@ -3224,8 +3234,8 @@ Acked-by: jbeulich@novell.com
__save_init_fpu(prev_p); /* _not_ save_init_fpu() */
mcl->op = __HYPERVISOR_fpu_taskswitch;
mcl->args[0] = 1;
---- head-2011-09-07.orig/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -120,6 +120,8 @@ int bootloader_type;
unsigned long saved_video_mode;
@@ -3308,8 +3318,8 @@ Acked-by: jbeulich@novell.com
};
---- head-2011-09-07.orig/arch/x86/kernel/setup64-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/setup64-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/setup64-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/setup64-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -113,9 +113,9 @@ void __init setup_per_cpu_areas(void)
if (!NODE_DATA(cpu_to_node(i))) {
printk("cpu with no node %d, num_online_nodes %d\n",
@@ -3362,8 +3372,8 @@ Acked-by: jbeulich@novell.com
}
#ifndef CONFIG_X86_NO_TSS
else
---- head-2011-09-07.orig/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -14,7 +14,6 @@
#include <linux/mm.h>
#include <linux/delay.h>
@@ -3427,8 +3437,8 @@ Acked-by: jbeulich@novell.com
}
/*
---- head-2011-09-07.orig/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -32,6 +32,7 @@
#include <linux/unwind.h>
#include <linux/uaccess.h>
@@ -3563,8 +3573,8 @@ Acked-by: jbeulich@novell.com
if (notify_die(DIE_GPF, "general protection fault", regs,
error_code, 13, SIGSEGV) == NOTIFY_STOP)
return;
---- head-2011-09-07.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -45,14 +45,34 @@
#define __vsyscall(nr) __attribute__ ((unused,__section__(".vsyscall_" #nr)))
@@ -3702,8 +3712,8 @@ Acked-by: jbeulich@novell.com
smp_call_function_single(cpu, cpu_vsyscall_init, NULL, 0, 1);
return NOTIFY_DONE;
}
---- head-2011-09-07.orig/arch/x86/mm/fault_64-xen.c 2011-07-26 09:27:34.000000000 +0200
-+++ head-2011-09-07/arch/x86/mm/fault_64-xen.c 2011-07-26 09:27:41.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/mm/fault_64-xen.c 2011-07-26 09:27:34.000000000 +0200
++++ head-2011-10-07/arch/x86/mm/fault_64-xen.c 2011-07-26 09:27:41.000000000 +0200
@@ -15,22 +15,22 @@
#include <linux/mman.h>
#include <linux/mm.h>
@@ -3765,8 +3775,8 @@ Acked-by: jbeulich@novell.com
pgd_t *pgd;
pgd = (pgd_t *)page_address(page) + pgd_index(address);
---- head-2011-09-07.orig/arch/x86/mm/init_64-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-07/arch/x86/mm/init_64-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/mm/init_64-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/arch/x86/mm/init_64-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -25,10 +25,12 @@
#include <linux/bootmem.h>
#include <linux/proc_fs.h>
@@ -4000,8 +4010,8 @@ Acked-by: jbeulich@novell.com
+ SMP_CACHE_BYTES, (4UL*1024*1024*1024), 0);
+}
+#endif
---- head-2011-09-07.orig/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-07/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -215,13 +215,13 @@ void mm_pin_all(void)
preempt_enable();
}
@@ -4062,8 +4072,8 @@ Acked-by: jbeulich@novell.com
/* Handle kernel mapping too which aliases part of the
* lowmem */
if (__pa(address) < KERNEL_TEXT_SIZE) {
---- head-2011-09-07.orig/drivers/char/tpm/tpm_xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-07/drivers/char/tpm/tpm_xen.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/drivers/char/tpm/tpm_xen.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/drivers/char/tpm/tpm_xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -463,7 +463,7 @@ static int tpmif_connect(struct xenbus_d
tp->backend_id = domid;
@@ -4073,8 +4083,8 @@ Acked-by: jbeulich@novell.com
if (err <= 0) {
WPRINTK("bind_listening_port_to_irqhandler failed "
"(err=%d)\n", err);
---- head-2011-09-07.orig/drivers/hwmon/Kconfig 2011-09-20 11:28:23.000000000 +0200
-+++ head-2011-09-07/drivers/hwmon/Kconfig 2011-06-30 16:06:09.000000000 +0200
+--- head-2011-10-07.orig/drivers/hwmon/Kconfig 2011-10-07 16:56:07.000000000 +0200
++++ head-2011-10-07/drivers/hwmon/Kconfig 2011-06-30 16:06:09.000000000 +0200
@@ -412,7 +412,7 @@ config SENSORS_GPIO_FAN
config SENSORS_CORETEMP
@@ -4085,7 +4095,7 @@ Acked-by: jbeulich@novell.com
If you say yes here you get support for the temperature
sensor inside your CPU. Most of the family 6 CPUs
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-09-07/drivers/hwmon/coretemp-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/drivers/hwmon/coretemp-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -0,0 +1,449 @@
+/*
+ * coretemp.c - Linux kernel module for hardware monitoring
@@ -4536,8 +4546,8 @@ Acked-by: jbeulich@novell.com
+
+module_init(coretemp_init)
+module_exit(coretemp_exit)
---- head-2011-09-07.orig/drivers/pci/msi-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-07/drivers/pci/msi-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/drivers/pci/msi-xen.c 2011-10-07 11:20:08.000000000 +0200
++++ head-2011-10-07/drivers/pci/msi-xen.c 2011-10-07 11:21:21.000000000 +0200
@@ -12,16 +12,15 @@
#include <linux/interrupt.h>
#include <linux/init.h>
@@ -4556,7 +4566,7 @@ Acked-by: jbeulich@novell.com
#include "pci.h"
#include "msi.h"
-@@ -156,6 +155,7 @@ int register_msi_get_owner(int (*func)(s
+@@ -161,6 +160,7 @@ int register_msi_get_owner(int (*func)(s
get_owner = func;
return 0;
}
@@ -4564,7 +4574,7 @@ Acked-by: jbeulich@novell.com
int unregister_msi_get_owner(int (*func)(struct pci_dev *dev))
{
-@@ -164,6 +164,7 @@ int unregister_msi_get_owner(int (*func)
+@@ -169,6 +169,7 @@ int unregister_msi_get_owner(int (*func)
get_owner = NULL;
return 0;
}
@@ -4572,7 +4582,7 @@ Acked-by: jbeulich@novell.com
static int msi_get_dev_owner(struct pci_dev *dev)
{
-@@ -259,11 +260,6 @@ static int msi_map_vector(struct pci_dev
+@@ -277,11 +278,6 @@ static int msi_map_vector(struct pci_dev
map_irq.pirq : evtchn_map_pirq(-1, map_irq.pirq));
}
@@ -4584,7 +4594,7 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_PM
void pci_restore_msi_state(struct pci_dev *dev)
{
-@@ -392,21 +388,32 @@ static int msix_capability_init(struct p
+@@ -427,21 +423,32 @@ static int msix_capability_init(struct p
}
/**
@@ -4621,7 +4631,7 @@ Acked-by: jbeulich@novell.com
/* Any bridge which does NOT route MSI transactions from it's
* secondary bus to it's primary bus must set NO_MSI flag on
* the secondary pci_bus.
-@@ -417,6 +424,13 @@ int pci_msi_supported(struct pci_dev * d
+@@ -452,6 +459,13 @@ int pci_msi_supported(struct pci_dev * d
if (bus->bus_flags & PCI_BUS_FLAGS_NO_MSI)
return -EINVAL;
@@ -4635,7 +4645,7 @@ Acked-by: jbeulich@novell.com
return 0;
}
-@@ -433,15 +447,12 @@ int pci_msi_supported(struct pci_dev * d
+@@ -468,14 +482,11 @@ int pci_msi_supported(struct pci_dev * d
extern int pci_frontend_enable_msi(struct pci_dev *dev);
int pci_enable_msi(struct pci_dev* dev)
{
@@ -4644,18 +4654,16 @@ Acked-by: jbeulich@novell.com
struct msi_dev_list *msi_dev_entry = get_msi_dev_pirq_list(dev);
- if (pci_msi_supported(dev) < 0)
-- return -EINVAL;
+- return -EINVAL;
-
- status = msi_init();
- if (status < 0)
-- return status;
+ status = pci_msi_check_device(dev, 1, PCI_CAP_ID_MSI);
+ if (status)
-+ return status;
+ return status;
#ifdef CONFIG_XEN_PCIDEV_FRONTEND
- if (!is_initial_xendomain())
-@@ -463,10 +474,6 @@ int pci_enable_msi(struct pci_dev* dev)
+@@ -498,10 +509,6 @@ int pci_enable_msi(struct pci_dev* dev)
temp = dev->irq;
@@ -4666,7 +4674,7 @@ Acked-by: jbeulich@novell.com
/* Check whether driver already requested for MSI-X irqs */
if (dev->msix_enabled) {
printk(KERN_INFO "PCI: %s: Can't enable MSI. "
-@@ -481,6 +488,7 @@ int pci_enable_msi(struct pci_dev* dev)
+@@ -516,6 +523,7 @@ int pci_enable_msi(struct pci_dev* dev)
return status;
}
@@ -4674,7 +4682,7 @@ Acked-by: jbeulich@novell.com
extern void pci_frontend_disable_msi(struct pci_dev* dev);
void pci_disable_msi(struct pci_dev* dev)
-@@ -488,12 +496,7 @@ void pci_disable_msi(struct pci_dev* dev
+@@ -523,12 +531,7 @@ void pci_disable_msi(struct pci_dev* dev
int pirq;
struct msi_dev_list *msi_dev_entry = get_msi_dev_pirq_list(dev);
@@ -4688,7 +4696,7 @@ Acked-by: jbeulich@novell.com
return;
#ifdef CONFIG_XEN_PCIDEV_FRONTEND
-@@ -516,6 +519,7 @@ void pci_disable_msi(struct pci_dev* dev
+@@ -551,6 +554,7 @@ void pci_disable_msi(struct pci_dev* dev
pci_intx(dev, 1); /* enable intx */
dev->msi_enabled = 0;
}
@@ -4696,7 +4704,7 @@ Acked-by: jbeulich@novell.com
/**
* pci_enable_msix - configure device's MSI-X capability structure
-@@ -541,7 +545,7 @@ int pci_enable_msix(struct pci_dev* dev,
+@@ -576,7 +580,7 @@ int pci_enable_msix(struct pci_dev* dev,
u16 control;
struct msi_dev_list *msi_dev_entry = get_msi_dev_pirq_list(dev);
@@ -4705,7 +4713,7 @@ Acked-by: jbeulich@novell.com
return -EINVAL;
#ifdef CONFIG_XEN_PCIDEV_FRONTEND
-@@ -580,14 +584,11 @@ int pci_enable_msix(struct pci_dev* dev,
+@@ -615,14 +619,11 @@ int pci_enable_msix(struct pci_dev* dev,
}
#endif
@@ -4722,7 +4730,7 @@ Acked-by: jbeulich@novell.com
pci_read_config_word(dev, msi_control_reg(pos), &control);
nr_entries = multi_msix_capable(control);
if (nvec > nr_entries)
-@@ -619,16 +620,12 @@ int pci_enable_msix(struct pci_dev* dev,
+@@ -654,16 +655,12 @@ int pci_enable_msix(struct pci_dev* dev,
return status;
}
@@ -4741,7 +4749,7 @@ Acked-by: jbeulich@novell.com
return;
#ifdef CONFIG_XEN_PCIDEV_FRONTEND
-@@ -659,6 +656,7 @@ void pci_disable_msix(struct pci_dev* de
+@@ -694,6 +691,7 @@ void pci_disable_msix(struct pci_dev* de
pci_intx(dev, 1); /* enable intx */
dev->msix_enabled = 0;
}
@@ -4749,7 +4757,7 @@ Acked-by: jbeulich@novell.com
/**
* msi_remove_pci_irq_vectors - reclaim MSI(X) irqs to unused state
-@@ -697,12 +695,18 @@ void pci_no_msi(void)
+@@ -732,12 +730,18 @@ void pci_no_msi(void)
pci_msi_enable = 0;
}
@@ -4775,8 +4783,8 @@ Acked-by: jbeulich@novell.com
+{
+ return 0;
+}
---- head-2011-09-07.orig/drivers/xen/blkfront/blkfront.c 2011-07-21 12:07:52.000000000 +0200
-+++ head-2011-09-07/drivers/xen/blkfront/blkfront.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/blkfront/blkfront.c 2011-07-21 12:07:52.000000000 +0200
++++ head-2011-10-07/drivers/xen/blkfront/blkfront.c 2011-01-31 17:32:29.000000000 +0100
@@ -244,7 +244,7 @@ static int setup_blkring(struct xenbus_d
info->ring_ref = err;
@@ -4786,8 +4794,8 @@ Acked-by: jbeulich@novell.com
if (err <= 0) {
xenbus_dev_fatal(dev, err,
"bind_listening_port_to_irqhandler");
---- head-2011-09-07.orig/drivers/xen/char/mem.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/drivers/xen/char/mem.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/char/mem.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/drivers/xen/char/mem.c 2011-01-31 17:32:29.000000000 +0100
@@ -18,7 +18,6 @@
#include <linux/raw.h>
#include <linux/tty.h>
@@ -4796,8 +4804,8 @@ Acked-by: jbeulich@novell.com
#include <linux/ptrace.h>
#include <linux/device.h>
#include <asm/pgalloc.h>
---- head-2011-09-07.orig/drivers/xen/core/hypervisor_sysfs.c 2007-07-10 09:42:30.000000000 +0200
-+++ head-2011-09-07/drivers/xen/core/hypervisor_sysfs.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/core/hypervisor_sysfs.c 2007-07-10 09:42:30.000000000 +0200
++++ head-2011-10-07/drivers/xen/core/hypervisor_sysfs.c 2011-01-31 17:32:29.000000000 +0100
@@ -50,7 +50,7 @@ static int __init hypervisor_subsys_init
if (!is_running_on_xen())
return -ENODEV;
@@ -4807,8 +4815,8 @@ Acked-by: jbeulich@novell.com
return 0;
}
---- head-2011-09-07.orig/drivers/xen/core/machine_reboot.c 2011-01-24 12:06:05.000000000 +0100
-+++ head-2011-09-07/drivers/xen/core/machine_reboot.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/core/machine_reboot.c 2011-01-24 12:06:05.000000000 +0100
++++ head-2011-10-07/drivers/xen/core/machine_reboot.c 2011-01-31 17:32:29.000000000 +0100
@@ -80,6 +80,8 @@ static void post_suspend(int suspend_can
#ifdef CONFIG_SMP
cpu_initialized_map = cpu_online_map;
@@ -4818,8 +4826,8 @@ Acked-by: jbeulich@novell.com
}
shinfo_mfn = xen_start_info->shared_info >> PAGE_SHIFT;
---- head-2011-09-07.orig/drivers/xen/core/smpboot.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-07/drivers/xen/core/smpboot.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/core/smpboot.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/drivers/xen/core/smpboot.c 2011-01-31 17:32:29.000000000 +0100
@@ -158,13 +158,12 @@ static void xen_smp_intr_exit(unsigned i
void __cpuinit cpu_bringup(void)
@@ -4929,8 +4937,8 @@ Acked-by: jbeulich@novell.com
prefill_possible_map();
}
---- head-2011-09-07.orig/drivers/xen/core/xen_sysfs.c 2009-05-29 10:25:53.000000000 +0200
-+++ head-2011-09-07/drivers/xen/core/xen_sysfs.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/core/xen_sysfs.c 2009-05-29 10:25:53.000000000 +0200
++++ head-2011-10-07/drivers/xen/core/xen_sysfs.c 2011-01-31 17:32:29.000000000 +0100
@@ -30,12 +30,12 @@ HYPERVISOR_ATTR_RO(type);
static int __init xen_sysfs_type_init(void)
@@ -5025,8 +5033,8 @@ Acked-by: jbeulich@novell.com
}
#endif
---- head-2011-09-07.orig/drivers/xen/fbfront/xenkbd.c 2011-05-23 11:08:11.000000000 +0200
-+++ head-2011-09-07/drivers/xen/fbfront/xenkbd.c 2011-09-20 11:34:12.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/fbfront/xenkbd.c 2011-10-07 11:20:01.000000000 +0200
++++ head-2011-10-07/drivers/xen/fbfront/xenkbd.c 2011-10-04 15:30:07.000000000 +0200
@@ -137,11 +137,11 @@ int __devinit xenkbd_probe(struct xenbus
kbd->id.bustype = BUS_PCI;
kbd->id.vendor = 0x5853;
@@ -5042,7 +5050,7 @@ Acked-by: jbeulich@novell.com
ret = input_register_device(kbd);
if (ret) {
-@@ -166,10 +166,10 @@ int __devinit xenkbd_probe(struct xenbus
+@@ -166,11 +166,10 @@ int __devinit xenkbd_probe(struct xenbus
input_set_abs_params(ptr, ABS_X, 0, XENFB_WIDTH, 0, 0);
input_set_abs_params(ptr, ABS_Y, 0, XENFB_HEIGHT, 0, 0);
} else {
@@ -5052,12 +5060,13 @@ Acked-by: jbeulich@novell.com
+ input_set_capability(ptr, EV_REL, REL_Y);
}
- __set_bit(REL_WHEEL, ptr->relbit);
+- __set_bit(EV_REL, ptr->evbit);
+ input_set_capability(ptr, EV_REL, REL_WHEEL);
__set_bit(EV_KEY, ptr->evbit);
for (i = BTN_LEFT; i <= BTN_TASK; i++)
---- head-2011-09-07.orig/drivers/xen/netback/common.h 2011-04-11 14:28:08.000000000 +0200
-+++ head-2011-09-07/drivers/xen/netback/common.h 2011-04-11 14:38:17.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/netback/common.h 2011-04-11 14:28:08.000000000 +0200
++++ head-2011-10-07/drivers/xen/netback/common.h 2011-04-11 14:38:17.000000000 +0200
@@ -98,7 +98,6 @@ typedef struct netif_st {
struct list_head list; /* scheduling list */
atomic_t refcnt;
@@ -5074,8 +5083,8 @@ Acked-by: jbeulich@novell.com
irqreturn_t netif_be_int(int irq, void *dev_id);
static inline int netbk_can_queue(struct net_device *dev)
---- head-2011-09-07.orig/drivers/xen/netback/interface.c 2011-02-17 10:08:03.000000000 +0100
-+++ head-2011-09-07/drivers/xen/netback/interface.c 2011-04-11 14:38:22.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/netback/interface.c 2011-02-17 10:08:03.000000000 +0100
++++ head-2011-10-07/drivers/xen/netback/interface.c 2011-04-11 14:38:22.000000000 +0200
@@ -257,7 +257,6 @@ netif_t *netif_alloc(struct device *pare
init_timer(&netif->tx_queue_timeout);
@@ -5084,8 +5093,8 @@ Acked-by: jbeulich@novell.com
dev->open = net_open;
dev->stop = net_close;
dev->change_mtu = netbk_change_mtu;
---- head-2011-09-07.orig/drivers/xen/netback/loopback.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/drivers/xen/netback/loopback.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/netback/loopback.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/drivers/xen/netback/loopback.c 2011-01-31 17:32:29.000000000 +0100
@@ -62,14 +62,17 @@ MODULE_PARM_DESC(nloopbacks, "Number of
struct net_private {
@@ -5180,8 +5189,8 @@ Acked-by: jbeulich@novell.com
dev->set_multicast_list = loopback_set_multicast_list;
dev->change_mtu = NULL; /* allow arbitrary mtu */
---- head-2011-09-07.orig/drivers/xen/netback/netback.c 2011-04-11 14:28:01.000000000 +0200
-+++ head-2011-09-07/drivers/xen/netback/netback.c 2011-04-11 14:38:25.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/netback/netback.c 2011-04-11 14:28:01.000000000 +0200
++++ head-2011-10-07/drivers/xen/netback/netback.c 2011-04-11 14:38:25.000000000 +0200
@@ -210,7 +210,7 @@ static struct sk_buff *netbk_copy_skb(st
goto err;
@@ -5307,8 +5316,8 @@ Acked-by: jbeulich@novell.com
"net-be-dbg",
&netif_be_dbg);
#endif
---- head-2011-09-07.orig/drivers/xen/netback/xenbus.c 2011-02-17 10:08:09.000000000 +0100
-+++ head-2011-09-07/drivers/xen/netback/xenbus.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/netback/xenbus.c 2011-02-17 10:08:09.000000000 +0100
++++ head-2011-10-07/drivers/xen/netback/xenbus.c 2011-01-31 17:32:29.000000000 +0100
@@ -19,6 +19,7 @@
#include <stdarg.h>
@@ -5422,8 +5431,8 @@ Acked-by: jbeulich@novell.com
xenbus_switch_state(dev, XenbusStateClosing);
break;
---- head-2011-09-07.orig/drivers/xen/netfront/accel.c 2009-05-04 10:01:03.000000000 +0200
-+++ head-2011-09-07/drivers/xen/netfront/accel.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/netfront/accel.c 2009-05-04 10:01:03.000000000 +0200
++++ head-2011-10-07/drivers/xen/netfront/accel.c 2011-01-31 17:32:29.000000000 +0100
@@ -548,7 +548,7 @@ static void accelerator_remove_hooks(str
/* Last chance to get statistics from the accelerator */
@@ -5452,8 +5461,8 @@ Acked-by: jbeulich@novell.com
spin_unlock_irqrestore(&accelerator->vif_states_lock, flags);
}
return rc;
---- head-2011-09-07.orig/drivers/xen/netfront/netfront.c 2011-06-30 16:05:07.000000000 +0200
-+++ head-2011-09-07/drivers/xen/netfront/netfront.c 2011-06-30 16:06:26.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/netfront/netfront.c 2011-06-30 16:05:07.000000000 +0200
++++ head-2011-10-07/drivers/xen/netfront/netfront.c 2011-06-30 16:06:26.000000000 +0200
@@ -515,7 +515,7 @@ static int setup_device(struct xenbus_de
memcpy(netdev->dev_addr, info->mac, ETH_ALEN);
@@ -5521,8 +5530,8 @@ Acked-by: jbeulich@novell.com
}
static int xennet_set_mac_address(struct net_device *dev, void *p)
---- head-2011-09-07.orig/drivers/xen/netfront/netfront.h 2011-02-09 15:35:17.000000000 +0100
-+++ head-2011-09-07/drivers/xen/netfront/netfront.h 2011-02-09 15:54:19.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/netfront/netfront.h 2011-02-09 15:35:17.000000000 +0100
++++ head-2011-10-07/drivers/xen/netfront/netfront.h 2011-02-09 15:54:19.000000000 +0100
@@ -149,9 +149,6 @@ struct netfront_info {
struct list_head list;
struct net_device *netdev;
@@ -5543,8 +5552,8 @@ Acked-by: jbeulich@novell.com
/* Private pointer to state internal to accelerator module */
void *accel_priv;
/* The accelerator used by this netfront device */
---- head-2011-09-07.orig/drivers/xen/pcifront/xenbus.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-07/drivers/xen/pcifront/xenbus.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/pcifront/xenbus.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/drivers/xen/pcifront/xenbus.c 2011-01-31 17:32:29.000000000 +0100
@@ -11,10 +11,6 @@
#include <xen/gnttab.h>
#include "pcifront.h"
@@ -5565,8 +5574,8 @@ Acked-by: jbeulich@novell.com
"pcifront", pdev);
if (err < 0) {
xenbus_dev_fatal(pdev->xdev, err,
---- head-2011-09-07.orig/drivers/xen/scsifront/xenbus.c 2011-02-08 10:03:34.000000000 +0100
-+++ head-2011-09-07/drivers/xen/scsifront/xenbus.c 2011-02-08 10:03:46.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/scsifront/xenbus.c 2011-02-08 10:03:34.000000000 +0100
++++ head-2011-10-07/drivers/xen/scsifront/xenbus.c 2011-02-08 10:03:46.000000000 +0100
@@ -100,7 +100,7 @@ static int scsifront_alloc_ring(struct v
err = bind_listening_port_to_irqhandler(
@@ -5576,8 +5585,8 @@ Acked-by: jbeulich@novell.com
if (err <= 0) {
xenbus_dev_fatal(dev, err, "bind_listening_port_to_irqhandler");
---- head-2011-09-07.orig/drivers/xen/sfc_netback/accel_fwd.c 2008-04-02 12:34:02.000000000 +0200
-+++ head-2011-09-07/drivers/xen/sfc_netback/accel_fwd.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/sfc_netback/accel_fwd.c 2008-04-02 12:34:02.000000000 +0200
++++ head-2011-10-07/drivers/xen/sfc_netback/accel_fwd.c 2011-01-31 17:32:29.000000000 +0100
@@ -308,7 +308,7 @@ static struct netback_accel *for_a_vnic(
static inline int packet_is_arp_reply(struct sk_buff *skb)
{
@@ -5603,8 +5612,8 @@ Acked-by: jbeulich@novell.com
DPRINTK("%s: found gratuitous ARP for " MAC_FMT "\n",
__FUNCTION__, MAC_ARG(mac));
---- head-2011-09-07.orig/drivers/xen/sfc_netback/accel_solarflare.c 2010-01-18 15:23:12.000000000 +0100
-+++ head-2011-09-07/drivers/xen/sfc_netback/accel_solarflare.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/sfc_netback/accel_solarflare.c 2010-01-18 15:23:12.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netback/accel_solarflare.c 2011-01-31 17:32:29.000000000 +0100
@@ -113,7 +113,7 @@ bend_dl_tx_packet(struct efx_dl_device *
BUG_ON(port == NULL);
@@ -5614,8 +5623,8 @@ Acked-by: jbeulich@novell.com
netback_accel_tx_packet(skb, port->fwd_priv);
else {
DPRINTK("Ignoring packet with missing mac address\n");
---- head-2011-09-07.orig/drivers/xen/sfc_netfront/accel_tso.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/drivers/xen/sfc_netfront/accel_tso.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/sfc_netfront/accel_tso.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netfront/accel_tso.c 2011-01-31 17:32:29.000000000 +0100
@@ -33,10 +33,9 @@
#include "accel_tso.h"
@@ -5677,8 +5686,8 @@ Acked-by: jbeulich@novell.com
}
tsoh_iph->tot_len = htons(ip_length);
---- head-2011-09-07.orig/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 16:03:44.000000000 +0200
-+++ head-2011-09-07/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 16:06:37.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 16:03:44.000000000 +0200
++++ head-2011-10-07/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 16:06:37.000000000 +0200
@@ -465,7 +465,7 @@ netfront_accel_enqueue_skb_multi(netfron
if (skb->ip_summed == CHECKSUM_PARTIAL) {
@@ -5705,8 +5714,8 @@ Acked-by: jbeulich@novell.com
skb->protocol = eth_type_trans(skb, net_dev);
/* CHECKSUM_UNNECESSARY as hardware has done it already */
skb->ip_summed = CHECKSUM_UNNECESSARY;
---- head-2011-09-07.orig/drivers/xen/sfc_netfront/accel_xenbus.c 2008-02-20 09:32:49.000000000 +0100
-+++ head-2011-09-07/drivers/xen/sfc_netfront/accel_xenbus.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/sfc_netfront/accel_xenbus.c 2008-02-20 09:32:49.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netfront/accel_xenbus.c 2011-01-31 17:32:29.000000000 +0100
@@ -356,7 +356,7 @@ static int vnic_setup_domU_shared_state(
/* Create xenbus msg event channel */
err = bind_listening_port_to_irqhandler
@@ -5725,8 +5734,8 @@ Acked-by: jbeulich@novell.com
if (err < 0) {
EPRINTK("Couldn't bind net event channel\n");
goto fail_net_irq;
---- head-2011-09-07.orig/drivers/xen/usbfront/xenbus.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-07/drivers/xen/usbfront/xenbus.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/usbfront/xenbus.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/drivers/xen/usbfront/xenbus.c 2011-01-31 17:32:29.000000000 +0100
@@ -111,7 +111,7 @@ static int setup_rings(struct xenbus_dev
info->conn_ring_ref = err;
@@ -5736,8 +5745,8 @@ Acked-by: jbeulich@novell.com
if (err <= 0) {
xenbus_dev_fatal(dev, err,
"bind_listening_port_to_irqhandler");
---- head-2011-09-07.orig/drivers/xen/xenbus/xenbus_xs.c 2011-06-30 15:37:44.000000000 +0200
-+++ head-2011-09-07/drivers/xen/xenbus/xenbus_xs.c 2011-06-30 16:06:45.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/xenbus/xenbus_xs.c 2011-10-07 10:44:29.000000000 +0200
++++ head-2011-10-07/drivers/xen/xenbus/xenbus_xs.c 2011-06-30 16:06:45.000000000 +0200
@@ -538,18 +538,15 @@ int xenbus_printf(struct xenbus_transact
{
va_list ap;
@@ -5761,8 +5770,8 @@ Acked-by: jbeulich@novell.com
ret = xenbus_write(t, dir, node, printf_buffer);
kfree(printf_buffer);
---- head-2011-09-07.orig/fs/aio.c 2011-04-13 11:25:29.000000000 +0200
-+++ head-2011-09-07/fs/aio.c 2011-04-13 12:31:48.000000000 +0200
+--- head-2011-10-07.orig/fs/aio.c 2011-04-13 11:25:29.000000000 +0200
++++ head-2011-10-07/fs/aio.c 2011-04-13 12:31:48.000000000 +0200
@@ -41,7 +41,7 @@
#ifdef CONFIG_EPOLL
@@ -5791,8 +5800,8 @@ Acked-by: jbeulich@novell.com
if (error)
return error;
---- head-2011-09-07.orig/arch/x86/include/asm/boot.h 2011-09-20 11:28:23.000000000 +0200
-+++ head-2011-09-07/arch/x86/include/asm/boot.h 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/asm/boot.h 2011-10-07 16:56:07.000000000 +0200
++++ head-2011-10-07/arch/x86/include/asm/boot.h 2011-01-31 17:32:29.000000000 +0100
@@ -16,7 +16,7 @@
& ~(CONFIG_PHYSICAL_ALIGN - 1))
@@ -5802,8 +5811,8 @@ Acked-by: jbeulich@novell.com
#define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
#else
#define MIN_KERNEL_ALIGN_LG2 (PAGE_SHIFT + THREAD_ORDER)
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:32:29.000000000 +0100
@@ -11,23 +11,24 @@
#include <asm/mmu.h>
@@ -5968,8 +5977,8 @@ Acked-by: jbeulich@novell.com
#endif
#ifndef CONFIG_X86_NO_IDT
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:32:29.000000000 +0100
@@ -19,10 +19,8 @@
* the start of the fixmap.
*/
@@ -5993,8 +6002,8 @@ Acked-by: jbeulich@novell.com
FIX_SHARED_INFO,
#define NR_FIX_ISAMAPS 256
FIX_ISAMAP_END,
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 17:32:29.000000000 +0100
@@ -67,12 +67,17 @@ extern void FASTCALL(kunmap_high(struct
void *kmap(struct page *page);
@@ -6014,8 +6023,8 @@ Acked-by: jbeulich@novell.com
#define flush_cache_kmaps() do { } while (0)
void clear_highpage(struct page *);
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/hypervisor.h 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/hypervisor.h 2011-01-31 17:32:29.000000000 +0100
@@ -69,6 +69,8 @@ extern start_info_t *xen_start_info;
#define is_initial_xendomain() 0
#endif
@@ -6047,8 +6056,8 @@ Acked-by: jbeulich@novell.com
#define arch_use_lazy_mmu_mode() unlikely(__get_cpu_var(xen_lazy_mmu))
#endif
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:32:29.000000000 +0100
@@ -11,6 +11,40 @@
#define _ASM_IRQFLAGS_H
@@ -6160,8 +6169,8 @@ Acked-by: jbeulich@novell.com
push %esp ; \
mov %ecx, %fs ; \
call evtchn_do_upcall ; \
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:32:29.000000000 +0100
@@ -6,6 +6,20 @@
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
@@ -6211,8 +6220,8 @@ Acked-by: jbeulich@novell.com
+ } while(0)
#endif
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 17:32:29.000000000 +0100
@@ -1,7 +1,6 @@
#ifndef _I386_PGALLOC_H
#define _I386_PGALLOC_H
@@ -6228,8 +6237,8 @@ Acked-by: jbeulich@novell.com
-#define check_pgt_cache() do { } while (0)
-
#endif /* _I386_PGALLOC_H */
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:32:29.000000000 +0100
@@ -52,32 +52,40 @@ static inline int pte_exec_kernel(pte_t
* value and then use set_pte to update it. -ben
*/
@@ -6348,8 +6357,8 @@ Acked-by: jbeulich@novell.com
-void vmalloc_sync_all(void);
-
#endif /* _I386_PGTABLE_3LEVEL_H */
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/pgtable-3level-defs.h 2007-06-12 13:14:02.000000000 +0200
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/pgtable-3level-defs.h 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/pgtable-3level-defs.h 2007-06-12 13:14:02.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/pgtable-3level-defs.h 2011-01-31 17:32:29.000000000 +0100
@@ -1,7 +1,7 @@
#ifndef _I386_PGTABLE_3LEVEL_DEFS_H
#define _I386_PGTABLE_3LEVEL_DEFS_H
@@ -6359,8 +6368,8 @@ Acked-by: jbeulich@novell.com
/*
* PGDIR_SHIFT determines what a top-level page table entry can map
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:38:07.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:38:07.000000000 +0100
@@ -24,11 +24,11 @@
#include <linux/slab.h>
#include <linux/list.h>
@@ -6534,8 +6543,8 @@ Acked-by: jbeulich@novell.com
#include <asm-generic/pgtable.h>
#endif /* _I386_PGTABLE_H */
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:32:29.000000000 +0100
@@ -21,6 +21,7 @@
#include <asm/percpu.h>
#include <linux/cpumask.h>
@@ -6778,8 +6787,8 @@ Acked-by: jbeulich@novell.com
+extern int force_mwait;
#endif /* __ASM_I386_PROCESSOR_H */
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:32:29.000000000 +0100
@@ -8,19 +8,15 @@
#include <linux/kernel.h>
#include <linux/threads.h>
@@ -6944,8 +6953,8 @@ Acked-by: jbeulich@novell.com
extern u8 apicid_2_node[];
#ifdef CONFIG_X86_LOCAL_APIC
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/system_32.h 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/system_32.h 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/system_32.h 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/system_32.h 2011-01-31 17:32:29.000000000 +0100
@@ -4,7 +4,7 @@
#include <linux/kernel.h>
#include <asm/segment.h>
@@ -7331,8 +7340,8 @@ Acked-by: jbeulich@novell.com
/*
* Force strict CPU ordering.
* And yes, this is required on UP too when we're talking
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:32:29.000000000 +0100
@@ -29,8 +29,13 @@
* and page-granular flushes are available only on i486 and up.
*/
@@ -7367,8 +7376,8 @@ Acked-by: jbeulich@novell.com
#define flush_tlb_kernel_range(start, end) flush_tlb_all()
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/desc_64.h 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/desc_64.h 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/desc_64.h 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/desc_64.h 2011-01-31 17:32:29.000000000 +0100
@@ -127,16 +127,6 @@ static inline void set_ldt_desc(unsigned
DESC_LDT, size * 8 - 1);
}
@@ -7417,8 +7426,8 @@ Acked-by: jbeulich@novell.com
}
/*
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:32:29.000000000 +0100
@@ -15,7 +15,6 @@
#include <asm/apicdef.h>
#include <asm/page.h>
@@ -7427,8 +7436,8 @@ Acked-by: jbeulich@novell.com
#include <asm/acpi.h>
/*
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/irqflags_64.h 2007-06-12 13:14:13.000000000 +0200
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/irqflags_64.h 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/irqflags_64.h 2007-06-12 13:14:13.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/irqflags_64.h 2011-01-31 17:32:29.000000000 +0100
@@ -9,6 +9,7 @@
*/
#ifndef _ASM_IRQFLAGS_H
@@ -7484,8 +7493,8 @@ Acked-by: jbeulich@novell.com
#else /* __ASSEMBLY__: */
# ifdef CONFIG_TRACE_IRQFLAGS
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/mmu_context_64.h 2007-06-12 13:14:13.000000000 +0200
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/mmu_context_64.h 2007-06-12 13:14:13.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 17:32:29.000000000 +0100
@@ -9,6 +9,9 @@
#include <asm/pgtable.h>
#include <asm/tlbflush.h>
@@ -7496,8 +7505,8 @@ Acked-by: jbeulich@novell.com
/*
* possibly do the LDT unload here?
*/
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/pgalloc_64.h 2010-09-23 15:39:04.000000000 +0200
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/pgalloc_64.h 2010-09-23 15:39:04.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 17:32:29.000000000 +0100
@@ -1,7 +1,6 @@
#ifndef _X86_64_PGALLOC_H
#define _X86_64_PGALLOC_H
@@ -7547,8 +7556,8 @@ Acked-by: jbeulich@novell.com
}
static inline pgd_t *pgd_alloc(struct mm_struct *mm)
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-02-07 15:38:08.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-02-07 15:38:08.000000000 +0100
@@ -1,12 +1,14 @@
#ifndef _X86_64_PGTABLE_H
#define _X86_64_PGTABLE_H
@@ -7759,8 +7768,8 @@ Acked-by: jbeulich@novell.com
+#endif /* !__ASSEMBLY__ */
#endif /* _X86_64_PGTABLE_H */
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:32:29.000000000 +0100
@@ -20,6 +20,7 @@
#include <asm/percpu.h>
#include <linux/personality.h>
@@ -7844,8 +7853,8 @@ Acked-by: jbeulich@novell.com
* NSC/Cyrix CPU indexed register access macros
*/
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:32:29.000000000 +0100
@@ -11,12 +11,11 @@
extern int disable_apic;
@@ -7898,8 +7907,8 @@ Acked-by: jbeulich@novell.com
#endif
/*
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/system_64.h 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/system_64.h 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/system_64.h 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/system_64.h 2011-01-31 17:32:29.000000000 +0100
@@ -3,7 +3,7 @@
#include <linux/kernel.h>
@@ -8041,8 +8050,8 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_SMP
#define smp_mb() mb()
#define smp_rmb() rmb()
---- head-2011-09-07.orig/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-07/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:32:29.000000000 +0100
@@ -2,7 +2,9 @@
#define _X8664_TLBFLUSH_H
@@ -8053,8 +8062,8 @@ Acked-by: jbeulich@novell.com
#define __flush_tlb() xen_tlb_flush()
---- head-2011-09-07.orig/include/linux/pci.h 2011-09-07 14:38:16.000000000 +0200
-+++ head-2011-09-07/include/linux/pci.h 2011-09-07 15:25:42.000000000 +0200
+--- head-2011-10-07.orig/include/linux/pci.h 2011-10-07 10:47:26.000000000 +0200
++++ head-2011-10-07/include/linux/pci.h 2011-09-07 15:25:42.000000000 +0200
@@ -331,7 +331,7 @@ struct pci_dev {
int rom_attr_enabled; /* has display of the rom attribute been enabled? */
struct bin_attribute *res_attr[DEVICE_COUNT_RESOURCE]; /* sysfs file for resources */
@@ -8064,8 +8073,8 @@ Acked-by: jbeulich@novell.com
struct list_head msi_list;
#endif
struct pci_vpd *vpd;
---- head-2011-09-07.orig/include/xen/net-util.h 2011-02-09 15:50:19.000000000 +0100
-+++ head-2011-09-07/include/xen/net-util.h 2011-02-09 15:53:07.000000000 +0100
+--- head-2011-10-07.orig/include/xen/net-util.h 2011-02-09 15:50:19.000000000 +0100
++++ head-2011-10-07/include/xen/net-util.h 2011-02-09 15:53:07.000000000 +0100
@@ -11,6 +11,7 @@ static inline int skb_checksum_setup(str
unsigned long *fixup_counter)
{
@@ -8113,8 +8122,8 @@ Acked-by: jbeulich@novell.com
goto out;
if (csum) {
---- head-2011-09-07.orig/lib/swiotlb-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-07/lib/swiotlb-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/lib/swiotlb-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/lib/swiotlb-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -751,7 +751,6 @@ swiotlb_dma_supported (struct device *hw
return (mask >= ((1UL << dma_bits) - 1));
}
@@ -8123,8 +8132,8 @@ Acked-by: jbeulich@novell.com
EXPORT_SYMBOL(swiotlb_map_single);
EXPORT_SYMBOL(swiotlb_unmap_single);
EXPORT_SYMBOL(swiotlb_map_sg);
---- head-2011-09-07.orig/mm/vmalloc.c 2011-09-20 11:28:23.000000000 +0200
-+++ head-2011-09-07/mm/vmalloc.c 2011-09-07 15:25:31.000000000 +0200
+--- head-2011-10-07.orig/mm/vmalloc.c 2011-10-07 16:56:07.000000000 +0200
++++ head-2011-10-07/mm/vmalloc.c 2011-09-07 15:25:31.000000000 +0200
@@ -1525,6 +1525,13 @@ static void *__vmalloc_area_node(struct
struct page **pages;
unsigned int nr_pages, array_size, i;
@@ -8165,8 +8174,8 @@ Acked-by: jbeulich@novell.com
#else
#define GFP_VMALLOC32 GFP_KERNEL
#endif
---- head-2011-09-07.orig/scripts/Makefile.xen.awk 2007-08-06 15:10:49.000000000 +0200
-+++ head-2011-09-07/scripts/Makefile.xen.awk 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-10-07.orig/scripts/Makefile.xen.awk 2007-08-06 15:10:49.000000000 +0200
++++ head-2011-10-07/scripts/Makefile.xen.awk 2011-01-31 17:32:29.000000000 +0100
@@ -13,7 +13,7 @@ BEGIN {
next
}
diff --git a/patches.xen/xen3-patch-2.6.23 b/patches.xen/xen3-patch-2.6.23
index 2fa9e211a2..5a5697911d 100644
--- a/patches.xen/xen3-patch-2.6.23
+++ b/patches.xen/xen3-patch-2.6.23
@@ -6,8 +6,8 @@ Automatically created from "patches.kernel.org/patch-2.6.23" by xen-port-patches
Acked-by: jbeulich@novell.com
---- head-2011-09-23.orig/arch/x86/Kbuild 2011-09-23 09:35:34.000000000 +0200
-+++ head-2011-09-23/arch/x86/Kbuild 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/Kbuild 2011-10-07 10:46:16.000000000 +0200
++++ head-2011-10-07/arch/x86/Kbuild 2011-01-31 17:49:31.000000000 +0100
@@ -2,7 +2,7 @@
obj-$(CONFIG_KVM) += kvm/
@@ -17,8 +17,8 @@ Acked-by: jbeulich@novell.com
# lguest paravirtualization support
obj-$(CONFIG_LGUEST_GUEST) += lguest/
---- head-2011-09-23.orig/arch/x86/kernel/asm-offsets.c 2011-09-23 09:35:34.000000000 +0200
-+++ head-2011-09-23/arch/x86/kernel/asm-offsets.c 2011-04-13 12:42:43.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/kernel/asm-offsets.c 2011-10-07 10:46:16.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/asm-offsets.c 2011-04-13 12:42:43.000000000 +0200
@@ -17,7 +17,7 @@
#include <asm/bootparam.h>
#include <asm/suspend.h>
@@ -37,8 +37,8 @@ Acked-by: jbeulich@novell.com
BLANK();
OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
OFFSET(XEN_vcpu_info_pending, vcpu_info, evtchn_upcall_pending);
---- head-2011-09-23.orig/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -362,6 +362,8 @@ static void __cpuinit generic_identify(s
if ( xlvl >= 0x80000004 )
get_model_name(c); /* Default name */
@@ -64,8 +64,8 @@ Acked-by: jbeulich@novell.com
nexgen_init_cpu();
umc_init_cpu();
early_cpu_detect();
---- head-2011-09-23.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -167,7 +167,7 @@ mtrr_del(int reg, unsigned long base, un
EXPORT_SYMBOL(mtrr_add);
EXPORT_SYMBOL(mtrr_del);
@@ -75,8 +75,8 @@ Acked-by: jbeulich@novell.com
{
}
---- head-2011-09-23.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -10,6 +10,7 @@
#include <linux/efi.h>
#include <linux/pfn.h>
@@ -132,8 +132,8 @@ Acked-by: jbeulich@novell.com
break;
}
}
---- head-2011-09-23.orig/arch/x86/kernel/entry_32.S 2011-09-07 14:44:06.000000000 +0200
-+++ head-2011-09-23/arch/x86/kernel/entry_32.S 2011-09-07 15:28:37.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/kernel/entry_32.S 2011-09-07 14:44:06.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/entry_32.S 2011-09-07 15:28:37.000000000 +0200
@@ -1045,7 +1045,7 @@ ENTRY(kernel_thread_helper)
CFI_ENDPROC
ENDPROC(kernel_thread_helper)
@@ -152,8 +152,8 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_FUNCTION_TRACER
#ifdef CONFIG_DYNAMIC_FTRACE
---- head-2011-09-23.orig/arch/x86/kernel/entry_32-xen.S 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/entry_32-xen.S 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/entry_32-xen.S 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/entry_32-xen.S 2011-01-31 17:49:31.000000000 +0100
@@ -452,9 +452,6 @@ restore_nocheck_notrace:
1: INTERRUPT_RETURN
.section .fixup,"ax"
@@ -164,8 +164,8 @@ Acked-by: jbeulich@novell.com
pushl $0 # no error code
pushl $do_iret_error
jmp error_code
---- head-2011-09-23.orig/arch/x86/kernel/head_32-xen.S 2011-08-09 10:37:32.000000000 +0200
-+++ head-2011-09-23/arch/x86/kernel/head_32-xen.S 2011-08-09 10:41:46.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/kernel/head_32-xen.S 2011-08-09 10:37:32.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/head_32-xen.S 2011-08-09 10:41:46.000000000 +0200
@@ -87,7 +87,10 @@ ENTRY(_stext)
/*
* BSS section
@@ -237,8 +237,8 @@ Acked-by: jbeulich@novell.com
- ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long, 1)
+ ELFNOTE(Xen, XEN_ELFNOTE_LOADER, .asciz "generic")
+ ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long 1)
---- head-2011-09-23.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -402,14 +402,6 @@ static void set_ioapic_affinity_irq(unsi
# include <linux/slab.h> /* kmalloc() */
# include <linux/timer.h> /* time_after() */
@@ -352,8 +352,8 @@ Acked-by: jbeulich@novell.com
{
unsigned long t1 = jiffies;
---- head-2011-09-23.orig/arch/x86/kernel/microcode-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/microcode-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/microcode-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/microcode-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -33,6 +33,7 @@
#include <linux/miscdevice.h>
#include <linux/spinlock.h>
@@ -362,8 +362,8 @@ Acked-by: jbeulich@novell.com
#include <linux/mutex.h>
#include <linux/cpu.h>
#include <linux/firmware.h>
---- head-2011-09-23.orig/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -24,7 +24,7 @@
#include <asm/bug.h>
@@ -373,8 +373,8 @@ Acked-by: jbeulich@novell.com
int iommu_merge __read_mostly = 0;
EXPORT_SYMBOL(iommu_merge);
---- head-2011-09-23.orig/arch/x86/kernel/process_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/process_32-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/process_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/process_32-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -241,6 +241,7 @@ early_param("idle", idle_setup);
void show_regs(struct pt_regs * regs)
{
@@ -490,8 +490,8 @@ Acked-by: jbeulich@novell.com
/*
* Leave lazy mode, flushing any hypercalls made here.
---- head-2011-09-23.orig/arch/x86/kernel/setup_32-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/setup_32-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/setup_32-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/setup_32-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -114,19 +114,10 @@ static unsigned int highmem_pages = -1;
/*
* Setup options
@@ -578,8 +578,8 @@ Acked-by: jbeulich@novell.com
if (is_initial_xendomain()) {
#ifdef CONFIG_VT
---- head-2011-09-23.orig/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -22,6 +22,7 @@
#include <asm/mtrr.h>
@@ -604,8 +604,8 @@ Acked-by: jbeulich@novell.com
{
if (per_cpu(cpu_tlbstate, cpu).state == TLBSTATE_OK)
BUG();
---- head-2011-09-23.orig/arch/x86/kernel/time-xen.c 2011-07-11 11:10:56.000000000 +0200
-+++ head-2011-09-23/arch/x86/kernel/time-xen.c 2011-07-11 11:22:42.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/kernel/time-xen.c 2011-07-11 11:10:56.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/time-xen.c 2011-07-11 11:22:42.000000000 +0200
@@ -75,11 +75,12 @@
#include <xen/evtchn.h>
#include <xen/interface/vcpu.h>
@@ -680,8 +680,8 @@ Acked-by: jbeulich@novell.com
}
extern void (*late_time_init)(void);
---- head-2011-09-23.orig/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -41,6 +41,10 @@
#include <linux/mca.h>
#endif
@@ -888,8 +888,8 @@ Acked-by: jbeulich@novell.com
#ifndef CONFIG_MATH_EMULATION
---- head-2011-09-23.orig/arch/x86/mach-xen/setup.c 2011-08-09 10:35:06.000000000 +0200
-+++ head-2011-09-23/arch/x86/mach-xen/setup.c 2011-09-07 15:28:26.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/mach-xen/setup.c 2011-08-09 10:35:06.000000000 +0200
++++ head-2011-10-07/arch/x86/mach-xen/setup.c 2011-09-07 15:28:26.000000000 +0200
@@ -12,6 +12,7 @@
#include <asm/e820.h>
#include <asm/setup.h>
@@ -926,8 +926,8 @@ Acked-by: jbeulich@novell.com
+ set_pmd(pmd, __pmd(__pa_symbol(swapper_pg_pmd) | _PAGE_TABLE));
+ }
}
---- head-2011-09-23.orig/arch/x86/mm/fault_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/mm/fault_32-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/mm/fault_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/mm/fault_32-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -346,7 +346,10 @@ static inline pmd_t *vmalloc_sync_one(pg
pmd_k = pmd_offset(pud_k, address);
if (!pmd_present(*pmd_k))
@@ -1013,8 +1013,8 @@ Acked-by: jbeulich@novell.com
tsk->thread.cr2 = address;
/* Kernel addresses are always protection faults */
tsk->thread.error_code = error_code | (address >= TASK_SIZE);
---- head-2011-09-23.orig/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -34,17 +34,16 @@ void *kmap_atomic_prot(struct page *page
/* even !CONFIG_PREEMPT needs this, for in_atomic in do_page_fault */
pagefault_disable();
@@ -1036,8 +1036,8 @@ Acked-by: jbeulich@novell.com
}
void *kmap_atomic(struct page *page, enum km_type type)
---- head-2011-09-23.orig/arch/x86/mm/init_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/mm/init_32-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/mm/init_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/mm/init_32-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -96,7 +96,7 @@ static pte_t * __init one_page_table_ini
#endif
pte_t *page_table = (pte_t *) alloc_bootmem_low_pages(PAGE_SIZE);
@@ -1100,8 +1100,8 @@ Acked-by: jbeulich@novell.com
if (!SHARED_KERNEL_PMD) {
/* If we're in PAE mode and have a non-shared
kernel pmd, then the pgd size must be a
---- head-2011-09-23.orig/arch/x86/mm/ioremap-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/mm/ioremap-xen.c 2011-02-07 15:38:30.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/mm/ioremap-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/mm/ioremap-xen.c 2011-02-07 15:38:30.000000000 +0100
@@ -344,9 +344,8 @@ void iounmap(volatile void __iomem *addr
/* Reset the direct mapping. Can block */
@@ -1113,8 +1113,8 @@ Acked-by: jbeulich@novell.com
PAGE_KERNEL);
global_flush_tlb();
}
---- head-2011-09-23.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -198,7 +198,7 @@ void pte_free(struct page *pte)
va, pfn_pte(pfn, PAGE_KERNEL), 0))
BUG();
@@ -1213,8 +1213,8 @@ Acked-by: jbeulich@novell.com
(atomic_read(&mm->mm_count) == 1) &&
!mm->context.has_foreign_mappings)
mm_unpin(mm);
---- head-2011-09-23.orig/arch/x86/xen/Kconfig 2011-09-23 09:35:34.000000000 +0200
-+++ head-2011-09-23/arch/x86/xen/Kconfig 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/xen/Kconfig 2011-10-07 10:46:16.000000000 +0200
++++ head-2011-10-07/arch/x86/xen/Kconfig 2011-01-31 17:49:31.000000000 +0100
@@ -2,7 +2,7 @@
# This Kconfig describes xen options
#
@@ -1224,8 +1224,8 @@ Acked-by: jbeulich@novell.com
bool "Xen guest support"
select PARAVIRT
select PARAVIRT_CLOCK
---- head-2011-09-23.orig/arch/x86/xen/xen-head.S 2011-09-23 09:35:34.000000000 +0200
-+++ head-2011-09-23/arch/x86/xen/xen-head.S 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/xen/xen-head.S 2011-10-07 10:46:16.000000000 +0200
++++ head-2011-10-07/arch/x86/xen/xen-head.S 2011-01-31 17:49:31.000000000 +0100
@@ -1,7 +1,7 @@
/* Xen-specific pieces of head.S, intended to be included in the right
place in head.S */
@@ -1241,8 +1241,8 @@ Acked-by: jbeulich@novell.com
-#endif /*CONFIG_XEN */
+#endif /* CONFIG_PARAVIRT_XEN */
---- head-2011-09-23.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:49:31.000000000 +0100
@@ -105,7 +105,7 @@ ENTRY(ia32_sysenter_target)
movl $VSYSCALL32_SYSEXIT,8(%rsp)
movq %rax,(%rsp)
@@ -1284,8 +1284,8 @@ Acked-by: jbeulich@novell.com
.quad sys_eventfd
+ .quad sys32_fallocate
ia32_syscall_end:
---- head-2011-09-23.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -224,37 +224,6 @@ unsigned long __init e820_end_of_ram(voi
}
@@ -1469,8 +1469,8 @@ Acked-by: jbeulich@novell.com
(unsigned long long) e820.map[i].addr,
(unsigned long long) (e820.map[i].addr + e820.map[i].size));
switch (e820.map[i].type) {
---- head-2011-09-23.orig/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -174,6 +174,7 @@ static __init void early_serial_init(cha
* mappings. Someone should fix this for domain 0. For now, use fake serial.
*/
@@ -1505,9 +1505,9 @@ Acked-by: jbeulich@novell.com
}
if (keep_early)
---- head-2011-09-23.orig/arch/x86/kernel/entry_64-xen.S 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/entry_64-xen.S 2011-01-31 17:49:31.000000000 +0100
-@@ -310,7 +310,7 @@ sysret_signal:
+--- head-2011-10-07.orig/arch/x86/kernel/entry_64-xen.S 2011-10-06 11:55:00.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/entry_64-xen.S 2011-10-07 11:21:43.000000000 +0200
+@@ -313,7 +313,7 @@ sysret_signal:
TRACE_IRQS_ON
/* sti */
XEN_UNBLOCK_EVENTS(%rsi)
@@ -1516,7 +1516,7 @@ Acked-by: jbeulich@novell.com
jz 1f
/* Really a signal */
-@@ -409,7 +409,7 @@ int_very_careful:
+@@ -412,7 +412,7 @@ int_very_careful:
jmp int_restore_rest
int_signal:
@@ -1525,7 +1525,7 @@ Acked-by: jbeulich@novell.com
jz 1f
movq %rsp,%rdi # &ptregs -> arg1
xorl %esi,%esi # oldset -> arg2
-@@ -552,7 +552,7 @@ retint_careful:
+@@ -555,7 +555,7 @@ retint_careful:
jmp retint_check
retint_signal:
@@ -1534,8 +1534,8 @@ Acked-by: jbeulich@novell.com
jz retint_restore_args
TRACE_IRQS_ON
XEN_UNBLOCK_EVENTS(%rsi)
---- head-2011-09-23.orig/arch/x86/kernel/head_64-xen.S 2011-08-09 10:37:34.000000000 +0200
-+++ head-2011-09-23/arch/x86/kernel/head_64-xen.S 2011-08-09 10:41:44.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/kernel/head_64-xen.S 2011-08-09 10:37:34.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/head_64-xen.S 2011-08-09 10:41:44.000000000 +0200
@@ -24,7 +24,7 @@
#include <xen/interface/elfnote.h>
#include <xen/interface/features.h>
@@ -1612,8 +1612,8 @@ Acked-by: jbeulich@novell.com
- ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long, 1)
+ ELFNOTE(Xen, XEN_ELFNOTE_LOADER, .asciz "generic")
+ ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long 1)
---- head-2011-09-23.orig/arch/x86/kernel/head64-xen.c 2011-08-09 10:37:35.000000000 +0200
-+++ head-2011-09-23/arch/x86/kernel/head64-xen.c 2011-08-09 10:41:42.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/kernel/head64-xen.c 2011-08-09 10:37:35.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/head64-xen.c 2011-08-09 10:41:42.000000000 +0200
@@ -89,7 +89,7 @@ void __init x86_64_start_kernel(char * r
struct xen_machphys_mapping mapping;
int i;
@@ -1623,8 +1623,8 @@ Acked-by: jbeulich@novell.com
xen_start_info = (struct start_info *)real_mode_data;
if (!xen_feature(XENFEAT_auto_translated_physmap))
---- head-2011-09-23.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -165,7 +165,9 @@ static inline void io_apic_write(unsigne
#endif
}
@@ -1747,8 +1747,8 @@ Acked-by: jbeulich@novell.com
}
static struct irq_chip ioapic_chip __read_mostly = {
---- head-2011-09-23.orig/arch/x86/kernel/ldt_64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/ldt_64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/ldt_64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/ldt_64-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -114,6 +114,8 @@ int init_new_context(struct task_struct
memset(&mm->context, 0, sizeof(mm->context));
init_MUTEX(&mm->context.sem);
@@ -1767,8 +1767,8 @@ Acked-by: jbeulich@novell.com
spin_lock(&mm_unpinned_lock);
list_del(&mm->context.unpinned);
spin_unlock(&mm_unpinned_lock);
---- head-2011-09-23.orig/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -32,7 +32,6 @@
/* Have we found an MP table */
@@ -1825,8 +1825,8 @@ Acked-by: jbeulich@novell.com
}
void __init
---- head-2011-09-23.orig/arch/x86/kernel/process_64-xen.c 2011-02-02 08:31:39.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/process_64-xen.c 2011-02-02 08:31:50.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/process_64-xen.c 2011-02-02 08:31:39.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/process_64-xen.c 2011-02-02 08:31:50.000000000 +0100
@@ -26,6 +26,7 @@
#include <linux/sched.h>
#include <linux/kernel.h>
@@ -1858,8 +1858,8 @@ Acked-by: jbeulich@novell.com
}
void show_regs(struct pt_regs *regs)
---- head-2011-09-23.orig/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -828,6 +828,8 @@ static void __cpuinit init_amd(struct cp
level = cpuid_eax(1);
if (c->x86 == 15 && ((level >= 0x0f48 && level < 0x0f50) || level >= 0x0f58))
@@ -1942,8 +1942,8 @@ Acked-by: jbeulich@novell.com
};
static char *x86_power_flags[] = {
"ts", /* temperature sensor */
---- head-2011-09-23.orig/arch/x86/kernel/setup64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/setup64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/setup64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/setup64-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -125,11 +125,14 @@ void __init setup_per_cpu_areas(void)
}
@@ -1970,8 +1970,8 @@ Acked-by: jbeulich@novell.com
/* others are initialized in smpboot.c */
pda->pcurrent = &init_task;
pda->irqstackptr = boot_cpu_stack;
---- head-2011-09-23.orig/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -362,7 +362,7 @@ __smp_call_function_single(int cpu, void
}
@@ -2008,8 +2008,8 @@ Acked-by: jbeulich@novell.com
put_cpu();
return 0;
}
---- head-2011-09-23.orig/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -34,6 +34,10 @@
#include <linux/bug.h>
#include <linux/kdebug.h>
@@ -2080,8 +2080,8 @@ Acked-by: jbeulich@novell.com
if (panic_on_unrecovered_nmi)
panic("NMI: Not continuing");
---- head-2011-09-23.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -42,6 +42,7 @@
#include <asm/segment.h>
#include <asm/desc.h>
@@ -2127,8 +2127,8 @@ Acked-by: jbeulich@novell.com
write_sequnlock_irqrestore(&vsyscall_gtod_data.lock, flags);
}
---- head-2011-09-23.orig/arch/x86/mm/fault_64-xen.c 2011-07-26 09:27:41.000000000 +0200
-+++ head-2011-09-23/arch/x86/mm/fault_64-xen.c 2011-08-15 10:44:41.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/mm/fault_64-xen.c 2011-07-26 09:27:41.000000000 +0200
++++ head-2011-10-07/arch/x86/mm/fault_64-xen.c 2011-08-15 10:44:41.000000000 +0200
@@ -160,7 +160,9 @@ void dump_pagetable(unsigned long addres
pmd_t *pmd;
pte_t *pte;
@@ -2250,8 +2250,8 @@ Acked-by: jbeulich@novell.com
goto no_context;
do_sigbus:
---- head-2011-09-23.orig/arch/x86/mm/init_64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/mm/init_64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/mm/init_64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/mm/init_64-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -66,6 +66,9 @@ int after_bootmem;
DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
extern unsigned long start_pfn;
@@ -2375,8 +2375,8 @@ Acked-by: jbeulich@novell.com
+ return "[vsyscall]";
+ return NULL;
+}
---- head-2011-09-23.orig/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -171,7 +171,7 @@ void mm_pin(struct mm_struct *mm)
mm_walk(mm, PAGE_KERNEL_RO);
xen_pgd_pin(__pa(mm->pgd)); /* kernel */
@@ -2481,8 +2481,8 @@ Acked-by: jbeulich@novell.com
ClearPagePrivate(pg);
__free_page(pg);
}
---- head-2011-09-23.orig/arch/x86/oprofile/xenoprof.c 2008-01-28 12:24:19.000000000 +0100
-+++ head-2011-09-23/arch/x86/oprofile/xenoprof.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/oprofile/xenoprof.c 2008-01-28 12:24:19.000000000 +0100
++++ head-2011-10-07/arch/x86/oprofile/xenoprof.c 2011-01-31 17:49:31.000000000 +0100
@@ -18,9 +18,9 @@
#include <linux/init.h>
#include <linux/oprofile.h>
@@ -2494,8 +2494,8 @@ Acked-by: jbeulich@novell.com
#include <xen/interface/xen.h>
#include <xen/interface/xenoprof.h>
#include <xen/xenoprof.h>
---- head-2011-09-23.orig/arch/x86/vdso/vdso32/note.S 2011-09-23 09:35:34.000000000 +0200
-+++ head-2011-09-23/arch/x86/vdso/vdso32/note.S 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/vdso/vdso32/note.S 2011-10-07 10:46:16.000000000 +0200
++++ head-2011-10-07/arch/x86/vdso/vdso32/note.S 2011-01-31 17:49:31.000000000 +0100
@@ -13,7 +13,7 @@ ELFNOTE_START(Linux, 0, "a")
.long LINUX_VERSION_CODE
ELFNOTE_END
@@ -2518,8 +2518,8 @@ Acked-by: jbeulich@novell.com
.byte VDSO_NOTE_NONEGSEG_BIT; .asciz "nosegneg" /* bit, name */
ELFNOTE_END
#endif
---- head-2011-09-23.orig/drivers/Makefile 2011-06-30 15:36:40.000000000 +0200
-+++ head-2011-09-23/drivers/Makefile 2011-06-30 16:09:27.000000000 +0200
+--- head-2011-10-07.orig/drivers/Makefile 2011-06-30 15:36:40.000000000 +0200
++++ head-2011-10-07/drivers/Makefile 2011-06-30 16:09:27.000000000 +0200
@@ -22,7 +22,7 @@ obj-$(CONFIG_ARM_AMBA) += amba/
obj-$(CONFIG_DMA_ENGINE) += dma/
@@ -2529,8 +2529,8 @@ Acked-by: jbeulich@novell.com
# regulators early, since some subsystems rely on them to initialize
obj-$(CONFIG_REGULATOR) += regulator/
---- head-2011-09-23.orig/drivers/block/Kconfig 2011-09-23 09:35:34.000000000 +0200
-+++ head-2011-09-23/drivers/block/Kconfig 2011-09-07 15:27:40.000000000 +0200
+--- head-2011-10-07.orig/drivers/block/Kconfig 2011-10-07 10:46:16.000000000 +0200
++++ head-2011-10-07/drivers/block/Kconfig 2011-09-07 15:27:40.000000000 +0200
@@ -475,9 +475,9 @@ config XILINX_SYSACE
help
Include support for the Xilinx SystemACE CompactFlash interface
@@ -2543,8 +2543,8 @@ Acked-by: jbeulich@novell.com
default y
select XEN_XENBUS_FRONTEND
help
---- head-2011-09-23.orig/drivers/block/Makefile 2011-09-23 09:35:34.000000000 +0200
-+++ head-2011-09-23/drivers/block/Makefile 2011-06-30 16:09:48.000000000 +0200
+--- head-2011-10-07.orig/drivers/block/Makefile 2011-10-07 10:46:16.000000000 +0200
++++ head-2011-10-07/drivers/block/Makefile 2011-06-30 16:09:48.000000000 +0200
@@ -35,7 +35,7 @@ obj-$(CONFIG_BLK_DEV_SX8) += sx8.o
obj-$(CONFIG_BLK_DEV_UB) += ub.o
obj-$(CONFIG_BLK_DEV_HD) += hd.o
@@ -2554,8 +2554,8 @@ Acked-by: jbeulich@novell.com
obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/
obj-$(CONFIG_BLK_DEV_DRBD) += drbd/
obj-$(CONFIG_BLK_DEV_RBD) += rbd.o
---- head-2011-09-23.orig/drivers/block/xen-blkfront.c 2011-09-23 09:35:34.000000000 +0200
-+++ head-2011-09-23/drivers/block/xen-blkfront.c 2011-06-30 16:09:40.000000000 +0200
+--- head-2011-10-07.orig/drivers/block/xen-blkfront.c 2011-10-07 10:46:16.000000000 +0200
++++ head-2011-10-07/drivers/block/xen-blkfront.c 2011-06-30 16:09:40.000000000 +0200
@@ -1374,7 +1374,6 @@ static const struct xenbus_device_id blk
static struct xenbus_driver blkfront = {
@@ -2564,8 +2564,8 @@ Acked-by: jbeulich@novell.com
.ids = blkfront_ids,
.probe = blkfront_probe,
.remove = blkfront_remove,
---- head-2011-09-23.orig/drivers/tty/hvc/Kconfig 2011-09-23 09:35:34.000000000 +0200
-+++ head-2011-09-23/drivers/tty/hvc/Kconfig 2011-09-07 15:27:50.000000000 +0200
+--- head-2011-10-07.orig/drivers/tty/hvc/Kconfig 2011-10-07 10:46:16.000000000 +0200
++++ head-2011-10-07/drivers/tty/hvc/Kconfig 2011-09-07 15:27:50.000000000 +0200
@@ -60,7 +60,7 @@ config HVC_IUCV
config HVC_XEN
@@ -2575,8 +2575,8 @@ Acked-by: jbeulich@novell.com
select HVC_DRIVER
select HVC_IRQ
default y
---- head-2011-09-23.orig/drivers/net/Kconfig 2011-09-23 09:40:45.000000000 +0200
-+++ head-2011-09-23/drivers/net/Kconfig 2011-09-23 09:45:48.000000000 +0200
+--- head-2011-10-07.orig/drivers/net/Kconfig 2011-10-07 10:46:16.000000000 +0200
++++ head-2011-10-07/drivers/net/Kconfig 2011-09-23 09:45:48.000000000 +0200
@@ -2963,9 +2963,9 @@ config TILE_NET
To compile this driver as a module, choose M here: the module
will be called tile_net.
@@ -2589,8 +2589,8 @@ Acked-by: jbeulich@novell.com
select XEN_XENBUS_FRONTEND
default y
help
---- head-2011-09-23.orig/drivers/net/Makefile 2011-09-23 09:35:34.000000000 +0200
-+++ head-2011-09-23/drivers/net/Makefile 2011-09-07 15:28:07.000000000 +0200
+--- head-2011-10-07.orig/drivers/net/Makefile 2011-10-07 10:46:16.000000000 +0200
++++ head-2011-10-07/drivers/net/Makefile 2011-09-07 15:28:07.000000000 +0200
@@ -171,7 +171,7 @@ obj-$(CONFIG_PPTP) += pppox.o pptp.o
obj-$(CONFIG_SLIP) += slip.o
obj-$(CONFIG_SLHC) += slhc.o
@@ -2600,8 +2600,8 @@ Acked-by: jbeulich@novell.com
obj-$(CONFIG_XEN_NETDEV_BACKEND) += xen-netback/
obj-$(CONFIG_DUMMY) += dummy.o
---- head-2011-09-23.orig/drivers/net/xen-netfront.c 2011-09-23 09:35:34.000000000 +0200
-+++ head-2011-09-23/drivers/net/xen-netfront.c 2011-09-07 15:28:15.000000000 +0200
+--- head-2011-10-07.orig/drivers/net/xen-netfront.c 2011-10-07 10:46:16.000000000 +0200
++++ head-2011-10-07/drivers/net/xen-netfront.c 2011-09-07 15:28:15.000000000 +0200
@@ -1935,7 +1935,6 @@ static int __devexit xennet_remove(struc
static struct xenbus_driver netfront_driver = {
@@ -2610,8 +2610,8 @@ Acked-by: jbeulich@novell.com
.ids = netfront_ids,
.probe = netfront_probe,
.remove = __devexit_p(xennet_remove),
---- head-2011-09-23.orig/drivers/xen/Kconfig 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-23/drivers/xen/Kconfig 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/Kconfig 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/drivers/xen/Kconfig 2011-01-31 17:49:31.000000000 +0100
@@ -23,6 +23,9 @@ config XEN_PRIVILEGED_GUEST
config XEN_UNPRIVILEGED_GUEST
def_bool !XEN_PRIVILEGED_GUEST
@@ -2622,8 +2622,8 @@ Acked-by: jbeulich@novell.com
config XEN_PRIVCMD
def_bool y
---- head-2011-09-23.orig/drivers/xen/Makefile 2011-02-24 13:56:24.000000000 +0100
-+++ head-2011-09-23/drivers/xen/Makefile 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/Makefile 2011-02-24 13:56:24.000000000 +0100
++++ head-2011-10-07/drivers/xen/Makefile 2011-01-31 17:49:31.000000000 +0100
@@ -1,10 +1,14 @@
-obj-y += core/
-obj-y += console/
@@ -2645,8 +2645,8 @@ Acked-by: jbeulich@novell.com
obj-$(CONFIG_XEN_BALLOON) += balloon/
obj-$(CONFIG_XEN_BLKDEV_BACKEND) += blkback/
obj-$(CONFIG_XEN_BLKDEV_TAP) += blktap/
---- head-2011-09-23.orig/drivers/xen/balloon/balloon.c 2011-03-23 08:51:42.000000000 +0100
-+++ head-2011-09-23/drivers/xen/balloon/balloon.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/balloon/balloon.c 2011-03-23 08:51:42.000000000 +0100
++++ head-2011-10-07/drivers/xen/balloon/balloon.c 2011-01-31 17:49:31.000000000 +0100
@@ -324,13 +324,9 @@ static int increase_reservation(unsigned
#ifndef MODULE
@@ -2661,8 +2661,8 @@ Acked-by: jbeulich@novell.com
vm_total_pages = nr_free_pagecache_pages();
#endif
---- head-2011-09-23.orig/drivers/xen/blkback/blkback.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-23/drivers/xen/blkback/blkback.c 2011-04-11 14:51:40.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/blkback/blkback.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/drivers/xen/blkback/blkback.c 2011-04-11 14:51:40.000000000 +0200
@@ -157,7 +157,7 @@ static void unplug_queue(blkif_t *blkif)
static void plug_queue(blkif_t *blkif, struct block_device *bdev)
@@ -2672,8 +2672,8 @@ Acked-by: jbeulich@novell.com
if (q == blkif->plug)
return;
---- head-2011-09-23.orig/drivers/xen/blkback/common.h 2011-04-11 14:28:27.000000000 +0200
-+++ head-2011-09-23/drivers/xen/blkback/common.h 2011-04-11 14:51:44.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/blkback/common.h 2011-04-11 14:28:27.000000000 +0200
++++ head-2011-10-07/drivers/xen/blkback/common.h 2011-04-11 14:51:44.000000000 +0200
@@ -35,7 +35,6 @@
#include <linux/wait.h>
#include <asm/hypervisor.h>
@@ -2691,8 +2691,8 @@ Acked-by: jbeulich@novell.com
/* statistics */
unsigned long st_print;
---- head-2011-09-23.orig/drivers/xen/blkback/interface.c 2011-04-11 14:29:25.000000000 +0200
-+++ head-2011-09-23/drivers/xen/blkback/interface.c 2011-04-11 14:51:52.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/blkback/interface.c 2011-04-11 14:29:25.000000000 +0200
++++ head-2011-10-07/drivers/xen/blkback/interface.c 2011-04-11 14:51:52.000000000 +0200
@@ -140,5 +140,5 @@ void blkif_free(blkif_t *blkif)
void __init blkif_interface_init(void)
{
@@ -2700,8 +2700,8 @@ Acked-by: jbeulich@novell.com
- 0, 0, NULL, NULL);
+ 0, 0, NULL);
}
---- head-2011-09-23.orig/drivers/xen/blkback/xenbus.c 2011-06-30 16:04:52.000000000 +0200
-+++ head-2011-09-23/drivers/xen/blkback/xenbus.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/blkback/xenbus.c 2011-06-30 16:04:52.000000000 +0200
++++ head-2011-10-07/drivers/xen/blkback/xenbus.c 2011-01-31 17:49:31.000000000 +0100
@@ -27,8 +27,6 @@
pr_debug("blkback/xenbus (%s:%d) " fmt ".\n", \
__FUNCTION__, __LINE__, ##args)
@@ -2738,8 +2738,8 @@ Acked-by: jbeulich@novell.com
return 0;
}
---- head-2011-09-23.orig/drivers/xen/blkfront/blkfront.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/drivers/xen/blkfront/blkfront.c 2011-07-21 12:08:17.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/blkfront/blkfront.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/drivers/xen/blkfront/blkfront.c 2011-07-21 12:08:17.000000000 +0200
@@ -572,14 +572,20 @@ int blkif_ioctl(struct inode *inode, str
return -EINVAL;
@@ -2771,8 +2771,8 @@ Acked-by: jbeulich@novell.com
{
struct blkfront_info *info = NULL;
struct request *req;
---- head-2011-09-23.orig/drivers/xen/blkfront/block.h 2010-02-24 13:13:46.000000000 +0100
-+++ head-2011-09-23/drivers/xen/blkfront/block.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/blkfront/block.h 2010-02-24 13:13:46.000000000 +0100
++++ head-2011-10-07/drivers/xen/blkfront/block.h 2011-01-31 17:49:31.000000000 +0100
@@ -107,7 +107,7 @@ struct blkfront_info
struct scatterlist sg[BLKIF_MAX_SEGMENTS_PER_REQUEST];
unsigned int irq;
@@ -2791,8 +2791,8 @@ Acked-by: jbeulich@novell.com
/* Virtual block-device subsystem. */
/* Note that xlvbd_add doesn't call add_disk for you: you're expected
---- head-2011-09-23.orig/drivers/xen/blkfront/vbd.c 2010-01-18 15:23:12.000000000 +0100
-+++ head-2011-09-23/drivers/xen/blkfront/vbd.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/blkfront/vbd.c 2010-01-18 15:23:12.000000000 +0100
++++ head-2011-10-07/drivers/xen/blkfront/vbd.c 2011-01-31 17:49:31.000000000 +0100
@@ -298,7 +298,7 @@ xlbd_release_minors(struct xlbd_major_in
static int
xlvbd_init_blk_queue(struct gendisk *gd, u16 sector_size)
@@ -2802,8 +2802,8 @@ Acked-by: jbeulich@novell.com
rq = blk_init_queue(do_blkif_request, &blkif_io_lock);
if (rq == NULL)
---- head-2011-09-23.orig/drivers/xen/blktap/common.h 2011-04-11 14:28:19.000000000 +0200
-+++ head-2011-09-23/drivers/xen/blktap/common.h 2011-04-11 14:51:59.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/blktap/common.h 2011-04-11 14:28:19.000000000 +0200
++++ head-2011-10-07/drivers/xen/blktap/common.h 2011-04-11 14:51:59.000000000 +0200
@@ -34,7 +34,6 @@
#include <linux/blkdev.h>
#include <asm/hypervisor.h>
@@ -2821,8 +2821,8 @@ Acked-by: jbeulich@novell.com
/* statistics */
unsigned long st_print;
---- head-2011-09-23.orig/drivers/xen/blktap/interface.c 2011-04-11 14:29:39.000000000 +0200
-+++ head-2011-09-23/drivers/xen/blktap/interface.c 2011-04-11 14:52:00.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/blktap/interface.c 2011-04-11 14:29:39.000000000 +0200
++++ head-2011-10-07/drivers/xen/blktap/interface.c 2011-04-11 14:52:00.000000000 +0200
@@ -136,5 +136,5 @@ void tap_blkif_kmem_cache_free(blkif_t *
void __init tap_blkif_interface_init(void)
{
@@ -2830,8 +2830,8 @@ Acked-by: jbeulich@novell.com
- 0, 0, NULL, NULL);
+ 0, 0, NULL);
}
---- head-2011-09-23.orig/drivers/xen/blktap/xenbus.c 2011-06-30 16:05:02.000000000 +0200
-+++ head-2011-09-23/drivers/xen/blktap/xenbus.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/blktap/xenbus.c 2011-06-30 16:05:02.000000000 +0200
++++ head-2011-10-07/drivers/xen/blktap/xenbus.c 2011-01-31 17:49:31.000000000 +0100
@@ -50,8 +50,6 @@ struct backend_info
int group_added;
};
@@ -2868,8 +2868,8 @@ Acked-by: jbeulich@novell.com
return 0;
}
---- head-2011-09-23.orig/drivers/xen/blktap2/blktap.h 2010-02-24 13:13:46.000000000 +0100
-+++ head-2011-09-23/drivers/xen/blktap2/blktap.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/blktap2/blktap.h 2010-02-24 13:13:46.000000000 +0100
++++ head-2011-10-07/drivers/xen/blktap2/blktap.h 2011-01-31 17:49:31.000000000 +0100
@@ -203,6 +203,7 @@ blktap_validate_params(struct blktap *ta
}
@@ -2878,8 +2878,8 @@ Acked-by: jbeulich@novell.com
int blktap_ring_init(int *);
int blktap_ring_free(void);
---- head-2011-09-23.orig/drivers/xen/blktap2/control.c 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-09-23/drivers/xen/blktap2/control.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/blktap2/control.c 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/drivers/xen/blktap2/control.c 2011-01-31 17:49:31.000000000 +0100
@@ -194,14 +194,20 @@ blktap_control_destroy_device(struct blk
clear_bit(BLKTAP_SHUTDOWN_REQUESTED, &tap->dev_inuse);
@@ -2904,8 +2904,8 @@ Acked-by: jbeulich@novell.com
static int __init
blktap_control_init(void)
{
---- head-2011-09-23.orig/drivers/xen/blktap2/device.c 2010-11-25 09:36:37.000000000 +0100
-+++ head-2011-09-23/drivers/xen/blktap2/device.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/blktap2/device.c 2010-11-25 09:36:37.000000000 +0100
++++ head-2011-10-07/drivers/xen/blktap2/device.c 2011-01-31 17:49:31.000000000 +0100
@@ -833,7 +833,7 @@ static void
blktap_device_run_queue(struct blktap *tap)
{
@@ -2932,8 +2932,8 @@ Acked-by: jbeulich@novell.com
- BTERR("blktap device unregister failed\n");
+ unregister_blkdev(blktap_device_major, "tapdev");
}
---- head-2011-09-23.orig/drivers/xen/blktap2/sysfs.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-23/drivers/xen/blktap2/sysfs.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/blktap2/sysfs.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/drivers/xen/blktap2/sysfs.c 2011-01-31 17:49:31.000000000 +0100
@@ -334,6 +334,24 @@ blktap_sysfs_create(struct blktap *tap)
return err;
}
@@ -2978,8 +2978,8 @@ Acked-by: jbeulich@novell.com
}
static ssize_t
---- head-2011-09-23.orig/drivers/xen/core/gnttab.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-23/drivers/xen/core/gnttab.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/core/gnttab.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/drivers/xen/core/gnttab.c 2011-01-31 17:49:31.000000000 +0100
@@ -42,7 +42,6 @@
#include <asm/synch_bitops.h>
#include <asm/io.h>
@@ -2988,8 +2988,8 @@ Acked-by: jbeulich@novell.com
#include <asm/gnttab_dma.h>
#ifdef HAVE_XEN_PLATFORM_COMPAT_H
---- head-2011-09-23.orig/drivers/xen/core/reboot.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-23/drivers/xen/core/reboot.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/core/reboot.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/drivers/xen/core/reboot.c 2011-01-31 17:49:31.000000000 +0100
@@ -3,6 +3,7 @@
#include <linux/unistd.h>
#include <linux/module.h>
@@ -2998,8 +2998,8 @@ Acked-by: jbeulich@novell.com
#include <linux/sysrq.h>
#include <asm/hypervisor.h>
#include <xen/xenbus.h>
---- head-2011-09-23.orig/drivers/xen/core/xen_proc.c 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-09-23/drivers/xen/core/xen_proc.c 2011-04-01 13:07:57.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/core/xen_proc.c 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/drivers/xen/core/xen_proc.c 2011-04-01 13:07:57.000000000 +0200
@@ -1,11 +1,15 @@
-
+#include <linux/init.h>
@@ -3027,8 +3027,8 @@ Acked-by: jbeulich@novell.com
void remove_xen_proc_entry(const char *name)
{
---- head-2011-09-23.orig/drivers/xen/netback/common.h 2011-04-11 14:38:17.000000000 +0200
-+++ head-2011-09-23/drivers/xen/netback/common.h 2011-04-11 14:52:16.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/netback/common.h 2011-04-11 14:38:17.000000000 +0200
++++ head-2011-10-07/drivers/xen/netback/common.h 2011-04-11 14:52:16.000000000 +0200
@@ -39,7 +39,6 @@
#include <linux/etherdevice.h>
#include <linux/wait.h>
@@ -3037,8 +3037,8 @@ Acked-by: jbeulich@novell.com
#include <xen/xenbus.h>
#include <xen/interface/event_channel.h>
---- head-2011-09-23.orig/drivers/xen/scsiback/common.h 2011-04-11 14:27:49.000000000 +0200
-+++ head-2011-09-23/drivers/xen/scsiback/common.h 2011-04-11 14:52:20.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/scsiback/common.h 2011-04-11 14:27:49.000000000 +0200
++++ head-2011-10-07/drivers/xen/scsiback/common.h 2011-04-11 14:52:20.000000000 +0200
@@ -49,7 +49,6 @@
#include <scsi/scsi_dbg.h>
#include <scsi/scsi_eh.h>
@@ -3047,8 +3047,8 @@ Acked-by: jbeulich@novell.com
#include <xen/xenbus.h>
#include <xen/interface/io/ring.h>
#include <xen/interface/io/vscsiif.h>
---- head-2011-09-23.orig/drivers/xen/scsiback/interface.c 2011-04-11 14:30:02.000000000 +0200
-+++ head-2011-09-23/drivers/xen/scsiback/interface.c 2011-04-11 14:52:22.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/scsiback/interface.c 2011-04-11 14:30:02.000000000 +0200
++++ head-2011-10-07/drivers/xen/scsiback/interface.c 2011-04-11 14:52:22.000000000 +0200
@@ -126,7 +126,7 @@ void scsiback_free(struct vscsibk_info *
int __init scsiback_interface_init(void)
{
@@ -3058,8 +3058,8 @@ Acked-by: jbeulich@novell.com
if (!scsiback_cachep) {
printk(KERN_ERR "scsiback: can't init scsi cache\n");
return -ENOMEM;
---- head-2011-09-23.orig/drivers/xen/scsifront/scsifront.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-23/drivers/xen/scsifront/scsifront.c 2011-02-08 10:03:55.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/scsifront/scsifront.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/drivers/xen/scsifront/scsifront.c 2011-02-08 10:03:55.000000000 +0100
@@ -147,7 +147,7 @@ static void scsifront_cdb_cmd_done(struc
add_id_to_freelist(info, id);
@@ -3089,8 +3089,8 @@ Acked-by: jbeulich@novell.com
vscsiif_request_t *ring_req;
uint16_t rqid;
---- head-2011-09-23.orig/drivers/xen/sfc_netback/accel_solarflare.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/drivers/xen/sfc_netback/accel_solarflare.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/sfc_netback/accel_solarflare.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netback/accel_solarflare.c 2011-01-31 17:49:31.000000000 +0100
@@ -37,7 +37,6 @@
#include "ci/efhw/public.h"
@@ -3099,8 +3099,8 @@ Acked-by: jbeulich@novell.com
#include <linux/list.h>
#include <linux/mutex.h>
---- head-2011-09-23.orig/drivers/xen/sfc_netutil/accel_util.c 2010-09-23 15:39:04.000000000 +0200
-+++ head-2011-09-23/drivers/xen/sfc_netutil/accel_util.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/sfc_netutil/accel_util.c 2010-09-23 15:39:04.000000000 +0200
++++ head-2011-10-07/drivers/xen/sfc_netutil/accel_util.c 2011-01-31 17:49:31.000000000 +0100
@@ -28,7 +28,6 @@
#include <asm/pgtable.h>
#include <asm/hypercall.h>
@@ -3109,8 +3109,8 @@ Acked-by: jbeulich@novell.com
#include <xen/gnttab.h>
#include "accel_util.h"
---- head-2011-09-23.orig/drivers/xen/tpmback/common.h 2011-04-11 14:32:54.000000000 +0200
-+++ head-2011-09-23/drivers/xen/tpmback/common.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/tpmback/common.h 2011-04-11 14:32:54.000000000 +0200
++++ head-2011-10-07/drivers/xen/tpmback/common.h 2011-01-31 17:49:31.000000000 +0100
@@ -10,7 +10,6 @@
#include <linux/interrupt.h>
#include <linux/mm.h>
@@ -3119,8 +3119,8 @@ Acked-by: jbeulich@novell.com
#include <xen/xenbus.h>
#include <xen/interface/event_channel.h>
#include <xen/interface/io/tpmif.h>
---- head-2011-09-23.orig/drivers/xen/tpmback/interface.c 2011-04-11 14:31:42.000000000 +0200
-+++ head-2011-09-23/drivers/xen/tpmback/interface.c 2011-04-11 14:52:30.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/tpmback/interface.c 2011-04-11 14:31:42.000000000 +0200
++++ head-2011-10-07/drivers/xen/tpmback/interface.c 2011-04-11 14:52:30.000000000 +0200
@@ -13,6 +13,7 @@
#include "common.h"
@@ -3138,8 +3138,8 @@ Acked-by: jbeulich@novell.com
return tpmif_cachep ? 0 : -ENOMEM;
}
---- head-2011-09-23.orig/drivers/xen/usbback/usbback.h 2011-04-11 14:27:35.000000000 +0200
-+++ head-2011-09-23/drivers/xen/usbback/usbback.h 2011-04-11 14:52:41.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/usbback/usbback.h 2011-04-11 14:27:35.000000000 +0200
++++ head-2011-10-07/drivers/xen/usbback/usbback.h 2011-04-11 14:52:41.000000000 +0200
@@ -55,7 +55,6 @@
#include <linux/wait.h>
#include <linux/list.h>
@@ -3148,8 +3148,8 @@ Acked-by: jbeulich@novell.com
#include <xen/xenbus.h>
#include <xen/interface/event_channel.h>
#include <xen/interface/io/usbif.h>
---- head-2011-09-23.orig/drivers/xen/usbfront/xenbus.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/drivers/xen/usbfront/xenbus.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/usbfront/xenbus.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/drivers/xen/usbfront/xenbus.c 2011-01-31 17:49:31.000000000 +0100
@@ -393,7 +393,7 @@ static int __init usbfront_init(void)
return -ENODEV;
@@ -3159,8 +3159,8 @@ Acked-by: jbeulich@novell.com
if (!xenhcd_urbp_cachep) {
printk(KERN_ERR "usbfront failed to create kmem cache\n");
return -ENOMEM;
---- head-2011-09-23.orig/drivers/xen/util.c 2007-07-10 09:42:30.000000000 +0200
-+++ head-2011-09-23/drivers/xen/util.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/util.c 2007-07-10 09:42:30.000000000 +0200
++++ head-2011-10-07/drivers/xen/util.c 2011-01-31 17:49:31.000000000 +0100
@@ -1,8 +1,5 @@
-#include <linux/mm.h>
+#include <linux/err.h>
@@ -3217,8 +3217,8 @@ Acked-by: jbeulich@novell.com
-}
-EXPORT_SYMBOL_GPL(free_vm_area);
-#endif /* CONFIG_X86 */
---- head-2011-09-23.orig/drivers/xen/xenbus/xenbus_backend_client.c 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-09-23/drivers/xen/xenbus/xenbus_backend_client.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/xenbus/xenbus_backend_client.c 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-10-07/drivers/xen/xenbus/xenbus_backend_client.c 2011-01-31 17:49:31.000000000 +0100
@@ -32,9 +32,9 @@
#include <linux/err.h>
@@ -3230,8 +3230,8 @@ Acked-by: jbeulich@novell.com
/* Based on Rusty Russell's skeleton driver's map_page */
struct vm_struct *xenbus_map_ring_valloc(struct xenbus_device *dev, grant_ref_t gnt_ref)
---- head-2011-09-23.orig/drivers/xen/xenbus/xenbus_client.c 2011-06-30 15:37:44.000000000 +0200
-+++ head-2011-09-23/drivers/xen/xenbus/xenbus_client.c 2011-06-30 16:10:27.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/xenbus/xenbus_client.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-10-07/drivers/xen/xenbus/xenbus_client.c 2011-06-30 16:10:27.000000000 +0200
@@ -30,19 +30,25 @@
* IN THE SOFTWARE.
*/
@@ -3677,8 +3677,8 @@ Acked-by: jbeulich@novell.com
enum xenbus_state xenbus_read_driver_state(const char *path)
{
int result;
---- head-2011-09-23.orig/drivers/xen/xenbus/xenbus_comms.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-23/drivers/xen/xenbus/xenbus_comms.c 2011-04-11 14:52:53.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/xenbus/xenbus_comms.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/drivers/xen/xenbus/xenbus_comms.c 2011-04-11 14:52:53.000000000 +0200
@@ -34,12 +34,15 @@
#include <linux/interrupt.h>
#include <linux/sched.h>
@@ -3744,8 +3744,8 @@ Acked-by: jbeulich@novell.com
xen_store_evtchn, wake_waiting,
0, "xenbus", &xb_waitq);
if (err <= 0) {
---- head-2011-09-23.orig/drivers/xen/xenbus/xenbus_dev.c 2011-06-30 15:37:44.000000000 +0200
-+++ head-2011-09-23/drivers/xen/xenbus/xenbus_dev.c 2011-06-30 16:10:32.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/xenbus/xenbus_dev.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-10-07/drivers/xen/xenbus/xenbus_dev.c 2011-06-30 16:10:32.000000000 +0200
@@ -487,7 +487,13 @@ static const struct file_operations xenb
#endif
};
@@ -3761,8 +3761,8 @@ Acked-by: jbeulich@novell.com
{
xenbus_dev_intf = create_xen_proc_entry("xenbus", 0400);
if (xenbus_dev_intf)
---- head-2011-09-23.orig/drivers/xen/xenbus/xenbus_probe.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-23/drivers/xen/xenbus/xenbus_probe.c 2011-06-30 16:10:35.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/xenbus/xenbus_probe.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/drivers/xen/xenbus/xenbus_probe.c 2011-10-07 11:21:32.000000000 +0200
@@ -43,21 +43,26 @@
#include <linux/mm.h>
#include <linux/notifier.h>
@@ -3968,7 +3968,7 @@ Acked-by: jbeulich@novell.com
}
/* We watch for devices appearing and vanishing. */
-@@ -1102,10 +1122,18 @@ fail0:
+@@ -1130,10 +1150,18 @@ fail0:
#endif
#endif /* CONFIG_XEN_PRIVILEGED_GUEST */
@@ -3988,7 +3988,7 @@ Acked-by: jbeulich@novell.com
DPRINTK("");
-@@ -1124,6 +1152,7 @@ static int xenbus_probe_init(void)
+@@ -1152,6 +1180,7 @@ static int xenbus_probe_init(void)
* Domain0 doesn't have a store_evtchn or store_mfn yet.
*/
if (is_initial_xendomain()) {
@@ -3996,7 +3996,7 @@ Acked-by: jbeulich@novell.com
struct evtchn_alloc_unbound alloc_unbound;
/* Allocate Xenstore page */
-@@ -1162,10 +1191,13 @@ static int xenbus_probe_init(void)
+@@ -1190,10 +1219,13 @@ static int xenbus_probe_init(void)
if (xsd_port_intf)
xsd_port_intf->read_proc = xsd_port_read;
#endif
@@ -4011,7 +4011,7 @@ Acked-by: jbeulich@novell.com
xen_store_evtchn = xen_start_info->store_evtchn;
xen_store_mfn = xen_start_info->store_mfn;
xen_store_interface = mfn_to_virt(xen_store_mfn);
-@@ -1181,7 +1213,9 @@ static int xenbus_probe_init(void)
+@@ -1209,7 +1241,9 @@ static int xenbus_probe_init(void)
goto err;
}
@@ -4021,7 +4021,7 @@ Acked-by: jbeulich@novell.com
/* Initialize the interface to xenstore. */
err = xs_init();
-@@ -1191,6 +1225,7 @@ static int xenbus_probe_init(void)
+@@ -1219,6 +1253,7 @@ static int xenbus_probe_init(void)
goto err;
}
@@ -4029,7 +4029,7 @@ Acked-by: jbeulich@novell.com
/* Register ourselves with the kernel device subsystem */
if (!xenbus_frontend.error) {
xenbus_frontend.error = device_register(&xenbus_frontend.dev);
-@@ -1201,6 +1236,7 @@ static int xenbus_probe_init(void)
+@@ -1229,6 +1264,7 @@ static int xenbus_probe_init(void)
xenbus_frontend.error);
}
}
@@ -4037,7 +4037,7 @@ Acked-by: jbeulich@novell.com
xenbus_backend_device_register();
if (!is_initial_xendomain())
-@@ -1215,16 +1251,22 @@ static int xenbus_probe_init(void)
+@@ -1243,16 +1279,22 @@ static int xenbus_probe_init(void)
* registered.
*/
@@ -4062,8 +4062,8 @@ Acked-by: jbeulich@novell.com
{
return xenbus_probe_init();
}
---- head-2011-09-23.orig/drivers/xen/xenbus/xenbus_probe.h 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-23/drivers/xen/xenbus/xenbus_probe.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/xenbus/xenbus_probe.h 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/drivers/xen/xenbus/xenbus_probe.h 2011-01-31 17:49:31.000000000 +0100
@@ -62,7 +62,9 @@ struct xen_bus_type
int (*get_bus_id)(char bus_id[XEN_BUS_ID_SIZE], const char *nodename);
int (*probe)(const char *type, const char *dir);
@@ -4082,8 +4082,8 @@ Acked-by: jbeulich@novell.com
+extern void xenbus_dev_changed(const char *node, struct xen_bus_type *bus);
#endif
---- head-2011-09-23.orig/drivers/xen/xenbus/xenbus_probe_backend.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-23/drivers/xen/xenbus/xenbus_probe_backend.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/xenbus/xenbus_probe_backend.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/drivers/xen/xenbus/xenbus_probe_backend.c 2011-01-31 17:49:31.000000000 +0100
@@ -236,7 +236,7 @@ static void backend_changed(struct xenbu
{
DPRINTK("");
@@ -4093,9 +4093,9 @@ Acked-by: jbeulich@novell.com
}
static struct xenbus_watch be_watch = {
---- head-2011-09-23.orig/drivers/xen/xenbus/xenbus_xs.c 2011-06-30 16:06:45.000000000 +0200
-+++ head-2011-09-23/drivers/xen/xenbus/xenbus_xs.c 2011-06-30 16:10:38.000000000 +0200
-@@ -661,7 +661,9 @@ void unregister_xenbus_watch(struct xenb
+--- head-2011-10-07.orig/drivers/xen/xenbus/xenbus_xs.c 2011-06-30 16:06:45.000000000 +0200
++++ head-2011-10-07/drivers/xen/xenbus/xenbus_xs.c 2011-10-07 11:21:33.000000000 +0200
+@@ -671,7 +671,9 @@ void unregister_xenbus_watch(struct xenb
char token[sizeof(watch) * 2 + 1];
int err;
@@ -4105,7 +4105,7 @@ Acked-by: jbeulich@novell.com
sprintf(token, "%lX", (long)watch);
-@@ -680,6 +682,11 @@ void unregister_xenbus_watch(struct xenb
+@@ -690,6 +692,11 @@ void unregister_xenbus_watch(struct xenb
up_read(&xs_state.watch_mutex);
@@ -4117,7 +4117,7 @@ Acked-by: jbeulich@novell.com
/* Cancel pending watch events. */
spin_lock(&watch_events_lock);
list_for_each_entry_safe(msg, tmp, &watch_events, list) {
-@@ -691,11 +698,8 @@ void unregister_xenbus_watch(struct xenb
+@@ -701,11 +708,8 @@ void unregister_xenbus_watch(struct xenb
}
spin_unlock(&watch_events_lock);
@@ -4130,7 +4130,7 @@ Acked-by: jbeulich@novell.com
}
EXPORT_SYMBOL_GPL(unregister_xenbus_watch);
-@@ -733,6 +737,7 @@ void xs_suspend_cancel(void)
+@@ -743,6 +747,7 @@ void xs_suspend_cancel(void)
mutex_unlock(&xs_state.transaction_mutex);
}
@@ -4138,7 +4138,7 @@ Acked-by: jbeulich@novell.com
static int xenwatch_handle_callback(void *data)
{
struct xs_stored_msg *msg = data;
-@@ -750,6 +755,7 @@ static int xenwatch_handle_callback(void
+@@ -760,6 +765,7 @@ static int xenwatch_handle_callback(void
return 0;
}
@@ -4146,7 +4146,7 @@ Acked-by: jbeulich@novell.com
static int xenwatch_thread(void *unused)
{
-@@ -779,6 +785,7 @@ static int xenwatch_thread(void *unused)
+@@ -789,6 +795,7 @@ static int xenwatch_thread(void *unused)
msg = list_entry(ent, struct xs_stored_msg, list);
@@ -4154,7 +4154,7 @@ Acked-by: jbeulich@novell.com
/*
* Unlock the mutex before running an XBWF_new_thread
* handler. kthread_run can block which can deadlock
-@@ -795,6 +802,15 @@ static int xenwatch_thread(void *unused)
+@@ -805,6 +812,15 @@ static int xenwatch_thread(void *unused)
xenwatch_handle_callback(msg);
mutex_unlock(&xenwatch_mutex);
}
@@ -4170,8 +4170,8 @@ Acked-by: jbeulich@novell.com
}
return 0;
---- head-2011-09-23.orig/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-23/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 17:49:31.000000000 +0100
@@ -26,7 +26,6 @@
#include <asm/pgtable.h>
#include <xen/evtchn.h>
@@ -4180,8 +4180,8 @@ Acked-by: jbeulich@novell.com
#include <xen/interface/xen.h>
#include <xen/interface/xenoprof.h>
#include "../../../drivers/oprofile/cpu_buffer.h"
---- head-2011-09-23.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:49:31.000000000 +0100
@@ -53,6 +53,8 @@ extern unsigned long __FIXADDR_TOP;
enum fixed_addresses {
FIX_HOLE,
@@ -4191,8 +4191,8 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_X86_LOCAL_APIC
FIX_APIC_BASE, /* local (CPU) APIC) -- required for SMP or not */
#endif
---- head-2011-09-23.orig/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 17:49:31.000000000 +0100
@@ -75,8 +75,7 @@ struct page *kmap_atomic_to_page(void *p
#define kmap_atomic_pte(page, type) \
@@ -4203,8 +4203,8 @@ Acked-by: jbeulich@novell.com
#define flush_cache_kmaps() do { } while (0)
---- head-2011-09-23.orig/arch/x86/include/mach-xen/asm/maddr_32.h 2011-08-08 12:54:10.000000000 +0200
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/maddr_32.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/maddr_32.h 2011-08-08 12:54:10.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/maddr_32.h 2011-01-31 17:49:31.000000000 +0100
@@ -155,6 +155,7 @@ static inline paddr_t pte_machine_to_phy
#ifdef CONFIG_X86_PAE
@@ -4213,8 +4213,8 @@ Acked-by: jbeulich@novell.com
static inline pte_t pfn_pte_ma(unsigned long page_nr, pgprot_t pgprot)
{
pte_t pte;
---- head-2011-09-23.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:49:31.000000000 +0100
@@ -16,7 +16,7 @@ void mm_pin_all(void);
static inline void xen_activate_mm(struct mm_struct *prev,
struct mm_struct *next)
@@ -4242,8 +4242,8 @@ Acked-by: jbeulich@novell.com
/* stop flush ipis for the previous mm */
cpu_clear(cpu, prev->cpu_vm_mask);
---- head-2011-09-23.orig/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 17:49:31.000000000 +0100
@@ -5,7 +5,7 @@
#include <linux/mm.h> /* for struct page */
#include <asm/io.h> /* for phys_to_virt and page_to_pseudophys */
@@ -4272,8 +4272,8 @@ Acked-by: jbeulich@novell.com
if (!PageHighMem(pte)) \
BUG_ON(HYPERVISOR_update_va_mapping( \
(unsigned long)__va(pfn << PAGE_SHIFT), \
---- head-2011-09-23.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:38:07.000000000 +0100
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:38:23.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:38:07.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:38:23.000000000 +0100
@@ -26,9 +26,6 @@
#include <linux/spinlock.h>
#include <linux/sched.h>
@@ -4405,8 +4405,8 @@ Acked-by: jbeulich@novell.com
xen_l1_entry_update(ptep, __pte(0)); \
else \
*(ptep) = __pte(0); \
---- head-2011-09-23.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:49:31.000000000 +0100
@@ -23,26 +23,11 @@
#define pud_present(pud) 1
@@ -4435,8 +4435,8 @@ Acked-by: jbeulich@novell.com
}
/* Rules for using set_pte: the pte being assigned *must* be
---- head-2011-09-23.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:49:31.000000000 +0100
@@ -89,7 +89,6 @@ struct cpuinfo_x86 {
#define X86_VENDOR_UMC 3
#define X86_VENDOR_NEXGEN 4
@@ -4482,8 +4482,8 @@ Acked-by: jbeulich@novell.com
/*
* Size of io_bitmap.
*/
---- head-2011-09-23.orig/arch/x86/include/mach-xen/asm/system_32.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/system_32.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/system_32.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/system_32.h 2011-01-31 17:49:31.000000000 +0100
@@ -205,11 +205,6 @@ static inline unsigned long get_limit(un
*/
@@ -4512,8 +4512,8 @@ Acked-by: jbeulich@novell.com
extern unsigned long arch_align_stack(unsigned long sp);
extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
---- head-2011-09-23.orig/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:49:31.000000000 +0100
@@ -91,7 +91,11 @@ struct tlb_state
DECLARE_PER_CPU(struct tlb_state, cpu_tlbstate);
#endif /* SMP */
@@ -4527,8 +4527,8 @@ Acked-by: jbeulich@novell.com
static inline void flush_tlb_pgtables(struct mm_struct *mm,
unsigned long start, unsigned long end)
---- head-2011-09-23.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:49:31.000000000 +0100
@@ -23,9 +23,9 @@
* compile time, but to set the physical address only
* in the boot process.
@@ -4560,8 +4560,8 @@ Acked-by: jbeulich@novell.com
}
#endif
---- head-2011-09-23.orig/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 17:49:31.000000000 +0100
@@ -76,7 +76,7 @@ static inline void switch_mm(struct mm_s
if (likely(prev != next)) {
@@ -4580,8 +4580,8 @@ Acked-by: jbeulich@novell.com
mm_pin(next);
switch_mm(prev, next, NULL);
}
---- head-2011-09-23.orig/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 17:49:31.000000000 +0100
@@ -21,7 +21,7 @@ static inline void pmd_populate_kernel(s
static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, struct page *pte)
@@ -4609,8 +4609,8 @@ Acked-by: jbeulich@novell.com
BUG_ON(HYPERVISOR_update_va_mapping(
(unsigned long)pud,
pfn_pte(virt_to_phys(pud)>>PAGE_SHIFT,
---- head-2011-09-23.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-02-07 15:38:08.000000000 +0100
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-02-07 15:38:18.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-02-07 15:38:08.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-02-07 15:38:18.000000000 +0100
@@ -304,7 +304,7 @@ static inline pte_t ptep_get_and_clear_f
{
if (full) {
@@ -4701,8 +4701,8 @@ Acked-by: jbeulich@novell.com
#define __HAVE_ARCH_PTEP_GET_AND_CLEAR
#define __HAVE_ARCH_PTEP_GET_AND_CLEAR_FULL
#define __HAVE_ARCH_PTEP_CLEAR_FLUSH
---- head-2011-09-23.orig/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:49:31.000000000 +0100
@@ -83,7 +83,6 @@ struct cpuinfo_x86 {
#define X86_VENDOR_UMC 3
#define X86_VENDOR_NEXGEN 4
@@ -4751,8 +4751,8 @@ Acked-by: jbeulich@novell.com
static inline void serialize_cpu(void)
{
__asm__ __volatile__ ("cpuid" : : : "ax", "bx", "cx", "dx");
---- head-2011-09-23.orig/arch/x86/include/mach-xen/asm/system_64.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/system_64.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/system_64.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/system_64.h 2011-01-31 17:49:31.000000000 +0100
@@ -79,12 +79,16 @@ static inline unsigned long read_cr0(voi
unsigned long cr0;
asm volatile("movq %%cr0,%0" : "=r" (cr0));
@@ -4813,8 +4813,8 @@ Acked-by: jbeulich@novell.com
#endif /* __KERNEL__ */
#define nop() __asm__ __volatile__ ("nop")
---- head-2011-09-23.orig/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:49:31.000000000 +0100
@@ -89,7 +89,11 @@ static inline void flush_tlb_range(struc
#endif
@@ -4828,8 +4828,8 @@ Acked-by: jbeulich@novell.com
static inline void flush_tlb_pgtables(struct mm_struct *mm,
unsigned long start, unsigned long end)
---- head-2011-09-23.orig/arch/x86/include/asm/thread_info.h 2011-01-31 17:02:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/include/asm/thread_info.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/asm/thread_info.h 2011-01-31 17:02:29.000000000 +0100
++++ head-2011-10-07/arch/x86/include/asm/thread_info.h 2011-01-31 17:49:31.000000000 +0100
@@ -151,7 +151,8 @@ struct thread_info {
#define _TIF_WORK_CTXSW_PREV (_TIF_WORK_CTXSW|_TIF_USER_RETURN_NOTIFY)
#define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW|_TIF_DEBUG)
@@ -4840,8 +4840,8 @@ Acked-by: jbeulich@novell.com
#endif
#define PREEMPT_ACTIVE 0x10000000
---- head-2011-09-23.orig/arch/x86/include/asm/xen/interface.h 2011-09-23 09:35:34.000000000 +0200
-+++ head-2011-09-23/arch/x86/include/asm/xen/interface.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/asm/xen/interface.h 2011-10-07 10:46:16.000000000 +0200
++++ head-2011-10-07/arch/x86/include/asm/xen/interface.h 2011-01-31 17:49:31.000000000 +0100
@@ -10,17 +10,20 @@
#define _ASM_X86_XEN_INTERFACE_H
@@ -4894,8 +4894,8 @@ Acked-by: jbeulich@novell.com
/*
* SEGMENT DESCRIPTOR TABLES
---- head-2011-09-23.orig/include/linux/elfnote.h 2011-09-23 09:35:34.000000000 +0200
-+++ head-2011-09-23/include/linux/elfnote.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/include/linux/elfnote.h 2011-10-07 10:46:16.000000000 +0200
++++ head-2011-10-07/include/linux/elfnote.h 2011-01-31 17:49:31.000000000 +0100
@@ -52,7 +52,7 @@
4484:.balign 4 ; \
.popsection ;
@@ -4905,8 +4905,8 @@ Acked-by: jbeulich@novell.com
ELFNOTE_START(name, type, "") \
desc ; \
ELFNOTE_END
---- head-2011-09-23.orig/include/linux/page-flags.h 2011-09-07 15:19:40.000000000 +0200
-+++ head-2011-09-23/include/linux/page-flags.h 2011-09-07 15:27:19.000000000 +0200
+--- head-2011-10-07.orig/include/linux/page-flags.h 2011-09-07 15:19:40.000000000 +0200
++++ head-2011-10-07/include/linux/page-flags.h 2011-09-07 15:27:19.000000000 +0200
@@ -124,8 +124,15 @@ enum pageflags {
PG_fscache = PG_private_2, /* page backed by cache */
@@ -4935,8 +4935,8 @@ Acked-by: jbeulich@novell.com
#else
# define __PG_XEN (1 << PG_foreign)
#endif
---- head-2011-09-23.orig/include/xen/driver_util.h 2007-06-12 13:14:19.000000000 +0200
-+++ head-2011-09-23/include/xen/driver_util.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/include/xen/driver_util.h 2007-06-12 13:14:19.000000000 +0200
++++ head-2011-10-07/include/xen/driver_util.h 2011-01-31 17:49:31.000000000 +0100
@@ -1,14 +1,8 @@
+#ifndef __XEN_DRIVER_UTIL_H__
+#define __XEN_DRIVER_UTIL_H__
@@ -4955,8 +4955,8 @@ Acked-by: jbeulich@novell.com
-#endif /* __ASM_XEN_DRIVER_UTIL_H__ */
+#endif /* __XEN_DRIVER_UTIL_H__ */
---- head-2011-09-23.orig/include/xen/features.h 2011-09-23 09:35:34.000000000 +0200
-+++ head-2011-09-23/include/xen/features.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/include/xen/features.h 2011-10-07 10:46:16.000000000 +0200
++++ head-2011-10-07/include/xen/features.h 2011-01-31 17:49:31.000000000 +0100
@@ -10,6 +10,7 @@
#define __XEN_FEATURES_H__
@@ -4971,8 +4971,8 @@ Acked-by: jbeulich@novell.com
-#endif /* __ASM_XEN_FEATURES_H__ */
+#endif /* __XEN_FEATURES_H__ */
---- head-2011-09-23.orig/include/xen/interface/arch-x86/xen.h 2011-03-17 13:50:24.000000000 +0100
-+++ head-2011-09-23/include/xen/interface/arch-x86/xen.h 2011-03-17 14:11:48.000000000 +0100
+--- head-2011-10-07.orig/include/xen/interface/arch-x86/xen.h 2011-03-17 13:50:24.000000000 +0100
++++ head-2011-10-07/include/xen/interface/arch-x86/xen.h 2011-03-17 14:11:48.000000000 +0100
@@ -50,6 +50,9 @@
#endif
#define set_xen_guest_handle(hnd, val) set_xen_guest_handle_raw(hnd, val)
@@ -4983,8 +4983,8 @@ Acked-by: jbeulich@novell.com
#if defined(__i386__)
#include "xen-x86_32.h"
#elif defined(__x86_64__)
---- head-2011-09-23.orig/include/xen/interface/event_channel.h 2011-01-31 15:14:12.000000000 +0100
-+++ head-2011-09-23/include/xen/interface/event_channel.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/include/xen/interface/event_channel.h 2011-01-31 15:14:12.000000000 +0100
++++ head-2011-10-07/include/xen/interface/event_channel.h 2011-01-31 17:49:31.000000000 +0100
@@ -250,6 +250,7 @@ struct evtchn_op {
struct evtchn_unmask unmask;
} u;
@@ -4993,8 +4993,8 @@ Acked-by: jbeulich@novell.com
typedef struct evtchn_op evtchn_op_t;
DEFINE_XEN_GUEST_HANDLE(evtchn_op_t);
---- head-2011-09-23.orig/include/xen/interface/io/netif.h 2011-01-31 15:14:12.000000000 +0100
-+++ head-2011-09-23/include/xen/interface/io/netif.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/include/xen/interface/io/netif.h 2011-01-31 15:14:12.000000000 +0100
++++ head-2011-10-07/include/xen/interface/io/netif.h 2011-01-31 17:49:31.000000000 +0100
@@ -183,8 +183,22 @@ typedef struct netif_rx_response netif_r
* Generate netif ring structures and types.
*/
@@ -5018,8 +5018,8 @@ Acked-by: jbeulich@novell.com
#define NETIF_RSP_DROPPED -2
#define NETIF_RSP_ERROR -1
---- head-2011-09-23.orig/include/xen/interface/memory.h 2011-01-31 15:14:12.000000000 +0100
-+++ head-2011-09-23/include/xen/interface/memory.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/include/xen/interface/memory.h 2011-01-31 15:14:12.000000000 +0100
++++ head-2011-10-07/include/xen/interface/memory.h 2011-01-31 17:49:31.000000000 +0100
@@ -88,6 +88,7 @@ struct xen_memory_reservation {
*/
domid_t domid;
@@ -5044,8 +5044,8 @@ Acked-by: jbeulich@novell.com
typedef struct xen_add_to_physmap xen_add_to_physmap_t;
DEFINE_XEN_GUEST_HANDLE(xen_add_to_physmap_t);
---- head-2011-09-23.orig/include/xen/interface/sched.h 2011-01-31 15:14:12.000000000 +0100
-+++ head-2011-09-23/include/xen/interface/sched.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/include/xen/interface/sched.h 2011-01-31 15:14:12.000000000 +0100
++++ head-2011-10-07/include/xen/interface/sched.h 2011-01-31 17:49:31.000000000 +0100
@@ -67,6 +67,7 @@
struct sched_shutdown {
unsigned int reason; /* SHUTDOWN_* */
@@ -5062,8 +5062,8 @@ Acked-by: jbeulich@novell.com
typedef struct sched_poll sched_poll_t;
DEFINE_XEN_GUEST_HANDLE(sched_poll_t);
---- head-2011-09-23.orig/include/xen/interface/version.h 2011-01-31 15:14:12.000000000 +0100
-+++ head-2011-09-23/include/xen/interface/version.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-10-07.orig/include/xen/interface/version.h 2011-01-31 15:14:12.000000000 +0100
++++ head-2011-10-07/include/xen/interface/version.h 2011-01-31 17:49:31.000000000 +0100
@@ -36,6 +36,9 @@
/* arg == xen_extraversion_t. */
#define XENVER_extraversion 1
@@ -5091,8 +5091,8 @@ Acked-by: jbeulich@novell.com
#define XEN_CHANGESET_INFO_LEN (sizeof(xen_changeset_info_t))
#define XENVER_platform_parameters 5
---- head-2011-09-23.orig/include/xen/interface/xen.h 2011-09-07 15:18:35.000000000 +0200
-+++ head-2011-09-23/include/xen/interface/xen.h 2011-08-09 10:41:09.000000000 +0200
+--- head-2011-10-07.orig/include/xen/interface/xen.h 2011-09-07 15:18:35.000000000 +0200
++++ head-2011-10-07/include/xen/interface/xen.h 2011-08-09 10:41:09.000000000 +0200
@@ -32,7 +32,9 @@
#include <asm/pvclock-abi.h>
#endif
@@ -5155,8 +5155,8 @@ Acked-by: jbeulich@novell.com
typedef struct multicall_entry multicall_entry_t;
DEFINE_XEN_GUEST_HANDLE(multicall_entry_t);
---- head-2011-09-23.orig/include/xen/xenbus.h 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-23/include/xen/xenbus.h 2011-09-12 12:17:52.000000000 +0200
+--- head-2011-10-07.orig/include/xen/xenbus.h 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/include/xen/xenbus.h 2011-09-12 12:17:52.000000000 +0200
@@ -57,16 +57,20 @@ struct xenbus_watch
void (*callback)(struct xenbus_watch *,
const char **vec, unsigned int len);
diff --git a/patches.xen/xen3-patch-2.6.24 b/patches.xen/xen3-patch-2.6.24
index 7cdbfdbafb..71f71d84cb 100644
--- a/patches.xen/xen3-patch-2.6.24
+++ b/patches.xen/xen3-patch-2.6.24
@@ -6,8 +6,10 @@ Automatically created from "patches.kernel.org/patch-2.6.24" by xen-port-patches
Acked-by: jbeulich@novell.com
---- head-2011-09-23.orig/arch/x86/Kconfig 2011-09-07 15:25:51.000000000 +0200
-+++ head-2011-09-23/arch/x86/Kconfig 2011-09-07 15:36:37.000000000 +0200
+2.6.33/kernel/sysctl_check.c (would need to be reverted there)
+
+--- head-2011-10-07.orig/arch/x86/Kconfig 2011-09-07 15:25:51.000000000 +0200
++++ head-2011-10-07/arch/x86/Kconfig 2011-09-07 15:36:37.000000000 +0200
@@ -92,11 +92,11 @@ config GENERIC_CMOS_UPDATE
config CLOCKSOURCE_WATCHDOG
@@ -116,8 +118,8 @@ Acked-by: jbeulich@novell.com
select HOTPLUG
default y
help
---- head-2011-09-23.orig/arch/x86/Makefile 2011-04-13 11:31:41.000000000 +0200
-+++ head-2011-09-23/arch/x86/Makefile 2011-02-01 14:11:04.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/Makefile 2011-04-13 11:31:41.000000000 +0200
++++ head-2011-10-07/arch/x86/Makefile 2011-02-01 14:11:04.000000000 +0100
@@ -158,8 +158,8 @@ BOOT_TARGETS = bzlilo bzdisk fdimage fdi
PHONY += bzImage vmlinuz $(BOOT_TARGETS)
@@ -138,8 +140,8 @@ Acked-by: jbeulich@novell.com
else
# Default kernel to build
all: bzImage
---- head-2011-09-23.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:56:27.000000000 +0100
@@ -125,20 +125,16 @@ sysenter_do_call:
jmp int_ret_from_sys_call
@@ -188,16 +190,16 @@ Acked-by: jbeulich@novell.com
jmp cstar_do_call
END(ia32_cstar_target)
---- head-2011-09-23.orig/arch/x86/kernel/Makefile 2011-09-07 15:25:48.000000000 +0200
-+++ head-2011-09-23/arch/x86/kernel/Makefile 2011-09-07 15:36:34.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/kernel/Makefile 2011-09-07 15:25:48.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/Makefile 2011-09-07 15:36:34.000000000 +0200
@@ -120,4 +120,4 @@ endif
disabled-obj-$(CONFIG_XEN) := early-quirks.o hpet.o i8253.o i8259_$(BITS).o reboot.o \
smpboot_$(BITS).o tsc_$(BITS).o tsc_sync.o
disabled-obj-$(CONFIG_XEN_UNPRIVILEGED_GUEST) += mpparse_64.o
-%/head_64.o %/head_64.s: $(if $(CONFIG_XEN),EXTRA_AFLAGS,dummy) :=
+%/head_64.o %/head_64.s: asflags-$(CONFIG_XEN) :=
---- head-2011-09-23.orig/arch/x86/kernel/acpi/processor_extcntl_xen.c 2010-03-22 12:00:53.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/acpi/processor_extcntl_xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/acpi/processor_extcntl_xen.c 2010-03-22 12:00:53.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/acpi/processor_extcntl_xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -68,7 +68,7 @@ static int xen_cx_notifier(struct acpi_p
/* Get dependency relationships */
@@ -216,8 +218,8 @@ Acked-by: jbeulich@novell.com
kfree(buf);
return -EINVAL;
}
---- head-2011-09-23.orig/arch/x86/kernel/cpu/Makefile 2011-09-23 09:35:33.000000000 +0200
-+++ head-2011-09-23/arch/x86/kernel/cpu/Makefile 2011-06-30 16:31:56.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/kernel/cpu/Makefile 2011-10-07 11:27:28.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/cpu/Makefile 2011-06-30 16:31:56.000000000 +0200
@@ -33,6 +33,8 @@ obj-$(CONFIG_MTRR) += mtrr/
obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o
@@ -227,8 +229,8 @@ Acked-by: jbeulich@novell.com
quiet_cmd_mkcapflags = MKCAP $@
cmd_mkcapflags = $(PERL) $(srctree)/$(src)/mkcapflags.pl $< $@
---- head-2011-09-23.orig/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -214,7 +214,7 @@ static void __cpuinit get_cpu_vendor(str
static int __init x86_fxsr_setup(char * s)
@@ -248,8 +250,8 @@ Acked-by: jbeulich@novell.com
c->x86_clflush_size = 32;
memset(&c->x86_capability, 0, sizeof c->x86_capability);
---- head-2011-09-23.orig/arch/x86/kernel/cpu/intel.c 2011-09-23 09:35:33.000000000 +0200
-+++ head-2011-09-23/arch/x86/kernel/cpu/intel.c 2011-06-30 16:32:02.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/kernel/cpu/intel.c 2011-10-07 11:27:28.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/cpu/intel.c 2011-06-30 16:32:02.000000000 +0200
@@ -302,6 +302,7 @@ static void __cpuinit srat_detect_node(s
#endif
}
@@ -282,8 +284,8 @@ Acked-by: jbeulich@novell.com
/* Work around errata */
srat_detect_node(c);
---- head-2011-09-23.orig/arch/x86/kernel/cpu/intel_cacheinfo.c 2011-06-30 16:01:36.000000000 +0200
-+++ head-2011-09-23/arch/x86/kernel/cpu/intel_cacheinfo.c 2011-06-30 16:32:06.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/kernel/cpu/intel_cacheinfo.c 2011-06-30 16:01:36.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/cpu/intel_cacheinfo.c 2011-06-30 16:32:06.000000000 +0200
@@ -290,8 +290,9 @@ amd_cpuid4(int leaf, union _cpuid4_leaf_
eax->split.type = types[leaf];
eax->split.level = levels[leaf];
@@ -326,8 +328,8 @@ Acked-by: jbeulich@novell.com
break;
default:
break;
---- head-2011-09-23.orig/arch/x86/kernel/cpu/mcheck/mce_dom0.c 2011-08-15 10:44:20.000000000 +0200
-+++ head-2011-09-23/arch/x86/kernel/cpu/mcheck/mce_dom0.c 2011-08-15 10:44:51.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/kernel/cpu/mcheck/mce_dom0.c 2011-08-15 10:44:20.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/cpu/mcheck/mce_dom0.c 2011-08-15 10:44:51.000000000 +0200
@@ -17,7 +17,7 @@ static int convert_log(struct mc_info *m
x86_mcinfo_lookup(mic, mi, MC_TYPE_GLOBAL);
if (mic == NULL)
@@ -364,8 +366,8 @@ Acked-by: jbeulich@novell.com
/* Log the machine checks left over from the previous reset. */
mce_dom0_interrupt(VIRQ_MCA, NULL);
---- head-2011-09-23.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -52,6 +52,13 @@ struct resource code_resource = {
.flags = IORESOURCE_BUSY | IORESOURCE_MEM
};
@@ -427,8 +429,8 @@ Acked-by: jbeulich@novell.com
* memory space.
*/
last = 0x100000000ull;
---- head-2011-09-23.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -24,7 +24,7 @@
#include <asm/page.h>
#include <asm/e820.h>
@@ -509,8 +511,8 @@ Acked-by: jbeulich@novell.com
+ max_pfn << PAGE_SHIFT) - *addr;
+ return i + 1;
+}
---- head-2011-09-23.orig/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -6,15 +6,10 @@
#include <asm/io.h>
#include <asm/processor.h>
@@ -544,8 +546,8 @@ Acked-by: jbeulich@novell.com
#endif
early_console = &early_vga_console;
} else if (!strncmp(buf, "simnow", 6)) {
---- head-2011-09-23.orig/arch/x86/kernel/entry_32-xen.S 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:10:06.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/kernel/entry_32-xen.S 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:10:06.000000000 +0200
@@ -254,6 +254,7 @@ check_userspace:
jb resume_kernel # not returning to v8086 or userspace
@@ -595,8 +597,8 @@ Acked-by: jbeulich@novell.com
+#include "syscall_table_32.S"
syscall_table_size=(.-sys_call_table)
---- head-2011-09-23.orig/arch/x86/kernel/entry_64-xen.S 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/entry_64-xen.S 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/entry_64-xen.S 2011-10-07 11:21:43.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/entry_64-xen.S 2011-10-07 11:28:06.000000000 +0200
@@ -57,7 +57,7 @@
#include <xen/interface/arch-x86_64.h>
#include <xen/interface/features.h>
@@ -606,7 +608,7 @@ Acked-by: jbeulich@novell.com
.code64
-@@ -275,6 +275,7 @@ ret_from_sys_call:
+@@ -277,6 +277,7 @@ ret_from_sys_call:
movl $_TIF_ALLWORK_MASK,%edi
/* edi: flagmask */
sysret_check:
@@ -614,7 +616,7 @@ Acked-by: jbeulich@novell.com
GET_THREAD_INFO(%rcx)
XEN_BLOCK_EVENTS(%rsi)
TRACE_IRQS_OFF
-@@ -365,6 +366,7 @@ int_ret_from_sys_call:
+@@ -368,6 +369,7 @@ int_ret_from_sys_call:
movl $_TIF_ALLWORK_MASK,%edi
/* edi: mask to check */
int_with_check:
@@ -622,7 +624,7 @@ Acked-by: jbeulich@novell.com
GET_THREAD_INFO(%rcx)
movl threadinfo_flags(%rcx),%edx
andl %edi,%edx
-@@ -516,11 +518,12 @@ END(stub_rt_sigreturn)
+@@ -519,11 +521,12 @@ END(stub_rt_sigreturn)
retint_check:
CFI_DEFAULT_STACK adj=1
@@ -636,7 +638,7 @@ Acked-by: jbeulich@novell.com
movl EFLAGS-REST_SKIP(%rsp), %eax
shr $9, %eax # EAX[0] == IRET_EFLAGS.IF
XEN_GET_VCPU_INFO(%rsi)
-@@ -841,7 +844,7 @@ error_call_handler:
+@@ -844,7 +847,7 @@ error_call_handler:
movq ORIG_RAX(%rsp),%rsi # get error code
movq $-1,ORIG_RAX(%rsp)
call *%rax
@@ -645,7 +647,7 @@ Acked-by: jbeulich@novell.com
RESTORE_REST
/* cli */
XEN_BLOCK_EVENTS(%rsi)
-@@ -849,14 +852,11 @@ error_exit:
+@@ -852,14 +855,11 @@ error_exit:
GET_THREAD_INFO(%rcx)
testb $3,CS-ARGOFFSET(%rsp)
jz retint_kernel
@@ -661,7 +663,7 @@ Acked-by: jbeulich@novell.com
jmp retint_restore_args
#if 0
-@@ -1071,7 +1071,7 @@ child_rip:
+@@ -1074,7 +1074,7 @@ child_rip:
movq %rsi, %rdi
call *%rax
# exit
@@ -670,8 +672,8 @@ Acked-by: jbeulich@novell.com
call do_exit
CFI_ENDPROC
ENDPROC(child_rip)
---- head-2011-09-23.orig/arch/x86/kernel/fixup.c 2008-01-28 12:24:18.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/fixup.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/fixup.c 2008-01-28 12:24:18.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/fixup.c 2011-01-31 17:56:27.000000000 +0100
@@ -34,7 +34,7 @@
#include <linux/delay.h>
#include <linux/version.h>
@@ -681,8 +683,8 @@ Acked-by: jbeulich@novell.com
fastcall void do_fixup_4gb_segment(struct pt_regs *regs, long error_code)
{
---- head-2011-09-23.orig/arch/x86/kernel/head64-xen.c 2011-08-09 10:41:42.000000000 +0200
-+++ head-2011-09-23/arch/x86/kernel/head64-xen.c 2011-08-09 10:44:02.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/kernel/head64-xen.c 2011-08-09 10:41:42.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/head64-xen.c 2011-08-09 10:44:02.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * linux/arch/x86_64/kernel/head64.c -- prepare to run common code
@@ -739,8 +741,8 @@ Acked-by: jbeulich@novell.com
#endif
early_printk("Kernel alive\n");
---- head-2011-09-23.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -427,7 +427,7 @@ static struct irq_cpu_info {
#define IRQ_ALLOWED(cpu, allowed_mask) cpu_isset(cpu, allowed_mask)
@@ -931,8 +933,8 @@ Acked-by: jbeulich@novell.com
#endif /* CONFIG_ACPI */
static int __init parse_disable_timer_pin_1(char *arg)
---- head-2011-09-23.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -31,6 +31,7 @@
#include <linux/sysdev.h>
#include <linux/msi.h>
@@ -1176,8 +1178,8 @@ Acked-by: jbeulich@novell.com
#endif
#endif /* !CONFIG_XEN */
+
---- head-2011-09-23.orig/arch/x86/kernel/ioport_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/ioport_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/ioport_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/ioport_32-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * linux/arch/i386/kernel/ioport.c
@@ -1185,8 +1187,8 @@ Acked-by: jbeulich@novell.com
* This contains the io-permission bitmap code - written by obz, with changes
* by Linus.
*/
---- head-2011-09-23.orig/arch/x86/kernel/ioport_64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/ioport_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/ioport_64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/ioport_64-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * linux/arch/x86_64/kernel/ioport.c
@@ -1194,8 +1196,8 @@ Acked-by: jbeulich@novell.com
* This contains the io-permission bitmap code - written by obz, with changes
* by Linus.
*/
---- head-2011-09-23.orig/arch/x86/kernel/ldt_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/ldt_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/ldt_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/ldt_32-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * linux/arch/i386/kernel/ldt.c
@@ -1257,8 +1259,8 @@ Acked-by: jbeulich@novell.com
out:
return error;
}
---- head-2011-09-23.orig/arch/x86/kernel/ldt_64-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/ldt_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/ldt_64-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/ldt_64-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * linux/arch/x86_64/kernel/ldt.c
@@ -1337,8 +1339,8 @@ Acked-by: jbeulich@novell.com
out:
return error;
}
---- head-2011-09-23.orig/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -65,8 +65,10 @@ unsigned long mp_lapic_addr;
unsigned int def_to_bigsmp = 0;
@@ -1388,8 +1390,8 @@ Acked-by: jbeulich@novell.com
*/
for (i = 0; i < 16; i++) {
int idx;
---- head-2011-09-23.orig/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -54,9 +54,12 @@ int nr_ioapics;
unsigned long mp_lapic_addr = 0;
@@ -1454,8 +1456,8 @@ Acked-by: jbeulich@novell.com
processor.mpc_type = MP_PROCESSOR;
processor.mpc_apicid = id;
processor.mpc_apicver = 0;
---- head-2011-09-23.orig/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -13,14 +13,13 @@
#include <linux/pci.h>
#include <linux/module.h>
@@ -1548,8 +1550,8 @@ Acked-by: jbeulich@novell.com
if (mem && vaddr >= mem->virt_base && vaddr < (mem->virt_base + (mem->size << PAGE_SHIFT))) {
int page = (vaddr - mem->virt_base) >> PAGE_SHIFT;
---- head-2011-09-23.orig/arch/x86/kernel/process_32-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/process_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/process_32-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/process_32-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * linux/arch/i386/kernel/process.c
@@ -1676,8 +1678,8 @@ Acked-by: jbeulich@novell.com
show_trace(NULL, regs, &regs->esp);
}
---- head-2011-09-23.orig/arch/x86/kernel/process_64-xen.c 2011-02-02 08:31:50.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/process_64-xen.c 2011-02-02 08:32:00.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/process_64-xen.c 2011-02-02 08:31:50.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/process_64-xen.c 2011-02-02 08:32:00.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * linux/arch/x86-64/kernel/process.c
@@ -1744,8 +1746,8 @@ Acked-by: jbeulich@novell.com
__switch_to(struct task_struct *prev_p, struct task_struct *next_p)
{
struct thread_struct *prev = &prev_p->thread,
---- head-2011-09-23.orig/arch/x86/kernel/quirks.c 2011-09-07 15:20:23.000000000 +0200
-+++ head-2011-09-23/arch/x86/kernel/quirks.c 2011-09-07 15:36:26.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/kernel/quirks.c 2011-09-07 15:20:23.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/quirks.c 2011-09-07 15:36:26.000000000 +0200
@@ -4,8 +4,6 @@
#include <linux/pci.h>
#include <linux/irq.h>
@@ -1764,8 +1766,8 @@ Acked-by: jbeulich@novell.com
unsigned long force_hpet_address;
static enum {
---- head-2011-09-23.orig/arch/x86/kernel/setup64-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/setup64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/setup64-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/setup64-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -15,7 +15,6 @@
#include <linux/bootmem.h>
#include <linux/bitops.h>
@@ -1814,8 +1816,8 @@ Acked-by: jbeulich@novell.com
/*
* cpu_init() initializes state that is per-CPU. Some data is already
* initialized (naturally) in the bootstrap process, such as the GDT
---- head-2011-09-23.orig/arch/x86/kernel/setup_32-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/setup_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/setup_32-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/setup_32-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * linux/arch/i386/kernel/setup.c
@@ -2072,8 +2074,8 @@ Acked-by: jbeulich@novell.com
#endif
#ifdef CONFIG_ACPI
---- head-2011-09-23.orig/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -1,10 +1,5 @@
/*
- * linux/arch/x86-64/kernel/setup.c
@@ -2523,8 +2525,8 @@ Acked-by: jbeulich@novell.com
return c_start(m, pos);
}
---- head-2011-09-23.orig/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -72,7 +72,7 @@
*
* B stepping CPUs may hang. There are hardware work arounds
@@ -2576,8 +2578,8 @@ Acked-by: jbeulich@novell.com
irq_exit();
if (wait) {
---- head-2011-09-23.orig/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -167,6 +167,7 @@ asmlinkage void smp_invalidate_interrupt
out:
ack_APIC_irq();
@@ -2784,8 +2786,8 @@ Acked-by: jbeulich@novell.com
irq_exit();
if (wait) {
mb();
---- head-2011-09-23.orig/arch/x86/kernel/time-xen.c 2011-07-11 11:22:42.000000000 +0200
-+++ head-2011-09-23/arch/x86/kernel/time-xen.c 2011-08-23 13:45:52.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/kernel/time-xen.c 2011-07-11 11:22:42.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/time-xen.c 2011-08-23 13:45:52.000000000 +0200
@@ -1,6 +1,4 @@
/*
- * linux/arch/i386/kernel/time.c
@@ -2893,8 +2895,8 @@ Acked-by: jbeulich@novell.com
};
static int __init xen_sysctl_init(void)
{
---- head-2011-09-23.orig/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * linux/arch/i386/traps.c
@@ -3137,8 +3139,8 @@ Acked-by: jbeulich@novell.com
/*
* NB. All these are "trap gates" (i.e. events_mask isn't set) except
---- head-2011-09-23.orig/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * linux/arch/x86-64/traps.c
@@ -3291,8 +3293,8 @@ Acked-by: jbeulich@novell.com
get_debugreg(condition, 6);
if (notify_die(DIE_DEBUG, "debug", regs, condition, error_code,
---- head-2011-09-23.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * linux/arch/x86_64/kernel/vsyscall.c
@@ -3382,8 +3384,8 @@ Acked-by: jbeulich@novell.com
write_rdtscp_aux((node << 12) | cpu);
/* Store cpu number in limit so that it can be loaded quickly
---- head-2011-09-23.orig/arch/x86/mm/fault_32-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/arch/x86/mm/fault_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/mm/fault_32-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/arch/x86/mm/fault_32-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -25,6 +25,7 @@
#include <linux/kprobes.h>
#include <linux/uaccess.h>
@@ -3565,8 +3567,8 @@ Acked-by: jbeulich@novell.com
goto no_context;
do_sigbus:
---- head-2011-09-23.orig/arch/x86/mm/fault_64-xen.c 2011-08-15 10:44:41.000000000 +0200
-+++ head-2011-09-23/arch/x86/mm/fault_64-xen.c 2011-07-26 09:28:01.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/mm/fault_64-xen.c 2011-08-15 10:44:41.000000000 +0200
++++ head-2011-10-07/arch/x86/mm/fault_64-xen.c 2011-07-26 09:28:01.000000000 +0200
@@ -25,6 +25,7 @@
#include <linux/kprobes.h>
#include <linux/uaccess.h>
@@ -3729,8 +3731,8 @@ Acked-by: jbeulich@novell.com
- return 1;
-}
-__setup("pagefaulttrace", enable_pagefaulttrace);
---- head-2011-09-23.orig/arch/x86/mm/hypervisor.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/mm/hypervisor.c 2011-08-09 10:46:16.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/mm/hypervisor.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/mm/hypervisor.c 2011-08-09 10:46:16.000000000 +0200
@@ -71,8 +71,8 @@ static inline bool use_lazy_mmu_mode(voi
static void multicall_failed(const multicall_entry_t *mc, int rc)
@@ -3833,8 +3835,8 @@ Acked-by: jbeulich@novell.com
cr_mcl[i - 1].args[MULTI_UVMFLAGS_INDEX] = order
? UVMF_TLB_FLUSH|UVMF_ALL
: UVMF_INVLPG|UVMF_ALL;
---- head-2011-09-23.orig/arch/x86/mm/init_32-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/arch/x86/mm/init_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/mm/init_32-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/arch/x86/mm/init_32-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -94,7 +94,14 @@ static pte_t * __init one_page_table_ini
#else
if (!(__pmd_val(*pmd) & _PAGE_PRESENT)) {
@@ -3917,8 +3919,8 @@ Acked-by: jbeulich@novell.com
}
/*
---- head-2011-09-23.orig/arch/x86/mm/init_64-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/arch/x86/mm/init_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/mm/init_64-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/arch/x86/mm/init_64-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -798,7 +798,7 @@ static void xen_finish_init_mapping(void
/* Setup the direct mapping of the physical memory at PAGE_OFFSET.
This runs before bootmem is initialized and gets pages directly from the
@@ -4005,8 +4007,8 @@ Acked-by: jbeulich@novell.com
+ return 0;
+}
+#endif
---- head-2011-09-23.orig/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -17,9 +17,6 @@
#include <asm/pgalloc.h>
#include <asm/mmu_context.h>
@@ -4228,8 +4230,8 @@ Acked-by: jbeulich@novell.com
flush_map(&l);
---- head-2011-09-23.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -6,6 +6,7 @@
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -4256,8 +4258,8 @@ Acked-by: jbeulich@novell.com
{
memset(pmd, 0, PTRS_PER_PMD*sizeof(pmd_t));
}
---- head-2011-09-23.orig/arch/x86/pci/pcifront.c 2009-03-18 10:39:31.000000000 +0100
-+++ head-2011-09-23/arch/x86/pci/pcifront.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/pci/pcifront.c 2009-03-18 10:39:31.000000000 +0100
++++ head-2011-10-07/arch/x86/pci/pcifront.c 2011-01-31 17:56:27.000000000 +0100
@@ -31,7 +31,7 @@ static int __init pcifront_x86_stub_init
if (raw_pci_ops)
return 0;
@@ -4267,8 +4269,8 @@ Acked-by: jbeulich@novell.com
/* Copied from arch/i386/pci/common.c */
pci_cache_line_size = 32 >> 2;
---- head-2011-09-23.orig/drivers/acpi/processor_core.c 2011-09-23 09:35:33.000000000 +0200
-+++ head-2011-09-23/drivers/acpi/processor_core.c 2011-06-30 16:32:20.000000000 +0200
+--- head-2011-10-07.orig/drivers/acpi/processor_core.c 2011-10-07 11:27:28.000000000 +0200
++++ head-2011-10-07/drivers/acpi/processor_core.c 2011-06-30 16:32:20.000000000 +0200
@@ -176,11 +176,21 @@ int acpi_get_cpuid(acpi_handle handle, i
return apic_id;
@@ -4291,8 +4293,8 @@ Acked-by: jbeulich@novell.com
/* In UP kernel, only processor 0 is valid */
if (apic_id == 0)
return apic_id;
---- head-2011-09-23.orig/drivers/acpi/processor_extcntl.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-23/drivers/acpi/processor_extcntl.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/acpi/processor_extcntl.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/drivers/acpi/processor_extcntl.c 2011-01-31 17:56:27.000000000 +0100
@@ -95,7 +95,7 @@ int processor_notify_external(struct acp
ret = processor_extcntl_ops->hotplug(pr, type);
break;
@@ -4302,8 +4304,8 @@ Acked-by: jbeulich@novell.com
break;
}
---- head-2011-09-23.orig/drivers/acpi/processor_idle.c 2011-09-07 14:39:37.000000000 +0200
-+++ head-2011-09-23/drivers/acpi/processor_idle.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/acpi/processor_idle.c 2011-09-07 14:39:37.000000000 +0200
++++ head-2011-10-07/drivers/acpi/processor_idle.c 2011-01-31 17:56:27.000000000 +0100
@@ -1081,6 +1081,14 @@ int acpi_processor_cst_has_changed(struc
if (!pr->flags.power_setup_done)
return -ENODEV;
@@ -4319,8 +4321,8 @@ Acked-by: jbeulich@novell.com
cpuidle_pause_and_lock();
cpuidle_disable_device(&pr->power.dev);
acpi_processor_get_power_info(pr);
---- head-2011-09-23.orig/drivers/char/tpm/tpm_xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/drivers/char/tpm/tpm_xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/char/tpm/tpm_xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/drivers/char/tpm/tpm_xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -104,9 +104,9 @@ void __exit tpmif_exit(void);
#define DPRINTK(fmt, args...) \
pr_debug("xen_tpm_fr (%s:%d) " fmt, __FUNCTION__, __LINE__, ##args)
@@ -4333,8 +4335,8 @@ Acked-by: jbeulich@novell.com
#define GRANT_INVALID_REF 0
---- head-2011-09-23.orig/drivers/cpuidle/Kconfig 2011-09-23 09:35:33.000000000 +0200
-+++ head-2011-09-23/drivers/cpuidle/Kconfig 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/cpuidle/Kconfig 2011-10-07 11:27:28.000000000 +0200
++++ head-2011-10-07/drivers/cpuidle/Kconfig 2011-01-31 17:56:27.000000000 +0100
@@ -1,6 +1,7 @@
config CPU_IDLE
@@ -4343,8 +4345,8 @@ Acked-by: jbeulich@novell.com
default ACPI
help
CPU idle is a generic framework for supporting software-controlled
---- head-2011-09-23.orig/drivers/dma/Kconfig 2011-09-23 09:35:33.000000000 +0200
-+++ head-2011-09-23/drivers/dma/Kconfig 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/dma/Kconfig 2011-10-07 11:27:28.000000000 +0200
++++ head-2011-10-07/drivers/dma/Kconfig 2011-01-31 17:56:27.000000000 +0100
@@ -61,7 +61,7 @@ config INTEL_IOATDMA
tristate "Intel I/OAT DMA support"
depends on PCI && X86
@@ -4354,15 +4356,15 @@ Acked-by: jbeulich@novell.com
select ASYNC_TX_DISABLE_PQ_VAL_DMA
select ASYNC_TX_DISABLE_XOR_VAL_DMA
help
---- head-2011-09-23.orig/drivers/dma/ioat/Makefile 2011-09-23 09:35:33.000000000 +0200
-+++ head-2011-09-23/drivers/dma/ioat/Makefile 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/dma/ioat/Makefile 2011-10-07 11:27:28.000000000 +0200
++++ head-2011-10-07/drivers/dma/ioat/Makefile 2011-01-31 17:56:27.000000000 +0100
@@ -1,2 +1,3 @@
obj-$(CONFIG_INTEL_IOATDMA) += ioatdma.o
-ioatdma-y := pci.o dma.o dma_v2.o dma_v3.o dca.o
+dca-$(CONFIG_DCA) := dca.o
+ioatdma-y := pci.o dma.o dma_v2.o dma_v3.o $(dca-y) $(dca-m)
---- head-2011-09-23.orig/drivers/dma/ioat/dca.c 2011-09-23 09:35:33.000000000 +0200
-+++ head-2011-09-23/drivers/dma/ioat/dca.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/dma/ioat/dca.c 2011-10-07 11:27:28.000000000 +0200
++++ head-2011-10-07/drivers/dma/ioat/dca.c 2011-01-31 17:56:27.000000000 +0100
@@ -682,3 +682,15 @@ ioat3_dca_init(struct pci_dev *pdev, voi
return dca;
@@ -4379,8 +4381,8 @@ Acked-by: jbeulich@novell.com
+ free_dca_provider(device->dca);
+ device->dca = NULL;
+}
---- head-2011-09-23.orig/drivers/dma/ioat/dma.h 2011-09-23 09:35:33.000000000 +0200
-+++ head-2011-09-23/drivers/dma/ioat/dma.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/dma/ioat/dma.h 2011-10-07 11:27:28.000000000 +0200
++++ head-2011-10-07/drivers/dma/ioat/dma.h 2011-01-31 17:56:27.000000000 +0100
@@ -347,4 +347,22 @@ void ioat_kobject_del(struct ioatdma_dev
extern const struct sysfs_ops ioat_sysfs_ops;
extern struct ioat_sysfs_entry ioat_version_attr;
@@ -4404,8 +4406,8 @@ Acked-by: jbeulich@novell.com
+#endif
+
#endif /* IOATDMA_H */
---- head-2011-09-23.orig/drivers/dma/ioat/pci.c 2011-09-23 09:35:33.000000000 +0200
-+++ head-2011-09-23/drivers/dma/ioat/pci.c 2011-09-07 15:36:19.000000000 +0200
+--- head-2011-10-07.orig/drivers/dma/ioat/pci.c 2011-10-07 11:27:28.000000000 +0200
++++ head-2011-10-07/drivers/dma/ioat/pci.c 2011-09-07 15:36:19.000000000 +0200
@@ -29,7 +29,6 @@
#include <linux/module.h>
#include <linux/pci.h>
@@ -4427,8 +4429,8 @@ Acked-by: jbeulich@novell.com
ioat_dma_remove(device);
}
---- head-2011-09-23.orig/drivers/firmware/dell_rbu.c 2011-04-13 11:25:29.000000000 +0200
-+++ head-2011-09-23/drivers/firmware/dell_rbu.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/firmware/dell_rbu.c 2011-04-13 11:25:29.000000000 +0200
++++ head-2011-10-07/drivers/firmware/dell_rbu.c 2011-01-31 17:56:27.000000000 +0100
@@ -175,9 +175,8 @@ static int create_packet(void *data, siz
(unsigned long)packet_data_temp_buf, ordernum, 0)) {
free_pages((unsigned long)packet_data_temp_buf,
@@ -4441,8 +4443,8 @@ Acked-by: jbeulich@novell.com
retval = -ENOMEM;
spin_lock(&rbu_data.lock);
goto out_alloc_packet_array;
---- head-2011-09-23.orig/drivers/hwmon/coretemp-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/drivers/hwmon/coretemp-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/hwmon/coretemp-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/drivers/hwmon/coretemp-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -49,7 +49,7 @@ static struct coretemp_data *coretemp_up
struct pdev_entry {
struct list_head list;
@@ -4496,8 +4498,8 @@ Acked-by: jbeulich@novell.com
/* supported CPU not found, but report the unknown
family 6 CPU */
---- head-2011-09-23.orig/drivers/oprofile/cpu_buffer.c 2011-04-13 12:22:07.000000000 +0200
-+++ head-2011-09-23/drivers/oprofile/cpu_buffer.c 2011-04-13 12:44:01.000000000 +0200
+--- head-2011-10-07.orig/drivers/oprofile/cpu_buffer.c 2011-04-13 12:22:07.000000000 +0200
++++ head-2011-10-07/drivers/oprofile/cpu_buffer.c 2011-04-13 12:44:01.000000000 +0200
@@ -425,6 +425,39 @@ void oprofile_add_pc(unsigned long pc, i
log_sample(cpu_buf, pc, 0, is_kernel, event, NULL);
}
@@ -4538,9 +4540,9 @@ Acked-by: jbeulich@novell.com
void oprofile_add_trace(unsigned long pc)
{
struct oprofile_cpu_buffer *cpu_buf = &__get_cpu_var(op_cpu_buffer);
---- head-2011-09-23.orig/drivers/pci/msi-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/drivers/pci/msi-xen.c 2011-01-31 17:56:27.000000000 +0100
-@@ -260,6 +260,12 @@ static int msi_map_vector(struct pci_dev
+--- head-2011-10-07.orig/drivers/pci/msi-xen.c 2011-10-07 11:21:21.000000000 +0200
++++ head-2011-10-07/drivers/pci/msi-xen.c 2011-10-07 11:27:53.000000000 +0200
+@@ -278,6 +278,12 @@ static int msi_map_vector(struct pci_dev
map_irq.pirq : evtchn_map_pirq(-1, map_irq.pirq));
}
@@ -4553,7 +4555,7 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_PM
void pci_restore_msi_state(struct pci_dev *dev)
{
-@@ -269,7 +275,7 @@ void pci_restore_msi_state(struct pci_de
+@@ -286,7 +292,7 @@ void pci_restore_msi_state(struct pci_de
if (!dev->msi_enabled && !dev->msix_enabled)
return;
@@ -4562,7 +4564,7 @@ Acked-by: jbeulich@novell.com
if (dev->msi_enabled)
msi_set_enable(dev, 0);
if (dev->msix_enabled)
-@@ -306,7 +312,7 @@ static int msi_capability_init(struct pc
+@@ -341,7 +347,7 @@ static int msi_capability_init(struct pc
return -EBUSY;
/* Set MSI enabled bits */
@@ -4571,7 +4573,7 @@ Acked-by: jbeulich@novell.com
msi_set_enable(dev, 1);
dev->msi_enabled = 1;
-@@ -380,7 +386,7 @@ static int msix_capability_init(struct p
+@@ -415,7 +421,7 @@ static int msix_capability_init(struct p
return avail;
}
@@ -4580,7 +4582,7 @@ Acked-by: jbeulich@novell.com
msix_set_enable(dev, 1);
dev->msix_enabled = 1;
-@@ -516,7 +522,7 @@ void pci_disable_msi(struct pci_dev* dev
+@@ -551,7 +557,7 @@ void pci_disable_msi(struct pci_dev* dev
/* Disable MSI mode */
msi_set_enable(dev, 0);
@@ -4589,7 +4591,7 @@ Acked-by: jbeulich@novell.com
dev->msi_enabled = 0;
}
EXPORT_SYMBOL(pci_disable_msi);
-@@ -653,7 +659,7 @@ void pci_disable_msix(struct pci_dev* de
+@@ -688,7 +694,7 @@ void pci_disable_msix(struct pci_dev* de
/* Disable MSI mode */
msix_set_enable(dev, 0);
@@ -4598,8 +4600,8 @@ Acked-by: jbeulich@novell.com
dev->msix_enabled = 0;
}
EXPORT_SYMBOL(pci_disable_msix);
---- head-2011-09-23.orig/drivers/xen/balloon/balloon.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/drivers/xen/balloon/balloon.c 2011-03-23 08:52:11.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/balloon/balloon.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/drivers/xen/balloon/balloon.c 2011-03-23 08:52:11.000000000 +0100
@@ -123,10 +123,8 @@ static DECLARE_WORK(balloon_worker, ball
PAGE_TO_LIST(p)->prev = NULL; \
} while(0)
@@ -4631,8 +4633,8 @@ Acked-by: jbeulich@novell.com
return NOTIFY_DONE;
}
---- head-2011-09-23.orig/drivers/xen/blkback/blkback.c 2011-04-11 14:51:40.000000000 +0200
-+++ head-2011-09-23/drivers/xen/blkback/blkback.c 2011-09-23 09:47:08.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/blkback/blkback.c 2011-04-11 14:51:40.000000000 +0200
++++ head-2011-10-07/drivers/xen/blkback/blkback.c 2011-09-23 09:47:08.000000000 +0200
@@ -278,13 +278,10 @@ static void __end_block_io_op(pending_re
}
}
@@ -4657,8 +4659,8 @@ Acked-by: jbeulich@novell.com
return -ENOMEM;
}
---- head-2011-09-23.orig/drivers/xen/blkback/blkback-pagemap.c 2009-06-09 15:01:37.000000000 +0200
-+++ head-2011-09-23/drivers/xen/blkback/blkback-pagemap.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/blkback/blkback-pagemap.c 2009-06-09 15:01:37.000000000 +0200
++++ head-2011-10-07/drivers/xen/blkback/blkback-pagemap.c 2011-01-31 17:56:27.000000000 +0100
@@ -38,8 +38,8 @@ blkback_pagemap_set(int idx, struct page
entry = blkback_pagemap + idx;
@@ -4688,8 +4690,8 @@ Acked-by: jbeulich@novell.com
BUG();
}
---- head-2011-09-23.orig/drivers/xen/blkback/vbd.c 2011-06-30 15:37:44.000000000 +0200
-+++ head-2011-09-23/drivers/xen/blkback/vbd.c 2011-06-30 16:32:27.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/blkback/vbd.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-10-07/drivers/xen/blkback/vbd.c 2011-06-30 16:32:27.000000000 +0200
@@ -133,18 +133,18 @@ void vbd_resize(blkif_t *blkif)
struct xenbus_device *dev = blkif->be->dev;
unsigned long long new_size = vbd_size(vbd);
@@ -4730,8 +4732,8 @@ Acked-by: jbeulich@novell.com
return;
abort:
xenbus_transaction_end(xbt, 1);
---- head-2011-09-23.orig/drivers/xen/blkback/xenbus.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/drivers/xen/blkback/xenbus.c 2011-06-30 16:32:30.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/blkback/xenbus.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/drivers/xen/blkback/xenbus.c 2011-06-30 16:32:30.000000000 +0200
@@ -294,10 +294,9 @@ static void backend_changed(struct xenbu
if ((be->major || be->minor) &&
@@ -4771,8 +4773,8 @@ Acked-by: jbeulich@novell.com
kfree(protocol);
/* Map the shared frame, irq etc. */
---- head-2011-09-23.orig/drivers/xen/blkfront/blkfront.c 2011-07-21 12:08:17.000000000 +0200
-+++ head-2011-09-23/drivers/xen/blkfront/blkfront.c 2011-07-21 12:16:23.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/blkfront/blkfront.c 2011-07-21 12:08:17.000000000 +0200
++++ head-2011-10-07/drivers/xen/blkfront/blkfront.c 2011-07-21 12:16:23.000000000 +0200
@@ -233,7 +233,7 @@ static int setup_blkring(struct xenbus_d
SHARED_RING_INIT(sring);
FRONT_RING_INIT(&info->ring, sring, PAGE_SIZE);
@@ -4825,8 +4827,8 @@ Acked-by: jbeulich@novell.com
uptodate = -EOPNOTSUPP;
info->feature_barrier = 0;
xlvbd_barrier(info);
---- head-2011-09-23.orig/drivers/xen/blkfront/block.h 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/drivers/xen/blkfront/block.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/blkfront/block.h 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/drivers/xen/blkfront/block.h 2011-01-31 17:56:27.000000000 +0100
@@ -59,7 +59,7 @@
#define DPRINTK(_f, _a...) pr_debug(_f, ## _a)
@@ -4836,8 +4838,8 @@ Acked-by: jbeulich@novell.com
#else
#define DPRINTK_IOCTL(_f, _a...) ((void)0)
#endif
---- head-2011-09-23.orig/drivers/xen/blkfront/vbd.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/drivers/xen/blkfront/vbd.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/blkfront/vbd.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/drivers/xen/blkfront/vbd.c 2011-01-31 17:56:27.000000000 +0100
@@ -185,7 +185,8 @@ xlbd_alloc_major_info(int major, int min
return NULL;
}
@@ -4878,8 +4880,8 @@ Acked-by: jbeulich@novell.com
return -ENOSYS;
}
#endif
---- head-2011-09-23.orig/drivers/xen/blktap/blktap.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-23/drivers/xen/blktap/blktap.c 2011-04-11 15:01:34.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/blktap/blktap.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/drivers/xen/blktap/blktap.c 2011-04-11 15:01:34.000000000 +0200
@@ -772,8 +772,8 @@ static int blktap_ioctl(struct inode *in
case BLKTAP_IOCTL_PRINT_IDXS:
{
@@ -4891,8 +4893,8 @@ Acked-by: jbeulich@novell.com
"| req_prod: %2d, rsp_prod: %2d\n",
info->ufe_ring.rsp_cons,
info->ufe_ring.req_prod_pvt,
---- head-2011-09-23.orig/drivers/xen/blktap/common.h 2011-04-11 14:51:59.000000000 +0200
-+++ head-2011-09-23/drivers/xen/blktap/common.h 2011-04-11 15:01:35.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/blktap/common.h 2011-04-11 14:51:59.000000000 +0200
++++ head-2011-10-07/drivers/xen/blktap/common.h 2011-04-11 15:01:35.000000000 +0200
@@ -40,7 +40,7 @@
#define DPRINTK(_f, _a...) pr_debug("(file=%s, line=%d) " _f, \
__FILE__ , __LINE__ , ## _a )
@@ -4902,8 +4904,8 @@ Acked-by: jbeulich@novell.com
struct backend_info;
---- head-2011-09-23.orig/drivers/xen/blktap/xenbus.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/drivers/xen/blktap/xenbus.c 2011-06-30 16:32:38.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/blktap/xenbus.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/drivers/xen/blktap/xenbus.c 2011-06-30 16:32:38.000000000 +0200
@@ -356,8 +356,8 @@ static void tap_frontend_changed(struct
switch (frontend_state) {
case XenbusStateInitialising:
@@ -4929,8 +4931,8 @@ Acked-by: jbeulich@novell.com
kfree(protocol);
/* Map the shared frame, irq etc. */
---- head-2011-09-23.orig/drivers/xen/blktap2/control.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/drivers/xen/blktap2/control.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/blktap2/control.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/drivers/xen/blktap2/control.c 2011-01-31 17:56:27.000000000 +0100
@@ -18,6 +18,7 @@ blktap_control_initialize_tap(struct blk
memset(tap, 0, sizeof(*tap));
set_bit(BLKTAP_CONTROL, &tap->dev_inuse);
@@ -4939,8 +4941,8 @@ Acked-by: jbeulich@novell.com
init_waitqueue_head(&tap->wq);
atomic_set(&tap->refcnt, 0);
---- head-2011-09-23.orig/drivers/xen/blktap2/device.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/drivers/xen/blktap2/device.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/blktap2/device.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/drivers/xen/blktap2/device.c 2011-01-31 17:56:27.000000000 +0100
@@ -16,7 +16,7 @@
#include "../blkback/blkback-pagemap.h"
@@ -4994,8 +4996,8 @@ Acked-by: jbeulich@novell.com
goto out;
}
---- head-2011-09-23.orig/drivers/xen/console/console.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-23/drivers/xen/console/console.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/console/console.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/drivers/xen/console/console.c 2011-01-31 17:56:27.000000000 +0100
@@ -716,10 +716,10 @@ static int __init xencons_init(void)
tty_set_operations(xencons_driver, &xencons_ops);
@@ -5022,8 +5024,8 @@ Acked-by: jbeulich@novell.com
return 0;
}
---- head-2011-09-23.orig/drivers/xen/console/xencons_ring.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-23/drivers/xen/console/xencons_ring.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/console/xencons_ring.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/drivers/xen/console/xencons_ring.c 2011-01-31 17:56:27.000000000 +0100
@@ -125,7 +125,7 @@ int xencons_ring_init(void)
xen_start_info->console.domU.evtchn,
handle_input, 0, "xencons", NULL);
@@ -5033,8 +5035,8 @@ Acked-by: jbeulich@novell.com
return irq;
}
---- head-2011-09-23.orig/drivers/xen/core/cpu_hotplug.c 2011-01-24 12:06:05.000000000 +0100
-+++ head-2011-09-23/drivers/xen/core/cpu_hotplug.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/core/cpu_hotplug.c 2011-01-24 12:06:05.000000000 +0100
++++ head-2011-10-07/drivers/xen/core/cpu_hotplug.c 2011-01-31 17:56:27.000000000 +0100
@@ -36,7 +36,7 @@ static void vcpu_hotplug(unsigned int cp
sprintf(dir, "cpu/%u", cpu);
err = xenbus_scanf(XBT_NIL, dir, "availability", "%s", state);
@@ -5084,8 +5086,8 @@ Acked-by: jbeulich@novell.com
rc = -EBUSY;
}
} else if (!cpu_isset(cpu, local_allowed_cpumask) ||
---- head-2011-09-23.orig/drivers/xen/core/evtchn.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-23/drivers/xen/core/evtchn.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/core/evtchn.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/drivers/xen/core/evtchn.c 2011-01-31 17:56:27.000000000 +0100
@@ -350,8 +350,8 @@ static int find_unbound_irq(void)
if (!warned) {
@@ -5118,16 +5120,16 @@ Acked-by: jbeulich@novell.com
irq, type_from_irq(irq), index_from_irq(irq), xen_pirq);
return -EINVAL;
}
---- head-2011-09-23.orig/drivers/xen/core/firmware.c 2007-06-22 09:08:06.000000000 +0200
-+++ head-2011-09-23/drivers/xen/core/firmware.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/core/firmware.c 2007-06-22 09:08:06.000000000 +0200
++++ head-2011-10-07/drivers/xen/core/firmware.c 2011-01-31 17:56:27.000000000 +0100
@@ -1,4 +1,5 @@
#include <linux/kernel.h>
+#include <linux/string.h>
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/edd.h>
---- head-2011-09-23.orig/drivers/xen/core/gnttab.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/drivers/xen/core/gnttab.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/core/gnttab.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/drivers/xen/core/gnttab.c 2011-01-31 17:56:27.000000000 +0100
@@ -691,7 +691,7 @@ int gnttab_resume(void)
resume_frames = alloc_xen_mmio(PAGE_SIZE * max_nr_gframes);
shared = ioremap(resume_frames, PAGE_SIZE * max_nr_gframes);
@@ -5137,8 +5139,8 @@ Acked-by: jbeulich@novell.com
return -1;
}
}
---- head-2011-09-23.orig/drivers/xen/core/machine_kexec.c 2009-07-13 14:25:35.000000000 +0200
-+++ head-2011-09-23/drivers/xen/core/machine_kexec.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/core/machine_kexec.c 2009-07-13 14:25:35.000000000 +0200
++++ head-2011-10-07/drivers/xen/core/machine_kexec.c 2011-01-31 17:56:27.000000000 +0100
@@ -29,6 +29,10 @@ void __init xen_machine_kexec_setup_reso
int k = 0;
int rc;
@@ -5178,8 +5180,8 @@ Acked-by: jbeulich@novell.com
void machine_shutdown(void)
{
/* do nothing */
---- head-2011-09-23.orig/drivers/xen/core/machine_reboot.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/drivers/xen/core/machine_reboot.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/core/machine_reboot.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/drivers/xen/core/machine_reboot.c 2011-01-31 17:56:27.000000000 +0100
@@ -204,8 +204,7 @@ int __xen_suspend(int fast_suspend, void
#if defined(__i386__) || defined(__x86_64__)
@@ -5190,8 +5192,8 @@ Acked-by: jbeulich@novell.com
return -EOPNOTSUPP;
}
#endif
---- head-2011-09-23.orig/drivers/xen/core/reboot.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/drivers/xen/core/reboot.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/core/reboot.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/drivers/xen/core/reboot.c 2011-01-31 17:56:27.000000000 +0100
@@ -82,14 +82,14 @@ static int xen_suspend(void *__unused)
daemonize("suspend");
err = set_cpus_allowed(current, cpumask_of_cpu(0));
@@ -5274,8 +5276,8 @@ Acked-by: jbeulich@novell.com
return err;
}
---- head-2011-09-23.orig/drivers/xen/core/smpboot.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/drivers/xen/core/smpboot.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/core/smpboot.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/drivers/xen/core/smpboot.c 2011-01-31 17:56:27.000000000 +0100
@@ -36,31 +36,20 @@ extern void failsafe_callback(void);
extern void system_call(void);
extern void smp_trap_init(trap_info_t *);
@@ -5423,8 +5425,8 @@ Acked-by: jbeulich@novell.com
cpu_set(cpu, cpu_online_map);
---- head-2011-09-23.orig/drivers/xen/fbfront/xenfb.c 2011-02-17 10:08:20.000000000 +0100
-+++ head-2011-09-23/drivers/xen/fbfront/xenfb.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/fbfront/xenfb.c 2011-02-17 10:08:20.000000000 +0100
++++ head-2011-10-07/drivers/xen/fbfront/xenfb.c 2011-01-31 17:56:27.000000000 +0100
@@ -240,8 +240,8 @@ static void xenfb_update_screen(struct x
mutex_unlock(&info->mm_lock);
@@ -5436,8 +5438,8 @@ Acked-by: jbeulich@novell.com
WARN_ON(1);
}
xenfb_do_update(info, x1, y1, x2 - x1, y2 - y1);
---- head-2011-09-23.orig/drivers/xen/fbfront/xenkbd.c 2011-09-20 11:34:12.000000000 +0200
-+++ head-2011-09-23/drivers/xen/fbfront/xenkbd.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/fbfront/xenkbd.c 2011-10-04 15:30:07.000000000 +0200
++++ head-2011-10-07/drivers/xen/fbfront/xenkbd.c 2011-01-31 17:56:27.000000000 +0100
@@ -80,8 +80,8 @@ static irqreturn_t input_handler(int rq,
input_report_key(dev, event->key.keycode,
event->key.pressed);
@@ -5449,8 +5451,8 @@ Acked-by: jbeulich@novell.com
break;
case XENKBD_TYPE_POS:
if (event->pos.rel_z)
---- head-2011-09-23.orig/drivers/xen/gntdev/gntdev.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-23/drivers/xen/gntdev/gntdev.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/gntdev/gntdev.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/drivers/xen/gntdev/gntdev.c 2011-01-31 17:56:27.000000000 +0100
@@ -378,14 +378,14 @@ static int __init gntdev_init(void)
struct class_device *device;
@@ -5663,8 +5665,8 @@ Acked-by: jbeulich@novell.com
"IOCTL_GNTDEV_GET_OFFSET_FOR_VADDR must be at "
"the start of the VM area. vma->vm_start = "
"%#lx; vaddr = %#lx\n",
---- head-2011-09-23.orig/drivers/xen/netback/common.h 2011-04-11 14:52:16.000000000 +0200
-+++ head-2011-09-23/drivers/xen/netback/common.h 2011-04-11 15:01:09.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/netback/common.h 2011-04-11 14:52:16.000000000 +0200
++++ head-2011-10-07/drivers/xen/netback/common.h 2011-04-11 15:01:09.000000000 +0200
@@ -45,10 +45,8 @@
#define DPRINTK(_f, _a...) \
pr_debug("(file=%s, line=%d) " _f, \
@@ -5678,8 +5680,8 @@ Acked-by: jbeulich@novell.com
typedef struct netif_st {
/* Unique identifier for this interface. */
---- head-2011-09-23.orig/drivers/xen/netback/interface.c 2011-04-11 14:38:22.000000000 +0200
-+++ head-2011-09-23/drivers/xen/netback/interface.c 2011-04-11 15:01:11.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/netback/interface.c 2011-04-11 14:38:22.000000000 +0200
++++ head-2011-10-07/drivers/xen/netback/interface.c 2011-04-11 15:01:11.000000000 +0200
@@ -175,9 +175,13 @@ static const struct netif_stat {
{ "rx_gso_csum_fixups", offsetof(netif_t, rx_gso_csum_fixups) / sizeof(long) },
};
@@ -5705,8 +5707,8 @@ Acked-by: jbeulich@novell.com
.get_ethtool_stats = netbk_get_ethtool_stats,
.get_strings = netbk_get_strings,
};
---- head-2011-09-23.orig/drivers/xen/netback/netback.c 2011-04-11 14:38:25.000000000 +0200
-+++ head-2011-09-23/drivers/xen/netback/netback.c 2011-04-11 15:01:12.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/netback/netback.c 2011-04-11 14:38:25.000000000 +0200
++++ head-2011-10-07/drivers/xen/netback/netback.c 2011-04-11 15:01:12.000000000 +0200
@@ -364,8 +364,8 @@ static void xen_network_done_notify(void
{
static struct net_device *eth0_dev = NULL;
@@ -5772,8 +5774,8 @@ Acked-by: jbeulich@novell.com
return -ENOMEM;
}
---- head-2011-09-23.orig/drivers/xen/netback/xenbus.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/drivers/xen/netback/xenbus.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/netback/xenbus.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/drivers/xen/netback/xenbus.c 2011-01-31 17:56:27.000000000 +0100
@@ -163,11 +163,9 @@ fail:
* and vif variables to the environment, for the benefit of the vif-* hotplug
* scripts.
@@ -5824,8 +5826,8 @@ Acked-by: jbeulich@novell.com
xenbus_switch_state(dev, XenbusStateInitWait);
}
break;
---- head-2011-09-23.orig/drivers/xen/netfront/accel.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/drivers/xen/netfront/accel.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/netfront/accel.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/drivers/xen/netfront/accel.c 2011-01-31 17:56:27.000000000 +0100
@@ -40,10 +40,8 @@
#define DPRINTK(fmt, args...) \
pr_debug("netfront/accel (%s:%d) " fmt, \
@@ -5875,8 +5877,8 @@ Acked-by: jbeulich@novell.com
}
---- head-2011-09-23.orig/drivers/xen/netfront/netfront.c 2011-06-30 16:06:26.000000000 +0200
-+++ head-2011-09-23/drivers/xen/netfront/netfront.c 2011-09-09 09:31:31.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/netfront/netfront.c 2011-06-30 16:06:26.000000000 +0200
++++ head-2011-10-07/drivers/xen/netfront/netfront.c 2011-09-09 09:31:31.000000000 +0200
@@ -207,10 +207,8 @@ static inline grant_ref_t xennet_get_rx_
#define DPRINTK(fmt, args...) \
pr_debug("netfront (%s:%d) " fmt, \
@@ -6109,8 +6111,8 @@ Acked-by: jbeulich@novell.com
SET_NETDEV_DEV(netdev, &dev->dev);
np->netdev = netdev;
---- head-2011-09-23.orig/drivers/xen/netfront/netfront.h 2011-02-09 15:54:19.000000000 +0100
-+++ head-2011-09-23/drivers/xen/netfront/netfront.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/netfront/netfront.h 2011-02-09 15:54:19.000000000 +0100
++++ head-2011-10-07/drivers/xen/netfront/netfront.h 2011-01-31 17:56:27.000000000 +0100
@@ -155,6 +155,8 @@ struct netfront_info {
spinlock_t tx_lock;
spinlock_t rx_lock;
@@ -6120,8 +6122,8 @@ Acked-by: jbeulich@novell.com
unsigned int irq;
unsigned int copying_receiver;
unsigned int carrier;
---- head-2011-09-23.orig/drivers/xen/xen-pciback/slot.c 2009-03-18 10:39:32.000000000 +0100
-+++ head-2011-09-23/drivers/xen/xen-pciback/slot.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/xen-pciback/slot.c 2009-03-18 10:39:32.000000000 +0100
++++ head-2011-10-07/drivers/xen/xen-pciback/slot.c 2011-01-31 17:56:27.000000000 +0100
@@ -64,9 +64,9 @@ int pciback_add_pci_dev(struct pciback_d
for (bus = 0; bus < PCI_BUS_NBR; bus++)
for (slot = 0; slot < PCI_SLOT_MAX; slot++) {
@@ -6135,8 +6137,8 @@ Acked-by: jbeulich@novell.com
slot_dev->slots[bus][slot] = dev;
goto unlock;
}
---- head-2011-09-23.orig/drivers/xen/pcifront/Makefile 2007-06-12 13:13:45.000000000 +0200
-+++ head-2011-09-23/drivers/xen/pcifront/Makefile 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/pcifront/Makefile 2007-06-12 13:13:45.000000000 +0200
++++ head-2011-10-07/drivers/xen/pcifront/Makefile 2011-01-31 17:56:27.000000000 +0100
@@ -2,6 +2,4 @@ obj-y += pcifront.o
pcifront-y := pci_op.o xenbus.o pci.o
@@ -6145,8 +6147,8 @@ Acked-by: jbeulich@novell.com
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_XEN_PCIDEV_FE_DEBUG) += -DDEBUG
---- head-2011-09-23.orig/drivers/xen/pcifront/pci_op.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-09-23/drivers/xen/pcifront/pci_op.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/pcifront/pci_op.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-10-07/drivers/xen/pcifront/pci_op.c 2011-01-31 17:56:27.000000000 +0100
@@ -67,7 +67,7 @@ static void pcifront_init_sd(struct pcif
return; /* No resources, nothing to do */
@@ -6230,8 +6232,8 @@ Acked-by: jbeulich@novell.com
}
#endif /* CONFIG_PCI_MSI */
---- head-2011-09-23.orig/drivers/xen/scsiback/emulate.c 2011-09-22 14:33:35.000000000 +0200
-+++ head-2011-09-23/drivers/xen/scsiback/emulate.c 2011-09-23 09:47:00.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/scsiback/emulate.c 2011-09-22 14:33:35.000000000 +0200
++++ head-2011-10-07/drivers/xen/scsiback/emulate.c 2011-09-23 09:47:00.000000000 +0200
@@ -114,9 +114,10 @@ static void resp_not_supported_cmd(pendi
}
@@ -6335,8 +6337,8 @@ Acked-by: jbeulich@novell.com
goto fail;
}
---- head-2011-09-23.orig/drivers/xen/scsiback/interface.c 2011-04-11 14:52:22.000000000 +0200
-+++ head-2011-09-23/drivers/xen/scsiback/interface.c 2011-04-11 15:00:59.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/scsiback/interface.c 2011-04-11 14:52:22.000000000 +0200
++++ head-2011-10-07/drivers/xen/scsiback/interface.c 2011-04-11 15:00:59.000000000 +0200
@@ -68,7 +68,7 @@ int scsiback_init_sring(struct vscsibk_i
int err;
@@ -6355,8 +6357,8 @@ Acked-by: jbeulich@novell.com
return -ENOMEM;
}
---- head-2011-09-23.orig/drivers/xen/scsiback/scsiback.c 2011-04-11 14:30:08.000000000 +0200
-+++ head-2011-09-23/drivers/xen/scsiback/scsiback.c 2011-09-23 09:47:02.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/scsiback/scsiback.c 2011-04-11 14:30:08.000000000 +0200
++++ head-2011-10-07/drivers/xen/scsiback/scsiback.c 2011-09-23 09:47:02.000000000 +0200
@@ -204,14 +204,14 @@ static void scsiback_print_status(char *
{
struct scsi_device *sdev = pending_req->sdev;
@@ -6535,8 +6537,8 @@ Acked-by: jbeulich@novell.com
return -ENOMEM;
}
---- head-2011-09-23.orig/drivers/xen/scsiback/translate.c 2008-07-21 11:00:33.000000000 +0200
-+++ head-2011-09-23/drivers/xen/scsiback/translate.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/scsiback/translate.c 2008-07-21 11:00:33.000000000 +0200
++++ head-2011-10-07/drivers/xen/scsiback/translate.c 2011-01-31 17:56:27.000000000 +0100
@@ -62,8 +62,8 @@ int scsiback_add_translation_entry(struc
if ((entry->v.chn == v->chn) &&
(entry->v.tgt == v->tgt) &&
@@ -6557,8 +6559,8 @@ Acked-by: jbeulich@novell.com
err = -ENOMEM;
goto out;
}
---- head-2011-09-23.orig/drivers/xen/scsiback/xenbus.c 2011-06-30 16:05:16.000000000 +0200
-+++ head-2011-09-23/drivers/xen/scsiback/xenbus.c 2011-06-30 16:32:56.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/scsiback/xenbus.c 2011-06-30 16:05:16.000000000 +0200
++++ head-2011-10-07/drivers/xen/scsiback/xenbus.c 2011-06-30 16:32:56.000000000 +0200
@@ -101,14 +101,13 @@ struct scsi_device *scsiback_get_scsi_de
shost = scsi_host_lookup(phy->hst);
@@ -6616,8 +6618,8 @@ Acked-by: jbeulich@novell.com
scsiback_remove(dev);
return err;
---- head-2011-09-23.orig/drivers/xen/scsifront/scsifront.c 2011-02-08 10:03:55.000000000 +0100
-+++ head-2011-09-23/drivers/xen/scsifront/scsifront.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/scsifront/scsifront.c 2011-02-08 10:03:55.000000000 +0100
++++ head-2011-10-07/drivers/xen/scsifront/scsifront.c 2011-01-31 17:56:27.000000000 +0100
@@ -118,8 +118,8 @@ static void scsifront_gnttab_done(struct
for (i = 0; i < s->nr_segments; i++) {
if (unlikely(gnttab_query_foreign_access(
@@ -6698,8 +6700,8 @@ Acked-by: jbeulich@novell.com
off = 0;
ref_cnt++;
}
---- head-2011-09-23.orig/drivers/xen/scsifront/xenbus.c 2011-02-08 10:03:46.000000000 +0100
-+++ head-2011-09-23/drivers/xen/scsifront/xenbus.c 2011-02-08 10:04:06.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/scsifront/xenbus.c 2011-02-08 10:03:46.000000000 +0100
++++ head-2011-10-07/drivers/xen/scsifront/xenbus.c 2011-02-08 10:04:06.000000000 +0100
@@ -215,7 +215,7 @@ static int scsifront_probe(struct xenbus
if (IS_ERR(info->kthread)) {
err = PTR_ERR(info->kthread);
@@ -6727,8 +6729,8 @@ Acked-by: jbeulich@novell.com
scsi_device_put(sdev);
xenbus_printf(XBT_NIL, dev->nodename,
state_str, "%d", XenbusStateClosed);
---- head-2011-09-23.orig/drivers/xen/sfc_netback/accel_fwd.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/drivers/xen/sfc_netback/accel_fwd.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/sfc_netback/accel_fwd.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netback/accel_fwd.c 2011-01-31 17:56:27.000000000 +0100
@@ -181,10 +181,11 @@ int netback_accel_fwd_add(const __u8 *ma
unsigned long flags;
cuckoo_hash_mac_key key = cuckoo_mac_to_key(mac);
@@ -6783,8 +6785,8 @@ Acked-by: jbeulich@novell.com
spin_lock_irqsave(&fwd_set->fwd_lock, flags);
/*
---- head-2011-09-23.orig/drivers/xen/sfc_netback/accel_msg.c 2008-02-20 09:32:49.000000000 +0100
-+++ head-2011-09-23/drivers/xen/sfc_netback/accel_msg.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/sfc_netback/accel_msg.c 2008-02-20 09:32:49.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netback/accel_msg.c 2011-01-31 17:56:27.000000000 +0100
@@ -57,11 +57,11 @@ static void netback_accel_msg_tx_localma
{
unsigned long lock_state;
@@ -6799,8 +6801,8 @@ Acked-by: jbeulich@novell.com
msg = net_accel_msg_start_send(bend->shared_page, &bend->to_domU,
&lock_state);
---- head-2011-09-23.orig/drivers/xen/sfc_netfront/accel_msg.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-23/drivers/xen/sfc_netfront/accel_msg.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/sfc_netfront/accel_msg.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netfront/accel_msg.c 2011-01-31 17:56:27.000000000 +0100
@@ -41,11 +41,13 @@ static void vnic_start_interrupts(netfro
/* Prime our interrupt */
spin_lock_irqsave(&vnic->irq_enabled_lock, flags);
@@ -6881,8 +6883,8 @@ Acked-by: jbeulich@novell.com
}
else {
spin_unlock_irqrestore(&vnic->irq_enabled_lock, flags);
---- head-2011-09-23.orig/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 16:06:37.000000000 +0200
-+++ head-2011-09-23/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 16:33:02.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 16:06:37.000000000 +0200
++++ head-2011-10-07/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 16:33:02.000000000 +0200
@@ -645,8 +645,10 @@ netfront_accel_vi_tx_post(netfront_accel
(cuckoo_hash_key *)(&key), &value);
@@ -6909,8 +6911,8 @@ Acked-by: jbeulich@novell.com
if (ip->protocol == IPPROTO_TCP) {
struct tcphdr *tcp = (struct tcphdr *)
---- head-2011-09-23.orig/drivers/xen/sfc_netutil/accel_msg_iface.c 2008-02-20 09:32:49.000000000 +0100
-+++ head-2011-09-23/drivers/xen/sfc_netutil/accel_msg_iface.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/sfc_netutil/accel_msg_iface.c 2008-02-20 09:32:49.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netutil/accel_msg_iface.c 2011-01-31 17:56:27.000000000 +0100
@@ -36,7 +36,7 @@
#else
#define NET_ACCEL_CHECK_MAGIC(_p, _errval) \
@@ -6920,8 +6922,8 @@ Acked-by: jbeulich@novell.com
__FUNCTION__, _p); \
return _errval; \
}
---- head-2011-09-23.orig/drivers/xen/sfc_netutil/accel_util.h 2008-02-20 09:32:49.000000000 +0100
-+++ head-2011-09-23/drivers/xen/sfc_netutil/accel_util.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/sfc_netutil/accel_util.h 2008-02-20 09:32:49.000000000 +0100
++++ head-2011-10-07/drivers/xen/sfc_netutil/accel_util.h 2011-01-31 17:56:27.000000000 +0100
@@ -63,9 +63,6 @@
DPRINTK("%s at %s:%d\n", #exp, __FILE__, __LINE__); \
} while(0)
@@ -6932,8 +6934,8 @@ Acked-by: jbeulich@novell.com
#include <xen/xenbus.h>
/*! Map a set of pages from another domain
---- head-2011-09-23.orig/drivers/xen/tpmback/interface.c 2011-04-11 14:52:30.000000000 +0200
-+++ head-2011-09-23/drivers/xen/tpmback/interface.c 2011-04-11 15:00:49.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/tpmback/interface.c 2011-04-11 14:52:30.000000000 +0200
++++ head-2011-10-07/drivers/xen/tpmback/interface.c 2011-04-11 15:00:49.000000000 +0200
@@ -50,7 +50,7 @@ static tpmif_t *alloc_tpmif(domid_t domi
out_of_memory:
if (tpmif != NULL)
@@ -6943,8 +6945,8 @@ Acked-by: jbeulich@novell.com
return ERR_PTR(-ENOMEM);
}
---- head-2011-09-23.orig/drivers/xen/tpmback/tpmback.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-09-23/drivers/xen/tpmback/tpmback.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/tpmback/tpmback.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-10-07/drivers/xen/tpmback/tpmback.c 2011-01-31 17:56:27.000000000 +0100
@@ -908,8 +908,7 @@ static int __init tpmback_init(void)
int rc;
@@ -6964,8 +6966,8 @@ Acked-by: jbeulich@novell.com
return 0;
}
---- head-2011-09-23.orig/drivers/xen/usbback/usbback.c 2011-04-11 14:30:35.000000000 +0200
-+++ head-2011-09-23/drivers/xen/usbback/usbback.c 2011-04-11 15:00:38.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/usbback/usbback.c 2011-04-11 14:30:35.000000000 +0200
++++ head-2011-10-07/drivers/xen/usbback/usbback.c 2011-04-11 15:00:38.000000000 +0200
@@ -88,6 +88,8 @@ typedef struct {
static pending_req_t *pending_reqs;
static struct list_head pending_free;
@@ -7105,8 +7107,8 @@ Acked-by: jbeulich@novell.com
usbif->xenusbd = NULL;
usbif_put(usbif);
---- head-2011-09-23.orig/drivers/xen/usbback/usbstub.c 2011-03-11 10:54:35.000000000 +0100
-+++ head-2011-09-23/drivers/xen/usbback/usbstub.c 2011-03-11 10:55:46.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/usbback/usbstub.c 2011-03-11 10:54:35.000000000 +0100
++++ head-2011-10-07/drivers/xen/usbback/usbstub.c 2011-03-11 10:55:46.000000000 +0100
@@ -150,7 +150,7 @@ static struct usbstub *usbstub_alloc(str
stub = kzalloc(sizeof(*stub), GFP_KERNEL);
@@ -7125,8 +7127,8 @@ Acked-by: jbeulich@novell.com
goto out;
}
---- head-2011-09-23.orig/drivers/xen/usbback/xenbus.c 2011-06-30 16:05:31.000000000 +0200
-+++ head-2011-09-23/drivers/xen/usbback/xenbus.c 2011-06-30 16:33:08.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/usbback/xenbus.c 2011-06-30 16:05:31.000000000 +0200
++++ head-2011-10-07/drivers/xen/usbback/xenbus.c 2011-06-30 16:33:08.000000000 +0200
@@ -240,9 +240,9 @@ static int connect_rings(usbif_t *usbif)
return err;
}
@@ -7151,8 +7153,8 @@ Acked-by: jbeulich@novell.com
xenbus_switch_state(dev, XenbusStateInitWait);
}
break;
---- head-2011-09-23.orig/drivers/xen/usbfront/usbfront.h 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-23/drivers/xen/usbfront/usbfront.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/usbfront/usbfront.h 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/drivers/xen/usbfront/usbfront.h 2011-01-31 17:56:27.000000000 +0100
@@ -82,6 +82,7 @@ struct urb_priv {
struct urb *urb;
int req_id; /* RING_REQUEST id for submitting */
@@ -7161,8 +7163,8 @@ Acked-by: jbeulich@novell.com
unsigned unlinked:1; /* dequeued marker */
};
---- head-2011-09-23.orig/drivers/xen/usbfront/usbfront-dbg.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-23/drivers/xen/usbfront/usbfront-dbg.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/usbfront/usbfront-dbg.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/drivers/xen/usbfront/usbfront-dbg.c 2011-01-31 17:56:27.000000000 +0100
@@ -91,8 +91,8 @@ static inline void create_debug_file(str
{
struct class_device *cldev = info_to_hcd(info)->self.class_dev;
@@ -7174,8 +7176,8 @@ Acked-by: jbeulich@novell.com
}
static inline void remove_debug_file(struct usbfront_info *info)
---- head-2011-09-23.orig/drivers/xen/usbfront/usbfront-hcd.c 2009-10-15 11:45:41.000000000 +0200
-+++ head-2011-09-23/drivers/xen/usbfront/usbfront-hcd.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/usbfront/usbfront-hcd.c 2009-10-15 11:45:41.000000000 +0200
++++ head-2011-10-07/drivers/xen/usbfront/usbfront-hcd.c 2011-01-31 17:56:27.000000000 +0100
@@ -114,7 +114,6 @@ static void xenhcd_stop(struct usb_hcd *
* non-error returns are promise to giveback the urb later
*/
@@ -7209,8 +7211,8 @@ Acked-by: jbeulich@novell.com
ret = xenhcd_unlink_urb(info, urbp);
done:
---- head-2011-09-23.orig/drivers/xen/usbfront/usbfront-q.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-23/drivers/xen/usbfront/usbfront-q.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/usbfront/usbfront-q.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/drivers/xen/usbfront/usbfront-q.c 2011-01-31 17:56:27.000000000 +0100
@@ -151,7 +151,7 @@ static int map_urb_for_request(struct us
ret = gnttab_alloc_grant_references(USBIF_MAX_SEGMENTS_PER_REQUEST, &gref_head);
@@ -7230,8 +7232,8 @@ Acked-by: jbeulich@novell.com
spin_lock(&info->lock);
}
---- head-2011-09-23.orig/drivers/xen/usbfront/xenbus.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/drivers/xen/usbfront/xenbus.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/usbfront/xenbus.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/drivers/xen/usbfront/xenbus.c 2011-01-31 17:56:27.000000000 +0100
@@ -395,7 +395,7 @@ static int __init usbfront_init(void)
xenhcd_urbp_cachep = kmem_cache_create("xenhcd_urb_priv",
sizeof(struct urb_priv), 0, 0, NULL);
@@ -7241,8 +7243,8 @@ Acked-by: jbeulich@novell.com
return -ENOMEM;
}
---- head-2011-09-23.orig/drivers/xen/util.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/drivers/xen/util.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/util.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/drivers/xen/util.c 2011-01-31 17:56:27.000000000 +0100
@@ -11,7 +11,7 @@ struct class *get_xen_class(void)
xen_class = class_create(THIS_MODULE, "xen");
@@ -7252,8 +7254,8 @@ Acked-by: jbeulich@novell.com
xen_class = NULL;
}
---- head-2011-09-23.orig/drivers/xen/xenbus/xenbus_comms.c 2011-04-11 14:52:53.000000000 +0200
-+++ head-2011-09-23/drivers/xen/xenbus/xenbus_comms.c 2011-04-11 15:00:27.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/xenbus/xenbus_comms.c 2011-04-11 14:52:53.000000000 +0200
++++ head-2011-10-07/drivers/xen/xenbus/xenbus_comms.c 2011-04-11 15:00:27.000000000 +0200
@@ -238,13 +238,13 @@ int xb_init_comms(void)
int err;
@@ -7281,8 +7283,8 @@ Acked-by: jbeulich@novell.com
return err;
}
---- head-2011-09-23.orig/drivers/xen/xenbus/xenbus_probe.c 2011-06-30 16:10:35.000000000 +0200
-+++ head-2011-09-23/drivers/xen/xenbus/xenbus_probe.c 2011-06-30 16:33:16.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/xenbus/xenbus_probe.c 2011-10-07 11:21:32.000000000 +0200
++++ head-2011-10-07/drivers/xen/xenbus/xenbus_probe.c 2011-10-07 11:27:58.000000000 +0200
@@ -112,13 +112,13 @@ static int frontend_bus_id(char bus_id[X
{
nodename = strchr(nodename, '/');
@@ -7386,34 +7388,34 @@ Acked-by: jbeulich@novell.com
return err;
}
-@@ -897,7 +888,7 @@ static void xenbus_reset_state_changed(s
- {
- if (xenbus_scanf(XBT_NIL, v[XS_WATCH_PATH], "", "%i", &be_state) != 1)
- be_state = XenbusStateUnknown;
-- printk(KERN_INFO "XENBUS: %s %s\n", v[XS_WATCH_PATH], xenbus_strstate(be_state));
-+ pr_info("XENBUS: %s %s\n", v[XS_WATCH_PATH], xenbus_strstate(be_state));
- wake_up(&be_state_wq);
+@@ -909,7 +900,7 @@ static void xenbus_reset_wait_for_backen
+ timeout = wait_event_interruptible_timeout(backend_state_wq,
+ backend_state == expected, 5 * HZ);
+ if (timeout <= 0)
+- printk(KERN_INFO "XENBUS: backend %s timed out.\n", be);
++ pr_info("XENBUS: backend %s timed out.\n", be);
}
-@@ -918,7 +909,7 @@ static void xenbus_reset_frontend_state(
- watch.callback = xenbus_reset_state_changed;
- be_state = XenbusStateUnknown;
+ /*
+@@ -932,7 +923,7 @@ static void xenbus_reset_frontend(char *
+ be_watch.callback = xenbus_reset_backend_state_changed;
+ backend_state = XenbusStateUnknown;
-- printk(KERN_INFO "XENBUS: triggering reconnect on %s\n", backend);
-+ pr_info("XENBUS: triggering reconnect on %s\n", backend);
- register_xenbus_watch(&watch);
+- printk(KERN_INFO "XENBUS: triggering reconnect on %s\n", be);
++ pr_info("XENBUS: triggering reconnect on %s\n", be);
+ register_xenbus_watch(&be_watch);
- xenbus_printf(XBT_NIL, frontend, "state", "%d", XenbusStateClosing);
-@@ -931,7 +922,7 @@ static void xenbus_reset_frontend_state(
- wait_event_interruptible(be_state_wq, xenbus_reset_check_final(&be_state));
+ /* fall through to forward backend to state XenbusStateInitialising */
+@@ -951,7 +942,7 @@ static void xenbus_reset_frontend(char *
+ }
- unregister_xenbus_watch(&watch);
-- printk(KERN_INFO "XENBUS: reconnect done on %s\n", backend);
-+ pr_info("XENBUS: reconnect done on %s\n", backend);
- kfree(watch.node);
+ unregister_xenbus_watch(&be_watch);
+- printk(KERN_INFO "XENBUS: reconnect done on %s\n", be);
++ pr_info("XENBUS: reconnect done on %s\n", be);
+ kfree(be_watch.node);
}
-@@ -1112,9 +1103,8 @@ int xenbus_conn(domid_t remote_dom, gran
+@@ -1140,9 +1131,8 @@ int xenbus_conn(domid_t remote_dom, gran
fail1:
rc2 = xb_free_port(xen_store_evtchn);
if (rc2 != 0)
@@ -7425,7 +7427,7 @@ Acked-by: jbeulich@novell.com
fail0:
xen_store_evtchn = -1;
return rc;
-@@ -1143,9 +1133,8 @@ xenbus_probe_init(void)
+@@ -1171,9 +1161,8 @@ xenbus_probe_init(void)
/* Register ourselves with the kernel bus subsystem */
xenbus_frontend.error = bus_register(&xenbus_frontend.bus);
if (xenbus_frontend.error)
@@ -7437,7 +7439,7 @@ Acked-by: jbeulich@novell.com
xenbus_backend_bus_register();
/*
-@@ -1220,8 +1209,8 @@ xenbus_probe_init(void)
+@@ -1248,8 +1237,8 @@ xenbus_probe_init(void)
/* Initialize the interface to xenstore. */
err = xs_init();
if (err) {
@@ -7448,7 +7450,7 @@ Acked-by: jbeulich@novell.com
goto err;
}
-@@ -1231,9 +1220,8 @@ xenbus_probe_init(void)
+@@ -1259,9 +1248,8 @@ xenbus_probe_init(void)
xenbus_frontend.error = device_register(&xenbus_frontend.dev);
if (xenbus_frontend.error) {
bus_unregister(&xenbus_frontend.bus);
@@ -7460,7 +7462,7 @@ Acked-by: jbeulich@novell.com
}
}
#endif
-@@ -1315,8 +1303,8 @@ static int print_device_status(struct de
+@@ -1343,8 +1331,8 @@ static int print_device_status(struct de
if (!dev->driver) {
/* Information only: is this too noisy? */
@@ -7471,7 +7473,7 @@ Acked-by: jbeulich@novell.com
return 0;
}
-@@ -1324,15 +1312,15 @@ static int print_device_status(struct de
+@@ -1352,15 +1340,15 @@ static int print_device_status(struct de
enum xenbus_state rstate = XenbusStateUnknown;
if (xendev->otherend)
rstate = xenbus_read_driver_state(xendev->otherend);
@@ -7492,7 +7494,7 @@ Acked-by: jbeulich@novell.com
return 0;
}
-@@ -1366,8 +1354,8 @@ static void wait_for_devices(struct xenb
+@@ -1394,8 +1382,8 @@ static void wait_for_devices(struct xenb
while (exists_connecting_device(drv)) {
if (time_after(jiffies, start + (seconds_waited+5)*HZ)) {
if (!seconds_waited)
@@ -7503,8 +7505,8 @@ Acked-by: jbeulich@novell.com
seconds_waited += 5;
printk("%us...", 300 - seconds_waited);
if (seconds_waited == 300)
---- head-2011-09-23.orig/drivers/xen/xenbus/xenbus_probe_backend.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/drivers/xen/xenbus/xenbus_probe_backend.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/xenbus/xenbus_probe_backend.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/drivers/xen/xenbus/xenbus_probe_backend.c 2011-01-31 17:56:27.000000000 +0100
@@ -60,8 +60,7 @@
#include <xen/platform-compat.h>
#endif
@@ -7586,8 +7588,8 @@ Acked-by: jbeulich@novell.com
}
}
---- head-2011-09-23.orig/drivers/xen/xenbus/xenbus_xs.c 2011-06-30 16:10:38.000000000 +0200
-+++ head-2011-09-23/drivers/xen/xenbus/xenbus_xs.c 2011-06-30 16:33:20.000000000 +0200
+--- head-2011-10-07.orig/drivers/xen/xenbus/xenbus_xs.c 2011-10-07 11:21:33.000000000 +0200
++++ head-2011-10-07/drivers/xen/xenbus/xenbus_xs.c 2011-10-07 11:27:59.000000000 +0200
@@ -135,9 +135,8 @@ static int get_error(const char *errorst
for (i = 0; strcmp(errorstring, xsd_errors[i].errstring) != 0; i++) {
@@ -7613,7 +7615,7 @@ Acked-by: jbeulich@novell.com
kfree(ret);
return ERR_PTR(-EINVAL);
}
-@@ -676,9 +675,8 @@ void unregister_xenbus_watch(struct xenb
+@@ -686,9 +685,8 @@ void unregister_xenbus_watch(struct xenb
err = xs_unwatch(watch->node, token);
if (err)
@@ -7625,7 +7627,7 @@ Acked-by: jbeulich@novell.com
up_read(&xs_state.watch_mutex);
-@@ -908,8 +906,8 @@ static int xenbus_thread(void *unused)
+@@ -918,8 +916,8 @@ static int xenbus_thread(void *unused)
for (;;) {
err = process_msg();
if (err)
@@ -7636,8 +7638,8 @@ Acked-by: jbeulich@novell.com
if (kthread_should_stop())
break;
}
---- head-2011-09-23.orig/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 17:56:27.000000000 +0100
@@ -28,7 +28,6 @@
#include <xen/xenoprof.h>
#include <xen/interface/xen.h>
@@ -7667,8 +7669,8 @@ Acked-by: jbeulich@novell.com
return ret;
}
---- head-2011-09-23.orig/arch/x86/include/asm/acpi.h 2011-06-30 15:41:07.000000000 +0200
-+++ head-2011-09-23/arch/x86/include/asm/acpi.h 2011-08-23 14:04:36.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/include/asm/acpi.h 2011-06-30 15:41:07.000000000 +0200
++++ head-2011-10-07/arch/x86/include/asm/acpi.h 2011-08-23 14:04:36.000000000 +0200
@@ -31,7 +31,7 @@
#include <asm/mpspec.h>
#include <asm/trampoline.h>
@@ -7711,8 +7713,8 @@ Acked-by: jbeulich@novell.com
return max_cstate;
}
---- head-2011-09-23.orig/arch/x86/include/mach-xen/asm/agp.h 2007-06-22 09:08:06.000000000 +0200
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/agp.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/agp.h 2007-06-22 09:08:06.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/agp.h 2011-01-31 17:56:27.000000000 +0100
@@ -1,20 +1,22 @@
-#ifndef AGP_H
-#define AGP_H 1
@@ -7762,15 +7764,15 @@ Acked-by: jbeulich@novell.com
/* Convert a physical address to an address suitable for the GART. */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/desc.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/desc.h 2011-01-31 17:56:27.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "desc_32.h"
+#else
+# include "desc_64.h"
+#endif
---- head-2011-09-23.orig/arch/x86/include/mach-xen/asm/desc_64.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/desc_64.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/desc_64.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/desc_64.h 2011-01-31 17:56:27.000000000 +0100
@@ -34,6 +34,18 @@ static inline void clear_LDT(void)
put_cpu();
}
@@ -7827,7 +7829,7 @@ Acked-by: jbeulich@novell.com
static inline void set_tssldt_descriptor(void *ptr, unsigned long tss, unsigned type,
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/dma-mapping.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/dma-mapping.h 2011-01-31 17:56:27.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "dma-mapping_32.h"
@@ -7835,7 +7837,7 @@ Acked-by: jbeulich@novell.com
+# include "dma-mapping_64.h"
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/fixmap.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/fixmap.h 2011-01-31 17:56:27.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "fixmap_32.h"
@@ -7843,7 +7845,7 @@ Acked-by: jbeulich@novell.com
+# include "fixmap_64.h"
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/hypercall.h 2011-08-23 13:29:27.000000000 +0200
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/hypercall.h 2011-08-23 13:29:27.000000000 +0200
@@ -0,0 +1,429 @@
+/******************************************************************************
+ * hypercall.h
@@ -8274,8 +8276,8 @@ Acked-by: jbeulich@novell.com
+}
+
+#endif /* __HYPERCALL_H__ */
---- head-2011-09-23.orig/arch/x86/include/mach-xen/asm/hypercall_32.h 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/hypercall_32.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/hypercall_32.h 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/hypercall_32.h 2011-01-31 17:56:27.000000000 +0100
@@ -1,191 +1,10 @@
-/******************************************************************************
- * hypercall.h
@@ -8717,8 +8719,8 @@ Acked-by: jbeulich@novell.com
-
-
-#endif /* __HYPERCALL_H__ */
---- head-2011-09-23.orig/arch/x86/include/mach-xen/asm/hypercall_64.h 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/hypercall_64.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/hypercall_64.h 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/hypercall_64.h 2011-01-31 17:56:27.000000000 +0100
@@ -1,198 +1,10 @@
-/******************************************************************************
- * hypercall.h
@@ -9170,8 +9172,8 @@ Acked-by: jbeulich@novell.com
-}
-
-#endif /* __HYPERCALL_H__ */
---- head-2011-09-23.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/hypervisor.h 2011-08-23 13:27:38.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/hypervisor.h 2011-08-23 13:27:38.000000000 +0200
@@ -38,12 +38,7 @@
#include <linux/version.h>
#include <linux/errno.h>
@@ -9194,7 +9196,7 @@ Acked-by: jbeulich@novell.com
#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/io.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/io.h 2011-01-31 17:56:27.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "io_32.h"
@@ -9202,15 +9204,15 @@ Acked-by: jbeulich@novell.com
+# include "io_64.h"
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/irqflags.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/irqflags.h 2011-01-31 17:56:27.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "irqflags_32.h"
+#else
+# include "irqflags_64.h"
+#endif
---- head-2011-09-23.orig/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:56:27.000000000 +0100
@@ -150,6 +150,23 @@ static inline int raw_irqs_disabled_flag
\
raw_irqs_disabled_flags(flags); \
@@ -9253,8 +9255,8 @@ Acked-by: jbeulich@novell.com
+#endif
+
#endif
---- head-2011-09-23.orig/arch/x86/include/mach-xen/asm/irqflags_64.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/irqflags_64.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/irqflags_64.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/irqflags_64.h 2011-01-31 17:56:27.000000000 +0100
@@ -116,6 +116,22 @@ static inline int raw_irqs_disabled_flag
})
@@ -9300,7 +9302,7 @@ Acked-by: jbeulich@novell.com
#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/maddr.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/maddr.h 2011-01-31 17:56:27.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "maddr_32.h"
@@ -9308,7 +9310,7 @@ Acked-by: jbeulich@novell.com
+# include "maddr_64.h"
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/mmu_context.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/mmu_context.h 2011-01-31 17:56:27.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "mmu_context_32.h"
@@ -9316,7 +9318,7 @@ Acked-by: jbeulich@novell.com
+# include "mmu_context_64.h"
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/pci.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/pci.h 2011-01-31 17:56:27.000000000 +0100
@@ -0,0 +1,100 @@
+#ifndef __x86_PCI_H
+#define __x86_PCI_H
@@ -9419,15 +9421,15 @@ Acked-by: jbeulich@novell.com
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/pgalloc.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/pgalloc.h 2011-01-31 17:56:27.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "pgalloc_32.h"
+#else
+# include "pgalloc_64.h"
+#endif
---- head-2011-09-23.orig/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 17:56:27.000000000 +0100
@@ -115,6 +115,8 @@ static inline void pgd_list_del(pgd_t *p
spin_unlock(&pgd_lock);
}
@@ -9477,15 +9479,15 @@ Acked-by: jbeulich@novell.com
}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/pgtable.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/pgtable.h 2011-01-31 17:56:27.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "pgtable_32.h"
+#else
+# include "pgtable_64.h"
+#endif
---- head-2011-09-23.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:38:23.000000000 +0100
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:38:23.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-01-31 17:56:27.000000000 +0100
@@ -17,10 +17,7 @@
#include <asm/fixmap.h>
#include <linux/threads.h>
@@ -9507,8 +9509,8 @@ Acked-by: jbeulich@novell.com
void pgtable_cache_init(void);
void paging_init(void);
---- head-2011-09-23.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-02-07 15:38:18.000000000 +0100
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-02-07 15:38:18.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-01-31 17:56:27.000000000 +0100
@@ -9,7 +9,7 @@
* the x86-64 page table tree.
*/
@@ -9527,15 +9529,15 @@ Acked-by: jbeulich@novell.com
#define MODULES_END _AC(0xffffffffff000000, UL)
#define MODULES_LEN (MODULES_END - MODULES_VADDR)
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/processor.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/processor.h 2011-01-31 17:56:27.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "processor_32.h"
+#else
+# include "processor_64.h"
+#endif
---- head-2011-09-23.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:56:27.000000000 +0100
@@ -70,17 +70,22 @@ struct cpuinfo_x86 {
char pad0;
int x86_power;
@@ -9644,8 +9646,8 @@ Acked-by: jbeulich@novell.com
#else
#define ASM_NOP1 GENERIC_NOP1
#define ASM_NOP2 GENERIC_NOP2
---- head-2011-09-23.orig/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:56:27.000000000 +0100
@@ -62,19 +62,26 @@ struct cpuinfo_x86 {
int x86_cache_alignment;
int x86_tlbsize; /* number of 4K pages in DTLB/ITLB combined(in pages)*/
@@ -9761,15 +9763,15 @@ Acked-by: jbeulich@novell.com
unsigned long edx)
{
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/smp.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/smp.h 2011-01-31 17:56:27.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "smp_32.h"
+#else
+# include "smp_64.h"
+#endif
---- head-2011-09-23.orig/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:56:27.000000000 +0100
@@ -11,7 +11,7 @@
#endif
@@ -9814,8 +9816,8 @@ Acked-by: jbeulich@novell.com
#define NO_PROC_ID 0xFF /* No processor magic marker */
---- head-2011-09-23.orig/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:56:27.000000000 +0100
@@ -38,12 +38,11 @@ extern void smp_alloc_memory(void);
extern volatile unsigned long smp_invalidate_needed;
extern void lock_ipi_call_lock(void);
@@ -9875,7 +9877,7 @@ Acked-by: jbeulich@novell.com
#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/swiotlb.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/swiotlb.h 2011-01-31 17:56:27.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "swiotlb_32.h"
@@ -9883,15 +9885,15 @@ Acked-by: jbeulich@novell.com
+# include_next <asm/swiotlb.h>
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/system.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/system.h 2011-01-31 17:56:27.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "system_32.h"
+#else
+# include "system_64.h"
+#endif
---- head-2011-09-23.orig/arch/x86/include/mach-xen/asm/system_32.h 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/system_32.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/system_32.h 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/system_32.h 2011-01-31 17:56:27.000000000 +0100
@@ -9,6 +9,7 @@
#include <asm/hypervisor.h>
@@ -9964,8 +9966,8 @@ Acked-by: jbeulich@novell.com
+void __show_registers(struct pt_regs *, int all);
#endif
---- head-2011-09-23.orig/arch/x86/include/mach-xen/asm/system_64.h 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/system_64.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/system_64.h 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/system_64.h 2011-01-31 17:56:27.000000000 +0100
@@ -11,8 +11,12 @@
#ifdef __KERNEL__
@@ -10034,15 +10036,15 @@ Acked-by: jbeulich@novell.com
#define set_mb(var, value) do { (void) xchg(&var, value); } while (0)
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/tlbflush.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/tlbflush.h 2011-01-31 17:56:27.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "tlbflush_32.h"
+#else
+# include "tlbflush_64.h"
+#endif
---- head-2011-09-23.orig/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:56:27.000000000 +0100
@@ -23,7 +23,6 @@
* - flush_tlb_page(vma, vmaddr) flushes one page
* - flush_tlb_range(vma, start, end) flushes a range of pages
@@ -10062,8 +10064,8 @@ Acked-by: jbeulich@novell.com
-}
-
#endif /* _I386_TLBFLUSH_H */
---- head-2011-09-23.orig/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:56:27.000000000 +0100
@@ -28,7 +28,6 @@
* - flush_tlb_page(vma, vmaddr) flushes one page
* - flush_tlb_range(vma, start, end) flushes a range of pages
@@ -10086,15 +10088,15 @@ Acked-by: jbeulich@novell.com
-
#endif /* _X8664_TLBFLUSH_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-09-23/arch/x86/include/mach-xen/asm/xor.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-10-07/arch/x86/include/mach-xen/asm/xor.h 2011-01-31 17:56:27.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "../../xor_32.h"
+#else
+# include "xor_64.h"
+#endif
---- head-2011-09-23.orig/arch/x86/include/asm/mmu.h 2011-09-23 09:35:34.000000000 +0200
-+++ head-2011-09-23/arch/x86/include/asm/mmu.h 2011-06-30 16:30:20.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/include/asm/mmu.h 2011-10-07 11:27:28.000000000 +0200
++++ head-2011-10-07/arch/x86/include/asm/mmu.h 2011-06-30 16:30:20.000000000 +0200
@@ -16,6 +16,9 @@ typedef struct {
/* True if mm supports a task running in 32 bit compatibility mode. */
unsigned short ia32_compat;
@@ -10105,8 +10107,8 @@ Acked-by: jbeulich@novell.com
struct mutex lock;
void *vdso;
---- head-2011-09-23.orig/include/linux/kexec.h 2011-04-13 11:25:29.000000000 +0200
-+++ head-2011-09-23/include/linux/kexec.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/include/linux/kexec.h 2011-04-13 11:25:29.000000000 +0200
++++ head-2011-10-07/include/linux/kexec.h 2011-01-31 17:56:27.000000000 +0100
@@ -205,8 +205,15 @@ extern struct kimage *kexec_crash_image;
#define VMCOREINFO_BYTES (4096)
#define VMCOREINFO_NOTE_NAME "VMCOREINFO"
@@ -10123,8 +10125,8 @@ Acked-by: jbeulich@novell.com
/* Location of a reserved region to hold the crash kernel.
*/
---- head-2011-09-23.orig/include/linux/oprofile.h 2011-09-07 15:19:35.000000000 +0200
-+++ head-2011-09-23/include/linux/oprofile.h 2011-04-13 12:44:12.000000000 +0200
+--- head-2011-10-07.orig/include/linux/oprofile.h 2011-09-07 15:19:35.000000000 +0200
++++ head-2011-10-07/include/linux/oprofile.h 2011-04-13 12:44:12.000000000 +0200
@@ -130,6 +130,8 @@ void oprofile_add_ext_hw_sample(unsigned
* backtrace. */
void oprofile_add_pc(unsigned long pc, int is_kernel, unsigned long event);
@@ -10134,8 +10136,8 @@ Acked-by: jbeulich@novell.com
/* add a backtrace entry, to be called from the ->backtrace callback */
void oprofile_add_trace(unsigned long eip);
---- head-2011-09-23.orig/include/linux/sysctl.h 2011-09-23 09:35:34.000000000 +0200
-+++ head-2011-09-23/include/linux/sysctl.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/include/linux/sysctl.h 2011-10-07 11:27:28.000000000 +0200
++++ head-2011-10-07/include/linux/sysctl.h 2011-01-31 17:56:27.000000000 +0100
@@ -59,6 +59,7 @@ enum
CTL_BUS=8, /* Busses */
CTL_ABI=9, /* Binary emulation */
@@ -10144,8 +10146,8 @@ Acked-by: jbeulich@novell.com
CTL_ARLAN=254, /* arlan wireless driver */
CTL_S390DBF=5677, /* s390 debug */
CTL_SUNRPC=7249, /* sunrpc debug */
---- head-2011-09-23.orig/include/xen/cpu_hotplug.h 2007-08-16 18:07:01.000000000 +0200
-+++ head-2011-09-23/include/xen/cpu_hotplug.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/include/xen/cpu_hotplug.h 2007-08-16 18:07:01.000000000 +0200
++++ head-2011-10-07/include/xen/cpu_hotplug.h 2011-01-31 17:56:27.000000000 +0100
@@ -25,8 +25,8 @@ void cpu_bringup(void);
static inline int smp_suspend(void)
{
@@ -10157,8 +10159,8 @@ Acked-by: jbeulich@novell.com
return -EOPNOTSUPP;
}
return 0;
---- head-2011-09-23.orig/include/xen/gnttab.h 2010-09-23 15:39:04.000000000 +0200
-+++ head-2011-09-23/include/xen/gnttab.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/include/xen/gnttab.h 2010-09-23 15:39:04.000000000 +0200
++++ head-2011-10-07/include/xen/gnttab.h 2011-01-31 17:56:27.000000000 +0100
@@ -172,11 +172,11 @@ gnttab_set_replace_op(struct gnttab_unma
BUG_ON(__ret); \
} \
@@ -10187,8 +10189,8 @@ Acked-by: jbeulich@novell.com
__func__, current->comm, (__HCarg_p)->status); \
}
---- head-2011-09-23.orig/include/xen/hvm.h 2011-01-31 15:14:12.000000000 +0100
-+++ head-2011-09-23/include/xen/hvm.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/include/xen/hvm.h 2011-01-31 15:14:12.000000000 +0100
++++ head-2011-10-07/include/xen/hvm.h 2011-01-31 17:56:27.000000000 +0100
@@ -13,8 +13,7 @@ static inline unsigned long hvm_get_para
xhv.index = idx;
r = HYPERVISOR_hvm_op(HVMOP_get_param, &xhv);
@@ -10199,8 +10201,8 @@ Acked-by: jbeulich@novell.com
return 0;
}
return xhv.value;
---- head-2011-09-23.orig/include/xen/net-util.h 2011-02-09 15:53:07.000000000 +0100
-+++ head-2011-09-23/include/xen/net-util.h 2011-02-09 15:55:10.000000000 +0100
+--- head-2011-10-07.orig/include/xen/net-util.h 2011-02-09 15:53:07.000000000 +0100
++++ head-2011-10-07/include/xen/net-util.h 2011-02-09 15:55:10.000000000 +0100
@@ -51,7 +51,7 @@ static inline int skb_checksum_setup(str
break;
default:
@@ -10210,8 +10212,8 @@ Acked-by: jbeulich@novell.com
"TCP/UDP packet, dropping a protocol"
" %d packet\n", iph->protocol);
goto out;
---- head-2011-09-23.orig/include/xen/pcifront.h 2007-06-18 08:38:13.000000000 +0200
-+++ head-2011-09-23/include/xen/pcifront.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/include/xen/pcifront.h 2007-06-18 08:38:13.000000000 +0200
++++ head-2011-10-07/include/xen/pcifront.h 2011-01-31 17:56:27.000000000 +0100
@@ -12,13 +12,11 @@
#ifndef __ia64__
@@ -10249,7 +10251,7 @@ Acked-by: jbeulich@novell.com
struct pcifront_sd *sd)
{
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-09-23/include/xen/sysctl.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-10-07/include/xen/sysctl.h 2011-01-31 17:56:27.000000000 +0100
@@ -0,0 +1,11 @@
+#ifndef _XEN_SYSCTL_H
+#define _XEN_SYSCTL_H
@@ -10262,8 +10264,8 @@ Acked-by: jbeulich@novell.com
+};
+
+#endif /* _XEN_SYSCTL_H */
---- head-2011-09-23.orig/include/xen/xenbus.h 2011-09-12 12:17:52.000000000 +0200
-+++ head-2011-09-23/include/xen/xenbus.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/include/xen/xenbus.h 2011-09-12 12:17:52.000000000 +0200
++++ head-2011-10-07/include/xen/xenbus.h 2011-01-31 17:56:27.000000000 +0100
@@ -107,7 +107,7 @@ struct xenbus_driver {
int (*suspend)(struct xenbus_device *dev);
int (*suspend_cancel)(struct xenbus_device *dev);
@@ -10273,8 +10275,8 @@ Acked-by: jbeulich@novell.com
struct device_driver driver;
int (*read_otherend_details)(struct xenbus_device *dev);
int (*is_ready)(struct xenbus_device *dev);
---- head-2011-09-23.orig/kernel/kexec.c 2011-04-28 11:09:21.000000000 +0200
-+++ head-2011-09-23/kernel/kexec.c 2011-04-28 11:10:13.000000000 +0200
+--- head-2011-10-07.orig/kernel/kexec.c 2011-04-28 11:09:21.000000000 +0200
++++ head-2011-10-07/kernel/kexec.c 2011-04-28 11:10:13.000000000 +0200
@@ -48,7 +48,11 @@ note_buf_t __percpu *crash_notes;
/* vmcoreinfo stuff */
@@ -10324,8 +10326,8 @@ Acked-by: jbeulich@novell.com
VMCOREINFO_SYMBOL(_stext);
VMCOREINFO_SYMBOL(vmlist);
---- head-2011-09-23.orig/kernel/sysctl_binary.c 2011-09-23 09:35:34.000000000 +0200
-+++ head-2011-09-23/kernel/sysctl_binary.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/kernel/sysctl_binary.c 2011-10-07 11:27:28.000000000 +0200
++++ head-2011-10-07/kernel/sysctl_binary.c 2011-01-31 17:56:27.000000000 +0100
@@ -873,6 +873,14 @@ static const struct bin_table bin_bus_ta
};
@@ -10351,18 +10353,8 @@ Acked-by: jbeulich@novell.com
/* CTL_ARLAN "arlan" no longer used */
{ CTL_DIR, CTL_S390DBF, "s390dbf", bin_s390dbf_table },
{ CTL_DIR, CTL_SUNRPC, "sunrpc", bin_sunrpc_table },
---- head-2011-09-23.orig/kernel/sysctl_check.c 2011-09-23 09:35:34.000000000 +0200
-+++ head-2011-09-23/kernel/sysctl_check.c 2011-01-31 17:56:27.000000000 +0100
-@@ -4,6 +4,7 @@
- #include <linux/sunrpc/debug.h>
- #include <linux/string.h>
- #include <net/ip_vs.h>
-+#include <xen/sysctl.h>
-
-
- static int sysctl_depth(struct ctl_table *table)
---- head-2011-09-23.orig/lib/swiotlb-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-23/lib/swiotlb-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-10-07.orig/lib/swiotlb-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/lib/swiotlb-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -27,7 +27,7 @@
#include <asm/uaccess.h>
#include <xen/gnttab.h>
diff --git a/patches.xen/xen3-patch-2.6.25 b/patches.xen/xen3-patch-2.6.25
index 5168e16f8d..196183e889 100644
--- a/patches.xen/xen3-patch-2.6.25
+++ b/patches.xen/xen3-patch-2.6.25
@@ -8,8 +8,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
2.6.32/arch/x86/kernel/rtc.c (hooks in {update,read}_persistent_clock() removed)
---- head-2011-09-07.orig/arch/x86/Kconfig 2011-09-07 15:36:37.000000000 +0200
-+++ head-2011-09-07/arch/x86/Kconfig 2011-09-07 15:37:01.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/Kconfig 2011-09-07 15:36:37.000000000 +0200
++++ head-2011-10-07/arch/x86/Kconfig 2011-09-07 15:37:01.000000000 +0200
@@ -40,7 +40,7 @@ config X86
select HAVE_FUNCTION_TRACE_MCOUNT_TEST
select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE
@@ -77,8 +77,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
help
Enables some debug statements within the PCI Frontend.
---- head-2011-09-07.orig/arch/x86/Kconfig.debug 2011-06-30 15:35:42.000000000 +0200
-+++ head-2011-09-07/arch/x86/Kconfig.debug 2011-06-30 16:33:56.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/Kconfig.debug 2011-06-30 15:35:42.000000000 +0200
++++ head-2011-10-07/arch/x86/Kconfig.debug 2011-06-30 16:33:56.000000000 +0200
@@ -247,6 +247,7 @@ config DEBUG_BOOT_PARAMS
bool "Debug boot parameters"
depends on DEBUG_KERNEL
@@ -87,8 +87,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
---help---
This option will cause struct boot_params to be exported via debugfs.
---- head-2011-09-07.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-09-07/arch/x86/ia32/ia32entry-xen.S 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-10-07/arch/x86/ia32/ia32entry-xen.S 2011-01-31 18:01:51.000000000 +0100
@@ -12,7 +12,6 @@
#include <asm/ia32_unistd.h>
#include <asm/thread_info.h>
@@ -132,8 +132,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+ .quad compat_sys_timerfd_settime /* 325 */
+ .quad compat_sys_timerfd_gettime
ia32_syscall_end:
---- head-2011-09-07.orig/arch/x86/kernel/Makefile 2011-09-07 15:36:34.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/Makefile 2011-09-07 15:37:04.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/kernel/Makefile 2011-09-07 15:36:34.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/Makefile 2011-09-07 15:37:04.000000000 +0200
@@ -113,11 +113,10 @@ ifeq ($(CONFIG_X86_64),y)
obj-$(CONFIG_PCI_MMCONFIG) += mmconf-fam10h_64.o
obj-y += vsmp_64.o
@@ -147,8 +147,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
smpboot_$(BITS).o tsc_$(BITS).o tsc_sync.o
-disabled-obj-$(CONFIG_XEN_UNPRIVILEGED_GUEST) += mpparse_64.o
-%/head_64.o %/head_64.s: asflags-$(CONFIG_XEN) :=
---- head-2011-09-07.orig/arch/x86/kernel/acpi/boot.c 2011-04-13 12:23:45.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/acpi/boot.c 2011-03-11 10:56:21.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/acpi/boot.c 2011-04-13 12:23:45.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/acpi/boot.c 2011-03-11 10:56:21.000000000 +0100
@@ -162,6 +162,11 @@ char *__init __acpi_map_table(unsigned l
if (!phys || !size)
return NULL;
@@ -161,8 +161,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
return early_ioremap(phys, size);
}
void __init __acpi_unmap_table(char *map, unsigned long size)
---- head-2011-09-07.orig/arch/x86/kernel/apic/apic-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/apic/apic-xen.c 2011-02-24 15:45:13.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/apic/apic-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/apic/apic-xen.c 2011-02-24 15:45:13.000000000 +0100
@@ -82,11 +82,12 @@ int setup_profiling_timer(unsigned int m
return -EINVAL;
}
@@ -182,8 +182,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
return 0;
}
+#endif
---- head-2011-09-07.orig/arch/x86/kernel/asm-offsets_32.c 2011-04-13 12:31:22.000000000 +0200
-+++ head-2011-09-07/arch/x86/kernel/asm-offsets_32.c 2011-04-13 12:45:37.000000000 +0200
+--- head-2011-10-07.orig/arch/x86/kernel/asm-offsets_32.c 2011-04-13 12:31:22.000000000 +0200
++++ head-2011-10-07/arch/x86/kernel/asm-offsets_32.c 2011-04-13 12:45:37.000000000 +0200
@@ -1,7 +1,9 @@
#include <asm/ucontext.h>
@@ -194,8 +194,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
/* workaround for a warning with -Wmissing-prototypes */
void foo(void);
---- head-2011-09-07.orig/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/cpu/common-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/cpu/common-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -27,45 +27,50 @@
#include "cpu.h"
@@ -597,8 +597,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
load_LDT(&init_mm.context);
---- head-2011-09-07.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -33,7 +33,7 @@ struct mtrr_ops generic_mtrr_ops = {
struct mtrr_ops *mtrr_if = &generic_mtrr_ops;
@@ -660,8 +660,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
op.cmd = XENPF_del_memtype;
op.u.del_memtype.handle = 0;
op.u.del_memtype.reg = reg;
---- head-2011-09-07.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/e820_32-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/e820_32-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -7,7 +7,6 @@
#include <linux/kexec.h>
#include <linux/module.h>
@@ -1032,8 +1032,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+ print_memory_map("modified");
+}
+#endif
---- head-2011-09-07.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/e820_64-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-10-07/arch/x86/kernel/e820_64-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -1,4 +1,4 @@
-/*
+/*
@@ -1832,8 +1832,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
}
int __init arch_get_ram_range(int slot, u64 *addr, u64 *size)
---- head-2011-09-07.orig/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-09-07/arch/x86/kernel/early_printk-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-10-07.orig/arch/x86/kernel