Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@novell.com>2011-07-21 14:50:39 +0200
committerJan Beulich <jbeulich@novell.com>2011-07-21 14:50:39 +0200
commitf4eb207d378cfab913454c0f9009c4a7e7b7066a (patch)
treed35a7d4073c6937c297a8572d8d0745e41fb1b2c
parent141a54f28ed58385533da77c5eaf7f6eea172b42 (diff)
- Update Xen patches to 3.0-rc7 and c/s 1098.
- Update Xen config files.
-rw-r--r--config/i386/ec21
-rw-r--r--config/i386/xen1
-rw-r--r--config/x86_64/ec21
-rw-r--r--config/x86_64/xen1
-rw-r--r--patches.xen/pci-guestdev56
-rw-r--r--patches.xen/pci-reserve39
-rw-r--r--patches.xen/xen-clockevents104
-rw-r--r--patches.xen/xen-op-packet50
-rw-r--r--patches.xen/xen-spinlock-poll-early24
-rw-r--r--patches.xen/xen-sys-suspend24
-rw-r--r--patches.xen/xen-unpriv-build82
-rw-r--r--patches.xen/xen-virq-per-cpu-irq32
-rw-r--r--patches.xen/xen-x86-EFI40
-rw-r--r--patches.xen/xen-x86-bigmem212
-rw-r--r--patches.xen/xen-x86-per-cpu-vcpu-info120
-rw-r--r--patches.xen/xen-x86-pmd-handling40
-rw-r--r--patches.xen/xen-x86_64-note-init-p2m69
-rw-r--r--patches.xen/xen-x86_64-pgd-alloc-order46
-rw-r--r--patches.xen/xen-x86_64-pgd-pin20
-rw-r--r--patches.xen/xen-x86_64-unmapped-initrd38
-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.diff193
-rw-r--r--patches.xen/xen3-auto-include-xen-interface.diff2
-rw-r--r--patches.xen/xen3-auto-xen-arch.diff3
-rw-r--r--patches.xen/xen3-auto-xen-drivers.diff13
-rw-r--r--patches.xen/xen3-auto-xen-kconfig.diff2
-rw-r--r--patches.xen/xen3-fixup-common62
-rw-r--r--patches.xen/xen3-fixup-xen2
-rw-r--r--patches.xen/xen3-patch-2.6.18135
-rw-r--r--patches.xen/xen3-patch-2.6.19494
-rw-r--r--patches.xen/xen3-patch-2.6.2014
-rw-r--r--patches.xen/xen3-patch-2.6.21471
-rw-r--r--patches.xen/xen3-patch-2.6.2234
-rw-r--r--patches.xen/xen3-patch-2.6.23504
-rw-r--r--patches.xen/xen3-patch-2.6.24729
-rw-r--r--patches.xen/xen3-patch-2.6.25672
-rw-r--r--patches.xen/xen3-patch-2.6.2671
-rw-r--r--patches.xen/xen3-patch-2.6.27560
-rw-r--r--patches.xen/xen3-patch-2.6.28457
-rw-r--r--patches.xen/xen3-patch-2.6.29406
-rw-r--r--patches.xen/xen3-patch-2.6.30434
-rw-r--r--patches.xen/xen3-patch-2.6.31504
-rw-r--r--patches.xen/xen3-patch-2.6.32579
-rw-r--r--patches.xen/xen3-patch-2.6.3374
-rw-r--r--patches.xen/xen3-patch-2.6.3414
-rw-r--r--patches.xen/xen3-patch-2.6.35228
-rw-r--r--patches.xen/xen3-patch-2.6.36238
-rw-r--r--patches.xen/xen3-patch-2.6.37332
-rw-r--r--patches.xen/xen3-patch-2.6.38254
-rw-r--r--patches.xen/xen3-patch-2.6.39252
-rw-r--r--patches.xen/xen3-patch-3.0-rc5200
53 files changed, 4696 insertions, 4243 deletions
diff --git a/config/i386/ec2 b/config/i386/ec2
index a05759b4d1..a578a8c968 100644
--- a/config/i386/ec2
+++ b/config/i386/ec2
@@ -1748,7 +1748,6 @@ CONFIG_HAVE_ARCH_KMEMCHECK=y
# CONFIG_KMEMCHECK is not set
# CONFIG_TEST_KSTRTOX is not set
CONFIG_STRICT_DEVMEM=y
-CONFIG_EARLY_PRINTK=y
# CONFIG_DEBUG_STACKOVERFLOW is not set
# CONFIG_X86_PTDUMP is not set
CONFIG_DEBUG_RODATA=y
diff --git a/config/i386/xen b/config/i386/xen
index 4b055f2b88..f3833f384d 100644
--- a/config/i386/xen
+++ b/config/i386/xen
@@ -417,7 +417,6 @@ CONFIG_ACPI_DOCK=y
CONFIG_ACPI_PROCESSOR=m
CONFIG_ACPI_IPMI=m
CONFIG_ACPI_HOTPLUG_CPU=y
-CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
CONFIG_ACPI_THERMAL=m
CONFIG_ACPI_CUSTOM_DSDT_FILE=""
# CONFIG_ACPI_CUSTOM_DSDT is not set
diff --git a/config/x86_64/ec2 b/config/x86_64/ec2
index 18ddb3a5c3..ee92cbd478 100644
--- a/config/x86_64/ec2
+++ b/config/x86_64/ec2
@@ -1720,7 +1720,6 @@ CONFIG_HAVE_ARCH_KMEMCHECK=y
# CONFIG_KMEMCHECK is not set
# CONFIG_TEST_KSTRTOX is not set
CONFIG_STRICT_DEVMEM=y
-CONFIG_EARLY_PRINTK=y
# CONFIG_DEBUG_STACKOVERFLOW is not set
# CONFIG_X86_PTDUMP is not set
CONFIG_DEBUG_RODATA=y
diff --git a/config/x86_64/xen b/config/x86_64/xen
index 678633f53a..f8708d2ba8 100644
--- a/config/x86_64/xen
+++ b/config/x86_64/xen
@@ -387,7 +387,6 @@ CONFIG_ACPI_DOCK=y
CONFIG_ACPI_PROCESSOR=m
CONFIG_ACPI_IPMI=m
CONFIG_ACPI_HOTPLUG_CPU=y
-CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
CONFIG_ACPI_THERMAL=m
CONFIG_ACPI_CUSTOM_DSDT_FILE=""
# CONFIG_ACPI_CUSTOM_DSDT is not set
diff --git a/patches.xen/pci-guestdev b/patches.xen/pci-guestdev
index 946988365b..cd9a573c20 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-06-30.orig/Documentation/kernel-parameters.txt 2011-06-30 15:04:42.000000000 +0200
-+++ head-2011-06-30/Documentation/kernel-parameters.txt 2011-06-30 15:22:39.000000000 +0200
+--- head-2011-07-21.orig/Documentation/kernel-parameters.txt 2011-07-21 12:00:02.000000000 +0200
++++ head-2011-07-21/Documentation/kernel-parameters.txt 2011-07-21 12:02:12.000000000 +0200
@@ -819,6 +819,24 @@ bytes respectively. Such letter suffixes
gpt [EFI] Forces disk with valid GPT signature but
invalid Protective MBR to be treated as GPT.
@@ -35,7 +35,7 @@ Acked-by: jbeulich@novell.com
hashdist= [KNL,NUMA] Large hashes allocated during boot
are distributed across NUMA nodes. Defaults on
for 64bit NUMA, off otherwise.
-@@ -2186,6 +2204,10 @@ bytes respectively. Such letter suffixes
+@@ -2188,6 +2206,10 @@ bytes respectively. Such letter suffixes
Run specified binary instead of /init from the ramdisk,
used for early userspace startup. See initrd.
@@ -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-06-30.orig/drivers/acpi/pci_root.c 2011-06-30 15:04:12.000000000 +0200
-+++ head-2011-06-30/drivers/acpi/pci_root.c 2011-06-30 15:22:30.000000000 +0200
+--- head-2011-07-21.orig/drivers/acpi/pci_root.c 2011-07-21 12:00:02.000000000 +0200
++++ head-2011-07-21/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-06-30.orig/drivers/acpi/scan.c 2011-05-19 06:06:34.000000000 +0200
-+++ head-2011-06-30/drivers/acpi/scan.c 2011-05-09 11:37:03.000000000 +0200
+--- head-2011-07-21.orig/drivers/acpi/scan.c 2011-07-21 12:00:02.000000000 +0200
++++ head-2011-07-21/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-06-30.orig/drivers/pci/Kconfig 2011-05-19 06:06:34.000000000 +0200
-+++ head-2011-06-30/drivers/pci/Kconfig 2011-01-31 14:31:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/pci/Kconfig 2011-07-21 12:00:02.000000000 +0200
++++ head-2011-07-21/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-06-30.orig/drivers/pci/Makefile 2011-06-30 15:04:14.000000000 +0200
-+++ head-2011-06-30/drivers/pci/Makefile 2011-01-31 14:31:28.000000000 +0100
+--- head-2011-07-21.orig/drivers/pci/Makefile 2011-07-21 12:00:02.000000000 +0200
++++ head-2011-07-21/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-06-30/drivers/pci/guestdev.c 2011-01-31 14:31:28.000000000 +0100
++++ head-2011-07-21/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-06-30/drivers/pci/iomulti.c 2011-01-31 14:31:28.000000000 +0100
++++ head-2011-07-21/drivers/pci/iomulti.c 2011-01-31 14:31:28.000000000 +0100
@@ -0,0 +1,897 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
@@ -2012,7 +2012,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-06-30/drivers/pci/iomulti.h 2011-01-31 14:31:28.000000000 +0100
++++ head-2011-07-21/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
@@ -2136,8 +2136,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-06-30.orig/drivers/pci/pci.c 2011-06-30 15:04:15.000000000 +0200
-+++ head-2011-06-30/drivers/pci/pci.c 2011-06-30 15:22:15.000000000 +0200
+--- head-2011-07-21.orig/drivers/pci/pci.c 2011-07-21 12:00:02.000000000 +0200
++++ head-2011-07-21/drivers/pci/pci.c 2011-06-30 15:22:15.000000000 +0200
@@ -3402,6 +3402,13 @@ resource_size_t pci_specified_resource_a
*/
int pci_is_reassigndev(struct pci_dev *dev)
@@ -2152,9 +2152,9 @@ Acked-by: jbeulich@novell.com
return (pci_specified_resource_alignment(dev) != 0);
}
---- head-2011-06-30.orig/drivers/pci/pci.h 2011-06-30 15:04:15.000000000 +0200
-+++ head-2011-06-30/drivers/pci/pci.h 2011-06-30 15:22:12.000000000 +0200
-@@ -312,4 +312,11 @@ static inline int pci_dev_specific_reset
+--- head-2011-07-21.orig/drivers/pci/pci.h 2011-07-21 12:00:02.000000000 +0200
++++ head-2011-07-21/drivers/pci/pci.h 2011-07-21 12:03:10.000000000 +0200
+@@ -314,4 +314,11 @@ static inline int pci_dev_specific_reset
}
#endif
@@ -2167,7 +2167,7 @@ Acked-by: jbeulich@novell.com
+
#endif /* DRIVERS_PCI_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-06-30/drivers/pci/pci-iomul.c 2011-01-31 14:31:28.000000000 +0100
++++ head-2011-07-21/drivers/pci/pci-iomul.c 2011-01-31 14:31:28.000000000 +0100
@@ -0,0 +1,437 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
@@ -2606,8 +2606,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-06-30.orig/include/linux/acpi.h 2011-06-30 15:04:23.000000000 +0200
-+++ head-2011-06-30/include/linux/acpi.h 2011-06-30 15:21:54.000000000 +0200
+--- head-2011-07-21.orig/include/linux/acpi.h 2011-07-21 12:00:02.000000000 +0200
++++ head-2011-07-21/include/linux/acpi.h 2011-06-30 15:21:54.000000000 +0200
@@ -247,6 +247,8 @@ int acpi_check_region(resource_size_t st
int acpi_resources_are_enforced(void);
@@ -2617,8 +2617,8 @@ 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-06-30.orig/include/linux/pci.h 2011-06-30 15:04:25.000000000 +0200
-+++ head-2011-06-30/include/linux/pci.h 2011-06-30 15:21:48.000000000 +0200
+--- head-2011-07-21.orig/include/linux/pci.h 2011-07-21 12:00:02.000000000 +0200
++++ head-2011-07-21/include/linux/pci.h 2011-06-30 15:21:48.000000000 +0200
@@ -1589,5 +1589,11 @@ int pci_vpd_find_tag(const u8 *buf, unsi
int pci_vpd_find_info_keyword(const u8 *buf, unsigned int off,
unsigned int len, const char *kw);
@@ -2631,18 +2631,18 @@ Acked-by: jbeulich@novell.com
+
#endif /* __KERNEL__ */
#endif /* LINUX_PCI_H */
---- head-2011-06-30.orig/include/xen/Kbuild 2011-01-05 01:50:19.000000000 +0100
-+++ head-2011-06-30/include/xen/Kbuild 2011-01-31 14:31:28.000000000 +0100
+--- head-2011-07-21.orig/include/xen/Kbuild 2011-07-21 12:00:02.000000000 +0200
++++ head-2011-07-21/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-06-30/include/xen/public/Kbuild 2011-01-31 14:31:28.000000000 +0100
++++ head-2011-07-21/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-06-30/include/xen/public/iomulti.h 2011-01-31 14:31:28.000000000 +0100
++++ head-2011-07-21/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/pci-reserve b/patches.xen/pci-reserve
index 77ea60d6c0..0ef5f841e6 100644
--- a/patches.xen/pci-reserve
+++ b/patches.xen/pci-reserve
@@ -8,17 +8,8 @@ by PCI hotplug.
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Acked-by: jbeulich@novell.com
----
- Documentation/kernel-parameters.txt | 7 +
- drivers/pci/Kconfig | 7 +
- drivers/pci/Makefile | 1
- drivers/pci/pci.h | 15 +++
- drivers/pci/reserve.c | 137 ++++++++++++++++++++++++++++++++++++
- drivers/pci/setup-bus.c | 8 +-
- 6 files changed, 174 insertions(+), 1 deletion(-)
-
---- a/Documentation/kernel-parameters.txt
-+++ b/Documentation/kernel-parameters.txt
+--- head-2011-07-21.orig/Documentation/kernel-parameters.txt 2011-07-21 12:02:12.000000000 +0200
++++ head-2011-07-21/Documentation/kernel-parameters.txt 2011-07-21 12:04:00.000000000 +0200
@@ -2036,6 +2036,13 @@ bytes respectively. Such letter suffixes
realloc reallocate PCI resources if allocations done by BIOS
are erroneous.
@@ -33,8 +24,8 @@ Acked-by: jbeulich@novell.com
pcie_aspm= [PCIE] Forcibly enable or disable PCIe Active State Power
Management.
off Disable ASPM.
---- a/drivers/pci/Kconfig
-+++ b/drivers/pci/Kconfig
+--- head-2011-07-21.orig/drivers/pci/Kconfig 2011-01-31 14:31:27.000000000 +0100
++++ head-2011-07-21/drivers/pci/Kconfig 2011-01-31 14:32:40.000000000 +0100
@@ -45,6 +45,13 @@ config PCI_IOMULTI
help
Say Y here if you need io multiplexing.
@@ -49,8 +40,8 @@ Acked-by: jbeulich@novell.com
config PCI_STUB
tristate "PCI Stub driver"
depends on PCI
---- a/drivers/pci/Makefile
-+++ b/drivers/pci/Makefile
+--- head-2011-07-21.orig/drivers/pci/Makefile 2011-01-31 14:31:28.000000000 +0100
++++ head-2011-07-21/drivers/pci/Makefile 2011-01-31 14:32:40.000000000 +0100
@@ -11,6 +11,7 @@ obj-$(CONFIG_PCI_GUESTDEV) += guestdev.o
obj-$(CONFIG_PCI_IOMULTI) += pci-iomul.o
iomul-$(CONFIG_PCI_IOMULTI) := iomulti.o
@@ -59,8 +50,8 @@ Acked-by: jbeulich@novell.com
obj-$(CONFIG_PCI_QUIRKS) += quirks.o
---- a/drivers/pci/pci.h
-+++ b/drivers/pci/pci.h
+--- head-2011-07-21.orig/drivers/pci/pci.h 2011-07-21 12:03:10.000000000 +0200
++++ head-2011-07-21/drivers/pci/pci.h 2011-07-21 12:04:04.000000000 +0200
@@ -321,4 +321,19 @@ extern int pci_is_iomuldev(struct pci_de
#define pci_is_iomuldev(dev) 0
#endif
@@ -81,8 +72,8 @@ Acked-by: jbeulich@novell.com
+#endif /* CONFIG_PCI_RESERVE */
+
#endif /* DRIVERS_PCI_H */
---- /dev/null
-+++ b/drivers/pci/reserve.c
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ head-2011-07-21/drivers/pci/reserve.c 2011-01-31 14:32:40.000000000 +0100
@@ -0,0 +1,137 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
@@ -221,9 +212,9 @@ Acked-by: jbeulich@novell.com
+ return 1;
+}
+__setup("pci_reserve=", pci_reserve_setup);
---- a/drivers/pci/setup-bus.c
-+++ b/drivers/pci/setup-bus.c
-@@ -561,7 +561,7 @@ static void pbus_size_io(struct pci_bus
+--- head-2011-07-21.orig/drivers/pci/setup-bus.c 2011-07-21 12:00:02.000000000 +0200
++++ head-2011-07-21/drivers/pci/setup-bus.c 2011-07-21 12:04:10.000000000 +0200
+@@ -561,7 +561,7 @@ static void pbus_size_io(struct pci_bus
{
struct pci_dev *dev;
struct resource *b_res = find_free_bus_resource(bus, IORESOURCE_IO);
@@ -232,7 +223,7 @@ Acked-by: jbeulich@novell.com
if (!b_res)
return;
-@@ -589,6 +589,11 @@ static void pbus_size_io(struct pci_bus
+@@ -589,6 +589,11 @@ static void pbus_size_io(struct pci_bus
size1 = (!add_head || (add_head && !add_size)) ? size0 :
calculate_iosize(size, min_size+add_size, size1,
resource_size(b_res), 4096);
@@ -244,7 +235,7 @@ Acked-by: jbeulich@novell.com
if (!size0 && !size1) {
if (b_res->start || b_res->end)
dev_info(&bus->self->dev, "disabling bridge window "
-@@ -683,6 +688,7 @@ static int pbus_size_mem(struct pci_bus
+@@ -683,6 +688,7 @@ static int pbus_size_mem(struct pci_bus
min_align = align1 >> 1;
align += aligns[order];
}
diff --git a/patches.xen/xen-clockevents b/patches.xen/xen-clockevents
index a50acb11cc..0efb588af4 100644
--- a/patches.xen/xen-clockevents
+++ b/patches.xen/xen-clockevents
@@ -4,8 +4,8 @@ Patch-mainline: n/a
Once validated this could be merged into the 2.6.?? patch.
---- head-2011-06-30.orig/arch/x86/Kconfig 2011-06-30 17:25:32.000000000 +0200
-+++ head-2011-06-30/arch/x86/Kconfig 2011-07-04 10:26:08.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/Kconfig 2011-06-30 17:25:32.000000000 +0200
++++ head-2011-07-21/arch/x86/Kconfig 2011-07-04 10:26:08.000000000 +0200
@@ -93,7 +93,6 @@ config CLOCKSOURCE_WATCHDOG
config GENERIC_CLOCKEVENTS
@@ -14,9 +14,9 @@ Once validated this could be merged into the 2.6.?? patch.
config GENERIC_CLOCKEVENTS_BROADCAST
def_bool y
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-03-23 10:01:46.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/hypervisor.h 2011-02-02 15:09:52.000000000 +0100
-@@ -74,7 +74,6 @@ extern start_info_t *xen_start_info;
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-07-21 12:19:45.000000000 +0200
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/hypervisor.h 2011-07-21 12:33:02.000000000 +0200
+@@ -70,7 +70,6 @@ extern start_info_t *xen_start_info;
#define init_hypervisor_platform() init_hypervisor(&boot_cpu_data)
DECLARE_PER_CPU(struct vcpu_runstate_info, runstate);
@@ -24,8 +24,8 @@ Once validated this could be merged into the 2.6.?? patch.
#define vcpu_running(cpu) (per_cpu(runstate.state, cpu) == RUNSTATE_running)
/* arch/xen/kernel/evtchn.c */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/irqflags.h 2011-02-01 15:09:47.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/irqflags.h 2011-02-02 15:09:52.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/irqflags.h 2011-02-01 15:09:47.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/irqflags.h 2011-02-02 15:09:52.000000000 +0100
@@ -4,6 +4,8 @@
#include <asm/smp-processor-id.h>
@@ -71,8 +71,8 @@ Once validated this could be merged into the 2.6.?? patch.
/*
* For spinlocks, etc:
---- head-2011-06-30.orig/arch/x86/kernel/time-xen.c 2011-04-14 16:36:14.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/time-xen.c 2011-07-04 10:25:07.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/kernel/time-xen.c 2011-07-11 15:30:50.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/time-xen.c 2011-07-11 15:30:55.000000000 +0200
@@ -20,15 +20,12 @@
#include <linux/clocksource.h>
#include <linux/sysdev.h>
@@ -122,7 +122,7 @@ Once validated this could be merged into the 2.6.?? patch.
/* Does this guest OS track Xen time, or set its wall clock independently? */
static int independent_wallclock = 0;
static int __init __independent_wallclock(char *str)
-@@ -188,6 +169,11 @@ static u64 get_nsec_offset(struct shadow
+@@ -183,6 +164,11 @@ static u64 get_nsec_offset(struct shadow
return scale_delta(delta, shadow->tsc_to_nsec_mul, shadow->tsc_shift);
}
@@ -131,25 +131,26 @@ Once validated this could be merged into the 2.6.?? patch.
+ return (jiffies_64 - jiffies_bias) * NS_PER_TICK + system_time_bias;
+}
+
- static void update_wallclock(void)
+ static void update_wallclock(bool local)
{
static DEFINE_MUTEX(uwc_mutex);
-@@ -204,7 +190,7 @@ static void update_wallclock(void)
+@@ -199,7 +185,7 @@ static void update_wallclock(bool local)
} while ((s->wc_version & 1) | (shadow_tv_version ^ s->wc_version));
- if (!independent_wallclock) {
+ if (local) {
- u64 tmp = processed_system_time;
+ u64 tmp = processed_system_time(get_jiffies_64());
long nsec = do_div(tmp, NSEC_PER_SEC);
struct timespec tv;
-@@ -222,6 +208,13 @@ static void _update_wallclock(struct wor
+@@ -217,6 +203,14 @@ static void _update_wallclock(struct wor
}
static DECLARE_WORK(update_wallclock_work, _update_wallclock);
+void xen_check_wallclock_update(void)
+{
+ if (shadow_tv_version != HYPERVISOR_shared_info->wc_version
++ && !is_initial_xendomain() && !independent_wallclock
+ && keventd_up())
+ schedule_work(&update_wallclock_work);
+}
@@ -157,7 +158,7 @@ Once validated this could be merged into the 2.6.?? patch.
/*
* Reads a consistent set of time-base values from Xen, into a shadow data
* area.
-@@ -283,7 +276,7 @@ static void sync_xen_wallclock(unsigned
+@@ -319,7 +313,7 @@ static void sync_xen_wallclock(unsigned
op.cmd = XENPF_settime;
op.u.settime.secs = now.tv_sec;
op.u.settime.nsecs = now.tv_nsec;
@@ -165,8 +166,8 @@ Once validated this could be merged into the 2.6.?? patch.
+ op.u.settime.system_time = processed_system_time(get_jiffies_64());
WARN_ON(HYPERVISOR_platform_op(&op));
- update_wallclock();
-@@ -292,7 +285,7 @@ static void sync_xen_wallclock(unsigned
+ update_wallclock(false);
+@@ -328,7 +322,7 @@ static void sync_xen_wallclock(unsigned
mod_timer(&sync_xen_wallclock_timer, jiffies + 60*HZ);
}
@@ -175,7 +176,16 @@ Once validated this could be merged into the 2.6.?? patch.
{
unsigned int cpu = get_cpu();
struct shadow_time_info *shadow = &per_cpu(shadow_time, cpu);
-@@ -316,7 +309,7 @@ static unsigned long long local_clock(vo
+@@ -363,7 +357,7 @@ unsigned long xen_read_wallclock(void)
+ rmb();
+ } while ((s->wc_version & 1) | (version ^ s->wc_version));
+
+- delta = local_clock() + (u64)sec * NSEC_PER_SEC + nsec;
++ delta = xen_local_clock() + (u64)sec * NSEC_PER_SEC + nsec;
+ do_div(delta, NSEC_PER_SEC);
+
+ return delta;
+@@ -382,7 +376,7 @@ int xen_write_wallclock(unsigned long no
/*
* Runstate accounting
*/
@@ -184,7 +194,7 @@ Once validated this could be merged into the 2.6.?? patch.
{
u64 state_time;
struct vcpu_runstate_info *state;
-@@ -352,7 +345,7 @@ unsigned long long sched_clock(void)
+@@ -418,7 +412,7 @@ unsigned long long sched_clock(void)
*/
preempt_disable();
@@ -193,7 +203,7 @@ Once validated this could be merged into the 2.6.?? patch.
get_runstate_snapshot(&runstate);
-@@ -395,138 +388,6 @@ unsigned long profile_pc(struct pt_regs
+@@ -461,139 +455,6 @@ unsigned long profile_pc(struct pt_regs
}
EXPORT_SYMBOL(profile_pc);
@@ -261,6 +271,7 @@ Once validated this could be merged into the 2.6.?? patch.
- write_sequnlock(&xtime_lock);
-
- if (shadow_tv_version != HYPERVISOR_shared_info->wc_version
+- && !is_initial_xendomain() && !independent_wallclock
- && keventd_up())
- schedule_work(&update_wallclock_work);
-
@@ -332,7 +343,7 @@ Once validated this could be merged into the 2.6.?? patch.
void mark_tsc_unstable(char *reason)
{
#ifndef CONFIG_XEN /* XXX Should tell the hypervisor about this fact. */
-@@ -535,24 +396,13 @@ void mark_tsc_unstable(char *reason)
+@@ -602,24 +463,13 @@ void mark_tsc_unstable(char *reason)
}
EXPORT_SYMBOL_GPL(mark_tsc_unstable);
@@ -358,7 +369,7 @@ Once validated this could be merged into the 2.6.?? patch.
if (unlikely((s64)(ret - last) < 0)) {
if (last - ret > permitted_clock_jitter
-@@ -578,7 +428,7 @@ static cycle_t xen_clocksource_read(stru
+@@ -645,7 +495,7 @@ static cycle_t xen_clocksource_read(stru
last = cur;
}
#else
@@ -367,7 +378,7 @@ Once validated this could be merged into the 2.6.?? patch.
#endif
}
-@@ -589,26 +439,13 @@ static void xen_clocksource_resume(struc
+@@ -656,26 +506,13 @@ static void xen_clocksource_resume(struc
init_cpu_khz();
@@ -398,17 +409,8 @@ Once validated this could be merged into the 2.6.?? patch.
}
static struct clocksource clocksource_xen = {
-@@ -653,7 +490,7 @@ void xen_read_persistent_clock(struct ti
- rmb();
- } while ((s->wc_version & 1) | (version ^ s->wc_version));
-
-- delta = local_clock() + (u64)sec * NSEC_PER_SEC + nsec;
-+ delta = xen_local_clock() + (u64)sec * NSEC_PER_SEC + nsec;
- do_div(delta, NSEC_PER_SEC);
-
- ts->tv_sec = delta;
-@@ -668,24 +505,10 @@ int xen_update_persistent_clock(void)
- return 0;
+@@ -706,24 +543,10 @@ struct vcpu_runstate_info *setup_runstat
+ return rs;
}
-/* Dynamically-mapped IRQ. */
@@ -427,13 +429,13 @@ Once validated this could be merged into the 2.6.?? patch.
-
static void __init _late_time_init(void)
{
- update_wallclock();
+ update_wallclock(false);
- setup_cpu0_timer_irq();
+ xen_clockevents_init();
}
void __init time_init(void)
-@@ -694,22 +517,11 @@ void __init time_init(void)
+@@ -732,22 +555,11 @@ void __init time_init(void)
printk(KERN_INFO "Xen reported: %u.%03u MHz processor.\n",
cpu_khz / 1000, cpu_khz % 1000);
@@ -459,7 +461,7 @@ Once validated this could be merged into the 2.6.?? patch.
clocksource_register_hz(&clocksource_xen, NSEC_PER_SEC);
-@@ -725,146 +537,23 @@ void __init time_init(void)
+@@ -763,146 +575,23 @@ void __init time_init(void)
/* Convert jiffies to system time. */
u64 jiffies_to_st(unsigned long j)
{
@@ -618,8 +620,8 @@ Once validated this could be merged into the 2.6.?? patch.
#ifdef CONFIG_CPU_FREQ
static int time_cpufreq_notifier(struct notifier_block *nb, unsigned long val,
void *data)
---- head-2011-06-30.orig/drivers/xen/Kconfig 2011-04-11 15:10:40.000000000 +0200
-+++ head-2011-06-30/drivers/xen/Kconfig 2011-04-14 11:21:30.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/Kconfig 2011-04-11 15:10:40.000000000 +0200
++++ head-2011-07-21/drivers/xen/Kconfig 2011-04-14 11:21:30.000000000 +0200
@@ -366,9 +366,6 @@ endmenu
config HAVE_IRQ_IGNORE_UNHANDLED
def_bool y
@@ -630,8 +632,8 @@ Once validated this could be merged into the 2.6.?? patch.
config ARCH_HAS_WALK_MEMORY
def_bool y
depends on X86
---- head-2011-06-30.orig/drivers/xen/core/Makefile 2010-04-19 14:55:02.000000000 +0200
-+++ head-2011-06-30/drivers/xen/core/Makefile 2011-02-02 15:09:52.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/core/Makefile 2010-04-19 14:55:02.000000000 +0200
++++ head-2011-07-21/drivers/xen/core/Makefile 2011-02-02 15:09:52.000000000 +0100
@@ -12,6 +12,7 @@ obj-$(CONFIG_XEN_SYSFS) += xen_sysfs.o
obj-$(CONFIG_XEN_SMPBOOT) += smpboot.o
obj-$(CONFIG_SMP) += spinlock.o
@@ -641,7 +643,7 @@ Once validated this could be merged into the 2.6.?? patch.
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-06-30/drivers/xen/core/clockevents.c 2011-02-02 15:09:52.000000000 +0100
++++ head-2011-07-21/drivers/xen/core/clockevents.c 2011-02-02 15:09:52.000000000 +0100
@@ -0,0 +1,298 @@
+/*
+ * Xen clockevent functions
@@ -941,8 +943,8 @@ Once validated this could be merged into the 2.6.?? patch.
+
+ xen_setup_cpu_clockevents();
+}
---- head-2011-06-30.orig/drivers/xen/core/evtchn.c 2011-04-14 16:36:14.000000000 +0200
-+++ head-2011-06-30/drivers/xen/core/evtchn.c 2011-04-13 16:49:13.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/core/evtchn.c 2011-04-14 16:36:14.000000000 +0200
++++ head-2011-07-21/drivers/xen/core/evtchn.c 2011-04-13 16:49:13.000000000 +0200
@@ -382,6 +382,7 @@ asmlinkage void __irq_entry evtchn_do_up
wmb();
#endif
@@ -959,8 +961,8 @@ Once validated this could be merged into the 2.6.?? patch.
l1 = xchg(&vcpu_info->evtchn_pending_sel, 0);
---- head-2011-06-30.orig/drivers/xen/core/machine_reboot.c 2011-07-04 10:19:56.000000000 +0200
-+++ head-2011-06-30/drivers/xen/core/machine_reboot.c 2011-07-04 10:25:00.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/core/machine_reboot.c 2011-07-04 10:19:56.000000000 +0200
++++ head-2011-07-21/drivers/xen/core/machine_reboot.c 2011-07-04 10:25:00.000000000 +0200
@@ -14,6 +14,7 @@
#include <asm/hypervisor.h>
#include <xen/xenbus.h>
@@ -984,8 +986,8 @@ Once validated this could be merged into the 2.6.?? patch.
if (!suspend_cancelled) {
#ifdef __x86_64__
/*
---- head-2011-06-30.orig/drivers/xen/core/smpboot.c 2011-04-14 16:36:14.000000000 +0200
-+++ head-2011-06-30/drivers/xen/core/smpboot.c 2011-02-07 12:28:20.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/core/smpboot.c 2011-04-14 16:36:14.000000000 +0200
++++ head-2011-07-21/drivers/xen/core/smpboot.c 2011-02-07 12:28:20.000000000 +0100
@@ -18,6 +18,7 @@
#include <linux/percpu.h>
#include <asm/desc.h>
@@ -1002,8 +1004,8 @@ Once validated this could be merged into the 2.6.?? patch.
local_irq_enable();
}
---- head-2011-06-30.orig/drivers/xen/core/spinlock.c 2011-04-13 16:38:13.000000000 +0200
-+++ head-2011-06-30/drivers/xen/core/spinlock.c 2011-04-13 16:49:13.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/core/spinlock.c 2011-04-13 16:38:13.000000000 +0200
++++ head-2011-07-21/drivers/xen/core/spinlock.c 2011-04-13 16:49:13.000000000 +0200
@@ -13,6 +13,7 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -1013,7 +1015,7 @@ Once validated this could be merged into the 2.6.?? patch.
struct spinning {
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-06-30/include/xen/clock.h 2011-02-02 15:09:52.000000000 +0100
++++ head-2011-07-21/include/xen/clock.h 2011-02-02 15:09:52.000000000 +0100
@@ -0,0 +1,19 @@
+#ifndef __XEN_CPU_CLOCK_H__
+#define __XEN_CPU_CLOCK_H__
diff --git a/patches.xen/xen-op-packet b/patches.xen/xen-op-packet
index 3203afaf31..a1e2a60488 100644
--- a/patches.xen/xen-op-packet
+++ b/patches.xen/xen-op-packet
@@ -3,8 +3,8 @@ Subject: add support for new operation type BLKIF_OP_PACKET
Patch-mainline: n/a
References: fate#300964
---- head-2011-06-30.orig/drivers/xen/blkback/blkback.c 2011-04-14 17:15:22.000000000 +0200
-+++ head-2011-06-30/drivers/xen/blkback/blkback.c 2011-04-14 17:16:19.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/blkback/blkback.c 2011-04-14 17:15:22.000000000 +0200
++++ head-2011-07-21/drivers/xen/blkback/blkback.c 2011-04-14 17:16:19.000000000 +0200
@@ -194,13 +194,15 @@ static void fast_flush_area(pending_req_
static void print_stats(blkif_t *blkif)
@@ -37,8 +37,8 @@ References: fate#300964
default:
/* A good sign something is wrong: sleep for a while to
* avoid excessive CPU consumption by a bad guest. */
---- head-2011-06-30.orig/drivers/xen/blkback/common.h 2011-04-04 14:51:29.000000000 +0200
-+++ head-2011-06-30/drivers/xen/blkback/common.h 2011-04-04 14:51:59.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/blkback/common.h 2011-04-04 14:51:29.000000000 +0200
++++ head-2011-07-21/drivers/xen/blkback/common.h 2011-04-04 14:51:59.000000000 +0200
@@ -84,6 +84,7 @@ typedef struct blkif_st {
int st_wr_req;
int st_oo_req;
@@ -47,9 +47,9 @@ References: fate#300964
int st_rd_sect;
int st_wr_sect;
---- head-2011-06-30.orig/drivers/xen/blkfront/blkfront.c 2011-07-01 16:58:40.000000000 +0200
-+++ head-2011-06-30/drivers/xen/blkfront/blkfront.c 2011-07-04 10:17:23.000000000 +0200
-@@ -719,6 +719,8 @@ static int blkif_queue_request(struct re
+--- head-2011-07-21.orig/drivers/xen/blkfront/blkfront.c 2011-07-21 12:22:31.000000000 +0200
++++ head-2011-07-21/drivers/xen/blkfront/blkfront.c 2011-07-21 12:32:39.000000000 +0200
+@@ -718,6 +718,8 @@ static int blkif_queue_request(struct re
if (req->cmd_flags & REQ_HARDBARRIER)
#endif
ring_req->operation = info->flush_op;
@@ -58,7 +58,7 @@ References: fate#300964
ring_req->nr_segments = blk_rq_map_sg(req->q, req, info->sg);
BUG_ON(ring_req->nr_segments > BLKIF_MAX_SEGMENTS_PER_REQUEST);
-@@ -776,7 +778,8 @@ void do_blkif_request(struct request_que
+@@ -775,7 +777,8 @@ void do_blkif_request(struct request_que
blk_start_request(req);
@@ -68,7 +68,7 @@ References: fate#300964
__blk_end_request_all(req, -EIO);
continue;
}
-@@ -866,6 +869,7 @@ static irqreturn_t blkif_int(int irq, vo
+@@ -865,6 +868,7 @@ static irqreturn_t blkif_int(int irq, vo
/* fall through */
case BLKIF_OP_READ:
case BLKIF_OP_WRITE:
@@ -76,8 +76,8 @@ References: fate#300964
if (unlikely(bret->status != BLKIF_RSP_OKAY))
DPRINTK("Bad return from blkdev data "
"request: %x\n", bret->status);
---- head-2011-06-30.orig/drivers/xen/blktap/blktap.c 2011-07-04 10:15:07.000000000 +0200
-+++ head-2011-06-30/drivers/xen/blktap/blktap.c 2011-07-04 10:17:28.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/blktap/blktap.c 2011-07-04 10:15:07.000000000 +0200
++++ head-2011-07-21/drivers/xen/blktap/blktap.c 2011-07-04 10:17:28.000000000 +0200
@@ -1125,13 +1125,14 @@ static void fast_flush_area(pending_req_
static void print_stats(blkif_t *blkif)
@@ -107,8 +107,8 @@ References: fate#300964
default:
/* A good sign something is wrong: sleep for a while to
* avoid excessive CPU consumption by a bad guest. */
---- head-2011-06-30.orig/drivers/xen/blktap/common.h 2011-04-11 15:01:35.000000000 +0200
-+++ head-2011-06-30/drivers/xen/blktap/common.h 2011-04-04 14:51:50.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/blktap/common.h 2011-04-11 15:01:35.000000000 +0200
++++ head-2011-07-21/drivers/xen/blktap/common.h 2011-04-04 14:51:50.000000000 +0200
@@ -70,6 +70,7 @@ typedef struct blkif_st {
int st_rd_req;
int st_wr_req;
@@ -117,8 +117,8 @@ References: fate#300964
int st_rd_sect;
int st_wr_sect;
---- head-2011-06-30.orig/drivers/xen/blktap2/blktap.h 2011-04-11 15:10:09.000000000 +0200
-+++ head-2011-06-30/drivers/xen/blktap2/blktap.h 2011-04-11 15:10:29.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/blktap2/blktap.h 2011-04-11 15:10:09.000000000 +0200
++++ head-2011-07-21/drivers/xen/blktap2/blktap.h 2011-04-11 15:10:29.000000000 +0200
@@ -138,6 +138,7 @@ struct blktap_statistics {
int st_rd_req;
int st_wr_req;
@@ -127,8 +127,8 @@ References: fate#300964
int st_rd_sect;
int st_wr_sect;
s64 st_rd_cnt;
---- head-2011-06-30.orig/drivers/xen/blktap2/device.c 2011-02-07 14:13:37.000000000 +0100
-+++ head-2011-06-30/drivers/xen/blktap2/device.c 2010-11-23 15:06:50.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/blktap2/device.c 2011-02-07 14:13:37.000000000 +0100
++++ head-2011-07-21/drivers/xen/blktap2/device.c 2010-11-23 15:06:50.000000000 +0100
@@ -366,7 +366,8 @@ blktap_device_fail_pending_requests(stru
BTERR("%u:%u: failing pending %s of %d pages\n",
@@ -167,8 +167,8 @@ References: fate#300964
tap->stats.st_wr_sect += nr_sects;
tap->stats.st_wr_req++;
} else {
---- head-2011-06-30.orig/drivers/xen/blktap2-new/blktap.h 2011-02-24 16:01:23.000000000 +0100
-+++ head-2011-06-30/drivers/xen/blktap2-new/blktap.h 2011-04-11 15:10:27.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/blktap2-new/blktap.h 2011-02-24 16:01:23.000000000 +0100
++++ head-2011-07-21/drivers/xen/blktap2-new/blktap.h 2011-04-11 15:10:27.000000000 +0200
@@ -111,6 +111,7 @@ struct blktap_statistics {
int st_rd_req;
int st_wr_req;
@@ -177,8 +177,8 @@ References: fate#300964
int st_rd_sect;
int st_wr_sect;
s64 st_rd_cnt;
---- head-2011-06-30.orig/drivers/xen/blktap2-new/device.c 2011-03-11 00:00:00.000000000 +0100
-+++ head-2011-06-30/drivers/xen/blktap2-new/device.c 2011-03-11 11:09:10.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/blktap2-new/device.c 2011-03-11 00:00:00.000000000 +0100
++++ head-2011-07-21/drivers/xen/blktap2-new/device.c 2011-03-11 11:09:10.000000000 +0100
@@ -189,6 +189,8 @@ blktap_device_make_request(struct blktap
request->rq = rq;
@@ -188,8 +188,8 @@ References: fate#300964
err = blktap_request_get_pages(tap, request, nsegs);
if (err)
---- head-2011-06-30.orig/drivers/xen/blktap2-new/ring.c 2011-04-11 15:10:17.000000000 +0200
-+++ head-2011-06-30/drivers/xen/blktap2-new/ring.c 2011-02-24 15:39:28.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/blktap2-new/ring.c 2011-04-11 15:10:17.000000000 +0200
++++ head-2011-07-21/drivers/xen/blktap2-new/ring.c 2011-02-24 15:39:28.000000000 +0100
@@ -153,11 +153,11 @@ blktap_ring_map_request(struct blktap *t
int seg, err = 0;
int write;
@@ -270,8 +270,8 @@ References: fate#300964
time->tv_sec, time->tv_usec);
}
---- head-2011-06-30.orig/include/xen/interface/io/blkif.h 2011-06-30 17:26:34.000000000 +0200
-+++ head-2011-06-30/include/xen/interface/io/blkif.h 2011-03-17 14:34:04.000000000 +0100
+--- head-2011-07-21.orig/include/xen/interface/io/blkif.h 2011-06-30 17:26:34.000000000 +0200
++++ head-2011-07-21/include/xen/interface/io/blkif.h 2011-03-17 14:34:04.000000000 +0100
@@ -77,10 +77,9 @@
*/
#define BLKIF_OP_FLUSH_DISKCACHE 3
diff --git a/patches.xen/xen-spinlock-poll-early b/patches.xen/xen-spinlock-poll-early
index 36155365f3..0e69294b10 100644
--- a/patches.xen/xen-spinlock-poll-early
+++ b/patches.xen/xen-spinlock-poll-early
@@ -6,9 +6,9 @@ This could be merged into the original ticket spinlock code once
validated, if there wasn't the dependency on smp-processor-id.h, which
only gets introduced in the 2.6.32 merge.
---- head-2011-04-13.orig/arch/x86/include/mach-xen/asm/spinlock.h 2011-02-01 15:09:47.000000000 +0100
-+++ head-2011-04-13/arch/x86/include/mach-xen/asm/spinlock.h 2011-01-18 15:47:44.000000000 +0100
-@@ -41,11 +41,12 @@
+--- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/spinlock.h 2011-07-12 11:15:37.000000000 +0200
++++ head-2011-06-30/arch/x86/include/mach-xen/asm/spinlock.h 2011-07-12 11:16:28.000000000 +0200
+@@ -45,11 +45,12 @@
#ifdef TICKET_SHIFT
#include <asm/irqflags.h>
@@ -23,7 +23,7 @@ only gets introduced in the 2.6.32 merge.
unsigned int xen_spin_adjust(const arch_spinlock_t *, unsigned int token);
void xen_spin_kick(arch_spinlock_t *, unsigned int token);
-@@ -113,6 +114,9 @@ static __always_inline int __ticket_spin
+@@ -117,6 +118,9 @@ static __always_inline int __ticket_spin
:
: "memory", "cc");
@@ -33,7 +33,7 @@ only gets introduced in the 2.6.32 merge.
return tmp;
}
#elif TICKET_SHIFT == 16
-@@ -179,10 +183,15 @@ static __always_inline int __ticket_spin
+@@ -183,10 +187,15 @@ static __always_inline int __ticket_spin
:
: "memory", "cc");
@@ -49,7 +49,7 @@ only gets introduced in the 2.6.32 merge.
static inline int __ticket_spin_is_locked(arch_spinlock_t *lock)
{
int tmp = ACCESS_ONCE(lock->slock);
-@@ -204,16 +213,18 @@ static __always_inline void __ticket_spi
+@@ -208,16 +217,18 @@ static __always_inline void __ticket_spi
bool free;
__ticket_spin_lock_preamble;
@@ -76,7 +76,7 @@ only gets introduced in the 2.6.32 merge.
}
static __always_inline void __ticket_spin_lock_flags(arch_spinlock_t *lock,
-@@ -223,13 +234,15 @@ static __always_inline void __ticket_spi
+@@ -227,13 +238,15 @@ static __always_inline void __ticket_spi
bool free;
__ticket_spin_lock_preamble;
@@ -99,7 +99,7 @@ only gets introduced in the 2.6.32 merge.
}
static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)
-@@ -246,6 +259,7 @@ static __always_inline void __ticket_spi
+@@ -250,6 +263,7 @@ static __always_inline void __ticket_spi
#undef __ticket_spin_lock_preamble
#undef __ticket_spin_lock_body
#undef __ticket_spin_unlock_body
@@ -107,8 +107,8 @@ only gets introduced in the 2.6.32 merge.
#endif
#define __arch_spin(n) __ticket_spin_##n
---- head-2011-04-13.orig/arch/x86/include/mach-xen/asm/spinlock_types.h 2011-02-01 14:55:46.000000000 +0100
-+++ head-2011-04-13/arch/x86/include/mach-xen/asm/spinlock_types.h 2010-01-26 11:27:24.000000000 +0100
+--- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/spinlock_types.h 2011-02-01 14:55:46.000000000 +0100
++++ head-2011-06-30/arch/x86/include/mach-xen/asm/spinlock_types.h 2010-01-26 11:27:24.000000000 +0100
@@ -26,6 +26,11 @@ typedef union {
# define TICKET_SHIFT 16
u16 cur, seq;
@@ -121,8 +121,8 @@ only gets introduced in the 2.6.32 merge.
#else
/*
* This differs from the pre-2.6.24 spinlock by always using xchgb
---- head-2011-04-13.orig/drivers/xen/core/spinlock.c 2011-04-13 16:49:13.000000000 +0200
-+++ head-2011-04-13/drivers/xen/core/spinlock.c 2011-04-14 17:50:59.000000000 +0200
+--- head-2011-06-30.orig/drivers/xen/core/spinlock.c 2011-04-13 16:49:13.000000000 +0200
++++ head-2011-06-30/drivers/xen/core/spinlock.c 2011-04-14 17:50:59.000000000 +0200
@@ -39,6 +39,8 @@ int __cpuinit xen_spinlock_init(unsigned
struct evtchn_bind_ipi bind_ipi;
int rc;
diff --git a/patches.xen/xen-sys-suspend b/patches.xen/xen-sys-suspend
index 79db583cd0..b7c4cf3abe 100644
--- a/patches.xen/xen-sys-suspend
+++ b/patches.xen/xen-sys-suspend
@@ -4,8 +4,8 @@ Patch-mainline: n/a
... rather than calling just a few functions explicitly.
---- head-2011-06-30.orig/arch/x86/kernel/time-xen.c 2011-07-01 16:27:27.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/time-xen.c 2011-04-14 16:18:25.000000000 +0200
+--- head-2011-06-30.orig/arch/x86/kernel/time-xen.c 2011-07-11 15:29:59.000000000 +0200
++++ head-2011-06-30/arch/x86/kernel/time-xen.c 2011-07-11 15:30:38.000000000 +0200
@@ -72,6 +72,10 @@ DEFINE_PER_CPU(struct vcpu_runstate_info
/* Must be signed, as it's compared with s64 quantities which can be -ve. */
#define NS_PER_TICK (1000000000LL/HZ)
@@ -17,7 +17,7 @@ Patch-mainline: n/a
/*
* GCC 4.3 can turn loops over an induction variable into division. We do
* not support arbitrary 64-bit division, and so must break the induction.
-@@ -531,6 +535,17 @@ void mark_tsc_unstable(char *reason)
+@@ -598,6 +602,17 @@ void mark_tsc_unstable(char *reason)
}
EXPORT_SYMBOL_GPL(mark_tsc_unstable);
@@ -35,7 +35,7 @@ Patch-mainline: n/a
static cycle_t cs_last;
static cycle_t xen_clocksource_read(struct clocksource *cs)
-@@ -567,11 +582,32 @@ static cycle_t xen_clocksource_read(stru
+@@ -634,11 +649,32 @@ static cycle_t xen_clocksource_read(stru
#endif
}
@@ -70,7 +70,7 @@ Patch-mainline: n/a
cs_last = local_clock();
}
-@@ -603,17 +639,6 @@ struct vcpu_runstate_info *setup_runstat
+@@ -670,17 +706,6 @@ struct vcpu_runstate_info *setup_runstat
return rs;
}
@@ -85,10 +85,10 @@ Patch-mainline: n/a
- runstate->time[RUNSTATE_offline];
-}
-
- void xen_read_persistent_clock(struct timespec *ts)
- {
- const shared_info_t *s = HYPERVISOR_shared_info;
-@@ -659,10 +684,6 @@ static void setup_cpu0_timer_irq(void)
+ /* Dynamically-mapped IRQ. */
+ DEFINE_PER_CPU(int, timer_irq);
+
+@@ -697,10 +722,6 @@ static void setup_cpu0_timer_irq(void)
BUG_ON(per_cpu(timer_irq, 0) < 0);
}
@@ -98,8 +98,8 @@ Patch-mainline: n/a
-
static void __init _late_time_init(void)
{
- update_wallclock();
-@@ -805,35 +826,6 @@ void xen_halt(void)
+ update_wallclock(false);
+@@ -843,35 +864,6 @@ void xen_halt(void)
VOID(HYPERVISOR_vcpu_op(VCPUOP_down, smp_processor_id(), NULL));
}
@@ -129,7 +129,7 @@ Patch-mainline: n/a
-
- processed_system_time = per_cpu(shadow_time, 0).system_timestamp;
-
-- update_wallclock();
+- update_wallclock(false);
-}
-
#ifdef CONFIG_SMP
diff --git a/patches.xen/xen-unpriv-build b/patches.xen/xen-unpriv-build
index f317a95560..d8789b9f5c 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-06-30.orig/arch/x86/Kconfig 2011-07-04 10:26:08.000000000 +0200
-+++ head-2011-06-30/arch/x86/Kconfig 2011-07-04 12:15:51.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/Kconfig 2011-07-04 10:26:08.000000000 +0200
++++ head-2011-07-21/arch/x86/Kconfig 2011-07-04 12:15:51.000000000 +0200
@@ -661,6 +661,7 @@ config APB_TIMER
config DMI
default y
@@ -64,8 +64,18 @@ Patch-mainline: n/a
source "fs/Kconfig"
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/swiotlb.h 2011-02-01 15:09:47.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/swiotlb.h 2011-02-02 15:10:34.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/Kconfig.debug 2011-06-30 16:39:08.000000000 +0200
++++ head-2011-07-21/arch/x86/Kconfig.debug 2011-07-21 12:33:36.000000000 +0200
+@@ -33,6 +33,7 @@ config X86_VERBOSE_BOOTUP
+
+ config EARLY_PRINTK
+ bool "Early printk" if EXPERT
++ depends on !XEN_UNPRIVILEGED_GUEST
+ default y
+ ---help---
+ Write kernel log output directly into the VGA buffer or to a serial
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/swiotlb.h 2011-02-01 15:09:47.000000000 +0100
++++ head-2011-07-21/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>
@@ -75,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-06-30.orig/drivers/firmware/Kconfig 2010-11-23 16:20:20.000000000 +0100
-+++ head-2011-06-30/drivers/firmware/Kconfig 2011-04-13 16:55:00.000000000 +0200
+--- head-2011-07-21.orig/drivers/firmware/Kconfig 2010-11-23 16:20:20.000000000 +0100
++++ head-2011-07-21/drivers/firmware/Kconfig 2011-04-13 16:55:00.000000000 +0200
@@ -127,7 +127,7 @@ config DMI_SYSFS
config ISCSI_IBFT_FIND
@@ -86,8 +96,8 @@ Patch-mainline: n/a
default n
help
This option enables the kernel to find the region of memory
---- head-2011-06-30.orig/drivers/pci/Kconfig 2011-02-01 15:09:47.000000000 +0100
-+++ head-2011-06-30/drivers/pci/Kconfig 2011-02-02 15:10:34.000000000 +0100
+--- head-2011-07-21.orig/drivers/pci/Kconfig 2011-02-01 15:09:47.000000000 +0100
++++ head-2011-07-21/drivers/pci/Kconfig 2011-02-02 15:10:34.000000000 +0100
@@ -74,7 +74,7 @@ config PARAVIRT_XEN_PCIDEV_FRONTEND
config XEN_PCIDEV_FRONTEND
@@ -97,8 +107,8 @@ Patch-mainline: n/a
depends on PCI && XEN && (PCI_GOXEN_FE || PCI_GOANY || X86_64)
select HOTPLUG
help
---- head-2011-06-30.orig/drivers/video/Kconfig 2011-06-30 16:35:51.000000000 +0200
-+++ head-2011-06-30/drivers/video/Kconfig 2011-07-04 12:16:02.000000000 +0200
+--- head-2011-07-21.orig/drivers/video/Kconfig 2011-06-30 16:35:51.000000000 +0200
++++ head-2011-07-21/drivers/video/Kconfig 2011-07-04 12:16:02.000000000 +0200
@@ -745,7 +745,7 @@ config FB_UVESA
config FB_VESA
@@ -108,8 +118,8 @@ Patch-mainline: n/a
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
---- head-2011-06-30.orig/drivers/xen/Kconfig 2011-04-14 11:28:14.000000000 +0200
-+++ head-2011-06-30/drivers/xen/Kconfig 2011-04-14 11:28:24.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/Kconfig 2011-04-14 11:28:14.000000000 +0200
++++ head-2011-07-21/drivers/xen/Kconfig 2011-04-14 11:28:24.000000000 +0200
@@ -18,7 +18,8 @@ config XEN_PRIVILEGED_GUEST
Support for privileged operation (domain 0)
@@ -128,8 +138,8 @@ Patch-mainline: n/a
default XEN_PRIVILEGED_GUEST
help
Device for accessing (in user-space) pages that have been granted
---- head-2011-06-30.orig/drivers/xen/balloon/balloon.c 2010-11-25 13:47:01.000000000 +0100
-+++ head-2011-06-30/drivers/xen/balloon/balloon.c 2011-03-23 08:54:09.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/balloon/balloon.c 2010-11-25 13:47:01.000000000 +0100
++++ head-2011-07-21/drivers/xen/balloon/balloon.c 2011-03-23 08:54:09.000000000 +0100
@@ -656,6 +656,9 @@ void balloon_update_driver_allowance(lon
bs.driver_pages += delta;
balloon_unlock(flags);
@@ -169,8 +179,8 @@ Patch-mainline: n/a
EXPORT_SYMBOL_GPL(balloon_release_driver_page);
MODULE_LICENSE("Dual BSD/GPL");
---- head-2011-06-30.orig/drivers/xen/console/console.c 2011-02-01 15:04:27.000000000 +0100
-+++ head-2011-06-30/drivers/xen/console/console.c 2011-02-02 15:10:34.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/console/console.c 2011-02-01 15:04:27.000000000 +0100
++++ head-2011-07-21/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>
@@ -213,8 +223,8 @@ Patch-mainline: n/a
/******************** User-space console driver (/dev/console) ************/
---- head-2011-06-30.orig/drivers/xen/core/Makefile 2011-02-02 15:09:57.000000000 +0100
-+++ head-2011-06-30/drivers/xen/core/Makefile 2011-02-02 15:10:34.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/core/Makefile 2011-02-02 15:09:57.000000000 +0100
++++ head-2011-07-21/drivers/xen/core/Makefile 2011-02-02 15:10:34.000000000 +0100
@@ -2,10 +2,11 @@
# Makefile for the linux kernel.
#
@@ -230,8 +240,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-06-30.orig/drivers/xen/core/evtchn.c 2011-04-14 16:37:16.000000000 +0200
-+++ head-2011-06-30/drivers/xen/core/evtchn.c 2011-04-14 16:37:32.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/core/evtchn.c 2011-04-14 16:37:16.000000000 +0200
++++ head-2011-07-21/drivers/xen/core/evtchn.c 2011-04-14 16:37:32.000000000 +0200
@@ -1834,6 +1834,7 @@ void evtchn_register_pirq(int irq)
"fasteoi");
}
@@ -248,8 +258,8 @@ Patch-mainline: n/a
int evtchn_get_xen_pirq(int irq)
{
---- head-2011-06-30.orig/drivers/xen/core/gnttab.c 2011-02-02 15:10:16.000000000 +0100
-+++ head-2011-06-30/drivers/xen/core/gnttab.c 2011-02-02 15:10:34.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/core/gnttab.c 2011-02-02 15:10:16.000000000 +0100
++++ head-2011-07-21/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
@@ -279,8 +289,8 @@ Patch-mainline: n/a
#ifdef __HAVE_ARCH_PTE_SPECIAL
static unsigned int GNTMAP_pte_special;
---- head-2011-06-30.orig/drivers/xen/privcmd/Makefile 2007-07-10 09:42:30.000000000 +0200
-+++ head-2011-06-30/drivers/xen/privcmd/Makefile 2011-02-02 15:10:34.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/privcmd/Makefile 2007-07-10 09:42:30.000000000 +0200
++++ head-2011-07-21/drivers/xen/privcmd/Makefile 2011-02-02 15:10:34.000000000 +0100
@@ -1,3 +1,3 @@
-
-obj-y += privcmd.o
@@ -288,8 +298,8 @@ Patch-mainline: n/a
+priv-$(CONFIG_COMPAT) := compat_privcmd.o
+obj-y := privcmd.o
+obj-$(CONFIG_XEN_PRIVILEGED_GUEST) += $(priv-y)
---- head-2011-06-30.orig/drivers/xen/privcmd/privcmd.c 2011-02-01 15:09:47.000000000 +0100
-+++ head-2011-06-30/drivers/xen/privcmd/privcmd.c 2011-02-02 15:10:34.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/privcmd/privcmd.c 2011-02-01 15:09:47.000000000 +0100
++++ head-2011-07-21/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;
@@ -343,8 +353,8 @@ Patch-mainline: n/a
};
static int capabilities_read(char *page, char **start, off_t off,
---- head-2011-06-30.orig/drivers/xen/xenbus/xenbus_comms.c 2011-04-11 15:03:17.000000000 +0200
-+++ head-2011-06-30/drivers/xen/xenbus/xenbus_comms.c 2011-04-01 10:23:25.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/xenbus/xenbus_comms.c 2011-04-11 15:03:17.000000000 +0200
++++ head-2011-07-21/drivers/xen/xenbus/xenbus_comms.c 2011-04-01 10:23:25.000000000 +0200
@@ -52,12 +52,12 @@
static int xenbus_irq;
@@ -368,8 +378,8 @@ Patch-mainline: n/a
wake_up(&xb_waitq);
return IRQ_HANDLED;
}
---- head-2011-06-30.orig/drivers/xen/xenbus/xenbus_probe.c 2011-06-10 12:08:06.000000000 +0200
-+++ head-2011-06-30/drivers/xen/xenbus/xenbus_probe.c 2011-07-04 12:15:46.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/xenbus/xenbus_probe.c 2011-06-10 12:08:06.000000000 +0200
++++ head-2011-07-21/drivers/xen/xenbus/xenbus_probe.c 2011-07-04 12:15:46.000000000 +0200
@@ -92,7 +92,11 @@ static unsigned long xen_store_mfn;
extern struct mutex xenwatch_mutex;
@@ -398,8 +408,8 @@ Patch-mainline: n/a
{
BUG_ON(!is_xenstored_ready());
---- head-2011-06-30.orig/fs/compat_ioctl.c 2011-02-01 14:55:46.000000000 +0100
-+++ head-2011-06-30/fs/compat_ioctl.c 2011-02-02 15:10:34.000000000 +0100
+--- head-2011-07-21.orig/fs/compat_ioctl.c 2011-02-01 14:55:46.000000000 +0100
++++ head-2011-07-21/fs/compat_ioctl.c 2011-02-02 15:10:34.000000000 +0100
@@ -1481,7 +1481,7 @@ static long do_ioctl_trans(int fd, unsig
return do_video_stillpicture(fd, cmd, argp);
case VIDEO_SET_SPU_PALETTE:
@@ -409,8 +419,8 @@ Patch-mainline: n/a
case IOCTL_PRIVCMD_MMAP_32:
case IOCTL_PRIVCMD_MMAPBATCH_32:
case IOCTL_PRIVCMD_MMAPBATCH_V2_32:
---- head-2011-06-30.orig/include/xen/firmware.h 2007-07-02 08:16:19.000000000 +0200
-+++ head-2011-06-30/include/xen/firmware.h 2011-02-02 15:10:34.000000000 +0100
+--- head-2011-07-21.orig/include/xen/firmware.h 2007-07-02 08:16:19.000000000 +0200
++++ head-2011-07-21/include/xen/firmware.h 2011-02-02 15:10:34.000000000 +0100
@@ -5,6 +5,10 @@
void copy_edd(void);
#endif
@@ -422,8 +432,8 @@ Patch-mainline: n/a
+#endif
#endif /* __XEN_FIRMWARE_H__ */
---- head-2011-06-30.orig/include/xen/gnttab.h 2010-11-23 15:07:01.000000000 +0100
-+++ head-2011-06-30/include/xen/gnttab.h 2011-02-02 15:10:34.000000000 +0100
+--- head-2011-07-21.orig/include/xen/gnttab.h 2010-11-23 15:07:01.000000000 +0100
++++ head-2011-07-21/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-virq-per-cpu-irq b/patches.xen/xen-virq-per-cpu-irq
index 6f63ce9178..827d44eb5a 100644
--- a/patches.xen/xen-virq-per-cpu-irq
+++ b/patches.xen/xen-virq-per-cpu-irq
@@ -2,9 +2,9 @@ From: jbeulich@novell.com
Subject: fold per-CPU VIRQs onto a single IRQ each
Patch-mainline: n/a
---- head-2011-04-13.orig/arch/x86/kernel/time-xen.c 2011-04-14 16:18:25.000000000 +0200
-+++ head-2011-04-13/arch/x86/kernel/time-xen.c 2011-04-14 16:36:14.000000000 +0200
-@@ -669,19 +669,17 @@ int xen_update_persistent_clock(void)
+--- head-2011-06-30.orig/arch/x86/kernel/time-xen.c 2011-07-11 15:30:38.000000000 +0200
++++ head-2011-06-30/arch/x86/kernel/time-xen.c 2011-07-11 15:30:50.000000000 +0200
+@@ -707,19 +707,17 @@ struct vcpu_runstate_info *setup_runstat
}
/* Dynamically-mapped IRQ. */
@@ -32,7 +32,7 @@ Patch-mainline: n/a
}
static void __init _late_time_init(void)
-@@ -827,8 +825,6 @@ void xen_halt(void)
+@@ -865,8 +863,6 @@ void xen_halt(void)
}
#ifdef CONFIG_SMP
@@ -41,7 +41,7 @@ Patch-mainline: n/a
int __cpuinit local_setup_timer(unsigned int cpu)
{
int seq, irq;
-@@ -854,16 +850,10 @@ int __cpuinit local_setup_timer(unsigned
+@@ -892,16 +888,10 @@ int __cpuinit local_setup_timer(unsigned
init_missing_ticks_accounting(cpu);
} while (read_seqretry(&xtime_lock, seq));
@@ -60,7 +60,7 @@ Patch-mainline: n/a
return 0;
}
-@@ -871,7 +861,7 @@ int __cpuinit local_setup_timer(unsigned
+@@ -909,7 +899,7 @@ int __cpuinit local_setup_timer(unsigned
void __cpuinit local_teardown_timer(unsigned int cpu)
{
BUG_ON(cpu == 0);
@@ -69,8 +69,8 @@ Patch-mainline: n/a
}
#endif
---- head-2011-04-13.orig/drivers/xen/core/evtchn.c 2011-04-14 14:02:49.000000000 +0200
-+++ head-2011-04-13/drivers/xen/core/evtchn.c 2011-04-14 16:36:14.000000000 +0200
+--- head-2011-06-30.orig/drivers/xen/core/evtchn.c 2011-04-14 14:02:49.000000000 +0200
++++ head-2011-06-30/drivers/xen/core/evtchn.c 2011-04-14 16:36:14.000000000 +0200
@@ -59,6 +59,23 @@ static DEFINE_SPINLOCK(irq_mapping_updat
static int evtchn_to_irq[NR_EVENT_CHANNELS] = {
[0 ... NR_EVENT_CHANNELS-1] = -1 };
@@ -530,8 +530,8 @@ Patch-mainline: n/a
init_evtchn_cpu_bindings();
#ifdef CONFIG_SPARSE_IRQ
---- head-2011-04-13.orig/drivers/xen/core/smpboot.c 2011-03-03 16:14:20.000000000 +0100
-+++ head-2011-04-13/drivers/xen/core/smpboot.c 2011-04-14 16:36:14.000000000 +0200
+--- head-2011-06-30.orig/drivers/xen/core/smpboot.c 2011-03-03 16:14:20.000000000 +0100
++++ head-2011-06-30/drivers/xen/core/smpboot.c 2011-04-14 16:36:14.000000000 +0200
@@ -125,7 +125,7 @@ static int __cpuinit xen_smp_intr_init(u
fail:
xen_spinlock_cleanup(cpu);
@@ -550,8 +550,8 @@ Patch-mainline: n/a
xen_spinlock_cleanup(cpu);
}
#endif
---- head-2011-04-13.orig/drivers/xen/netback/netback.c 2011-04-13 17:01:32.000000000 +0200
-+++ head-2011-04-13/drivers/xen/netback/netback.c 2011-04-13 16:48:30.000000000 +0200
+--- head-2011-06-30.orig/drivers/xen/netback/netback.c 2011-04-13 17:01:32.000000000 +0200
++++ head-2011-06-30/drivers/xen/netback/netback.c 2011-04-13 16:48:30.000000000 +0200
@@ -1633,6 +1633,12 @@ static irqreturn_t netif_be_dbg(int irq,
return IRQ_HANDLED;
@@ -581,8 +581,8 @@ Patch-mainline: n/a
#endif
return 0;
---- head-2011-04-13.orig/drivers/xen/xenoprof/xenoprofile.c 2011-04-15 12:46:57.000000000 +0200
-+++ head-2011-04-13/drivers/xen/xenoprof/xenoprofile.c 2011-04-15 12:47:52.000000000 +0200
+--- head-2011-06-30.orig/drivers/xen/xenoprof/xenoprofile.c 2011-04-15 12:46:57.000000000 +0200
++++ head-2011-06-30/drivers/xen/xenoprof/xenoprofile.c 2011-04-15 12:47:52.000000000 +0200
@@ -198,6 +198,11 @@ static irqreturn_t xenoprof_ovf_interrup
return IRQ_HANDLED;
}
@@ -618,8 +618,8 @@ Patch-mainline: n/a
if (result < 0) {
unbind_virq();
---- head-2011-04-13.orig/include/xen/evtchn.h 2011-02-02 15:09:43.000000000 +0100
-+++ head-2011-04-13/include/xen/evtchn.h 2010-11-23 16:18:23.000000000 +0100
+--- head-2011-06-30.orig/include/xen/evtchn.h 2011-02-02 15:09:43.000000000 +0100
++++ head-2011-06-30/include/xen/evtchn.h 2010-11-23 16:18:23.000000000 +0100
@@ -94,6 +94,17 @@ int bind_virq_to_irqhandler(
unsigned long irqflags,
const char *devname,
diff --git a/patches.xen/xen-x86-EFI b/patches.xen/xen-x86-EFI
index 9195682b5d..070dd4cc62 100644
--- a/patches.xen/xen-x86-EFI
+++ b/patches.xen/xen-x86-EFI
@@ -3,8 +3,8 @@ From: jbeulich@novell.com
Patch-mainline: n/a
References: fate#311376, fate#311529, bnc#578927, bnc#628554
---- head-2011-06-30.orig/arch/x86/Kconfig 2011-07-04 12:31:30.000000000 +0200
-+++ head-2011-06-30/arch/x86/Kconfig 2011-07-04 12:31:53.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/Kconfig 2011-07-04 12:31:30.000000000 +0200
++++ head-2011-07-21/arch/x86/Kconfig 2011-07-04 12:31:53.000000000 +0200
@@ -1502,7 +1502,7 @@ config ARCH_USES_PG_UNCACHED
config EFI
@@ -14,8 +14,8 @@ References: fate#311376, fate#311529, bnc#578927, bnc#628554
---help---
This enables the kernel to use EFI runtime services that are
available (such as the EFI variable services).
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/setup.h 2011-02-01 14:54:13.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/setup.h 2011-07-04 12:32:43.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/setup.h 2011-02-01 14:54:13.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/setup.h 2011-07-04 12:32:43.000000000 +0200
@@ -3,6 +3,12 @@
void xen_start_kernel(void);
void xen_arch_setup(void);
@@ -29,9 +29,9 @@ References: fate#311376, fate#311529, bnc#578927, bnc#628554
#endif
#include_next <asm/setup.h>
---- head-2011-06-30.orig/arch/x86/kernel/setup-xen.c 2011-07-04 12:30:29.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/setup-xen.c 2011-07-04 12:32:51.000000000 +0200
-@@ -869,6 +869,8 @@ void __init setup_arch(char **cmdline_p)
+--- head-2011-07-21.orig/arch/x86/kernel/setup-xen.c 2011-07-21 12:41:22.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/setup-xen.c 2011-07-21 12:45:13.000000000 +0200
+@@ -919,6 +919,8 @@ void __init setup_arch(char **cmdline_p)
xen_start_info->console.dom0.info_size);
xen_start_info->console.domU.mfn = 0;
xen_start_info->console.domU.evtchn = 0;
@@ -40,13 +40,13 @@ References: fate#311376, fate#311529, bnc#578927, bnc#628554
} else
screen_info.orig_video_isVGA = 0;
copy_edid();
---- head-2011-06-30.orig/arch/x86/platform/efi/Makefile 2011-01-05 01:50:19.000000000 +0100
-+++ head-2011-06-30/arch/x86/platform/efi/Makefile 2011-06-09 17:06:13.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/platform/efi/Makefile 2011-07-21 11:59:58.000000000 +0200
++++ head-2011-07-21/arch/x86/platform/efi/Makefile 2011-06-09 17:06:13.000000000 +0200
@@ -1 +1,2 @@
obj-$(CONFIG_EFI) += efi.o efi_$(BITS).o efi_stub_$(BITS).o
+disabled-obj-$(CONFIG_XEN) := efi_%$(BITS).o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-06-30/arch/x86/platform/efi/efi-xen.c 2011-07-01 16:16:55.000000000 +0200
++++ head-2011-07-21/arch/x86/platform/efi/efi-xen.c 2011-07-01 16:16:55.000000000 +0200
@@ -0,0 +1,432 @@
+/*
+ * Common EFI (Extensible Firmware Interface) support functions
@@ -480,8 +480,8 @@ References: fate#311376, fate#311529, bnc#578927, bnc#628554
+ info->mem.size = 0;
+ return HYPERVISOR_platform_op(&op) ? 0 : info->mem.attr;
+}
---- head-2011-06-30.orig/drivers/rtc/Kconfig 2011-06-30 15:04:15.000000000 +0200
-+++ head-2011-06-30/drivers/rtc/Kconfig 2011-07-04 12:33:03.000000000 +0200
+--- head-2011-07-21.orig/drivers/rtc/Kconfig 2011-07-21 11:59:58.000000000 +0200
++++ head-2011-07-21/drivers/rtc/Kconfig 2011-07-04 12:33:03.000000000 +0200
@@ -556,7 +556,7 @@ config RTC_DRV_DS1742
config RTC_DRV_EFI
@@ -491,8 +491,8 @@ References: fate#311376, fate#311529, bnc#578927, bnc#628554
help
If you say yes here you will get support for the EFI
Real Time Clock.
---- head-2011-06-30.orig/drivers/xen/console/console.c 2011-02-02 15:10:34.000000000 +0100
-+++ head-2011-06-30/drivers/xen/console/console.c 2011-06-15 15:41:36.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/console/console.c 2011-02-02 15:10:34.000000000 +0100
++++ head-2011-07-21/drivers/xen/console/console.c 2011-06-15 15:41:36.000000000 +0200
@@ -315,6 +315,7 @@ void __init dom0_init_screen_info(const
break;
@@ -512,8 +512,8 @@ References: fate#311376, fate#311529, bnc#578927, bnc#628554
if (size >= offsetof(struct dom0_vga_console_info,
u.vesa_lfb.gbl_caps)
+ sizeof(info->u.vesa_lfb.gbl_caps))
---- head-2011-06-30.orig/include/linux/efi.h 2011-06-30 15:04:24.000000000 +0200
-+++ head-2011-06-30/include/linux/efi.h 2011-06-10 11:12:39.000000000 +0200
+--- head-2011-07-21.orig/include/linux/efi.h 2011-07-21 11:59:58.000000000 +0200
++++ head-2011-07-21/include/linux/efi.h 2011-06-10 11:12:39.000000000 +0200
@@ -249,7 +249,9 @@ struct efi_memory_map {
* All runtime access to EFI goes through this structure:
*/
@@ -535,8 +535,8 @@ References: fate#311376, fate#311529, bnc#578927, bnc#628554
} efi;
static inline int
---- head-2011-06-30.orig/include/xen/interface/platform.h 2010-06-22 15:48:58.000000000 +0200
-+++ head-2011-06-30/include/xen/interface/platform.h 2011-06-17 16:07:28.000000000 +0200
+--- head-2011-07-21.orig/include/xen/interface/platform.h 2010-06-22 15:48:58.000000000 +0200
++++ head-2011-07-21/include/xen/interface/platform.h 2011-06-17 16:07:28.000000000 +0200
@@ -114,10 +114,86 @@ struct xenpf_platform_quirk {
typedef struct xenpf_platform_quirk xenpf_platform_quirk_t;
DEFINE_XEN_GUEST_HANDLE(xenpf_platform_quirk_t);
@@ -657,8 +657,8 @@ References: fate#311376, fate#311529, bnc#578927, bnc#628554
struct xenpf_firmware_info firmware_info;
struct xenpf_enter_acpi_sleep enter_acpi_sleep;
struct xenpf_change_freq change_freq;
---- head-2011-06-30.orig/include/xen/interface/xen.h 2011-04-13 12:42:17.000000000 +0200
-+++ head-2011-06-30/include/xen/interface/xen.h 2011-06-07 13:55:11.000000000 +0200
+--- head-2011-07-21.orig/include/xen/interface/xen.h 2011-04-13 12:42:17.000000000 +0200
++++ head-2011-07-21/include/xen/interface/xen.h 2011-06-07 13:55:11.000000000 +0200
@@ -660,6 +660,7 @@ typedef struct dom0_vga_console_info {
uint8_t video_type; /* DOM0_VGA_CONSOLE_??? */
#define XEN_VGATYPE_TEXT_MODE_3 0x03
diff --git a/patches.xen/xen-x86-bigmem b/patches.xen/xen-x86-bigmem
index 6f0298f6db..f641ab2b0f 100644
--- a/patches.xen/xen-x86-bigmem
+++ b/patches.xen/xen-x86-bigmem
@@ -1,10 +1,23 @@
From: jbeulich@novell.com
Subject: fix issues with the assignment of huge amounts of memory
Patch-mainline: obsolete
-References: bnc#482614, bnc#537435
+References: bnc#482614, bnc#537435, bnc#700856
---- head-2011-06-30.orig/arch/x86/kernel/e820-xen.c 2011-04-26 09:20:05.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/e820-xen.c 2011-04-13 17:05:50.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-07-21 12:40:47.000000000 +0200
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/hypervisor.h 2011-07-20 15:47:08.000000000 +0200
+@@ -102,6 +102,10 @@ void xen_pgd_pin(unsigned long ptr);
+ void xen_pgd_unpin(unsigned long ptr);
+
+ void xen_init_pgd_pin(void);
++#ifdef CONFIG_PM_SLEEP
++void setup_pfn_to_mfn_frame_list(void *(*)(unsigned long, unsigned long,
++ unsigned long));
++#endif
+
+ void xen_set_ldt(const void *ptr, unsigned int ents);
+
+--- head-2011-07-21.orig/arch/x86/kernel/e820-xen.c 2011-04-26 09:20:05.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/e820-xen.c 2011-04-13 17:05:50.000000000 +0200
@@ -954,6 +954,26 @@ static int __init parse_memopt(char *p)
/* don't remove all of memory when handling "mem={invalid}" param */
if (mem_size == 0)
@@ -63,8 +76,8 @@ References: bnc#482614, bnc#537435
if (is_initial_xendomain()) {
memmap.nr_entries = E820MAX;
set_xen_guest_handle(memmap.buffer, machine_e820.map);
---- head-2011-06-30.orig/arch/x86/kernel/setup-xen.c 2011-07-04 12:21:52.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/setup-xen.c 2011-07-04 12:30:29.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/kernel/setup-xen.c 2011-07-04 12:21:52.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/setup-xen.c 2011-07-21 12:41:22.000000000 +0200
@@ -133,12 +133,7 @@ static struct notifier_block xen_panic_b
unsigned long *phys_to_machine_mapping;
EXPORT_SYMBOL(phys_to_machine_mapping);
@@ -75,69 +88,182 @@ References: bnc#482614, bnc#537435
-#else
- *pfn_to_mfn_frame_list[128];
-#endif
-+unsigned long *pfn_to_mfn_frame_list_list, **pfn_to_mfn_frame_list;
++static unsigned long *pfn_to_mfn_frame_list_list, **pfn_to_mfn_frame_list;
/* Raw start-of-day parameters from the hypervisor. */
start_info_t *xen_start_info;
-@@ -1170,17 +1165,17 @@ void __init setup_arch(char **cmdline_p)
+@@ -179,6 +174,56 @@ struct boot_params __initdata boot_param
+ #else
+ struct boot_params boot_params;
+ #endif
++#else /* CONFIG_XEN */
++/*
++ * Initialise the list of the frames that specify the list of
++ * frames that make up the p2m table. Used by save/restore and
++ * kexec/crash.
++ */
++#ifdef CONFIG_PM_SLEEP
++void
++#else
++static void __init
++#endif
++setup_pfn_to_mfn_frame_list(typeof(__alloc_bootmem) *__alloc_bootmem)
++{
++ unsigned long i, j, size;
++ unsigned int k, fpp = PAGE_SIZE / sizeof(unsigned long);
++
++ size = (max_pfn + fpp - 1) / fpp;
++ size = (size + fpp - 1) / fpp;
++ ++size; /* include a zero terminator for crash tools */
++ size *= sizeof(unsigned long);
++ if (__alloc_bootmem)
++ pfn_to_mfn_frame_list_list = alloc_bootmem_pages(size);
++ if (size > PAGE_SIZE
++ && xen_create_contiguous_region((unsigned long)
++ pfn_to_mfn_frame_list_list,
++ get_order(size), 0))
++ BUG();
++ size -= sizeof(unsigned long);
++ if (__alloc_bootmem)
++ pfn_to_mfn_frame_list = alloc_bootmem(size);
++
++ for (i = j = 0, k = -1; i < max_pfn; i += fpp, j++) {
++ if (j == fpp)
++ j = 0;
++ if (j == 0) {
++ k++;
++ BUG_ON(k * sizeof(unsigned long) >= size);
++ if (__alloc_bootmem)
++ pfn_to_mfn_frame_list[k] =
++ alloc_bootmem_pages(PAGE_SIZE);
++ pfn_to_mfn_frame_list_list[k] =
++ virt_to_mfn(pfn_to_mfn_frame_list[k]);
++ }
++ pfn_to_mfn_frame_list[k][j] =
++ virt_to_mfn(&phys_to_machine_mapping[i]);
++ }
++ HYPERVISOR_shared_info->arch.max_pfn = max_pfn;
++ HYPERVISOR_shared_info->arch.pfn_to_mfn_frame_list_list =
++ virt_to_mfn(pfn_to_mfn_frame_list_list);
++}
+ #endif
+
+ /*
+@@ -1170,46 +1215,42 @@ void __init setup_arch(char **cmdline_p)
p2m_pages = xen_start_info->nr_pages;
if (!xen_feature(XENFEAT_auto_translated_physmap)) {
- unsigned long i, j;
-+ unsigned long i, j, size;
- unsigned int k, fpp;
-
+- unsigned int k, fpp;
+-
/* Make sure we have a large enough P->M table. */
phys_to_machine_mapping = alloc_bootmem_pages(
max_pfn * sizeof(unsigned long));
- memset(phys_to_machine_mapping, ~0,
- max_pfn * sizeof(unsigned long));
++#ifdef CONFIG_X86_32
memcpy(phys_to_machine_mapping,
(unsigned long *)xen_start_info->mfn_list,
p2m_pages * sizeof(unsigned long));
+ memset(phys_to_machine_mapping + p2m_pages, ~0,
+ (max_pfn - p2m_pages) * sizeof(unsigned long));
++#else /* We must not use memcpy() and memset() here, as they're
++ not capable of dealing with 4Gb or more at a time. */
++ {
++ void *src = (void *)xen_start_info->mfn_list;
++ unsigned long size, *dst = phys_to_machine_mapping;
++ unsigned int fpp = PAGE_SIZE / sizeof(*dst);
++
++ for (size = p2m_pages; size >= fpp; size -= fpp) {
++ copy_page(dst, src);
++ src += PAGE_SIZE;
++ dst += fpp;
++ }
++ memcpy(dst, src, size * sizeof(*dst));
++ dst += size;
++ for (size = max_pfn - p2m_pages; size; --size)
++ *dst++ = INVALID_P2M_ENTRY;
++ }
++#endif
free_bootmem(
__pa(xen_start_info->mfn_list),
PFN_PHYS(PFN_UP(xen_start_info->nr_pages *
-@@ -1190,15 +1185,26 @@ void __init setup_arch(char **cmdline_p)
- * Initialise the list of the frames that specify the list of
- * frames that make up the p2m table. Used by save/restore.
- */
+ sizeof(unsigned long))));
+
+- /*
+- * Initialise the list of the frames that specify the list of
+- * frames that make up the p2m table. Used by save/restore.
+- */
- pfn_to_mfn_frame_list_list = alloc_bootmem_pages(PAGE_SIZE);
-
- fpp = PAGE_SIZE/sizeof(unsigned long);
-+ size = (max_pfn + fpp - 1) / fpp;
-+ size = (size + fpp - 1) / fpp;
-+ ++size; /* include a zero terminator for crash tools */
-+ size *= sizeof(unsigned long);
-+ pfn_to_mfn_frame_list_list = alloc_bootmem_pages(size);
-+ if (size > PAGE_SIZE
-+ && xen_create_contiguous_region((unsigned long)
-+ pfn_to_mfn_frame_list_list,
-+ get_order(size), 0))
-+ BUG();
-+ size -= sizeof(unsigned long);
-+ pfn_to_mfn_frame_list = alloc_bootmem(size);
-+
- for (i = j = 0, k = -1; i < max_pfn; i += fpp, j++) {
- if (j == fpp)
- j = 0;
- if (j == 0) {
- k++;
+- fpp = PAGE_SIZE/sizeof(unsigned long);
+- for (i = j = 0, k = -1; i < max_pfn; i += fpp, j++) {
+- if (j == fpp)
+- j = 0;
+- if (j == 0) {
+- k++;
- BUG_ON(k>=ARRAY_SIZE(pfn_to_mfn_frame_list));
-+ BUG_ON(k * sizeof(unsigned long) >= size);
- pfn_to_mfn_frame_list[k] =
- alloc_bootmem_pages(PAGE_SIZE);
- pfn_to_mfn_frame_list_list[k] =
---- head-2011-06-30.orig/drivers/xen/core/machine_reboot.c 2011-04-14 17:32:26.000000000 +0200
-+++ head-2011-06-30/drivers/xen/core/machine_reboot.c 2011-04-14 17:32:34.000000000 +0200
-@@ -76,7 +76,7 @@ static void post_suspend(int suspend_can
+- pfn_to_mfn_frame_list[k] =
+- alloc_bootmem_pages(PAGE_SIZE);
+- pfn_to_mfn_frame_list_list[k] =
+- virt_to_mfn(pfn_to_mfn_frame_list[k]);
+- }
+- pfn_to_mfn_frame_list[k][j] =
+- virt_to_mfn(&phys_to_machine_mapping[i]);
+- }
+- HYPERVISOR_shared_info->arch.max_pfn = max_pfn;
+- HYPERVISOR_shared_info->arch.pfn_to_mfn_frame_list_list =
+- virt_to_mfn(pfn_to_mfn_frame_list_list);
++#ifndef CONFIG_KEXEC
++ if (!is_initial_xendomain())
++#endif
++ setup_pfn_to_mfn_frame_list(__alloc_bootmem);
+ }
+
+ /* Mark all ISA DMA channels in-use - using them wouldn't work. */
+--- head-2011-07-21.orig/drivers/xen/core/machine_reboot.c 2011-04-14 17:32:26.000000000 +0200
++++ head-2011-07-21/drivers/xen/core/machine_reboot.c 2011-07-20 16:09:26.000000000 +0200
+@@ -72,11 +72,7 @@ static void pre_suspend(void)
+
+ static void post_suspend(int suspend_cancelled)
+ {
+- int i, j, k, fpp;
unsigned long shinfo_mfn;
- extern unsigned long max_pfn;
- extern unsigned long *pfn_to_mfn_frame_list_list;
+- extern unsigned long max_pfn;
+- extern unsigned long *pfn_to_mfn_frame_list_list;
- extern unsigned long *pfn_to_mfn_frame_list[];
-+ extern unsigned long **pfn_to_mfn_frame_list;
if (suspend_cancelled) {
xen_start_info->store_mfn =
+@@ -84,6 +80,8 @@ static void post_suspend(int suspend_can
+ xen_start_info->console.domU.mfn =
+ pfn_to_mfn(xen_start_info->console.domU.mfn);
+ } else {
++ unsigned int i;
++
+ #ifdef CONFIG_SMP
+ cpumask_copy(vcpu_initialized_mask, cpu_online_mask);
+ #endif
+@@ -100,20 +98,8 @@ static void post_suspend(int suspend_can
+
+ clear_page(empty_zero_page);
+
+- fpp = PAGE_SIZE/sizeof(unsigned long);
+- for (i = 0, j = 0, k = -1; i < max_pfn; i += fpp, j++) {
+- if ((j % fpp) == 0) {
+- k++;
+- pfn_to_mfn_frame_list_list[k] =
+- virt_to_mfn(pfn_to_mfn_frame_list[k]);
+- j = 0;
+- }
+- pfn_to_mfn_frame_list[k][j] =
+- virt_to_mfn(&phys_to_machine_mapping[i]);
+- }
+- HYPERVISOR_shared_info->arch.max_pfn = max_pfn;
+- HYPERVISOR_shared_info->arch.pfn_to_mfn_frame_list_list =
+- virt_to_mfn(pfn_to_mfn_frame_list_list);
++ if (!suspend_cancelled)
++ setup_pfn_to_mfn_frame_list(NULL);
+ }
+ #endif
+
diff --git a/patches.xen/xen-x86-per-cpu-vcpu-info b/patches.xen/xen-x86-per-cpu-vcpu-info
index 78748c46ee..3bc2ed9b56 100644
--- a/patches.xen/xen-x86-per-cpu-vcpu-info
+++ b/patches.xen/xen-x86-per-cpu-vcpu-info
@@ -5,8 +5,8 @@ Patch-mainline: obsolete
... reducing access code size and latency, as well as being the
prerequisite for removing the limitation on 32 vCPU-s per guest.
---- head-2011-06-30.orig/arch/x86/include/asm/percpu.h 2011-06-30 15:04:06.000000000 +0200
-+++ head-2011-06-30/arch/x86/include/asm/percpu.h 2011-04-13 17:06:05.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/include/asm/percpu.h 2011-07-21 11:59:58.000000000 +0200
++++ head-2011-07-21/arch/x86/include/asm/percpu.h 2011-04-13 17:06:05.000000000 +0200
@@ -311,6 +311,40 @@ do { \
pxo_ret__; \
})
@@ -59,9 +59,9 @@ prerequisite for removing the limitation on 32 vCPU-s per guest.
#define __this_cpu_read_1(pcp) percpu_from_op("mov", (pcp), "m"(pcp))
#define __this_cpu_read_2(pcp) percpu_from_op("mov", (pcp), "m"(pcp))
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-03-23 10:11:23.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/hypervisor.h 2011-03-23 10:12:07.000000000 +0100
-@@ -51,12 +51,26 @@
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-07-20 15:47:08.000000000 +0200
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/hypervisor.h 2011-07-21 12:42:38.000000000 +0200
+@@ -47,12 +47,26 @@
extern shared_info_t *HYPERVISOR_shared_info;
@@ -88,8 +88,8 @@ prerequisite for removing the limitation on 32 vCPU-s per guest.
#ifdef CONFIG_X86_32
extern unsigned long hypervisor_virt_start;
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/irqflags.h 2011-02-02 15:09:52.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/irqflags.h 2011-02-03 14:42:15.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/irqflags.h 2011-02-02 15:09:52.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/irqflags.h 2011-02-03 14:42:15.000000000 +0100
@@ -14,7 +14,7 @@
* includes these barriers, for example.
*/
@@ -165,8 +165,8 @@ prerequisite for removing the limitation on 32 vCPU-s per guest.
TRACE_IRQS_OFF ; \
sysexit_ecrit: /**** END OF SYSEXIT CRITICAL REGION ****/ ; \
mov $__KERNEL_PERCPU, %ecx ; \
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 10:11:13.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 10:12:10.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 10:11:13.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 10:12:10.000000000 +0100
@@ -123,6 +123,8 @@ static inline void xen_set_pgd(pgd_t *pg
#define __pte_mfn(_pte) (((_pte).pte & PTE_PFN_MASK) >> PAGE_SHIFT)
@@ -176,8 +176,8 @@ prerequisite for removing the limitation on 32 vCPU-s per guest.
extern void sync_global_pgds(unsigned long start, unsigned long end);
/*
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/system.h 2011-04-13 16:26:43.000000000 +0200
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/system.h 2011-04-13 17:06:13.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/system.h 2011-04-13 16:26:43.000000000 +0200
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/system.h 2011-04-13 17:06:13.000000000 +0200
@@ -245,8 +245,8 @@ static inline void xen_write_cr0(unsigne
asm volatile("mov %0,%%cr0": : "r" (val), "m" (__force_order));
}
@@ -189,8 +189,8 @@ prerequisite for removing the limitation on 32 vCPU-s per guest.
static inline unsigned long xen_read_cr3(void)
{
---- head-2011-06-30.orig/arch/x86/kernel/cpu/common-xen.c 2011-07-01 15:19:34.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/cpu/common-xen.c 2011-07-04 12:30:47.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/kernel/cpu/common-xen.c 2011-07-01 15:19:34.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/cpu/common-xen.c 2011-07-04 12:30:47.000000000 +0200
@@ -365,8 +365,16 @@ static const char *__cpuinit table_looku
__u32 cpu_caps_cleared[NCAPINTS] __cpuinitdata;
__u32 cpu_caps_set[NCAPINTS] __cpuinitdata;
@@ -209,8 +209,8 @@ prerequisite for removing the limitation on 32 vCPU-s per guest.
#ifdef CONFIG_X86_32
loadsegment(fs, __KERNEL_PERCPU);
#else
---- head-2011-06-30.orig/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:44:50.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/entry_32-xen.S 2011-04-13 17:06:21.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:44:50.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/entry_32-xen.S 2011-04-13 17:06:21.000000000 +0200
@@ -441,6 +441,9 @@ sysenter_exit:
movl PT_EIP(%esp), %edx
movl PT_OLDESP(%esp), %ecx
@@ -243,9 +243,9 @@ prerequisite for removing the limitation on 32 vCPU-s per guest.
.previous
# Hypervisor uses this for application faults while it executes.
---- head-2011-06-30.orig/arch/x86/kernel/head-xen.c 2011-07-01 15:39:52.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/head-xen.c 2011-02-03 14:42:15.000000000 +0100
-@@ -144,6 +144,8 @@ void __init xen_start_kernel(void)
+--- head-2011-07-21.orig/arch/x86/kernel/head-xen.c 2011-07-11 15:41:28.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/head-xen.c 2011-07-11 15:41:49.000000000 +0200
+@@ -145,6 +145,8 @@ void __init xen_start_kernel(void)
HYPERVISOR_shared_info = (shared_info_t *)fix_to_virt(FIX_SHARED_INFO);
clear_page(empty_zero_page);
@@ -254,9 +254,9 @@ prerequisite for removing the limitation on 32 vCPU-s per guest.
/* Set up mapping of lowest 1MB of physical memory. */
for (i = 0; i < NR_FIX_ISAMAPS; i++)
if (is_initial_xendomain())
---- head-2011-06-30.orig/arch/x86/kernel/time-xen.c 2011-07-04 10:25:07.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/time-xen.c 2011-04-14 16:19:12.000000000 +0200
-@@ -247,16 +247,10 @@ static void get_time_values_from_xen(uns
+--- head-2011-07-21.orig/arch/x86/kernel/time-xen.c 2011-07-11 15:30:55.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/time-xen.c 2011-07-11 15:31:45.000000000 +0200
+@@ -243,16 +243,10 @@ static void get_time_values_from_xen(uns
local_irq_restore(flags);
}
@@ -274,8 +274,46 @@ prerequisite for removing the limitation on 32 vCPU-s per guest.
+ return percpu_read(shadow_time.version) == vcpu_info_read(time.version);
}
- static void sync_xen_wallclock(unsigned long dummy);
-@@ -296,7 +290,7 @@ unsigned long long xen_local_clock(void)
+ #ifdef CONFIG_XEN_PRIVILEGED_GUEST
+@@ -260,15 +254,13 @@ int xen_update_wallclock(const struct ti
+ {
+ struct timespec now;
+ s64 nsec;
+- unsigned int cpu;
+ struct shadow_time_info *shadow;
+ struct xen_platform_op op;
+
+ if (!is_initial_xendomain() || independent_wallclock)
+ return -EPERM;
+
+- cpu = get_cpu();
+- shadow = &per_cpu(shadow_time, cpu);
++ shadow = &__get_cpu_var(shadow_time);
+
+ /*
+ * Ensure we don't get blocked for a long time so that our time delta
+@@ -277,9 +269,9 @@ int xen_update_wallclock(const struct ti
+ */
+ for (;;) {
+ nsec = tv->tv_nsec - get_nsec_offset(shadow);
+- if (time_values_up_to_date(cpu))
++ if (time_values_up_to_date())
+ break;
+- get_time_values_from_xen(cpu);
++ get_time_values_from_xen(smp_processor_id());
+ }
+ set_normalized_timespec(&now, tv->tv_sec, nsec);
+
+@@ -290,8 +282,6 @@ int xen_update_wallclock(const struct ti
+ WARN_ON(HYPERVISOR_platform_op(&op));
+ update_wallclock(false);
+
+- put_cpu();
+-
+ return 0;
+ }
+ #endif
+@@ -333,7 +323,7 @@ unsigned long long xen_local_clock(void)
local_time_version = shadow->version;
rdtsc_barrier();
time = shadow->system_timestamp + get_nsec_offset(shadow);
@@ -284,8 +322,8 @@ prerequisite for removing the limitation on 32 vCPU-s per guest.
get_time_values_from_xen(cpu);
barrier();
} while (local_time_version != shadow->version);
---- head-2011-06-30.orig/arch/x86/mm/hypervisor.c 2011-05-09 11:54:29.000000000 +0200
-+++ head-2011-06-30/arch/x86/mm/hypervisor.c 2011-05-09 11:55:04.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/mm/hypervisor.c 2011-05-09 11:54:29.000000000 +0200
++++ head-2011-07-21/arch/x86/mm/hypervisor.c 2011-05-09 11:55:04.000000000 +0200
@@ -41,6 +41,7 @@
#include <xen/balloon.h>
#include <xen/features.h>
@@ -398,8 +436,8 @@ prerequisite for removing the limitation on 32 vCPU-s per guest.
#define NR_MC BITS_PER_LONG
#define NR_MMU BITS_PER_LONG
---- head-2011-06-30.orig/arch/x86/mm/init_64-xen.c 2011-07-04 12:30:03.000000000 +0200
-+++ head-2011-06-30/arch/x86/mm/init_64-xen.c 2011-02-03 14:42:15.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/init_64-xen.c 2011-07-04 12:30:03.000000000 +0200
++++ head-2011-07-21/arch/x86/mm/init_64-xen.c 2011-02-03 14:42:15.000000000 +0100
@@ -118,6 +118,26 @@ void __meminit early_make_page_readonly(
BUG();
}
@@ -427,8 +465,8 @@ prerequisite for removing the limitation on 32 vCPU-s per guest.
#ifndef CONFIG_XEN
static int __init parse_direct_gbpages_off(char *arg)
{
---- head-2011-06-30.orig/drivers/xen/Kconfig 2011-04-14 11:28:24.000000000 +0200
-+++ head-2011-06-30/drivers/xen/Kconfig 2011-04-14 11:28:35.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/Kconfig 2011-04-14 11:28:24.000000000 +0200
++++ head-2011-07-21/drivers/xen/Kconfig 2011-04-14 11:28:35.000000000 +0200
@@ -382,6 +382,18 @@ config XEN_COMPAT
default 0x030002 if XEN_COMPAT_030002_AND_LATER
default 0
@@ -448,8 +486,8 @@ prerequisite for removing the limitation on 32 vCPU-s per guest.
endmenu
config HAVE_IRQ_IGNORE_UNHANDLED
---- head-2011-06-30.orig/drivers/xen/core/evtchn.c 2011-04-14 16:37:32.000000000 +0200
-+++ head-2011-06-30/drivers/xen/core/evtchn.c 2011-04-14 16:37:51.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/core/evtchn.c 2011-04-14 16:37:32.000000000 +0200
++++ head-2011-07-21/drivers/xen/core/evtchn.c 2011-04-14 16:37:51.000000000 +0200
@@ -355,6 +355,24 @@ static DEFINE_PER_CPU(unsigned int, upca
static DEFINE_PER_CPU(unsigned int, current_l1i);
static DEFINE_PER_CPU(unsigned int, current_l2i);
@@ -538,8 +576,8 @@ prerequisite for removing the limitation on 32 vCPU-s per guest.
}
EXPORT_SYMBOL_GPL(unmask_evtchn);
---- head-2011-06-30.orig/drivers/xen/core/machine_reboot.c 2011-04-14 17:32:34.000000000 +0200
-+++ head-2011-06-30/drivers/xen/core/machine_reboot.c 2011-07-04 12:30:40.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/core/machine_reboot.c 2011-07-20 16:09:26.000000000 +0200
++++ head-2011-07-21/drivers/xen/core/machine_reboot.c 2011-07-21 12:42:42.000000000 +0200
@@ -70,7 +70,7 @@ static void pre_suspend(void)
mfn_to_pfn(xen_start_info->console.domU.mfn);
}
@@ -547,9 +585,9 @@ prerequisite for removing the limitation on 32 vCPU-s per guest.
-static void post_suspend(int suspend_cancelled)
+static void post_suspend(int suspend_cancelled, int fast_suspend)
{
- int i, j, k, fpp;
unsigned long shinfo_mfn;
-@@ -87,8 +87,21 @@ static void post_suspend(int suspend_can
+
+@@ -85,8 +85,21 @@ static void post_suspend(int suspend_can
#ifdef CONFIG_SMP
cpumask_copy(vcpu_initialized_mask, cpu_online_mask);
#endif
@@ -572,7 +610,7 @@ prerequisite for removing the limitation on 32 vCPU-s per guest.
}
shinfo_mfn = xen_start_info->shared_info >> PAGE_SHIFT;
-@@ -130,7 +143,7 @@ static void post_suspend(int suspend_can
+@@ -116,7 +129,7 @@ static void post_suspend(int suspend_can
#define switch_idle_mm() ((void)0)
#define mm_pin_all() ((void)0)
#define pre_suspend() xen_pre_suspend()
@@ -581,7 +619,7 @@ prerequisite for removing the limitation on 32 vCPU-s per guest.
#endif
-@@ -161,7 +174,7 @@ static int take_machine_down(void *_susp
+@@ -147,7 +160,7 @@ static int take_machine_down(void *_susp
BUG_ON(suspend_cancelled > 0);
suspend->resume_notifier(suspend_cancelled);
if (suspend_cancelled >= 0)
@@ -590,8 +628,8 @@ prerequisite for removing the limitation on 32 vCPU-s per guest.
if (!suspend_cancelled)
xen_clockevents_resume();
if (suspend_cancelled >= 0)
---- head-2011-06-30.orig/drivers/xen/core/smpboot.c 2011-03-03 16:50:49.000000000 +0100
-+++ head-2011-06-30/drivers/xen/core/smpboot.c 2011-02-03 14:42:15.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/core/smpboot.c 2011-03-03 16:50:49.000000000 +0100
++++ head-2011-07-21/drivers/xen/core/smpboot.c 2011-02-03 14:42:15.000000000 +0100
@@ -290,8 +290,13 @@ void __init smp_prepare_cpus(unsigned in
void __init smp_prepare_boot_cpu(void)
@@ -606,8 +644,8 @@ prerequisite for removing the limitation on 32 vCPU-s per guest.
}
#ifdef CONFIG_HOTPLUG_CPU
---- head-2011-06-30.orig/drivers/xen/core/spinlock.c 2011-04-14 17:50:59.000000000 +0200
-+++ head-2011-06-30/drivers/xen/core/spinlock.c 2011-04-14 17:51:20.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/core/spinlock.c 2011-04-14 17:50:59.000000000 +0200
++++ head-2011-07-21/drivers/xen/core/spinlock.c 2011-04-14 17:51:20.000000000 +0200
@@ -130,7 +130,7 @@ unsigned int xen_spin_wait(arch_spinlock
spinning.prev = percpu_read(_spinning);
smp_wmb();
diff --git a/patches.xen/xen-x86-pmd-handling b/patches.xen/xen-x86-pmd-handling
index 6cc9cac6dd..b7ba373716 100644
--- a/patches.xen/xen-x86-pmd-handling
+++ b/patches.xen/xen-x86-pmd-handling
@@ -2,9 +2,9 @@ From: jbeulich@novell.com
Subject: consolidate pmd/pud/pgd entry handling
Patch-mainline: obsolete
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-02-02 15:09:52.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/hypervisor.h 2011-03-23 10:11:23.000000000 +0100
-@@ -101,10 +101,12 @@ void xen_invlpg(unsigned long ptr);
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-07-21 12:33:02.000000000 +0200
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/hypervisor.h 2011-07-21 12:40:47.000000000 +0200
+@@ -97,10 +97,12 @@ void xen_invlpg(unsigned long ptr);
void xen_l1_entry_update(pte_t *ptr, pte_t val);
void xen_l2_entry_update(pmd_t *ptr, pmd_t val);
void xen_l3_entry_update(pud_t *ptr, pud_t val); /* x86_64/PAE */
@@ -18,7 +18,7 @@ Patch-mainline: obsolete
void xen_set_ldt(const void *ptr, unsigned int ents);
#ifdef CONFIG_SMP
-@@ -339,6 +341,18 @@ MULTI_update_va_mapping(
+@@ -335,6 +337,18 @@ MULTI_update_va_mapping(
}
static inline void
@@ -37,8 +37,8 @@ Patch-mainline: obsolete
MULTI_grant_table_op(multicall_entry_t *mcl, unsigned int cmd,
void *uop, unsigned int count)
{
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/pgalloc.h 2011-02-01 15:41:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pgalloc.h 2011-02-03 14:41:13.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pgalloc.h 2011-02-01 15:41:35.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/pgalloc.h 2011-02-03 14:41:13.000000000 +0100
@@ -75,20 +75,16 @@ static inline void pmd_populate(struct m
struct page *pte)
{
@@ -118,8 +118,8 @@ Patch-mainline: obsolete
}
static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/pgtable.h 2011-03-23 10:10:00.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pgtable.h 2011-03-23 10:11:19.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pgtable.h 2011-03-23 10:10:00.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/pgtable.h 2011-03-23 10:11:19.000000000 +0100
@@ -618,7 +618,7 @@ static inline pmd_t xen_local_pmdp_get_a
{
pmd_t res = *pmdp;
@@ -129,8 +129,8 @@ Patch-mainline: obsolete
return res;
}
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-04-12 15:59:10.000000000 +0200
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-04-11 16:12:34.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-04-12 15:59:10.000000000 +0200
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-04-11 16:12:34.000000000 +0200
@@ -56,12 +56,15 @@ static inline void __xen_pte_clear(pte_t
ptep->pte_high = 0;
}
@@ -167,8 +167,8 @@ Patch-mainline: obsolete
#ifdef CONFIG_SMP
static inline pte_t xen_ptep_get_and_clear(pte_t *ptep, pte_t res)
{
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-04-12 15:59:10.000000000 +0200
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 10:11:13.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-04-12 15:59:10.000000000 +0200
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 10:11:13.000000000 +0100
@@ -65,10 +65,13 @@ static inline void xen_set_pmd(pmd_t *pm
xen_l2_entry_update(pmdp, pmd);
}
@@ -226,8 +226,8 @@ Patch-mainline: obsolete
#define __pte_mfn(_pte) (((_pte).pte & PTE_PFN_MASK) >> PAGE_SHIFT)
---- head-2011-06-30.orig/arch/x86/mm/hypervisor.c 2011-05-09 11:54:21.000000000 +0200
-+++ head-2011-06-30/arch/x86/mm/hypervisor.c 2011-05-09 11:54:29.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/mm/hypervisor.c 2011-05-09 11:54:21.000000000 +0200
++++ head-2011-07-21/arch/x86/mm/hypervisor.c 2011-05-09 11:54:29.000000000 +0200
@@ -360,31 +360,91 @@ void xen_l1_entry_update(pte_t *ptr, pte
}
EXPORT_SYMBOL_GPL(xen_l1_entry_update);
@@ -327,8 +327,8 @@ Patch-mainline: obsolete
}
#endif /* CONFIG_X86_64 */
---- head-2011-06-30.orig/arch/x86/mm/init_32-xen.c 2011-07-04 12:15:21.000000000 +0200
-+++ head-2011-06-30/arch/x86/mm/init_32-xen.c 2011-07-04 12:29:02.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/mm/init_32-xen.c 2011-07-04 12:15:21.000000000 +0200
++++ head-2011-07-21/arch/x86/mm/init_32-xen.c 2011-07-04 12:29:02.000000000 +0200
@@ -690,6 +690,8 @@ static void __init zone_sizes_init(void)
#endif
@@ -347,8 +347,8 @@ Patch-mainline: obsolete
}
#ifdef CONFIG_MEMORY_HOTPLUG
---- head-2011-06-30.orig/arch/x86/mm/init_64-xen.c 2011-04-13 16:54:38.000000000 +0200
-+++ head-2011-06-30/arch/x86/mm/init_64-xen.c 2011-07-04 12:30:03.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/mm/init_64-xen.c 2011-04-13 16:54:38.000000000 +0200
++++ head-2011-07-21/arch/x86/mm/init_64-xen.c 2011-07-04 12:30:03.000000000 +0200
@@ -231,8 +231,11 @@ static pud_t *fill_pud(pgd_t *pgd, unsig
{
if (pgd_none(*pgd)) {
@@ -410,8 +410,8 @@ Patch-mainline: obsolete
}
/*
---- head-2011-06-30.orig/arch/x86/mm/pgtable-xen.c 2011-04-12 15:59:10.000000000 +0200
-+++ head-2011-06-30/arch/x86/mm/pgtable-xen.c 2011-04-11 16:12:44.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/mm/pgtable-xen.c 2011-04-12 15:59:10.000000000 +0200
++++ head-2011-07-21/arch/x86/mm/pgtable-xen.c 2011-04-11 16:12:44.000000000 +0200
@@ -66,16 +66,16 @@ early_param("userpte", setup_userpte);
void __pte_free(pgtable_t pte)
{
diff --git a/patches.xen/xen-x86_64-note-init-p2m b/patches.xen/xen-x86_64-note-init-p2m
index 8883821a47..be2cc9b31e 100644
--- a/patches.xen/xen-x86_64-note-init-p2m
+++ b/patches.xen/xen-x86_64-note-init-p2m
@@ -1,6 +1,6 @@
From: jbeulich@novell.com
Subject: eliminate scalability issues from initial mapping setup
-Patch-mainline: obsolete
+Patch-mainline: n/a
References: bnc#417417
Direct Xen to place the initial P->M table outside of the initial
@@ -18,8 +18,8 @@ shouldn't be as expensive (and hence can be viewed as an optimization
avoiding the spurious page fault on the local CPU), but is required
when the functions are used before the page fault handler gets set up.
---- head-2011-06-30.orig/arch/x86/kernel/head64-xen.c 2011-04-12 15:59:10.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/head64-xen.c 2011-04-11 16:14:44.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/kernel/head64-xen.c 2011-04-12 15:59:10.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/head64-xen.c 2011-04-11 16:14:44.000000000 +0200
@@ -121,6 +121,14 @@ void __init x86_64_start_reservations(ch
memblock_x86_reserve_range(__pa_symbol(&_text), __pa_symbol(&__bss_stop), "TEXT DATA BSS");
@@ -35,8 +35,8 @@ when the functions are used before the page fault handler gets set up.
/*
* At this point everything still needed from the boot loader
* or BIOS or kernel text should be early reserved or marked not
---- head-2011-06-30.orig/arch/x86/kernel/head_64-xen.S 2011-02-03 14:42:36.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/head_64-xen.S 2011-02-03 14:42:41.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/head_64-xen.S 2011-02-03 14:42:36.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/head_64-xen.S 2011-02-03 14:42:41.000000000 +0100
@@ -17,6 +17,7 @@
#include <linux/elfnote.h>
#include <asm/segment.h>
@@ -53,9 +53,9 @@ when the functions are used before the page fault handler gets set up.
ELFNOTE(Xen, XEN_ELFNOTE_FEATURES, .asciz "writable_page_tables|writable_descriptor_tables|auto_translated_physmap|supervisor_mode_kernel")
ELFNOTE(Xen, XEN_ELFNOTE_LOADER, .asciz "generic")
ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long 1)
---- head-2011-06-30.orig/arch/x86/kernel/setup-xen.c 2011-07-04 12:32:51.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/setup-xen.c 2011-07-04 12:34:40.000000000 +0200
-@@ -1059,6 +1059,54 @@ void __init setup_arch(char **cmdline_p)
+--- head-2011-07-21.orig/arch/x86/kernel/setup-xen.c 2011-07-21 12:45:13.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/setup-xen.c 2011-07-21 12:50:48.000000000 +0200
+@@ -1109,6 +1109,54 @@ void __init setup_arch(char **cmdline_p)
init_gbpages();
/* max_pfn_mapped is updated here */
@@ -110,7 +110,7 @@ when the functions are used before the page fault handler gets set up.
max_low_pfn_mapped = init_memory_mapping(0, max_low_pfn<<PAGE_SHIFT);
max_pfn_mapped = max_low_pfn_mapped;
-@@ -1066,6 +1114,7 @@ void __init setup_arch(char **cmdline_p)
+@@ -1116,6 +1164,7 @@ void __init setup_arch(char **cmdline_p)
if (max_pfn > max_low_pfn) {
max_pfn_mapped = init_memory_mapping(1UL<<32,
max_pfn<<PAGE_SHIFT);
@@ -118,7 +118,7 @@ when the functions are used before the page fault handler gets set up.
/* can we preseve max_low_pfn ?*/
max_low_pfn = max_pfn;
}
-@@ -1157,7 +1206,7 @@ void __init setup_arch(char **cmdline_p)
+@@ -1207,7 +1256,7 @@ void __init setup_arch(char **cmdline_p)
difference = xen_start_info->nr_pages - max_pfn;
set_xen_guest_handle(reservation.extent_start,
@@ -127,21 +127,25 @@ when the functions are used before the page fault handler gets set up.
reservation.nr_extents = difference;
ret = HYPERVISOR_memory_op(XENMEM_decrease_reservation,
&reservation);
-@@ -1174,14 +1223,86 @@ void __init setup_arch(char **cmdline_p)
- phys_to_machine_mapping = alloc_bootmem_pages(
- max_pfn * sizeof(unsigned long));
- memcpy(phys_to_machine_mapping,
-- (unsigned long *)xen_start_info->mfn_list,
-+ __va(__pa(xen_start_info->mfn_list)),
- p2m_pages * sizeof(unsigned long));
- memset(phys_to_machine_mapping + p2m_pages, ~0,
- (max_pfn - p2m_pages) * sizeof(unsigned long));
+@@ -1229,7 +1278,7 @@ void __init setup_arch(char **cmdline_p)
+ #else /* We must not use memcpy() and memset() here, as they're
+ not capable of dealing with 4Gb or more at a time. */
+ {
+- void *src = (void *)xen_start_info->mfn_list;
++ void *src = __va(__pa(xen_start_info->mfn_list));
+ unsigned long size, *dst = phys_to_machine_mapping;
+ unsigned int fpp = PAGE_SIZE / sizeof(*dst);
+
+@@ -1243,11 +1292,80 @@ void __init setup_arch(char **cmdline_p)
+ for (size = max_pfn - p2m_pages; size; --size)
+ *dst++ = INVALID_P2M_ENTRY;
+ }
+-#endif
- free_bootmem(
- __pa(xen_start_info->mfn_list),
- PFN_PHYS(PFN_UP(xen_start_info->nr_pages *
- sizeof(unsigned long))));
+
-+#ifdef CONFIG_X86_64
+ if (xen_start_info->mfn_list == VMEMMAP_START) {
+ /*
+ * Since it is well isolated we can (and since it is
@@ -215,12 +219,11 @@ when the functions are used before the page fault handler gets set up.
+ free_bootmem(__pa(xen_start_info->mfn_list),
+ PFN_PHYS(PFN_UP(xen_start_info->nr_pages *
+ sizeof(unsigned long))));
-+
- /*
- * Initialise the list of the frames that specify the list of
---- head-2011-06-30.orig/arch/x86/mm/init-xen.c 2011-07-01 15:48:40.000000000 +0200
-+++ head-2011-06-30/arch/x86/mm/init-xen.c 2011-07-04 12:34:33.000000000 +0200
+ #ifndef CONFIG_KEXEC
+ if (!is_initial_xendomain())
+--- head-2011-07-21.orig/arch/x86/mm/init-xen.c 2011-07-01 15:48:40.000000000 +0200
++++ head-2011-07-21/arch/x86/mm/init-xen.c 2011-07-04 12:34:33.000000000 +0200
@@ -351,9 +351,20 @@ unsigned long __init_refok init_memory_m
* RO all the pagetable pages, including the ones that are beyond
* pgt_buf_end at that time.
@@ -243,8 +246,8 @@ when the functions are used before the page fault handler gets set up.
if (!after_bootmem)
early_memtest(start, end);
---- head-2011-06-30.orig/arch/x86/mm/init_64-xen.c 2011-07-04 12:33:26.000000000 +0200
-+++ head-2011-06-30/arch/x86/mm/init_64-xen.c 2011-07-04 12:33:56.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/mm/init_64-xen.c 2011-07-04 12:33:26.000000000 +0200
++++ head-2011-07-21/arch/x86/mm/init_64-xen.c 2011-07-04 12:33:56.000000000 +0200
@@ -220,6 +220,17 @@ void sync_global_pgds(unsigned long star
}
}
@@ -370,8 +373,8 @@ when the functions are used before the page fault handler gets set up.
/* Destroy the Xen-created mappings beyond the kernel image. */
start = PAGE_ALIGN(_brk_end);
end = __START_KERNEL_map + (pgt_buf_start << PAGE_SHIFT);
---- head-2011-06-30.orig/arch/x86/mm/pageattr-xen.c 2011-04-13 17:01:32.000000000 +0200
-+++ head-2011-06-30/arch/x86/mm/pageattr-xen.c 2011-04-28 11:36:37.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/mm/pageattr-xen.c 2011-04-13 17:01:32.000000000 +0200
++++ head-2011-07-21/arch/x86/mm/pageattr-xen.c 2011-04-28 11:36:37.000000000 +0200
@@ -1496,7 +1496,7 @@ static void __make_page_writable(unsigne
pte = lookup_address(va, &level);
@@ -381,8 +384,8 @@ when the functions are used before the page fault handler gets set up.
BUG();
if (in_secondary_range(va)) {
unsigned long pfn = pte_pfn(*pte);
---- head-2011-06-30.orig/arch/x86/mm/pgtable-xen.c 2011-04-11 16:14:31.000000000 +0200
-+++ head-2011-06-30/arch/x86/mm/pgtable-xen.c 2011-02-03 14:42:41.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/pgtable-xen.c 2011-04-11 16:14:31.000000000 +0200
++++ head-2011-07-21/arch/x86/mm/pgtable-xen.c 2011-02-03 14:42:41.000000000 +0100
@@ -344,7 +344,7 @@ void __init xen_init_pgd_pin(void)
if (PTRS_PER_PUD > 1) /* not folded */
SetPagePinned(virt_to_page(pud));
@@ -401,8 +404,8 @@ when the functions are used before the page fault handler gets set up.
continue;
SetPagePinned(pmd_page(*pmd));
}
---- head-2011-06-30.orig/arch/x86/mm/pgtable_32-xen.c 2011-02-01 15:03:10.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/pgtable_32-xen.c 2011-02-03 14:42:41.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/pgtable_32-xen.c 2011-02-01 15:03:10.000000000 +0100
++++ head-2011-07-21/arch/x86/mm/pgtable_32-xen.c 2011-02-03 14:42:41.000000000 +0100
@@ -174,6 +174,6 @@ void make_lowmem_page_writable(void *va,
pte = lookup_address((unsigned long)va, &level);
BUG_ON(!pte || level != PG_LEVEL_4K || !pte_present(*pte));
diff --git a/patches.xen/xen-x86_64-pgd-alloc-order b/patches.xen/xen-x86_64-pgd-alloc-order
index b3a26cc7a9..e7bb70abf9 100644
--- a/patches.xen/xen-x86_64-pgd-alloc-order
+++ b/patches.xen/xen-x86_64-pgd-alloc-order
@@ -4,9 +4,9 @@ Patch-mainline: n/a
At the same time remove the useless user mode pair of init_level4_pgt.
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2010-11-23 16:31:40.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/hypervisor.h 2011-03-23 10:13:55.000000000 +0100
-@@ -106,8 +106,8 @@ void do_hypervisor_callback(struct pt_re
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-07-21 12:45:30.000000000 +0200
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/hypervisor.h 2011-07-21 12:45:52.000000000 +0200
+@@ -102,8 +102,8 @@ void do_hypervisor_callback(struct pt_re
* be MACHINE addresses.
*/
@@ -17,7 +17,7 @@ At the same time remove the useless user mode pair of init_level4_pgt.
void xen_load_gs(unsigned int selector); /* x86_64 only */
void xen_tlb_flush(void);
void xen_invlpg(unsigned long ptr);
-@@ -115,7 +115,7 @@ void xen_invlpg(unsigned long ptr);
+@@ -111,7 +111,7 @@ void xen_invlpg(unsigned long ptr);
void xen_l1_entry_update(pte_t *ptr, pte_t val);
void xen_l2_entry_update(pmd_t *ptr, pmd_t val);
void xen_l3_entry_update(pud_t *ptr, pud_t val); /* x86_64/PAE */
@@ -26,8 +26,8 @@ At the same time remove the useless user mode pair of init_level4_pgt.
void xen_pgd_pin(pgd_t *);
void xen_pgd_unpin(pgd_t *);
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/mmu_context.h 2011-02-08 10:25:49.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/mmu_context.h 2011-02-08 10:46:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/mmu_context.h 2011-02-08 10:25:49.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/mmu_context.h 2011-02-08 10:46:27.000000000 +0100
@@ -82,6 +82,9 @@ static inline void switch_mm(struct mm_s
{
unsigned cpu = smp_processor_id();
@@ -61,8 +61,8 @@ At the same time remove the useless user mode pair of init_level4_pgt.
load_LDT_nolock(&next->context);
}
}
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/pgalloc.h 2011-02-03 14:41:13.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pgalloc.h 2011-02-03 14:42:36.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pgalloc.h 2011-02-03 14:41:13.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/pgalloc.h 2011-02-03 14:42:36.000000000 +0100
@@ -123,15 +123,13 @@ static inline void pud_populate(struct m
#endif /* CONFIG_X86_PAE */
@@ -80,8 +80,8 @@ At the same time remove the useless user mode pair of init_level4_pgt.
else
*__user_pgd(pgd) = *pgd = ent;
}
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 10:12:10.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 10:13:50.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 10:12:10.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 10:13:50.000000000 +0100
@@ -106,18 +106,25 @@ static inline void xen_set_pud(pud_t *pu
: (void)(*__pudp = xen_make_pud(0)); \
})
@@ -111,8 +111,8 @@ At the same time remove the useless user mode pair of init_level4_pgt.
: (void)(*__user_pgd(__pgdp) = *__pgdp = xen_make_pgd(0)); \
})
---- head-2011-06-30.orig/arch/x86/kernel/cpu/common-xen.c 2011-07-04 12:30:47.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/cpu/common-xen.c 2011-07-04 12:33:38.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/kernel/cpu/common-xen.c 2011-07-04 12:30:47.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/cpu/common-xen.c 2011-07-04 12:33:38.000000000 +0200
@@ -1083,8 +1083,7 @@ DEFINE_PER_CPU_FIRST(union irq_stack_uni
void xen_switch_pt(void)
{
@@ -123,8 +123,8 @@ At the same time remove the useless user mode pair of init_level4_pgt.
#endif
}
---- head-2011-06-30.orig/arch/x86/kernel/head_64-xen.S 2011-02-01 14:55:46.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/head_64-xen.S 2011-02-03 14:42:36.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/head_64-xen.S 2011-02-01 14:55:46.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/head_64-xen.S 2011-02-03 14:42:36.000000000 +0100
@@ -56,14 +56,6 @@ ENTRY(name)
__PAGE_ALIGNED_BSS
NEXT_PAGE(init_level4_pgt)
@@ -140,8 +140,8 @@ At the same time remove the useless user mode pair of init_level4_pgt.
NEXT_PAGE(level3_kernel_pgt)
.fill 512,8,0
---- head-2011-06-30.orig/arch/x86/mm/hypervisor.c 2011-05-09 11:55:22.000000000 +0200
-+++ head-2011-06-30/arch/x86/mm/hypervisor.c 2011-05-09 11:55:28.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/mm/hypervisor.c 2011-05-09 11:55:22.000000000 +0200
++++ head-2011-07-21/arch/x86/mm/hypervisor.c 2011-05-09 11:55:28.000000000 +0200
@@ -523,7 +523,7 @@ void xen_l3_entry_update(pud_t *ptr, pud
#endif
@@ -223,8 +223,8 @@ At the same time remove the useless user mode pair of init_level4_pgt.
#endif
if (HYPERVISOR_mmuext_op(op, NR_PGD_PIN_OPS, NULL, DOMID_SELF) < 0)
BUG();
---- head-2011-06-30.orig/arch/x86/mm/init_64-xen.c 2011-07-04 12:33:18.000000000 +0200
-+++ head-2011-06-30/arch/x86/mm/init_64-xen.c 2011-07-04 12:33:26.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/mm/init_64-xen.c 2011-07-04 12:33:18.000000000 +0200
++++ head-2011-07-21/arch/x86/mm/init_64-xen.c 2011-07-04 12:33:26.000000000 +0200
@@ -765,9 +765,6 @@ void __init xen_init_pt(void)
(PTRS_PER_PUD - pud_index(__START_KERNEL_map))
* sizeof(*level3_kernel_pgt));
@@ -244,8 +244,8 @@ At the same time remove the useless user mode pair of init_level4_pgt.
early_make_page_readonly(level3_kernel_pgt,
XENFEAT_writable_page_tables);
early_make_page_readonly(level3_user_pgt,
---- head-2011-06-30.orig/arch/x86/mm/pgtable-xen.c 2010-11-23 16:31:40.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/pgtable-xen.c 2011-04-11 16:14:31.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/mm/pgtable-xen.c 2010-11-23 16:31:40.000000000 +0100
++++ head-2011-07-21/arch/x86/mm/pgtable-xen.c 2011-04-11 16:14:31.000000000 +0200
@@ -291,9 +291,11 @@ static void pgd_walk(pgd_t *pgd_base, pg
BUG();
seq = 0;
@@ -323,9 +323,9 @@ At the same time remove the useless user mode pair of init_level4_pgt.
}
/* blktap and gntdev need this, as otherwise they would implicitly (and
---- head-2011-06-30.orig/drivers/xen/core/machine_reboot.c 2011-07-04 12:30:40.000000000 +0200
-+++ head-2011-06-30/drivers/xen/core/machine_reboot.c 2011-07-04 12:33:28.000000000 +0200
-@@ -187,8 +187,7 @@ static int take_machine_down(void *_susp
+--- head-2011-07-21.orig/drivers/xen/core/machine_reboot.c 2011-07-21 12:42:42.000000000 +0200
++++ head-2011-07-21/drivers/xen/core/machine_reboot.c 2011-07-21 12:45:54.000000000 +0200
+@@ -173,8 +173,7 @@ static int take_machine_down(void *_susp
* in fast-suspend mode as that implies a new enough Xen.
*/
if (!suspend->fast_suspend)
diff --git a/patches.xen/xen-x86_64-pgd-pin b/patches.xen/xen-x86_64-pgd-pin
index ff49df4c7b..f52c93ff82 100644
--- a/patches.xen/xen-x86_64-pgd-pin
+++ b/patches.xen/xen-x86_64-pgd-pin
@@ -2,9 +2,9 @@ From: jbeulich@novell.com
Subject: make pinning of pgd pairs transparent to callers
Patch-mainline: obsolete
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-03-23 10:12:07.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/hypervisor.h 2010-11-23 16:31:40.000000000 +0100
-@@ -116,8 +116,8 @@ void xen_l1_entry_update(pte_t *ptr, pte
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-07-21 12:42:38.000000000 +0200
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/hypervisor.h 2011-07-21 12:45:30.000000000 +0200
+@@ -112,8 +112,8 @@ void xen_l1_entry_update(pte_t *ptr, pte
void xen_l2_entry_update(pmd_t *ptr, pmd_t val);
void xen_l3_entry_update(pud_t *ptr, pud_t val); /* x86_64/PAE */
void xen_l4_entry_update(pgd_t *ptr, int user, pgd_t val); /* x86_64 only */
@@ -14,9 +14,9 @@ Patch-mainline: obsolete
+void xen_pgd_unpin(pgd_t *);
void xen_init_pgd_pin(void);
-
---- head-2011-06-30.orig/arch/x86/mm/hypervisor.c 2011-05-09 11:55:04.000000000 +0200
-+++ head-2011-06-30/arch/x86/mm/hypervisor.c 2011-05-09 11:55:22.000000000 +0200
+ #ifdef CONFIG_PM_SLEEP
+--- head-2011-07-21.orig/arch/x86/mm/hypervisor.c 2011-05-09 11:55:04.000000000 +0200
++++ head-2011-07-21/arch/x86/mm/hypervisor.c 2011-05-09 11:55:22.000000000 +0200
@@ -622,26 +622,38 @@ EXPORT_SYMBOL_GPL(xen_invlpg_mask);
#endif /* CONFIG_SMP */
@@ -70,8 +70,8 @@ Patch-mainline: obsolete
}
void xen_set_ldt(const void *ptr, unsigned int ents)
---- head-2011-06-30.orig/arch/x86/mm/init_64-xen.c 2011-02-03 14:42:15.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/init_64-xen.c 2011-07-04 12:33:18.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/mm/init_64-xen.c 2011-02-03 14:42:15.000000000 +0100
++++ head-2011-07-21/arch/x86/mm/init_64-xen.c 2011-07-04 12:33:18.000000000 +0200
@@ -794,10 +794,8 @@ void __init xen_init_pt(void)
early_make_page_readonly(level1_fixmap_pgt,
XENFEAT_writable_page_tables);
@@ -85,8 +85,8 @@ Patch-mainline: obsolete
}
void __init xen_finish_init_mapping(void)
---- head-2011-06-30.orig/arch/x86/mm/pgtable-xen.c 2010-04-15 11:48:29.000000000 +0200
-+++ head-2011-06-30/arch/x86/mm/pgtable-xen.c 2010-11-23 16:31:40.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/pgtable-xen.c 2010-04-15 11:48:29.000000000 +0200
++++ head-2011-07-21/arch/x86/mm/pgtable-xen.c 2010-11-23 16:31:40.000000000 +0100
@@ -368,19 +368,13 @@ static void __pgd_pin(pgd_t *pgd)
{
pgd_walk(pgd, PAGE_KERNEL_RO);
diff --git a/patches.xen/xen-x86_64-unmapped-initrd b/patches.xen/xen-x86_64-unmapped-initrd
index 822fe71ae3..e070713d69 100644
--- a/patches.xen/xen-x86_64-unmapped-initrd
+++ b/patches.xen/xen-x86_64-unmapped-initrd
@@ -7,8 +7,8 @@ getting mapped into the initial mapping. The kernel doesn't really need
the initrd to be mapped, so use new infrastructure available in 4.1+
Xen to avoid the mapping and hence the restriction.
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/setup.h 2011-07-04 12:32:43.000000000 +0200
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/setup.h 2011-07-04 12:35:19.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/setup.h 2011-07-04 12:32:43.000000000 +0200
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/setup.h 2011-07-04 12:35:19.000000000 +0200
@@ -3,6 +3,13 @@
void xen_start_kernel(void);
void xen_arch_setup(void);
@@ -23,9 +23,9 @@ Xen to avoid the mapping and hence the restriction.
#ifdef CONFIG_EFI
void efi_probe(void);
#else
---- head-2011-06-30.orig/arch/x86/kernel/head-xen.c 2011-02-03 14:42:15.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/head-xen.c 2011-02-03 14:42:45.000000000 +0100
-@@ -75,6 +75,8 @@ extern void nmi(void);
+--- head-2011-07-21.orig/arch/x86/kernel/head-xen.c 2011-07-11 15:41:49.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/head-xen.c 2011-07-11 15:42:00.000000000 +0200
+@@ -76,6 +76,8 @@ extern void nmi(void);
#define CALLBACK_ADDR(fn) { __KERNEL_CS, (unsigned long)(fn) }
#endif
@@ -34,8 +34,8 @@ Xen to avoid the mapping and hence the restriction.
unsigned long *__read_mostly machine_to_phys_mapping =
(void *)MACH2PHYS_VIRT_START;
EXPORT_SYMBOL(machine_to_phys_mapping);
---- head-2011-06-30.orig/arch/x86/kernel/head32-xen.c 2011-07-01 15:19:34.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/head32-xen.c 2011-07-04 12:34:54.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/kernel/head32-xen.c 2011-07-01 15:19:34.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/head32-xen.c 2011-07-04 12:34:54.000000000 +0200
@@ -76,6 +76,11 @@ void __init i386_start_kernel(void)
break;
}
@@ -48,8 +48,8 @@ Xen to avoid the mapping and hence the restriction.
{
int max_cmdline;
---- head-2011-06-30.orig/arch/x86/kernel/head64-xen.c 2011-04-11 16:14:44.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/head64-xen.c 2011-04-11 16:14:59.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/kernel/head64-xen.c 2011-04-11 16:14:44.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/head64-xen.c 2011-04-11 16:14:59.000000000 +0200
@@ -121,13 +121,23 @@ void __init x86_64_start_reservations(ch
memblock_x86_reserve_range(__pa_symbol(&_text), __pa_symbol(&__bss_stop), "TEXT DATA BSS");
@@ -78,8 +78,8 @@ Xen to avoid the mapping and hence the restriction.
/*
* At this point everything still needed from the boot loader
---- head-2011-06-30.orig/arch/x86/kernel/head_64-xen.S 2011-02-03 14:42:41.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/head_64-xen.S 2011-02-03 14:42:45.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/head_64-xen.S 2011-02-03 14:42:41.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/head_64-xen.S 2011-02-03 14:42:45.000000000 +0100
@@ -147,6 +147,7 @@ ENTRY(empty_zero_page)
ELFNOTE(Xen, XEN_ELFNOTE_ENTRY, .quad startup_64)
ELFNOTE(Xen, XEN_ELFNOTE_HYPERCALL_PAGE, .quad hypercall_page)
@@ -88,9 +88,9 @@ Xen to avoid the mapping and hence the restriction.
ELFNOTE(Xen, XEN_ELFNOTE_INIT_P2M, .quad VMEMMAP_START)
ELFNOTE(Xen, XEN_ELFNOTE_FEATURES, .asciz "writable_page_tables|writable_descriptor_tables|auto_translated_physmap|supervisor_mode_kernel")
ELFNOTE(Xen, XEN_ELFNOTE_LOADER, .asciz "generic")
---- head-2011-06-30.orig/arch/x86/kernel/setup-xen.c 2011-07-04 12:34:40.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/setup-xen.c 2011-06-10 12:10:28.000000000 +0200
-@@ -410,7 +410,7 @@ static void __init relocate_initrd(void)
+--- head-2011-07-21.orig/arch/x86/kernel/setup-xen.c 2011-07-21 12:50:48.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/setup-xen.c 2011-07-21 12:51:23.000000000 +0200
+@@ -460,7 +460,7 @@ static void __init relocate_initrd(void)
#else
printk(KERN_ERR "initrd extends beyond end of memory "
"(0x%08lx > 0x%08lx)\ndisabling initrd\n",
@@ -99,7 +99,7 @@ Xen to avoid the mapping and hence the restriction.
max_low_pfn_mapped << PAGE_SHIFT);
initrd_start = 0;
#endif
-@@ -429,7 +429,7 @@ static void __init reserve_initrd(void)
+@@ -479,7 +479,7 @@ static void __init reserve_initrd(void)
!ramdisk_image || !ramdisk_size)
return; /* No initrd provided by bootloader */
#else
@@ -108,8 +108,8 @@ Xen to avoid the mapping and hence the restriction.
unsigned long ramdisk_size = xen_start_info->mod_len;
unsigned long ramdisk_end = PAGE_ALIGN(ramdisk_image + ramdisk_size);
unsigned long end_of_lowmem = max_low_pfn_mapped << PAGE_SHIFT;
---- head-2011-06-30.orig/arch/x86/mm/init-xen.c 2011-07-04 12:34:33.000000000 +0200
-+++ head-2011-06-30/arch/x86/mm/init-xen.c 2011-07-04 12:35:03.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/mm/init-xen.c 2011-07-04 12:34:33.000000000 +0200
++++ head-2011-07-21/arch/x86/mm/init-xen.c 2011-07-04 12:35:03.000000000 +0200
@@ -353,14 +353,7 @@ unsigned long __init_refok init_memory_m
*/
if (!after_bootmem && pgt_buf_top > pgt_buf_start) {
@@ -126,8 +126,8 @@ Xen to avoid the mapping and hence the restriction.
#endif
x86_init.mapping.pagetable_reserve(PFN_PHYS(pgt_buf_start),
PFN_PHYS(pgt_buf_top));
---- head-2011-06-30.orig/arch/x86/mm/init_64-xen.c 2011-07-04 12:33:56.000000000 +0200
-+++ head-2011-06-30/arch/x86/mm/init_64-xen.c 2011-07-04 12:35:04.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/mm/init_64-xen.c 2011-07-04 12:33:56.000000000 +0200
++++ head-2011-07-21/arch/x86/mm/init_64-xen.c 2011-07-04 12:35:04.000000000 +0200
@@ -220,13 +220,71 @@ void sync_global_pgds(unsigned long star
}
}
diff --git a/patches.xen/xen3-auto-arch-i386.diff b/patches.xen/xen3-auto-arch-i386.diff
index 6ab78e9c5b..cd415b8065 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 1095:3c900d6a5f6a)
+From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1098:73e47d0fdb10)
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 afd9c97eca..98dde57c31 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 1095:3c900d6a5f6a)
+From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1098:73e47d0fdb10)
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 42da5e4a4f..ba0856c1e5 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 1095:3c900d6a5f6a)
+From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1098:73e47d0fdb10)
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 7f366df08e..4ccf864f02 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 1095:3c900d6a5f6a)
+From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1098:73e47d0fdb10)
Patch-mainline: n/a
Acked-by: jbeulich@novell.com
@@ -17,9 +17,10 @@ take the forward porting patches:
2.6.22/kernel/timer.c
2.6.25/mm/highmem.c
2.6.30/include/linux/pci_regs.h
+2.6.35/kernel/time.c
---- head-2011-06-30.orig/drivers/Makefile 2011-06-30 15:04:12.000000000 +0200
-+++ head-2011-06-30/drivers/Makefile 2011-06-30 15:36:40.000000000 +0200
+--- head-2011-07-21.orig/drivers/Makefile 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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/
@@ -28,8 +29,8 @@ take the forward porting patches:
obj-$(CONFIG_IDE) += ide/
obj-$(CONFIG_SCSI) += scsi/
obj-$(CONFIG_ATA) += ata/
---- head-2011-06-30.orig/drivers/acpi/Makefile 2011-06-30 15:04:12.000000000 +0200
-+++ head-2011-06-30/drivers/acpi/Makefile 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-07-21.orig/drivers/acpi/Makefile 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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
@@ -40,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-06-30.orig/drivers/acpi/acpica/hwsleep.c 2011-03-15 02:20:32.000000000 +0100
-+++ head-2011-06-30/drivers/acpi/acpica/hwsleep.c 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-07-21.orig/drivers/acpi/acpica/hwsleep.c 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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;
@@ -79,8 +80,8 @@ take the forward porting patches:
return_ACPI_STATUS(AE_OK);
}
---- head-2011-06-30.orig/drivers/acpi/processor_driver.c 2011-05-19 06:06:34.000000000 +0200
-+++ head-2011-06-30/drivers/acpi/processor_driver.c 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-07-21.orig/drivers/acpi/processor_driver.c 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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) {
@@ -255,7 +256,7 @@ take the forward porting patches:
cpu_down(pr->id);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-06-30/drivers/acpi/processor_extcntl.c 2011-01-31 14:53:38.000000000 +0100
++++ head-2011-07-21/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
@@ -498,8 +499,8 @@ take the forward porting patches:
+ kfree(perf);
+ return ret;
+}
---- head-2011-06-30.orig/drivers/acpi/processor_idle.c 2011-06-30 15:04:12.000000000 +0200
-+++ head-2011-06-30/drivers/acpi/processor_idle.c 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-07-21.orig/drivers/acpi/processor_idle.c 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/drivers/acpi/processor_idle.c 2011-04-13 11:25:29.000000000 +0200
@@ -458,7 +458,8 @@ static int acpi_processor_get_power_info
*/
cx.entry_method = ACPI_CSTATE_HALT;
@@ -535,8 +536,8 @@ take the forward porting patches:
return 0;
}
---- head-2011-06-30.orig/drivers/acpi/processor_perflib.c 2011-06-30 15:04:12.000000000 +0200
-+++ head-2011-06-30/drivers/acpi/processor_perflib.c 2011-06-30 15:36:54.000000000 +0200
+--- head-2011-07-21.orig/drivers/acpi/processor_perflib.c 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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;
@@ -616,8 +617,8 @@ take the forward porting patches:
{
int result = 0;
acpi_status status = AE_OK;
---- head-2011-06-30.orig/drivers/acpi/sleep.c 2011-05-19 06:06:34.000000000 +0200
-+++ head-2011-06-30/drivers/acpi/sleep.c 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-07-21.orig/drivers/acpi/sleep.c 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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)
{
@@ -634,8 +635,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-06-30.orig/drivers/char/agp/intel-gtt.c 2011-06-30 15:04:12.000000000 +0200
-+++ head-2011-06-30/drivers/char/agp/intel-gtt.c 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-07-21.orig/drivers/char/agp/intel-gtt.c 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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;
@@ -666,8 +667,8 @@ take the forward porting patches:
put_page(page);
__free_pages(page, 2);
atomic_dec(&agp_bridge->current_memory_agp);
---- head-2011-06-30.orig/drivers/char/mem.c 2011-06-30 15:04:12.000000000 +0200
-+++ head-2011-06-30/drivers/char/mem.c 2011-05-23 10:56:58.000000000 +0200
+--- head-2011-07-21.orig/drivers/char/mem.c 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/drivers/char/mem.c 2011-05-23 10:56:58.000000000 +0200
@@ -86,6 +86,7 @@ void __weak unxlate_dev_mem_ptr(unsigned
{
}
@@ -726,16 +727,16 @@ take the forward porting patches:
#ifdef CONFIG_DEVKMEM
static const struct file_operations kmem_fops = {
---- head-2011-06-30.orig/drivers/char/tpm/Makefile 2006-09-20 05:42:06.000000000 +0200
-+++ head-2011-06-30/drivers/char/tpm/Makefile 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-07-21.orig/drivers/char/tpm/Makefile 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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-06-30.orig/drivers/char/tpm/tpm.h 2011-03-15 02:20:32.000000000 +0100
-+++ head-2011-06-30/drivers/char/tpm/tpm.h 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-07-21.orig/drivers/char/tpm/tpm.h 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/drivers/char/tpm/tpm.h 2011-04-13 11:25:29.000000000 +0200
@@ -108,6 +108,9 @@ struct tpm_chip {
struct dentry **bios_dir;
@@ -766,7 +767,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-06-30/drivers/char/tpm/tpm_vtpm.c 2011-01-31 14:53:38.000000000 +0100
++++ head-2011-07-21/drivers/char/tpm/tpm_vtpm.c 2011-01-31 14:53:38.000000000 +0100
@@ -0,0 +1,542 @@
+/*
+ * Copyright (C) 2006 IBM Corporation
@@ -1311,7 +1312,7 @@ take the forward porting patches:
+ kfree(vtpms);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-06-30/drivers/char/tpm/tpm_vtpm.h 2011-01-31 14:53:38.000000000 +0100
++++ head-2011-07-21/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
@@ -1369,7 +1370,7 @@ take the forward porting patches:
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-06-30/drivers/char/tpm/tpm_xen.c 2011-01-31 14:53:38.000000000 +0100
++++ head-2011-07-21/drivers/char/tpm/tpm_xen.c 2011-01-31 14:53:38.000000000 +0100
@@ -0,0 +1,722 @@
+/*
+ * Copyright (c) 2005, IBM Corporation
@@ -2093,8 +2094,8 @@ take the forward porting patches:
+module_init(tpmif_init);
+
+MODULE_LICENSE("Dual BSD/GPL");
---- head-2011-06-30.orig/drivers/edac/edac_mc.c 2011-06-30 15:04:12.000000000 +0200
-+++ head-2011-06-30/drivers/edac/edac_mc.c 2011-06-30 15:37:01.000000000 +0200
+--- head-2011-07-21.orig/drivers/edac/edac_mc.c 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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__);
@@ -2106,8 +2107,8 @@ take the forward porting patches:
/* ECC error page was not in our memory. Ignore it. */
if (!pfn_valid(page))
return;
---- head-2011-06-30.orig/drivers/firmware/dell_rbu.c 2010-08-02 00:11:14.000000000 +0200
-+++ head-2011-06-30/drivers/firmware/dell_rbu.c 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-07-21.orig/drivers/firmware/dell_rbu.c 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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;
@@ -2214,8 +2215,8 @@ take the forward porting patches:
spin_lock_init(&rbu_data.lock);
init_packet_head();
---- head-2011-06-30.orig/drivers/ide/ide-lib.c 2009-09-10 00:13:59.000000000 +0200
-+++ head-2011-06-30/drivers/ide/ide-lib.c 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-07-21.orig/drivers/ide/ide-lib.c 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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 */
@@ -2233,8 +2234,8 @@ take the forward porting patches:
addr = *dev->dma_mask;
}
---- head-2011-06-30.orig/drivers/oprofile/buffer_sync.c 2011-06-30 15:04:14.000000000 +0200
-+++ head-2011-06-30/drivers/oprofile/buffer_sync.c 2011-06-30 15:37:10.000000000 +0200
+--- head-2011-07-21.orig/drivers/oprofile/buffer_sync.c 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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>
@@ -2411,8 +2412,8 @@ take the forward porting patches:
mark_done(cpu);
mutex_unlock(&buffer_mutex);
---- head-2011-06-30.orig/drivers/oprofile/cpu_buffer.c 2011-05-19 06:06:34.000000000 +0200
-+++ head-2011-06-30/drivers/oprofile/cpu_buffer.c 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-07-21.orig/drivers/oprofile/cpu_buffer.c 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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>
@@ -2528,8 +2529,8 @@ take the forward porting patches:
/*
* This serves to avoid cpu buffer overflow, and makes sure
* the task mortuary progresses
---- head-2011-06-30.orig/drivers/oprofile/cpu_buffer.h 2011-01-05 01:50:19.000000000 +0100
-+++ head-2011-06-30/drivers/oprofile/cpu_buffer.h 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-07-21.orig/drivers/oprofile/cpu_buffer.h 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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;
@@ -2564,8 +2565,8 @@ take the forward porting patches:
+#define DOMAIN_SWITCH (1UL << 5)
#endif /* OPROFILE_CPU_BUFFER_H */
---- head-2011-06-30.orig/drivers/oprofile/event_buffer.h 2011-06-30 15:04:14.000000000 +0200
-+++ head-2011-06-30/drivers/oprofile/event_buffer.h 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-07-21.orig/drivers/oprofile/event_buffer.h 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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
@@ -2576,8 +2577,8 @@ take the forward porting patches:
extern const struct file_operations event_buffer_fops;
/* mutex between sync_cpu_buffers() and the
---- head-2011-06-30.orig/drivers/oprofile/oprof.c 2011-06-30 15:04:14.000000000 +0200
-+++ head-2011-06-30/drivers/oprofile/oprof.c 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-07-21.orig/drivers/oprofile/oprof.c 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/drivers/oprofile/oprof.c 2011-04-13 11:25:29.000000000 +0200
@@ -5,6 +5,10 @@
* @remark Read the file COPYING
*
@@ -2622,8 +2623,8 @@ take the forward porting patches:
int oprofile_setup(void)
{
int err;
---- head-2011-06-30.orig/drivers/oprofile/oprof.h 2011-01-05 01:50:19.000000000 +0100
-+++ head-2011-06-30/drivers/oprofile/oprof.h 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-07-21.orig/drivers/oprofile/oprof.h 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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);
@@ -2632,8 +2633,8 @@ take the forward porting patches:
+int oprofile_set_passive(int passive_domains[], unsigned int pdomains);
+
#endif /* OPROF_H */
---- head-2011-06-30.orig/drivers/oprofile/oprofile_files.c 2011-01-05 01:50:19.000000000 +0100
-+++ head-2011-06-30/drivers/oprofile/oprofile_files.c 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-07-21.orig/drivers/oprofile/oprofile_files.c 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/drivers/oprofile/oprofile_files.c 2011-04-13 11:25:29.000000000 +0200
@@ -5,11 +5,17 @@
* @remark Read the file COPYING
*
@@ -2857,8 +2858,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-06-30.orig/fs/aio.c 2011-05-19 06:06:34.000000000 +0200
-+++ head-2011-06-30/fs/aio.c 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-07-21.orig/fs/aio.c 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/fs/aio.c 2011-04-13 11:25:29.000000000 +0200
@@ -39,6 +39,11 @@
#include <asm/kmap_types.h>
#include <asm/uaccess.h>
@@ -3046,8 +3047,8 @@ take the forward porting patches:
get_ioctx(ioctx); /* io_destroy() expects us to hold a ref */
io_destroy(ioctx);
---- head-2011-06-30.orig/fs/compat_ioctl.c 2011-03-15 02:20:32.000000000 +0100
-+++ head-2011-06-30/fs/compat_ioctl.c 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-07-21.orig/fs/compat_ioctl.c 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/fs/compat_ioctl.c 2011-04-13 11:25:29.000000000 +0200
@@ -114,6 +114,13 @@
#include <asm/fbio.h>
#endif
@@ -3082,8 +3083,8 @@ take the forward porting patches:
};
/*
---- head-2011-06-30.orig/include/acpi/processor.h 2011-06-30 15:04:23.000000000 +0200
-+++ head-2011-06-30/include/acpi/processor.h 2011-06-30 15:37:24.000000000 +0200
+--- head-2011-07-21.orig/include/acpi/processor.h 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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
@@ -3267,8 +3268,8 @@ take the forward porting patches:
+#endif /* CONFIG_XEN */
+
#endif
---- head-2011-06-30.orig/include/asm-generic/pgtable.h 2011-06-30 15:04:23.000000000 +0200
-+++ head-2011-06-30/include/asm-generic/pgtable.h 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-07-21.orig/include/asm-generic/pgtable.h 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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
@@ -3280,8 +3281,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-06-30.orig/include/linux/aio.h 2010-08-02 00:11:14.000000000 +0200
-+++ head-2011-06-30/include/linux/aio.h 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-07-21.orig/include/linux/aio.h 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/include/linux/aio.h 2011-04-13 11:25:29.000000000 +0200
@@ -199,6 +199,12 @@ struct kioctx {
struct delayed_work wq;
@@ -3295,8 +3296,8 @@ take the forward porting patches:
struct rcu_head rcu_head;
};
---- head-2011-06-30.orig/include/linux/highmem.h 2011-03-15 02:20:32.000000000 +0100
-+++ head-2011-06-30/include/linux/highmem.h 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-07-21.orig/include/linux/highmem.h 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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);
}
@@ -3328,8 +3329,8 @@ take the forward porting patches:
+#endif
+
#endif /* _LINUX_HIGHMEM_H */
---- head-2011-06-30.orig/include/linux/interrupt.h 2011-06-30 15:04:24.000000000 +0200
-+++ head-2011-06-30/include/linux/interrupt.h 2011-04-13 11:26:32.000000000 +0200
+--- head-2011-07-21.orig/include/linux/interrupt.h 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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 */
@@ -3342,8 +3343,8 @@ take the forward porting patches:
#ifdef CONFIG_IRQ_FORCED_THREADING
extern bool force_irqthreads;
---- head-2011-06-30.orig/include/linux/kexec.h 2011-05-19 06:06:34.000000000 +0200
-+++ head-2011-06-30/include/linux/kexec.h 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-07-21.orig/include/linux/kexec.h 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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 )
@@ -3371,8 +3372,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-06-30.orig/include/linux/mm.h 2011-06-30 15:04:42.000000000 +0200
-+++ head-2011-06-30/include/linux/mm.h 2011-06-30 15:37:34.000000000 +0200
+--- head-2011-07-21.orig/include/linux/mm.h 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/include/linux/mm.h 2011-06-30 15:37:34.000000000 +0200
@@ -113,7 +113,12 @@ extern unsigned int kobjsize(const void
#define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */
@@ -3415,8 +3416,8 @@ take the forward porting patches:
#ifdef CONFIG_NUMA
/*
* set_policy() op must add a reference to any non-NULL @new mempolicy
---- head-2011-06-30.orig/include/linux/oprofile.h 2011-05-19 06:06:34.000000000 +0200
-+++ head-2011-06-30/include/linux/oprofile.h 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-07-21.orig/include/linux/oprofile.h 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/include/linux/oprofile.h 2011-04-13 11:25:29.000000000 +0200
@@ -19,6 +19,8 @@
#include <linux/errno.h>
#include <linux/printk.h>
@@ -3468,8 +3469,8 @@ take the forward porting patches:
/**
* Create a file of the given name as a child of the given root, with
---- head-2011-06-30.orig/include/linux/page-flags.h 2011-06-30 15:04:25.000000000 +0200
-+++ head-2011-06-30/include/linux/page-flags.h 2011-04-28 11:06:45.000000000 +0200
+--- head-2011-07-21.orig/include/linux/page-flags.h 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/include/linux/page-flags.h 2011-04-28 11:06:45.000000000 +0200
@@ -107,6 +107,11 @@ enum pageflags {
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
PG_compound_lock,
@@ -3534,8 +3535,8 @@ take the forward porting patches:
/*
* Flags checked when a page is prepped for return by the page allocator.
---- head-2011-06-30.orig/include/linux/pci.h 2011-06-30 15:21:48.000000000 +0200
-+++ head-2011-06-30/include/linux/pci.h 2011-06-30 15:37:41.000000000 +0200
+--- head-2011-07-21.orig/include/linux/pci.h 2011-06-30 15:21:48.000000000 +0200
++++ head-2011-07-21/include/linux/pci.h 2011-06-30 15:37:41.000000000 +0200
@@ -1008,6 +1008,11 @@ static inline int pci_msi_enabled(void)
{
return 0;
@@ -3559,8 +3560,8 @@ take the forward porting patches:
#endif
#ifdef CONFIG_PCIEPORTBUS
---- head-2011-06-30.orig/include/linux/vermagic.h 2010-02-24 19:52:17.000000000 +0100
-+++ head-2011-06-30/include/linux/vermagic.h 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-07-21.orig/include/linux/vermagic.h 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/include/linux/vermagic.h 2011-04-13 11:25:29.000000000 +0200
@@ -22,6 +22,11 @@
#else
#define MODULE_VERMAGIC_MODVERSIONS ""
@@ -3580,8 +3581,8 @@ take the forward porting patches:
- MODULE_ARCH_VERMAGIC
+ MODULE_VERMAGIC_XEN MODULE_ARCH_VERMAGIC
---- head-2011-06-30.orig/kernel/irq/spurious.c 2011-06-30 15:04:39.000000000 +0200
-+++ head-2011-06-30/kernel/irq/spurious.c 2011-06-30 15:38:11.000000000 +0200
+--- head-2011-07-21.orig/kernel/irq/spurious.c 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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))
@@ -3591,8 +3592,8 @@ take the forward porting patches:
desc->irqs_unhandled++;
desc->last_unhandled = jiffies;
}
---- head-2011-06-30.orig/kernel/kexec.c 2011-06-30 15:04:40.000000000 +0200
-+++ head-2011-06-30/kernel/kexec.c 2011-04-28 11:06:56.000000000 +0200
+--- head-2011-07-21.orig/kernel/kexec.c 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/kernel/kexec.c 2011-04-28 11:06:56.000000000 +0200
@@ -357,13 +357,26 @@ static int kimage_is_destination_range(s
return 0;
}
@@ -3793,8 +3794,8 @@ take the forward porting patches:
/* Install the new kernel, and Uninstall the old */
image = xchg(dest_image, image);
---- head-2011-06-30.orig/kernel/sysctl.c 2011-06-30 15:04:42.000000000 +0200
-+++ head-2011-06-30/kernel/sysctl.c 2011-06-30 15:38:23.000000000 +0200
+--- head-2011-07-21.orig/kernel/sysctl.c 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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,
},
@@ -3804,9 +3805,9 @@ take the forward porting patches:
{
.procname = "acpi_video_flags",
.data = &acpi_realmode_flags,
---- head-2011-06-30.orig/mm/memory.c 2011-06-30 15:04:40.000000000 +0200
-+++ head-2011-06-30/mm/memory.c 2011-06-30 15:38:34.000000000 +0200
-@@ -801,6 +801,12 @@ struct page *vm_normal_page(struct vm_ar
+--- head-2011-07-21.orig/mm/memory.c 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/mm/memory.c 2011-07-21 12:07:08.000000000 +0200
+@@ -802,6 +802,12 @@ struct page *vm_normal_page(struct vm_ar
{
unsigned long pfn = pte_pfn(pte);
@@ -3819,7 +3820,7 @@ take the forward porting patches:
if (HAVE_PTE_SPECIAL) {
if (likely(!pte_special(pte)))
goto check_pfn;
-@@ -832,6 +838,9 @@ struct page *vm_normal_page(struct vm_ar
+@@ -833,6 +839,9 @@ struct page *vm_normal_page(struct vm_ar
return NULL;
check_pfn:
if (unlikely(pfn > highest_memmap_pfn)) {
@@ -3829,7 +3830,7 @@ take the forward porting patches:
print_bad_pte(vma, addr, pte, NULL);
return NULL;
}
-@@ -1148,8 +1157,12 @@ again:
+@@ -1149,8 +1158,12 @@ again:
page->index > details->last_index))
continue;
}
@@ -3844,7 +3845,7 @@ take the forward porting patches:
tlb_remove_tlb_entry(tlb, pte, addr);
if (unlikely(!page))
continue;
-@@ -1395,6 +1408,7 @@ unsigned long zap_page_range(struct vm_a
+@@ -1396,6 +1409,7 @@ unsigned long zap_page_range(struct vm_a
tlb_finish_mmu(&tlb, address, end);
return end;
}
@@ -3852,7 +3853,7 @@ take the forward porting patches:
/**
* zap_vma_ptes - remove ptes mapping the vma
-@@ -1705,6 +1719,28 @@ int __get_user_pages(struct task_struct
+@@ -1706,6 +1720,28 @@ int __get_user_pages(struct task_struct
goto next_page;
}
@@ -3881,8 +3882,8 @@ take the forward porting patches:
if (!vma ||
(vma->vm_flags & (VM_IO | VM_PFNMAP)) ||
!(vm_flags & vma->vm_flags))
---- head-2011-06-30.orig/mm/mmap.c 2011-06-30 15:04:40.000000000 +0200
-+++ head-2011-06-30/mm/mmap.c 2011-06-30 15:38:40.000000000 +0200
+--- head-2011-07-21.orig/mm/mmap.c 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/mm/mmap.c 2011-06-30 15:38:40.000000000 +0200
@@ -1898,6 +1898,12 @@ static void unmap_region(struct mm_struc
tlb_finish_mmu(&tlb, start, end);
}
@@ -3914,8 +3915,8 @@ take the forward porting patches:
vma = mm->mmap;
if (!vma) /* Can happen if dup_mmap() received an OOM */
return;
---- head-2011-06-30.orig/mm/mprotect.c 2011-03-15 02:20:32.000000000 +0100
-+++ head-2011-06-30/mm/mprotect.c 2011-06-30 15:38:52.000000000 +0200
+--- head-2011-07-21.orig/mm/mprotect.c 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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))
@@ -3925,8 +3926,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-06-30.orig/mm/page_alloc.c 2011-06-30 15:04:42.000000000 +0200
-+++ head-2011-06-30/mm/page_alloc.c 2011-06-30 15:38:58.000000000 +0200
+--- head-2011-07-21.orig/mm/page_alloc.c 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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;
@@ -3941,8 +3942,8 @@ take the forward porting patches:
trace_mm_page_free_direct(page, order);
kmemcheck_free_shadow(page, order);
---- head-2011-06-30.orig/scripts/Makefile.build 2011-06-30 15:04:42.000000000 +0200
-+++ head-2011-06-30/scripts/Makefile.build 2011-06-30 15:39:08.000000000 +0200
+--- head-2011-07-21.orig/scripts/Makefile.build 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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
@@ -3965,8 +3966,8 @@ take the forward porting patches:
# ===========================================================================
ifneq ($(strip $(lib-y) $(lib-m) $(lib-n) $(lib-)),)
---- head-2011-06-30.orig/scripts/Makefile.lib 2011-06-30 15:04:42.000000000 +0200
-+++ head-2011-06-30/scripts/Makefile.lib 2011-04-13 11:25:29.000000000 +0200
+--- head-2011-07-21.orig/scripts/Makefile.lib 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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 aade0d7be7..c7e827afb7 100644
--- a/patches.xen/xen3-auto-include-xen-interface.diff
+++ b/patches.xen/xen3-auto-include-xen-interface.diff
@@ -1,5 +1,5 @@
Subject: xen3 include-xen-interface
-From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1095:3c900d6a5f6a)
+From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1098:73e47d0fdb10)
Patch-mainline: n/a
Acked-by: jbeulich@novell.com
diff --git a/patches.xen/xen3-auto-xen-arch.diff b/patches.xen/xen3-auto-xen-arch.diff
index 67300ef59f..9ff9e60514 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 1095:3c900d6a5f6a)
+From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1098:73e47d0fdb10)
Patch-mainline: n/a
Acked-by: jbeulich@novell.com
@@ -38,6 +38,7 @@ places):
+++ linux/arch/x86/mm/pageattr-xen.c
+++ linux/arch/x86/mm/pat-xen.c
+++ linux/arch/x86/mm/pgtable-xen.c
++++ linux/arch/x86/platform/efi/efi-xen.c
+++ linux/arch/x86/vdso/vdso32-setup-xen.c
+++ linux/drivers/char/mem-xen.c
+++ linux/drivers/hwmon/coretemp-xen.c
diff --git a/patches.xen/xen3-auto-xen-drivers.diff b/patches.xen/xen3-auto-xen-drivers.diff
index 3237b2605e..33df1d343e 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 1095:3c900d6a5f6a)
+From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1098:73e47d0fdb10)
Patch-mainline: n/a
Acked-by: jbeulich@novell.com
@@ -2861,8 +2861,8 @@ 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-06-30 15:37:44.000000000 +0200
-@@ -0,0 +1,966 @@
++++ b/drivers/xen/blkfront/blkfront.c 2011-07-15 11:19:50.000000000 +0200
+@@ -0,0 +1,965 @@
+/******************************************************************************
+ * blkfront.c
+ *
@@ -3431,12 +3431,11 @@ and in case upstream wants to take the forward porting patches:
+ return -EFAULT;
+ return 0;
+
-+ case CDROM_GET_CAPABILITY: {
-+ struct gendisk *gd = info->gd;
-+ if (gd->flags & GENHD_FL_CD)
++ case CDROM_GET_CAPABILITY:
++ if (info->gd && (info->gd->flags & GENHD_FL_CD))
+ return 0;
+ return -EINVAL;
-+ }
++
+ default:
+ if (info->mi && info->gd) {
+ switch (info->mi->major) {
diff --git a/patches.xen/xen3-auto-xen-kconfig.diff b/patches.xen/xen3-auto-xen-kconfig.diff
index 1db04f198e..52ed51c9fc 100644
--- a/patches.xen/xen3-auto-xen-kconfig.diff
+++ b/patches.xen/xen3-auto-xen-kconfig.diff
@@ -1,5 +1,5 @@
Subject: xen3 xen-kconfig
-From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1095:3c900d6a5f6a)
+From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1098:73e47d0fdb10)
Patch-mainline: n/a
Acked-by: jbeulich@novell.com
diff --git a/patches.xen/xen3-fixup-common b/patches.xen/xen3-fixup-common
index ea1f001aca..57c6209572 100644
--- a/patches.xen/xen3-fixup-common
+++ b/patches.xen/xen3-fixup-common
@@ -2,8 +2,8 @@ Subject: Fix xen build.
From: jbeulich@novell.com
Patch-mainline: n/a
---- head-2011-06-30.orig/drivers/acpi/acpica/hwsleep.c 2011-04-13 11:25:29.000000000 +0200
-+++ head-2011-06-30/drivers/acpi/acpica/hwsleep.c 2011-01-31 17:01:49.000000000 +0100
+--- head-2011-07-21.orig/drivers/acpi/acpica/hwsleep.c 2011-04-13 11:25:29.000000000 +0200
++++ head-2011-07-21/drivers/acpi/acpica/hwsleep.c 2011-01-31 17:01:49.000000000 +0100
@@ -419,6 +419,7 @@ ACPI_EXPORT_SYMBOL(acpi_enter_sleep_stat
* THIS FUNCTION MUST BE CALLED WITH INTERRUPTS DISABLED
*
@@ -20,8 +20,8 @@ Patch-mainline: n/a
/*******************************************************************************
*
---- head-2011-06-30.orig/drivers/base/cpu.c 2010-08-02 00:11:14.000000000 +0200
-+++ head-2011-06-30/drivers/base/cpu.c 2011-01-31 17:01:49.000000000 +0100
+--- head-2011-07-21.orig/drivers/base/cpu.c 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/drivers/base/cpu.c 2011-01-31 17:01:49.000000000 +0100
@@ -106,7 +106,7 @@ static inline void register_cpu_control(
}
#endif /* CONFIG_HOTPLUG_CPU */
@@ -40,8 +40,8 @@ Patch-mainline: n/a
if (!error)
error = sysdev_create_file(&cpu->sysdev, &attr_crash_notes);
#endif
---- head-2011-06-30.orig/drivers/ide/ide-lib.c 2011-04-13 11:25:29.000000000 +0200
-+++ head-2011-06-30/drivers/ide/ide-lib.c 2011-01-31 17:01:49.000000000 +0100
+--- head-2011-07-21.orig/drivers/ide/ide-lib.c 2011-04-13 11:25:29.000000000 +0200
++++ head-2011-07-21/drivers/ide/ide-lib.c 2011-01-31 17:01:49.000000000 +0100
@@ -18,6 +18,16 @@ void ide_toggle_bounce(ide_drive_t *driv
{
u64 addr = BLK_BOUNCE_HIGH; /* dma64_addr_t */
@@ -67,8 +67,8 @@ Patch-mainline: n/a
if (drive->queue)
blk_queue_bounce_limit(drive->queue, addr);
---- head-2011-06-30.orig/drivers/oprofile/buffer_sync.c 2011-06-30 15:37:10.000000000 +0200
-+++ head-2011-06-30/drivers/oprofile/buffer_sync.c 2011-06-30 16:01:00.000000000 +0200
+--- head-2011-07-21.orig/drivers/oprofile/buffer_sync.c 2011-06-30 15:37:10.000000000 +0200
++++ head-2011-07-21/drivers/oprofile/buffer_sync.c 2011-06-30 16:01:00.000000000 +0200
@@ -47,7 +47,9 @@ static cpumask_var_t marked_cpus;
static DEFINE_SPINLOCK(task_mortuary);
static void process_task_mortuary(void);
@@ -170,8 +170,8 @@ Patch-mainline: n/a
mark_done(cpu);
---- head-2011-06-30.orig/drivers/oprofile/cpu_buffer.c 2011-04-13 11:25:29.000000000 +0200
-+++ head-2011-06-30/drivers/oprofile/cpu_buffer.c 2011-04-13 12:22:07.000000000 +0200
+--- head-2011-07-21.orig/drivers/oprofile/cpu_buffer.c 2011-04-13 11:25:29.000000000 +0200
++++ head-2011-07-21/drivers/oprofile/cpu_buffer.c 2011-04-13 12:22:07.000000000 +0200
@@ -42,7 +42,11 @@ static void wq_sync_buffer(struct work_s
#define DEFAULT_TIMER_EXPIRE (HZ / 10)
static int work_enabled;
@@ -200,8 +200,8 @@ Patch-mainline: n/a
/*
* This serves to avoid cpu buffer overflow, and makes sure
---- head-2011-06-30.orig/drivers/oprofile/oprof.c 2011-04-13 11:25:29.000000000 +0200
-+++ head-2011-06-30/drivers/oprofile/oprof.c 2011-01-31 17:01:49.000000000 +0100
+--- head-2011-07-21.orig/drivers/oprofile/oprof.c 2011-04-13 11:25:29.000000000 +0200
++++ head-2011-07-21/drivers/oprofile/oprof.c 2011-01-31 17:01:49.000000000 +0100
@@ -39,6 +39,7 @@ static DEFINE_MUTEX(start_mutex);
*/
static int timer = 0;
@@ -218,8 +218,8 @@ Patch-mainline: n/a
int oprofile_setup(void)
{
---- head-2011-06-30.orig/drivers/oprofile/oprofile_files.c 2011-04-13 11:25:29.000000000 +0200
-+++ head-2011-06-30/drivers/oprofile/oprofile_files.c 2011-01-31 17:01:49.000000000 +0100
+--- head-2011-07-21.orig/drivers/oprofile/oprofile_files.c 2011-04-13 11:25:29.000000000 +0200
++++ head-2011-07-21/drivers/oprofile/oprofile_files.c 2011-01-31 17:01:49.000000000 +0100
@@ -180,6 +180,8 @@ static const struct file_operations dump
.llseek = noop_llseek,
};
@@ -249,8 +249,8 @@ Patch-mainline: n/a
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-06-30.orig/drivers/xen/core/smpboot.c 2010-11-08 17:27:03.000000000 +0100
-+++ head-2011-06-30/drivers/xen/core/smpboot.c 2011-01-31 17:01:49.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/core/smpboot.c 2010-11-08 17:27:03.000000000 +0100
++++ head-2011-07-21/drivers/xen/core/smpboot.c 2011-01-31 17:01:49.000000000 +0100
@@ -55,7 +55,6 @@ static char callfunc_name[NR_CPUS][15];
cpumask_t cpu_sibling_map[NR_CPUS] __cacheline_aligned;
@@ -259,8 +259,8 @@ Patch-mainline: n/a
#if defined(__i386__)
u8 x86_cpu_to_apicid[NR_CPUS] = { [0 ... NR_CPUS-1] = 0xff };
---- head-2011-06-30.orig/include/linux/mm.h 2011-06-30 15:37:34.000000000 +0200
-+++ head-2011-06-30/include/linux/mm.h 2011-06-30 16:01:09.000000000 +0200
+--- head-2011-07-21.orig/include/linux/mm.h 2011-06-30 15:37:34.000000000 +0200
++++ head-2011-07-21/include/linux/mm.h 2011-06-30 16:01:09.000000000 +0200
@@ -225,6 +225,7 @@ struct vm_operations_struct {
int (*access)(struct vm_area_struct *vma, unsigned long addr,
void *buf, int len, int write);
@@ -277,8 +277,8 @@ Patch-mainline: n/a
#ifdef CONFIG_NUMA
/*
---- head-2011-06-30.orig/include/linux/oprofile.h 2011-04-13 11:25:29.000000000 +0200
-+++ head-2011-06-30/include/linux/oprofile.h 2011-02-17 10:06:04.000000000 +0100
+--- head-2011-07-21.orig/include/linux/oprofile.h 2011-04-13 11:25:29.000000000 +0200
++++ head-2011-07-21/include/linux/oprofile.h 2011-02-17 10:06:04.000000000 +0100
@@ -19,8 +19,9 @@
#include <linux/errno.h>
#include <linux/printk.h>
@@ -304,8 +304,8 @@ Patch-mainline: n/a
/* Do any necessary interrupt setup. Optional. */
int (*setup)(void);
/* Do any necessary interrupt shutdown. Optional. */
---- head-2011-06-30.orig/include/linux/page-flags.h 2011-04-28 11:06:45.000000000 +0200
-+++ head-2011-06-30/include/linux/page-flags.h 2011-04-28 11:08:54.000000000 +0200
+--- head-2011-07-21.orig/include/linux/page-flags.h 2011-04-28 11:06:45.000000000 +0200
++++ head-2011-07-21/include/linux/page-flags.h 2011-04-28 11:08:54.000000000 +0200
@@ -109,7 +109,7 @@ enum pageflags {
#endif
#ifdef CONFIG_XEN
@@ -327,8 +327,8 @@ Patch-mainline: n/a
#define PageBlkback(page) test_bit(PG_blkback, &(page)->flags)
#define SetPageBlkback(page) set_bit(PG_blkback, &(page)->flags)
---- head-2011-06-30.orig/kernel/kexec.c 2011-04-28 11:06:56.000000000 +0200
-+++ head-2011-06-30/kernel/kexec.c 2011-04-28 11:08:43.000000000 +0200
+--- head-2011-07-21.orig/kernel/kexec.c 2011-04-28 11:06:56.000000000 +0200
++++ head-2011-07-21/kernel/kexec.c 2011-04-28 11:08:43.000000000 +0200
@@ -41,8 +41,10 @@
#include <asm/system.h>
#include <asm/sections.h>
@@ -368,9 +368,9 @@ Patch-mainline: n/a
return 0;
}
module_init(crash_notes_memory_init)
---- head-2011-06-30.orig/mm/memory.c 2011-06-30 15:38:34.000000000 +0200
-+++ head-2011-06-30/mm/memory.c 2011-06-30 16:01:18.000000000 +0200
-@@ -1157,10 +1157,12 @@ again:
+--- head-2011-07-21.orig/mm/memory.c 2011-07-21 12:07:08.000000000 +0200
++++ head-2011-07-21/mm/memory.c 2011-07-21 12:07:22.000000000 +0200
+@@ -1158,10 +1158,12 @@ again:
page->index > details->last_index))
continue;
}
@@ -383,8 +383,8 @@ Patch-mainline: n/a
ptent = ptep_get_and_clear_full(mm, addr, pte,
tlb->fullmm);
tlb_remove_tlb_entry(tlb, pte, addr);
---- head-2011-06-30.orig/mm/mmap.c 2011-06-30 15:38:40.000000000 +0200
-+++ head-2011-06-30/mm/mmap.c 2011-06-30 16:01:21.000000000 +0200
+--- head-2011-07-21.orig/mm/mmap.c 2011-06-30 15:38:40.000000000 +0200
++++ head-2011-07-21/mm/mmap.c 2011-06-30 16:01:21.000000000 +0200
@@ -1900,8 +1900,10 @@ static void unmap_region(struct mm_struc
static inline void unmap_vma(struct vm_area_struct *vma)
@@ -407,8 +407,8 @@ Patch-mainline: n/a
vma = mm->mmap;
if (!vma) /* Can happen if dup_mmap() received an OOM */
---- head-2011-06-30.orig/mm/tmem-xen.c 2011-05-23 10:40:00.000000000 +0200
-+++ head-2011-06-30/mm/tmem-xen.c 2011-05-23 11:03:08.000000000 +0200
+--- head-2011-07-21.orig/mm/tmem-xen.c 2011-05-23 10:40:00.000000000 +0200
++++ head-2011-07-21/mm/tmem-xen.c 2011-05-23 11:03:08.000000000 +0200
@@ -7,8 +7,9 @@
#include <linux/types.h>
#include <xen/interface/xen.h>
diff --git a/patches.xen/xen3-fixup-xen b/patches.xen/xen3-fixup-xen
index fc6b125fc3..67d3bb14d5 100644
--- a/patches.xen/xen3-fixup-xen
+++ b/patches.xen/xen3-fixup-xen
@@ -1,5 +1,5 @@
Subject: Fix Xen build wrt. Xen files coming from mainline.
-From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1095:3c900d6a5f6a)
+From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1098:73e47d0fdb10)
Patch-mainline: n/a
Acked-by: jbeulich@novell.com
diff --git a/patches.xen/xen3-patch-2.6.18 b/patches.xen/xen3-patch-2.6.18
index 0c0b653545..4f58542cd0 100644
--- a/patches.xen/xen3-patch-2.6.18
+++ b/patches.xen/xen3-patch-2.6.18
@@ -4,6 +4,8 @@ Patch-mainline: 2.6.18
Automatically created from "patches.kernel.org/patch-2.6.18" by xen-port-patches.py
+2.6.35/kernel/time.c change removed (no longer applicable)
+
Acked-by: jbeulich@novell.com
--- head-2011-06-30.orig/arch/x86/Kconfig 2011-06-30 16:00:41.000000000 +0200
@@ -34,7 +36,7 @@ Acked-by: jbeulich@novell.com
-disabled-obj-$(CONFIG_XEN) := i8259_$(BITS).o reboot.o smpboot_$(BITS).o
+disabled-obj-$(CONFIG_XEN) := i8253.o i8259_$(BITS).o reboot.o smpboot_$(BITS).o tsc_$(BITS).o
%/head_$(BITS).o %/head_$(BITS).s: $(if $(CONFIG_XEN),EXTRA_AFLAGS,dummy) :=
---- head-2011-06-30.orig/arch/x86/kernel/quirks.c 2011-01-05 01:50:19.000000000 +0100
+--- head-2011-06-30.orig/arch/x86/kernel/quirks.c 2011-07-12 11:06:10.000000000 +0200
+++ head-2011-06-30/arch/x86/kernel/quirks.c 2011-02-28 15:04:15.000000000 +0100
@@ -6,7 +6,7 @@
@@ -79,7 +81,7 @@ Acked-by: jbeulich@novell.com
+ kernel_eflags &= ~X86_EFLAGS_IF;
}
--- head-2011-06-30.orig/arch/x86/kernel/time-xen.c 2010-08-31 09:24:21.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/time-xen.c 2011-01-31 17:02:29.000000000 +0100
++++ head-2011-06-30/arch/x86/kernel/time-xen.c 2011-07-12 11:09:48.000000000 +0200
@@ -45,7 +45,6 @@
#include <linux/sysdev.h>
#include <linux/bcd.h>
@@ -178,16 +180,92 @@ Acked-by: jbeulich@novell.com
static struct {
spinlock_t lock;
struct timeval tv;
-@@ -530,6 +508,8 @@ int do_settimeofday(struct timespec *tv)
+@@ -467,16 +445,25 @@ static inline void monotonic_reset(void)
+ }
- EXPORT_SYMBOL(do_settimeofday);
+ int do_settimeofday(struct timespec *tv)
++#elif defined(CONFIG_XEN_PRIVILEGED_GUEST)
++int xen_update_wallclock(const struct timespec *tv)
++#endif
++#if defined(CONFIG_X86_64) || defined(CONFIG_XEN_PRIVILEGED_GUEST)
+ {
+ time_t sec;
+ s64 nsec;
+ unsigned int cpu;
+ struct shadow_time_info *shadow;
+ struct xen_platform_op op;
++#ifdef CONFIG_X86_64
++ int warp = 0;
+
+ if (unlikely(!tv)) {
+ monotonic_reset();
+- return 0;
++ if (!is_initial_xendomain() || independent_wallclock)
++ return 0;
++ tv = &xtime;
++ warp = 1;
+ }
+
+ if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
+@@ -484,11 +471,18 @@ int do_settimeofday(struct timespec *tv)
+ if (!is_initial_xendomain() && !independent_wallclock)
+ return -EPERM;
++#else
++ if (!is_initial_xendomain() || independent_wallclock)
++ return -EPERM;
+#endif
-+
+
+ cpu = get_cpu();
+ shadow = &per_cpu(shadow_time, cpu);
+
+- write_seqlock_irq(&xtime_lock);
++#ifdef CONFIG_X86_64
++ if (!warp)
++ write_seqlock_irq(&xtime_lock);
++#endif
+
+ /*
+ * Ensure we don't get blocked for a long time so that our time delta
+@@ -511,24 +505,37 @@ int do_settimeofday(struct timespec *tv)
+ op.u.settime.system_time = shadow->system_timestamp;
+ WARN_ON(HYPERVISOR_platform_op(&op));
+ update_wallclock();
++#ifdef CONFIG_X86_64
++ if (warp) {
++ put_cpu();
++ return 0;
++ }
++#endif
+ } else if (independent_wallclock) {
+ nsec -= shadow->system_timestamp;
+ __normalize_time(&sec, &nsec);
+ __update_wallclock(sec, nsec);
+ }
++#ifdef CONFIG_X86_64
+ ntp_clear();
+
+ monotonic_reset();
+
+ write_sequnlock_irq(&xtime_lock);
++#endif
+
+ put_cpu();
+
++#ifdef CONFIG_X86_64
+ clock_was_set();
++#endif
+ return 0;
+ }
++#endif
+
++#ifdef CONFIG_X86_64
+ EXPORT_SYMBOL(do_settimeofday);
++#endif
+
static void sync_xen_wallclock(unsigned long dummy);
static DEFINE_TIMER(sync_xen_wallclock_timer, sync_xen_wallclock, 0, 0);
- static void sync_xen_wallclock(unsigned long dummy)
-@@ -581,11 +561,15 @@ static int set_rtc_mmss(unsigned long no
+@@ -581,11 +588,15 @@ static int set_rtc_mmss(unsigned long no
return retval;
}
@@ -203,7 +281,7 @@ Acked-by: jbeulich@novell.com
{
unsigned int cpu = get_cpu();
struct shadow_time_info *shadow = &per_cpu(shadow_time, cpu);
-@@ -605,9 +589,9 @@ unsigned long long monotonic_clock(void)
+@@ -605,9 +616,9 @@ unsigned long long monotonic_clock(void)
return time;
}
@@ -214,7 +292,7 @@ Acked-by: jbeulich@novell.com
unsigned long long sched_clock(void)
{
return monotonic_clock();
-@@ -780,6 +764,89 @@ irqreturn_t timer_interrupt(int irq, voi
+@@ -780,6 +791,89 @@ irqreturn_t timer_interrupt(int irq, voi
return IRQ_HANDLED;
}
@@ -304,7 +382,7 @@ Acked-by: jbeulich@novell.com
static void init_missing_ticks_accounting(unsigned int cpu)
{
struct vcpu_register_runstate_memory_area area;
-@@ -926,7 +993,7 @@ static void setup_cpu0_timer_irq(void)
+@@ -926,7 +1020,7 @@ static void setup_cpu0_timer_irq(void)
VIRQ_TIMER,
0,
timer_interrupt,
@@ -313,7 +391,7 @@ Acked-by: jbeulich@novell.com
"timer0",
NULL);
BUG_ON(per_cpu(timer_irq, 0) < 0);
-@@ -968,11 +1035,11 @@ void __init time_init(void)
+@@ -968,11 +1062,11 @@ void __init time_init(void)
update_wallclock();
@@ -326,7 +404,7 @@ Acked-by: jbeulich@novell.com
vxtime.mode = VXTIME_TSC;
vxtime.quot = (1000000L << 32) / vxtime_hz;
vxtime.tsc_quot = (1000L << 32) / cpu_khz;
-@@ -1147,7 +1214,7 @@ int __cpuinit local_setup_timer(unsigned
+@@ -1147,7 +1241,7 @@ int __cpuinit local_setup_timer(unsigned
irq = bind_virq_to_irqhandler(VIRQ_TIMER,
cpu,
timer_interrupt,
@@ -373,7 +451,16 @@ Acked-by: jbeulich@novell.com
struct desc_struct {
unsigned long a,b;
---- head-2011-06-30.orig/arch/x86/include/asm/thread_info.h 2011-05-19 06:06:34.000000000 +0200
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ head-2011-06-30/arch/x86/include/mach-xen/asm/time.h 2011-07-11 10:35:24.000000000 +0200
+@@ -0,0 +1,6 @@
++#ifdef CONFIG_XEN_PRIVILEGED_GUEST
++struct timespec;
++int xen_update_wallclock(const struct timespec *);
++#endif
++
++#include_next <asm/time.h>
+--- head-2011-06-30.orig/arch/x86/include/asm/thread_info.h 2011-07-12 11:06:10.000000000 +0200
+++ head-2011-06-30/arch/x86/include/asm/thread_info.h 2011-01-31 17:02:29.000000000 +0100
@@ -144,11 +144,15 @@ struct thread_info {
_TIF_USER_RETURN_NOTIFY)
@@ -391,3 +478,25 @@ Acked-by: jbeulich@novell.com
#define PREEMPT_ACTIVE 0x10000000
+--- head-2011-06-30.orig/kernel/time/timekeeping.c 2011-07-12 11:06:10.000000000 +0200
++++ head-2011-06-30/kernel/time/timekeeping.c 2011-07-11 10:33:46.000000000 +0200
+@@ -20,6 +20,9 @@
+ #include <linux/time.h>
+ #include <linux/tick.h>
+ #include <linux/stop_machine.h>
++#ifdef CONFIG_XEN_PRIVILEGED_GUEST
++#include <asm/time.h>
++#endif
+
+ /* Structure holding internal timekeeping values. */
+ struct timekeeper {
+@@ -376,6 +379,9 @@ int do_settimeofday(const struct timespe
+
+ update_vsyscall(&xtime, &wall_to_monotonic, timekeeper.clock,
+ timekeeper.mult);
++#ifdef CONFIG_XEN_PRIVILEGED_GUEST
++ xen_update_wallclock(tv);
++#endif
+
+ write_sequnlock_irqrestore(&xtime_lock, flags);
+
diff --git a/patches.xen/xen3-patch-2.6.19 b/patches.xen/xen3-patch-2.6.19
index e2dc6bd08f..aaa1272523 100644
--- a/patches.xen/xen3-patch-2.6.19
+++ b/patches.xen/xen3-patch-2.6.19
@@ -6,8 +6,8 @@ Automatically created from "patches.kernel.org/patch-2.6.19" by xen-port-patches
Acked-by: jbeulich@novell.com
---- head-2011-06-30.orig/arch/x86/Kconfig 2011-06-30 16:01:48.000000000 +0200
-+++ head-2011-06-30/arch/x86/Kconfig 2011-06-30 16:02:26.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/Kconfig 2011-06-30 16:01:48.000000000 +0200
++++ head-2011-07-21/arch/x86/Kconfig 2011-06-30 16:02:26.000000000 +0200
@@ -533,6 +533,7 @@ config SCHED_OMIT_FRAME_POINTER
menuconfig PARAVIRT_GUEST
@@ -16,8 +16,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-06-30.orig/arch/x86/kernel/acpi/boot.c 2011-06-30 15:04:42.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/acpi/boot.c 2011-04-13 12:23:45.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/kernel/acpi/boot.c 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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;
@@ -70,8 +70,8 @@ Acked-by: jbeulich@novell.com
static int __init parse_acpi_skip_timer_override(char *arg)
{
acpi_skip_timer_override = 1;
---- head-2011-06-30.orig/arch/x86/kernel/apic/apic-xen.c 2007-06-12 13:12:48.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/apic/apic-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/apic/apic-xen.c 2007-06-12 13:12:48.000000000 +0200
++++ head-2011-07-21/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.
@@ -112,8 +112,8 @@ Acked-by: jbeulich@novell.com
#endif
}
}
---- head-2011-06-30.orig/arch/x86/kernel/cpu/common-xen.c 2009-05-19 09:16:41.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/cpu/common-xen.c 2009-05-19 09:16:41.000000000 +0200
++++ head-2011-07-21/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;
@@ -177,8 +177,8 @@ Acked-by: jbeulich@novell.com
/* Clear all 6 debug registers: */
set_debugreg(0, 0);
---- head-2011-06-30.orig/arch/x86/kernel/cpu/mcheck/mce_dom0.c 2009-10-01 11:00:47.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/cpu/mcheck/mce_dom0.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/cpu/mcheck/mce_dom0.c 2009-10-01 11:00:47.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/cpu/mcheck/mce_dom0.c 2011-01-31 17:29:16.000000000 +0100
@@ -53,8 +53,7 @@ static struct mc_info *g_mi;
/*dom0 mce virq handler, logging physical mce error info*/
@@ -197,8 +197,8 @@ Acked-by: jbeulich@novell.com
+ mce_dom0_interrupt(VIRQ_MCA, NULL);
}
---- head-2011-06-30.orig/arch/x86/kernel/entry_32-xen.S 2009-05-19 09:16:41.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/entry_32-xen.S 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/entry_32-xen.S 2009-05-19 09:16:41.000000000 +0200
++++ head-2011-07-21/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
@@ -585,8 +585,8 @@ Acked-by: jbeulich@novell.com
.section .rodata,"a"
#include "syscall_table.S"
---- head-2011-06-30.orig/arch/x86/kernel/head_32-xen.S 2007-06-12 13:12:48.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/head_32-xen.S 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/head_32-xen.S 2007-06-12 13:12:48.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/head_32-xen.S 2011-01-31 17:29:16.000000000 +0100
@@ -62,7 +62,7 @@ ENTRY(startup_32)
movl %eax,%gs
cld # gcc2 wants the direction flag cleared at all times
@@ -596,8 +596,8 @@ Acked-by: jbeulich@novell.com
jmp start_kernel
#define HYPERCALL_PAGE_OFFSET 0x1000
---- head-2011-06-30.orig/arch/x86/kernel/io_apic_32-xen.c 2009-03-18 10:39:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/io_apic_32-xen.c 2009-03-18 10:39:31.000000000 +0100
++++ head-2011-07-21/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>
@@ -1677,8 +1677,8 @@ Acked-by: jbeulich@novell.com
+ return 0;
+}
+early_param("noapic", parse_noapic);
---- head-2011-06-30.orig/arch/x86/kernel/ldt_32-xen.c 2007-06-12 13:12:48.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/ldt_32-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/ldt_32-xen.c 2007-06-12 13:12:48.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/ldt_32-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * linux/kernel/ldt.c
@@ -1686,8 +1686,8 @@ Acked-by: jbeulich@novell.com
*
* Copyright (C) 1992 Krishna Balasubramanian and Linus Torvalds
* Copyright (C) 1999 Ingo Molnar <mingo@redhat.com>
---- head-2011-06-30.orig/arch/x86/kernel/microcode-xen.c 2007-06-12 13:12:48.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/microcode-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/microcode-xen.c 2007-06-12 13:12:48.000000000 +0200
++++ head-2011-07-21/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
*
@@ -1823,8 +1823,8 @@ Acked-by: jbeulich@novell.com
module_init(microcode_init)
module_exit(microcode_exit)
-MODULE_ALIAS_MISCDEV(MICROCODE_MINOR);
---- head-2011-06-30.orig/arch/x86/kernel/mpparse_32-xen.c 2007-06-12 13:12:48.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/mpparse_32-xen.c 2007-06-12 13:12:48.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -30,6 +30,7 @@
#include <asm/io_apic.h>
@@ -1991,8 +1991,8 @@ Acked-by: jbeulich@novell.com
/*
* Mapping between Global System Interrups, which
* represent all possible interrupts, and IRQs
---- head-2011-06-30.orig/arch/x86/kernel/pci-dma-xen.c 2009-11-06 10:23:23.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/pci-dma-xen.c 2009-11-06 10:23:23.000000000 +0100
++++ head-2011-07-21/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;
@@ -2051,8 +2051,8 @@ Acked-by: jbeulich@novell.com
if (swiotlb)
swiotlb_unmap_single(dev, dma_addr, size, direction);
else
---- head-2011-06-30.orig/arch/x86/kernel/process_32-xen.c 2008-07-21 11:00:32.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/process_32-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/process_32-xen.c 2008-07-21 11:00:32.000000000 +0200
++++ head-2011-07-21/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>
@@ -2142,8 +2142,8 @@ Acked-by: jbeulich@novell.com
sp -= get_random_int() % 8192;
return sp & ~0xf;
}
---- head-2011-06-30.orig/arch/x86/kernel/setup_32-xen.c 2008-04-22 15:41:51.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/setup_32-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/setup_32-xen.c 2008-04-22 15:41:51.000000000 +0200
++++ head-2011-07-21/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>
@@ -2718,8 +2718,8 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_ACPI
acpi_boot_init();
---- head-2011-06-30.orig/arch/x86/kernel/smp_32-xen.c 2007-12-10 08:47:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/smp_32-xen.c 2007-12-10 08:47:31.000000000 +0100
++++ head-2011-07-21/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.
*/
@@ -2819,8 +2819,8 @@ Acked-by: jbeulich@novell.com
+ return 0;
+}
+EXPORT_SYMBOL(smp_call_function_single);
---- head-2011-06-30.orig/arch/x86/kernel/time-xen.c 2011-01-31 17:02:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/time-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/time-xen.c 2011-07-12 11:09:48.000000000 +0200
++++ head-2011-07-21/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 */
@@ -2868,7 +2868,7 @@ Acked-by: jbeulich@novell.com
sec = xtime.tv_sec;
usec += (xtime.tv_nsec / NSEC_PER_USEC);
-@@ -524,7 +514,7 @@ static void sync_xen_wallclock(unsigned
+@@ -551,7 +541,7 @@ static void sync_xen_wallclock(unsigned
write_seqlock_irq(&xtime_lock);
sec = xtime.tv_sec;
@@ -2877,7 +2877,7 @@ Acked-by: jbeulich@novell.com
__normalize_time(&sec, &nsec);
op.cmd = XENPF_settime;
-@@ -598,42 +588,49 @@ unsigned long long sched_clock(void)
+@@ -625,42 +615,49 @@ unsigned long long sched_clock(void)
}
#endif
@@ -2946,7 +2946,7 @@ Acked-by: jbeulich@novell.com
{
s64 delta, delta_cpu, stolen, blocked;
u64 sched_time;
-@@ -692,10 +689,15 @@ irqreturn_t timer_interrupt(int irq, voi
+@@ -719,10 +716,15 @@ irqreturn_t timer_interrupt(int irq, voi
}
/* System-wide jiffy work. */
@@ -2966,7 +2966,7 @@ Acked-by: jbeulich@novell.com
}
if (shadow_tv_version != HYPERVISOR_shared_info->wc_version) {
-@@ -742,7 +744,7 @@ irqreturn_t timer_interrupt(int irq, voi
+@@ -769,7 +771,7 @@ irqreturn_t timer_interrupt(int irq, voi
if (delta_cpu > 0) {
do_div(delta_cpu, NS_PER_TICK);
per_cpu(processed_system_time, cpu) += delta_cpu * NS_PER_TICK;
@@ -2975,7 +2975,7 @@ Acked-by: jbeulich@novell.com
account_user_time(current, (cputime_t)delta_cpu);
else
account_system_time(current, HARDIRQ_OFFSET,
-@@ -756,10 +758,10 @@ irqreturn_t timer_interrupt(int irq, voi
+@@ -783,10 +785,10 @@ irqreturn_t timer_interrupt(int irq, voi
/* Local timer processing (see update_process_times()). */
run_local_timers();
if (rcu_pending(cpu))
@@ -2988,7 +2988,7 @@ Acked-by: jbeulich@novell.com
return IRQ_HANDLED;
}
-@@ -969,10 +971,11 @@ extern void (*late_time_init)(void);
+@@ -996,10 +998,11 @@ extern void (*late_time_init)(void);
/* Duplicate of time_init() below, with hpet_enable part added */
static void __init hpet_time_init(void)
{
@@ -3004,8 +3004,8 @@ Acked-by: jbeulich@novell.com
if ((hpet_enable() >= 0) && hpet_use_timer) {
printk("Using HPET for base-timer\n");
---- head-2011-06-30.orig/arch/x86/kernel/traps_32-xen.c 2008-04-02 12:34:02.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/traps_32-xen.c 2008-04-02 12:34:02.000000000 +0200
++++ head-2011-07-21/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>
@@ -3452,8 +3452,8 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_KPROBES
fastcall void __kprobes do_int3(struct pt_regs *regs, long error_code)
{
---- head-2011-06-30.orig/arch/x86/mach-xen/setup.c 2008-04-02 12:34:02.000000000 +0200
-+++ head-2011-06-30/arch/x86/mach-xen/setup.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mach-xen/setup.c 2008-04-02 12:34:02.000000000 +0200
++++ head-2011-07-21/arch/x86/mach-xen/setup.c 2011-01-31 17:29:16.000000000 +0100
@@ -103,8 +103,10 @@ void __init pre_setup_arch_hook(void)
setup_xen_features();
@@ -3467,8 +3467,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-06-30.orig/arch/x86/mm/fault_32-xen.c 2010-09-23 15:39:04.000000000 +0200
-+++ head-2011-06-30/arch/x86/mm/fault_32-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/fault_32-xen.c 2010-09-23 15:39:04.000000000 +0200
++++ head-2011-07-21/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>
@@ -3555,8 +3555,8 @@ Acked-by: jbeulich@novell.com
yield();
down_read(&mm->mmap_sem);
goto survive;
---- head-2011-06-30.orig/arch/x86/mm/highmem_32-xen.c 2008-10-29 09:55:56.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/highmem_32-xen.c 2008-10-29 09:55:56.000000000 +0100
++++ head-2011-07-21/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();
@@ -3623,8 +3623,8 @@ Acked-by: jbeulich@novell.com
return (void*) vaddr;
}
---- head-2011-06-30.orig/arch/x86/mm/hypervisor.c 2009-06-09 15:01:37.000000000 +0200
-+++ head-2011-06-30/arch/x86/mm/hypervisor.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/hypervisor.c 2009-06-09 15:01:37.000000000 +0200
++++ head-2011-07-21/arch/x86/mm/hypervisor.c 2011-01-31 17:29:16.000000000 +0100
@@ -31,6 +31,7 @@
*/
@@ -3960,8 +3960,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-06-30.orig/arch/x86/mm/init_32-xen.c 2008-10-29 09:55:56.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/init_32-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/init_32-xen.c 2008-10-29 09:55:56.000000000 +0100
++++ head-2011-07-21/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)
{
@@ -4140,8 +4140,8 @@ Acked-by: jbeulich@novell.com
unsigned long start_pfn = start >> PAGE_SHIFT;
unsigned long nr_pages = size >> PAGE_SHIFT;
---- head-2011-06-30.orig/arch/x86/mm/ioremap-xen.c 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-06-30/arch/x86/mm/ioremap-xen.c 2011-02-07 15:37:37.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/ioremap-xen.c 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-07-21/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>
@@ -4189,8 +4189,8 @@ Acked-by: jbeulich@novell.com
vunmap((void __force *) addr);
return NULL;
}
---- head-2011-06-30.orig/arch/x86/mm/pgtable_32-xen.c 2010-09-23 15:39:04.000000000 +0200
-+++ head-2011-06-30/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/pgtable_32-xen.c 2010-09-23 15:39:04.000000000 +0200
++++ head-2011-07-21/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));
@@ -4246,8 +4246,8 @@ Acked-by: jbeulich@novell.com
}
pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
---- head-2011-06-30.orig/arch/x86/pci/irq-xen.c 2008-03-06 08:54:32.000000000 +0100
-+++ head-2011-06-30/arch/x86/pci/irq-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/pci/irq-xen.c 2008-03-06 08:54:32.000000000 +0100
++++ head-2011-07-21/arch/x86/pci/irq-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -991,10 +991,6 @@ static void __init pcibios_fixup_irqs(vo
pci_name(bridge), 'A' + pin, irq);
}
@@ -4304,8 +4304,8 @@ Acked-by: jbeulich@novell.com
-
- return count;
-}
---- head-2011-06-30.orig/arch/x86/ia32/ia32entry-xen.S 2008-04-02 12:34:02.000000000 +0200
-+++ head-2011-06-30/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/ia32/ia32entry-xen.S 2008-04-02 12:34:02.000000000 +0200
++++ head-2011-07-21/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:29:16.000000000 +0100
@@ -83,6 +83,7 @@
*/
ENTRY(ia32_sysenter_target)
@@ -4355,8 +4355,8 @@ Acked-by: jbeulich@novell.com
.quad compat_sys_move_pages
+ .quad sys_getcpu
ia32_syscall_end:
---- head-2011-06-30.orig/arch/x86/kernel/Makefile 2011-06-30 16:01:54.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/Makefile 2011-06-30 16:02:19.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/kernel/Makefile 2011-06-30 16:01:54.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/Makefile 2011-06-30 16:02:19.000000000 +0200
@@ -121,7 +121,7 @@ obj-$(CONFIG_X86_XEN) += fixup.o
###
# 64 bit specific files
@@ -4375,8 +4375,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-06-30.orig/arch/x86/kernel/e820_64-xen.c 2009-12-04 08:45:56.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/e820_64-xen.c 2009-12-04 08:45:56.000000000 +0100
++++ head-2011-07-21/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>
@@ -4868,8 +4868,8 @@ Acked-by: jbeulich@novell.com
}
unsigned long pci_mem_start = 0xaeedbabe;
---- head-2011-06-30.orig/arch/x86/kernel/early_printk-xen.c 2007-06-12 13:13:01.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/early_printk-xen.c 2007-06-12 13:13:01.000000000 +0200
++++ head-2011-07-21/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;
@@ -4916,8 +4916,8 @@ Acked-by: jbeulich@novell.com
}
-__setup("earlyprintk=", setup_early_printk);
---- head-2011-06-30.orig/arch/x86/kernel/entry_64-xen.S 2009-06-23 09:28:21.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/entry_64-xen.S 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/entry_64-xen.S 2009-06-23 09:28:21.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/entry_64-xen.S 2011-01-31 17:29:16.000000000 +0100
@@ -4,9 +4,6 @@
* Copyright (C) 1991, 1992 Linus Torvalds
* Copyright (C) 2000, 2001, 2002 Andi Kleen SuSE Labs
@@ -5160,8 +5160,8 @@ Acked-by: jbeulich@novell.com
ENTRY(alignment_check)
errorentry do_alignment_check
---- head-2011-06-30.orig/arch/x86/kernel/head_64-xen.S 2010-11-08 17:27:03.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/head_64-xen.S 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/head_64-xen.S 2010-11-08 17:27:03.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/head_64-xen.S 2011-01-31 17:29:16.000000000 +0100
@@ -5,9 +5,6 @@
* Copyright (C) 2000 Pavel Machek <pavel@suse.cz>
* Copyright (C) 2000 Karsten Keil <kkeil@suse.de>
@@ -5181,8 +5181,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-06-30.orig/arch/x86/kernel/head64-xen.c 2007-06-12 13:13:01.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/head64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/head64-xen.c 2007-06-12 13:13:01.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/head64-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -7,6 +7,9 @@
* Modified for Xen.
*/
@@ -5274,8 +5274,8 @@ Acked-by: jbeulich@novell.com
- setup_boot_cpu_data();
start_kernel();
}
---- head-2011-06-30.orig/arch/x86/kernel/io_apic_64-xen.c 2009-03-18 10:39:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/io_apic_64-xen.c 2009-03-18 10:39:31.000000000 +0100
++++ head-2011-07-21/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>
@@ -6975,8 +6975,8 @@ Acked-by: jbeulich@novell.com
spin_unlock_irqrestore(&ioapic_lock, flags);
return 0;
---- head-2011-06-30.orig/arch/x86/kernel/ioport_64-xen.c 2008-01-28 12:24:19.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/ioport_64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/ioport_64-xen.c 2008-01-28 12:24:19.000000000 +0100
++++ head-2011-07-21/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);
@@ -6985,8 +6985,8 @@ Acked-by: jbeulich@novell.com
set_xen_guest_handle(set_iobitmap.bitmap, (char *)bitmap);
set_iobitmap.nr_ports = IO_BITMAP_BITS;
---- head-2011-06-30.orig/arch/x86/kernel/mpparse_64-xen.c 2007-06-12 13:13:01.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/mpparse_64-xen.c 2007-06-12 13:13:01.000000000 +0200
++++ head-2011-07-21/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.
@@ -7600,8 +7600,8 @@ Acked-by: jbeulich@novell.com
-
-#endif /*CONFIG_X86_IO_APIC*/
#endif /*CONFIG_ACPI*/
---- head-2011-06-30.orig/arch/x86/kernel/process_64-xen.c 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/process_64-xen.c 2011-02-02 08:30:50.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/process_64-xen.c 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-07-21/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);
@@ -7808,8 +7808,8 @@ Acked-by: jbeulich@novell.com
sp -= get_random_int() % 8192;
return sp & ~0xf;
}
---- head-2011-06-30.orig/arch/x86/kernel/setup_64-xen.c 2010-10-05 09:58:12.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/setup_64-xen.c 2010-10-05 09:58:12.000000000 +0200
++++ head-2011-07-21/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);
@@ -8246,8 +8246,8 @@ Acked-by: jbeulich@novell.com
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* VIA/Cyrix/Centaur-defined */
---- head-2011-06-30.orig/arch/x86/kernel/setup64-xen.c 2011-01-31 17:02:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/setup64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/setup64-xen.c 2011-01-31 17:02:29.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/setup64-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -31,7 +31,7 @@
#include <asm/hypervisor.h>
#endif
@@ -8341,8 +8341,8 @@ Acked-by: jbeulich@novell.com
orig_ist->ist[v] = t->ist[v] = (unsigned long)estacks;
}
---- head-2011-06-30.orig/arch/x86/kernel/smp_64-xen.c 2008-04-02 12:34:02.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/smp_64-xen.c 2008-04-02 12:34:02.000000000 +0200
++++ head-2011-07-21/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();
@@ -8404,8 +8404,8 @@ Acked-by: jbeulich@novell.com
- return 0; /* Should not happen */
-#endif
-}
---- head-2011-06-30.orig/arch/x86/kernel/traps_64-xen.c 2008-04-02 12:34:02.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/traps_64-xen.c 2008-04-02 12:34:02.000000000 +0200
++++ head-2011-07-21/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>
@@ -8861,8 +8861,8 @@ Acked-by: jbeulich@novell.com
-__setup("call_trace=", call_trace_setup);
+early_param("call_trace", call_trace_setup);
#endif
---- head-2011-06-30.orig/arch/x86/kernel/vsyscall_64-xen.c 2007-06-18 08:38:13.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/vsyscall_64-xen.c 2007-06-18 08:38:13.000000000 +0200
++++ head-2011-07-21/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>
@@ -9056,8 +9056,8 @@ Acked-by: jbeulich@novell.com
return 0;
}
---- head-2011-06-30.orig/arch/x86/mm/fault_64-xen.c 2010-09-23 15:39:04.000000000 +0200
-+++ head-2011-06-30/arch/x86/mm/fault_64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/fault_64-xen.c 2010-09-23 15:39:04.000000000 +0200
++++ head-2011-07-21/arch/x86/mm/fault_64-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -40,8 +40,7 @@
#define PF_RSVD (1<<3)
#define PF_INSTR (1<<4)
@@ -9195,8 +9195,8 @@ Acked-by: jbeulich@novell.com
pgd_page_table(unlock, page);
}
spin_unlock(&pgd_lock);
---- head-2011-06-30.orig/arch/x86/mm/init_64-xen.c 2010-04-29 09:34:47.000000000 +0200
-+++ head-2011-06-30/arch/x86/mm/init_64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/init_64-xen.c 2010-04-29 09:34:47.000000000 +0200
++++ head-2011-07-21/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;
@@ -9509,8 +9509,8 @@ Acked-by: jbeulich@novell.com
}
int kern_addr_valid(unsigned long addr)
---- head-2011-06-30.orig/arch/x86/mm/pageattr_64-xen.c 2009-03-18 10:39:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/pageattr_64-xen.c 2009-03-18 10:39:31.000000000 +0100
++++ head-2011-07-21/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);
@@ -9575,8 +9575,8 @@ Acked-by: jbeulich@novell.com
}
}
up_write(&init_mm.mmap_sem);
---- head-2011-06-30.orig/drivers/char/tpm/tpm_xen.c 2011-01-31 14:53:38.000000000 +0100
-+++ head-2011-06-30/drivers/char/tpm/tpm_xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/drivers/char/tpm/tpm_xen.c 2011-01-31 14:53:38.000000000 +0100
++++ head-2011-07-21/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 */
@@ -9596,8 +9596,8 @@ Acked-by: jbeulich@novell.com
{
struct tpm_private *tp = tpm_priv;
unsigned long flags;
---- head-2011-06-30.orig/drivers/pci/Kconfig 2011-01-31 14:32:40.000000000 +0100
-+++ head-2011-06-30/drivers/pci/Kconfig 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/drivers/pci/Kconfig 2011-01-31 14:32:40.000000000 +0100
++++ head-2011-07-21/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"
@@ -9607,8 +9607,8 @@ Acked-by: jbeulich@novell.com
help
This allows native hypertransport devices to use interrupts.
---- head-2011-06-30.orig/drivers/pci/msi-xen.c 2009-12-04 08:45:56.000000000 +0100
-+++ head-2011-06-30/drivers/pci/msi-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/drivers/pci/msi-xen.c 2009-12-04 08:45:56.000000000 +0100
++++ head-2011-07-21/drivers/pci/msi-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -6,6 +6,7 @@
* Copyright (C) Tom Long Nguyen (tom.l.nguyen@intel.com)
*/
@@ -9840,8 +9840,8 @@ Acked-by: jbeulich@novell.com
* allocated for this device function, are reclaimed to unused state,
* which may be used later on.
**/
---- head-2011-06-30.orig/drivers/xen/Kconfig 2011-02-24 14:05:09.000000000 +0100
-+++ head-2011-06-30/drivers/xen/Kconfig 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/Kconfig 2011-02-24 14:05:09.000000000 +0100
++++ head-2011-07-21/drivers/xen/Kconfig 2011-01-31 17:29:16.000000000 +0100
@@ -332,6 +332,10 @@ endmenu
config HAVE_IRQ_IGNORE_UNHANDLED
def_bool y
@@ -9853,8 +9853,8 @@ Acked-by: jbeulich@novell.com
config NO_IDLE_HZ
def_bool y
---- head-2011-06-30.orig/drivers/xen/balloon/balloon.c 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-06-30/drivers/xen/balloon/balloon.c 2011-03-23 08:48:06.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/balloon/balloon.c 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-07-21/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>
@@ -10052,8 +10052,8 @@ Acked-by: jbeulich@novell.com
bs.driver_pages--;
balloon_unlock(flags);
---- head-2011-06-30.orig/drivers/xen/blkback/blkback.c 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-06-30/drivers/xen/blkback/blkback.c 2011-04-11 14:28:25.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/blkback/blkback.c 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-07-21/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);
}
@@ -10063,8 +10063,8 @@ Acked-by: jbeulich@novell.com
{
blkif_notify_work(dev_id);
return IRQ_HANDLED;
---- head-2011-06-30.orig/drivers/xen/blkback/common.h 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-06-30/drivers/xen/blkback/common.h 2011-04-11 14:28:27.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/blkback/common.h 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-07-21/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);
@@ -10074,8 +10074,8 @@ Acked-by: jbeulich@novell.com
int blkif_schedule(void *arg);
int blkback_barrier(struct xenbus_transaction xbt,
---- head-2011-06-30.orig/drivers/xen/blkfront/blkfront.c 2011-06-30 15:37:44.000000000 +0200
-+++ head-2011-06-30/drivers/xen/blkfront/blkfront.c 2011-06-30 16:02:36.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/blkfront/blkfront.c 2011-07-15 11:19:50.000000000 +0200
++++ head-2011-07-21/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 *);
@@ -10097,7 +10097,7 @@ Acked-by: jbeulich@novell.com
return err;
}
-@@ -742,7 +742,7 @@ void do_blkif_request(request_queue_t *r
+@@ -741,7 +741,7 @@ void do_blkif_request(request_queue_t *r
}
@@ -10106,7 +10106,7 @@ Acked-by: jbeulich@novell.com
{
struct request *req;
blkif_response_t *bret;
-@@ -853,7 +853,7 @@ static void blkif_completion(struct blk_
+@@ -852,7 +852,7 @@ static void blkif_completion(struct blk_
gnttab_end_foreign_access(s->req.seg[i].gref, 0UL);
}
@@ -10115,7 +10115,7 @@ Acked-by: jbeulich@novell.com
{
int i;
blkif_request_t *req;
-@@ -861,8 +861,10 @@ static void blkif_recover(struct blkfron
+@@ -860,8 +860,10 @@ static void blkif_recover(struct blkfron
int j;
/* Stage 1: Make a safe copy of the shadow state. */
@@ -10128,7 +10128,7 @@ Acked-by: jbeulich@novell.com
/* Stage 2: Set up free list. */
memset(&info->shadow, 0, sizeof(info->shadow));
-@@ -916,6 +918,8 @@ static void blkif_recover(struct blkfron
+@@ -915,6 +917,8 @@ static void blkif_recover(struct blkfron
kick_pending_request_queues(info);
spin_unlock_irq(&blkif_io_lock);
@@ -10137,8 +10137,8 @@ Acked-by: jbeulich@novell.com
}
int blkfront_is_ready(struct xenbus_device *dev)
---- head-2011-06-30.orig/drivers/xen/blktap/blktap.c 2011-06-30 15:37:44.000000000 +0200
-+++ head-2011-06-30/drivers/xen/blktap/blktap.c 2011-06-30 16:02:41.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/blktap/blktap.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-07-21/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);
}
@@ -10148,8 +10148,8 @@ Acked-by: jbeulich@novell.com
{
blkif_notify_work(dev_id);
return IRQ_HANDLED;
---- head-2011-06-30.orig/drivers/xen/blktap/common.h 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-06-30/drivers/xen/blktap/common.h 2011-04-11 14:28:19.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/blktap/common.h 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-07-21/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);
@@ -10159,8 +10159,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-06-30.orig/drivers/xen/blktap2/sysfs.c 2011-03-02 12:00:16.000000000 +0100
-+++ head-2011-06-30/drivers/xen/blktap2/sysfs.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/blktap2/sysfs.c 2011-03-02 12:00:16.000000000 +0100
++++ head-2011-07-21/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) {
@@ -10249,8 +10249,8 @@ Acked-by: jbeulich@novell.com
- return 0;
+ return err;
}
---- head-2011-06-30.orig/drivers/xen/console/console.c 2011-01-31 17:02:29.000000000 +0100
-+++ head-2011-06-30/drivers/xen/console/console.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/console/console.c 2011-01-31 17:02:29.000000000 +0100
++++ head-2011-07-21/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;
@@ -10296,8 +10296,8 @@ Acked-by: jbeulich@novell.com
.open = xencons_open,
.close = xencons_close,
.write = xencons_write,
---- head-2011-06-30.orig/drivers/xen/console/xencons_ring.c 2007-06-12 13:13:44.000000000 +0200
-+++ head-2011-06-30/drivers/xen/console/xencons_ring.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/console/xencons_ring.c 2007-06-12 13:13:44.000000000 +0200
++++ head-2011-07-21/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;
}
@@ -10316,8 +10316,8 @@ Acked-by: jbeulich@novell.com
cons++;
}
---- head-2011-06-30.orig/drivers/xen/core/evtchn.c 2010-11-25 09:36:37.000000000 +0100
-+++ head-2011-06-30/drivers/xen/core/evtchn.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/core/evtchn.c 2010-11-25 09:36:37.000000000 +0100
++++ head-2011-07-21/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(
@@ -10597,8 +10597,8 @@ Acked-by: jbeulich@novell.com
+ handle_fasteoi_irq, "fasteoi");
}
}
---- head-2011-06-30.orig/drivers/xen/core/gnttab.c 2010-09-23 15:39:04.000000000 +0200
-+++ head-2011-06-30/drivers/xen/core/gnttab.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/core/gnttab.c 2010-09-23 15:39:04.000000000 +0200
++++ head-2011-07-21/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);
@@ -10616,8 +10616,8 @@ Acked-by: jbeulich@novell.com
*pagep = new_page;
SetPageForeign(page, gnttab_page_free);
---- head-2011-06-30.orig/drivers/xen/core/reboot.c 2011-06-30 15:37:44.000000000 +0200
-+++ head-2011-06-30/drivers/xen/core/reboot.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/core/reboot.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-07-21/drivers/xen/core/reboot.c 2011-01-31 17:29:16.000000000 +0100
@@ -1,4 +1,3 @@
-#define __KERNEL_SYSCALLS__
#include <linux/version.h>
@@ -10649,8 +10649,8 @@ Acked-by: jbeulich@novell.com
{
switch_shutdown_state(SHUTDOWN_SUSPEND);
return IRQ_HANDLED;
---- head-2011-06-30.orig/drivers/xen/core/smpboot.c 2011-01-31 17:01:49.000000000 +0100
-+++ head-2011-06-30/drivers/xen/core/smpboot.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/core/smpboot.c 2011-01-31 17:01:49.000000000 +0100
++++ head-2011-07-21/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>
@@ -10671,8 +10671,8 @@ Acked-by: jbeulich@novell.com
#endif
void __init prefill_possible_map(void)
---- head-2011-06-30.orig/drivers/xen/fbfront/xenfb.c 2011-03-02 12:00:16.000000000 +0100
-+++ head-2011-06-30/drivers/xen/fbfront/xenfb.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/fbfront/xenfb.c 2011-03-02 12:00:16.000000000 +0100
++++ head-2011-07-21/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,
};
@@ -10683,8 +10683,8 @@ Acked-by: jbeulich@novell.com
{
/*
* No in events recognized, simply ignore them all.
---- head-2011-06-30.orig/drivers/xen/fbfront/xenkbd.c 2011-05-23 10:40:00.000000000 +0200
-+++ head-2011-06-30/drivers/xen/fbfront/xenkbd.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/fbfront/xenkbd.c 2011-05-23 10:40:00.000000000 +0200
++++ head-2011-07-21/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.
*/
@@ -10694,8 +10694,8 @@ Acked-by: jbeulich@novell.com
{
struct xenkbd_info *info = dev_id;
struct xenkbd_page *page = info->page;
---- head-2011-06-30.orig/drivers/xen/gntdev/gntdev.c 2011-01-03 12:43:21.000000000 +0100
-+++ head-2011-06-30/drivers/xen/gntdev/gntdev.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/gntdev/gntdev.c 2011-01-03 12:43:21.000000000 +0100
++++ head-2011-07-21/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();
}
@@ -10735,8 +10735,8 @@ Acked-by: jbeulich@novell.com
}
return copy;
---- head-2011-06-30.orig/drivers/xen/netback/accel.c 2011-06-30 15:37:44.000000000 +0200
-+++ head-2011-06-30/drivers/xen/netback/accel.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/netback/accel.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-07-21/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)) {
@@ -10746,8 +10746,8 @@ Acked-by: jbeulich@novell.com
__FUNCTION__, PTR_ERR(eth_name));
return 0;
} else {
---- head-2011-06-30.orig/drivers/xen/netback/common.h 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-06-30/drivers/xen/netback/common.h 2011-04-11 14:28:08.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/netback/common.h 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-07-21/drivers/xen/netback/common.h 2011-04-11 14:28:08.000000000 +0200
@@ -92,6 +92,7 @@ typedef struct netif_st {
/* Statistics */
@@ -10765,8 +10765,8 @@ Acked-by: jbeulich@novell.com
static inline int netbk_can_queue(struct net_device *dev)
{
---- head-2011-06-30.orig/drivers/xen/netback/interface.c 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-06-30/drivers/xen/netback/interface.c 2011-04-11 14:28:07.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/netback/interface.c 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-07-21/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[] = {
@@ -10775,8 +10775,8 @@ Acked-by: jbeulich@novell.com
};
static int netbk_get_stats_count(struct net_device *dev)
---- head-2011-06-30.orig/drivers/xen/netback/loopback.c 2011-01-03 12:43:21.000000000 +0100
-+++ head-2011-06-30/drivers/xen/netback/loopback.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/netback/loopback.c 2011-01-03 12:43:21.000000000 +0100
++++ head-2011-07-21/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++;
@@ -10794,8 +10794,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-06-30.orig/drivers/xen/netback/netback.c 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-06-30/drivers/xen/netback/netback.c 2011-04-11 14:28:01.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/netback/netback.c 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-07-21/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>
@@ -10883,8 +10883,8 @@ Acked-by: jbeulich@novell.com
{
struct list_head *ent;
netif_t *netif;
---- head-2011-06-30.orig/drivers/xen/netfront/netfront.c 2011-06-30 15:37:44.000000000 +0200
-+++ head-2011-06-30/drivers/xen/netfront/netfront.c 2011-06-30 16:02:48.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/netfront/netfront.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-07-21/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>
@@ -11026,8 +11026,8 @@ Acked-by: jbeulich@novell.com
};
#ifdef CONFIG_SYSFS
---- head-2011-06-30.orig/drivers/xen/netfront/netfront.h 2010-02-24 13:13:46.000000000 +0100
-+++ head-2011-06-30/drivers/xen/netfront/netfront.h 2011-02-09 15:35:17.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/netfront/netfront.h 2010-02-24 13:13:46.000000000 +0100
++++ head-2011-07-21/drivers/xen/netfront/netfront.h 2011-02-09 15:35:17.000000000 +0100
@@ -150,6 +150,7 @@ struct netfront_info {
struct net_device *netdev;
@@ -11036,8 +11036,8 @@ Acked-by: jbeulich@novell.com
struct netif_tx_front_ring tx;
struct netif_rx_front_ring rx;
---- head-2011-06-30.orig/drivers/xen/pciback/pciback.h 2009-03-18 10:39:32.000000000 +0100
-+++ head-2011-06-30/drivers/xen/pciback/pciback.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/pciback/pciback.h 2009-03-18 10:39:32.000000000 +0100
++++ head-2011-07-21/drivers/xen/pciback/pciback.h 2011-01-31 17:29:16.000000000 +0100
@@ -99,7 +99,7 @@ int pciback_publish_pci_roots(struct pci
void pciback_release_devices(struct pciback_device *pdev);
@@ -11047,8 +11047,8 @@ Acked-by: jbeulich@novell.com
void pciback_do_op(void *data);
int pciback_xenbus_register(void);
---- head-2011-06-30.orig/drivers/xen/pciback/pciback_ops.c 2011-02-17 09:58:10.000000000 +0100
-+++ head-2011-06-30/drivers/xen/pciback/pciback_ops.c 2011-02-17 10:07:33.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/pciback/pciback_ops.c 2011-02-17 09:58:10.000000000 +0100
++++ head-2011-07-21/drivers/xen/pciback/pciback_ops.c 2011-02-17 10:07:33.000000000 +0100
@@ -132,7 +132,7 @@ void pciback_do_op(void *data)
test_and_schedule_op(pdev);
}
@@ -11058,8 +11058,8 @@ Acked-by: jbeulich@novell.com
{
struct pciback_device *pdev = dev_id;
---- head-2011-06-30.orig/drivers/xen/pcifront/pcifront.h 2010-10-05 09:58:12.000000000 +0200
-+++ head-2011-06-30/drivers/xen/pcifront/pcifront.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/pcifront/pcifront.h 2010-10-05 09:58:12.000000000 +0200
++++ head-2011-07-21/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);
@@ -11068,8 +11068,8 @@ Acked-by: jbeulich@novell.com
+irqreturn_t pcifront_handler_aer(int irq, void *dev);
#endif /* __XEN_PCIFRONT_H__ */
---- head-2011-06-30.orig/drivers/xen/pcifront/pci_op.c 2010-11-25 09:36:37.000000000 +0100
-+++ head-2011-06-30/drivers/xen/pcifront/pci_op.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/pcifront/pci_op.c 2010-11-25 09:36:37.000000000 +0100
++++ head-2011-07-21/drivers/xen/pcifront/pci_op.c 2011-01-31 17:29:16.000000000 +0100
@@ -662,7 +662,7 @@ void pcifront_do_aer(void *data)
}
@@ -11079,8 +11079,8 @@ Acked-by: jbeulich@novell.com
{
struct pcifront_device *pdev = dev;
schedule_pcifront_aer_op(pdev);
---- head-2011-06-30.orig/drivers/xen/privcmd/compat_privcmd.c 2010-01-27 14:01:48.000000000 +0100
-+++ head-2011-06-30/drivers/xen/privcmd/compat_privcmd.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/privcmd/compat_privcmd.c 2010-01-27 14:01:48.000000000 +0100
++++ head-2011-07-21/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>
*/
@@ -11089,8 +11089,8 @@ Acked-by: jbeulich@novell.com
#include <linux/compat.h>
#include <linux/ioctl.h>
#include <linux/syscalls.h>
---- head-2011-06-30.orig/drivers/xen/privcmd/privcmd.c 2010-01-27 14:01:48.000000000 +0100
-+++ head-2011-06-30/drivers/xen/privcmd/privcmd.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/privcmd/privcmd.c 2010-01-27 14:01:48.000000000 +0100
++++ head-2011-07-21/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;
@@ -11151,8 +11151,8 @@ Acked-by: jbeulich@novell.com
vma->vm_ops = &privcmd_vm_ops;
vma->vm_private_data = NULL;
---- head-2011-06-30.orig/drivers/xen/scsiback/common.h 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-06-30/drivers/xen/scsiback/common.h 2011-04-11 14:27:49.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/scsiback/common.h 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-07-21/drivers/xen/scsiback/common.h 2011-04-11 14:27:49.000000000 +0200
@@ -138,7 +138,7 @@ typedef struct {
#define VSCSI_TYPE_HOST 1
@@ -11162,8 +11162,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-06-30.orig/drivers/xen/scsiback/scsiback.c 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-06-30/drivers/xen/scsiback/scsiback.c 2011-04-11 14:27:51.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/scsiback/scsiback.c 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-07-21/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);
@@ -11182,8 +11182,8 @@ Acked-by: jbeulich@novell.com
{
scsiback_notify_work((struct vscsibk_info *)dev_id);
return IRQ_HANDLED;
---- head-2011-06-30.orig/drivers/xen/scsifront/common.h 2010-02-24 13:13:46.000000000 +0100
-+++ head-2011-06-30/drivers/xen/scsifront/common.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/scsifront/common.h 2010-02-24 13:13:46.000000000 +0100
++++ head-2011-07-21/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);
@@ -11193,8 +11193,8 @@ Acked-by: jbeulich@novell.com
int scsifront_cmd_done(struct vscsifrnt_info *info);
---- head-2011-06-30.orig/drivers/xen/scsifront/scsifront.c 2011-02-02 12:19:11.000000000 +0100
-+++ head-2011-06-30/drivers/xen/scsifront/scsifront.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/scsifront/scsifront.c 2011-02-02 12:19:11.000000000 +0100
++++ head-2011-07-21/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);
}
@@ -11204,8 +11204,8 @@ Acked-by: jbeulich@novell.com
{
scsifront_notify_work((struct vscsifrnt_info *)dev_id);
return IRQ_HANDLED;
---- head-2011-06-30.orig/drivers/xen/sfc_netback/accel_xenbus.c 2010-01-04 11:56:34.000000000 +0100
-+++ head-2011-06-30/drivers/xen/sfc_netback/accel_xenbus.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/sfc_netback/accel_xenbus.c 2010-01-04 11:56:34.000000000 +0100
++++ head-2011-07-21/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
@@ -11226,8 +11226,8 @@ Acked-by: jbeulich@novell.com
{
VPRINTK("netirq %d from device %s\n", irq,
((struct xenbus_device *)context)->nodename);
---- head-2011-06-30.orig/drivers/xen/sfc_netfront/accel.h 2009-04-07 13:58:48.000000000 +0200
-+++ head-2011-06-30/drivers/xen/sfc_netfront/accel.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/sfc_netfront/accel.h 2009-04-07 13:58:48.000000000 +0200
++++ head-2011-07-21/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);
@@ -11241,8 +11241,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-06-30.orig/drivers/xen/sfc_netfront/accel_msg.c 2009-04-07 13:58:48.000000000 +0200
-+++ head-2011-06-30/drivers/xen/sfc_netfront/accel_msg.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/sfc_netfront/accel_msg.c 2009-04-07 13:58:48.000000000 +0200
++++ head-2011-07-21/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 *
}
@@ -11263,8 +11263,8 @@ Acked-by: jbeulich@novell.com
{
netfront_accel_vnic *vnic = (netfront_accel_vnic *)context;
struct net_device *net_dev = vnic->net_dev;
---- head-2011-06-30.orig/drivers/xen/sfc_netfront/accel_tso.c 2008-02-26 10:54:12.000000000 +0100
-+++ head-2011-06-30/drivers/xen/sfc_netfront/accel_tso.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/sfc_netfront/accel_tso.c 2008-02-26 10:54:12.000000000 +0100
++++ head-2011-07-21/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);
@@ -11274,8 +11274,8 @@ Acked-by: jbeulich@novell.com
EPRINTK("Trying to TSO send a packet without HW checksum\n");
tso_start(&state, skb);
---- head-2011-06-30.orig/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 15:37:44.000000000 +0200
-+++ head-2011-06-30/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 16:03:00.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-07-21/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;
@@ -11294,8 +11294,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-06-30.orig/drivers/xen/tpmback/common.h 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-06-30/drivers/xen/tpmback/common.h 2011-04-11 14:27:26.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/tpmback/common.h 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-07-21/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);
@@ -11305,8 +11305,8 @@ Acked-by: jbeulich@novell.com
long int tpmback_get_instance(struct backend_info *bi);
---- head-2011-06-30.orig/drivers/xen/tpmback/tpmback.c 2010-09-23 15:39:04.000000000 +0200
-+++ head-2011-06-30/drivers/xen/tpmback/tpmback.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/tpmback/tpmback.c 2010-09-23 15:39:04.000000000 +0200
++++ head-2011-07-21/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);
@@ -11325,8 +11325,8 @@ Acked-by: jbeulich@novell.com
{
tpmif_t *tpmif = (tpmif_t *) dev_id;
---- head-2011-06-30.orig/drivers/xen/usbback/usbback.c 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-06-30/drivers/xen/usbback/usbback.c 2011-04-11 14:27:33.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/usbback/usbback.c 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-07-21/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);
}
@@ -11345,8 +11345,8 @@ Acked-by: jbeulich@novell.com
{
pending_req_t *pending_req = (pending_req_t *)urb->context;
---- head-2011-06-30.orig/drivers/xen/usbback/usbback.h 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-06-30/drivers/xen/usbback/usbback.h 2011-04-11 14:27:35.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/usbback/usbback.h 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-07-21/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,
@@ -11356,8 +11356,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-06-30.orig/drivers/xen/usbback/usbstub.c 2011-03-02 12:00:16.000000000 +0100
-+++ head-2011-06-30/drivers/xen/usbback/usbstub.c 2011-03-11 10:54:35.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/usbback/usbstub.c 2011-03-02 12:00:16.000000000 +0100
++++ head-2011-07-21/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);
@@ -11385,8 +11385,8 @@ Acked-by: jbeulich@novell.com
&driver_attr_port_ids);
usb_deregister(&usbback_usb_driver);
}
---- head-2011-06-30.orig/drivers/xen/usbfront/usbfront.h 2009-10-15 11:45:41.000000000 +0200
-+++ head-2011-06-30/drivers/xen/usbfront/usbfront.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/usbfront/usbfront.h 2009-10-15 11:45:41.000000000 +0200
++++ head-2011-07-21/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;
@@ -11396,8 +11396,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-06-30.orig/drivers/xen/usbfront/usbfront-dbg.c 2009-10-15 11:45:41.000000000 +0200
-+++ head-2011-06-30/drivers/xen/usbfront/usbfront-dbg.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/usbfront/usbfront-dbg.c 2009-10-15 11:45:41.000000000 +0200
++++ head-2011-07-21/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)
{
@@ -11409,8 +11409,8 @@ Acked-by: jbeulich@novell.com
}
static inline void remove_debug_file(struct usbfront_info *info)
---- head-2011-06-30.orig/drivers/xen/usbfront/usbfront-q.c 2009-10-15 11:45:41.000000000 +0200
-+++ head-2011-06-30/drivers/xen/usbfront/usbfront-q.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/usbfront/usbfront-q.c 2009-10-15 11:45:41.000000000 +0200
++++ head-2011-07-21/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);
}
@@ -11429,8 +11429,8 @@ Acked-by: jbeulich@novell.com
{
xenhcd_notify_work((struct usbfront_info *) dev_id);
return IRQ_HANDLED;
---- head-2011-06-30.orig/drivers/xen/xenbus/xenbus_comms.c 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-06-30/drivers/xen/xenbus/xenbus_comms.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/xenbus/xenbus_comms.c 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-07-21/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);
@@ -11440,8 +11440,8 @@ Acked-by: jbeulich@novell.com
{
int old, new;
---- head-2011-06-30.orig/drivers/xen/xenoprof/xenoprofile.c 2010-01-07 09:38:29.000000000 +0100
-+++ head-2011-06-30/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/xenoprof/xenoprofile.c 2010-01-07 09:38:29.000000000 +0100
++++ head-2011-07-21/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 17:29:16.000000000 +0100
@@ -194,8 +194,7 @@ done:
oprofile_add_domain_switch(COORDINATOR_DOMAIN);
}
@@ -11452,8 +11452,8 @@ Acked-by: jbeulich@novell.com
{
struct xenoprof_buf * buf;
static unsigned long flag;
---- head-2011-06-30.orig/include/asm-generic/pgtable.h 2011-04-13 11:25:29.000000000 +0200
-+++ head-2011-06-30/include/asm-generic/pgtable.h 2011-03-11 10:54:24.000000000 +0100
+--- head-2011-07-21.orig/include/asm-generic/pgtable.h 2011-04-13 11:25:29.000000000 +0200
++++ head-2011-07-21/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
@@ -11463,8 +11463,8 @@ Acked-by: jbeulich@novell.com
#endif
#ifndef __HAVE_ARCH_PMDP_SPLITTING_FLUSH
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/desc_32.h 2008-01-28 12:24:19.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/desc_32.h 2008-01-28 12:24:19.000000000 +0100
++++ head-2011-07-21/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;
}
@@ -11625,8 +11625,8 @@ Acked-by: jbeulich@novell.com
static inline void clear_LDT(void)
{
int cpu = get_cpu();
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2007-06-12 13:14:02.000000000 +0200
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2007-06-12 13:14:02.000000000 +0200
++++ head-2011-07-21/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 */
@@ -11648,8 +11648,8 @@ Acked-by: jbeulich@novell.com
#define set_fixmap(idx, phys) \
__set_fixmap(idx, phys, PAGE_KERNEL)
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/hypercall_32.h 2009-06-23 09:28:21.000000000 +0200
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/hypercall_32.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/hypercall_32.h 2009-06-23 09:28:21.000000000 +0200
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/hypercall_32.h 2011-01-31 17:29:16.000000000 +0100
@@ -128,6 +128,23 @@
__res; \
})
@@ -11720,8 +11720,8 @@ Acked-by: jbeulich@novell.com
return _hypercall3(int, grant_table_op, cmd, uop, count);
}
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/hypercall_64.h 2009-06-23 09:28:21.000000000 +0200
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/hypercall_64.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/hypercall_64.h 2009-06-23 09:28:21.000000000 +0200
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/hypercall_64.h 2011-01-31 17:29:16.000000000 +0100
@@ -135,6 +135,23 @@
__res; \
})
@@ -11791,8 +11791,8 @@ Acked-by: jbeulich@novell.com
return _hypercall3(int, grant_table_op, cmd, uop, count);
}
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2009-07-13 14:25:35.000000000 +0200
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/hypervisor.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2009-07-13 14:25:35.000000000 +0200
++++ head-2011-07-21/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>
@@ -11863,8 +11863,8 @@ Acked-by: jbeulich@novell.com
static inline int
HYPERVISOR_yield(
void)
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2008-04-02 12:34:02.000000000 +0200
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2008-04-02 12:34:02.000000000 +0200
++++ head-2011-07-21/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
@@ -11921,8 +11921,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-06-30.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:37:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-07-21/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
@@ -12133,8 +12133,8 @@ Acked-by: jbeulich@novell.com
#include <asm-generic/pgtable.h>
#endif /* _I386_PGTABLE_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:02:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:02:29.000000000 +0100
++++ head-2011-07-21/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 */
@@ -12246,8 +12246,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-06-30.orig/arch/x86/include/mach-xen/asm/smp_32.h 2007-06-12 13:14:02.000000000 +0200
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/smp_32.h 2007-06-12 13:14:02.000000000 +0200
++++ head-2011-07-21/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));
}
@@ -12292,8 +12292,8 @@ Acked-by: jbeulich@novell.com
+#endif
+
#endif
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/system_32.h 2007-06-12 13:14:02.000000000 +0200
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/system_32.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/system_32.h 2007-06-12 13:14:02.000000000 +0200
++++ head-2011-07-21/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),\
@@ -12344,8 +12344,8 @@ Acked-by: jbeulich@novell.com
#ifndef CONFIG_X86_CMPXCHG
/*
* Building a kernel capable running on 80386. It may be necessary to
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/tlbflush_32.h 2007-11-26 16:59:25.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/tlbflush_32.h 2007-11-26 16:59:25.000000000 +0100
++++ head-2011-07-21/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()
@@ -12355,8 +12355,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-06-30.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2007-06-12 13:14:13.000000000 +0200
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2007-06-12 13:14:13.000000000 +0200
++++ head-2011-07-21/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 */
@@ -12366,8 +12366,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-06-30.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-02-07 15:37:14.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-07-21/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
@@ -12546,8 +12546,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-06-30.orig/arch/x86/include/mach-xen/asm/processor_64.h 2008-03-06 08:54:32.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/processor_64.h 2008-03-06 08:54:32.000000000 +0100
++++ head-2011-07-21/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));
}
@@ -12557,8 +12557,8 @@ Acked-by: jbeulich@novell.com
#define stack_current() \
({ \
struct thread_info *ti; \
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/smp_64.h 2007-06-12 13:14:13.000000000 +0200
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/smp_64.h 2007-06-12 13:14:13.000000000 +0200
++++ head-2011-07-21/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'
@@ -12664,8 +12664,8 @@ Acked-by: jbeulich@novell.com
+#endif /* !CONFIG_SMP */
#endif
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/system_64.h 2007-11-26 16:59:25.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/system_64.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/system_64.h 2007-11-26 16:59:25.000000000 +0100
++++ head-2011-07-21/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"
@@ -12674,8 +12674,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-06-30.orig/arch/x86/include/mach-xen/asm/tlbflush_64.h 2007-11-26 16:59:25.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/tlbflush_64.h 2007-11-26 16:59:25.000000000 +0100
++++ head-2011-07-21/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()
@@ -12686,8 +12686,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-06-30.orig/include/xen/evtchn.h 2011-01-31 15:14:12.000000000 +0100
-+++ head-2011-06-30/include/xen/evtchn.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/include/xen/evtchn.h 2011-01-31 15:14:12.000000000 +0100
++++ head-2011-07-21/include/xen/evtchn.h 2011-01-31 17:29:16.000000000 +0100
@@ -57,34 +57,34 @@
*/
int bind_caller_port_to_irqhandler(
@@ -12729,7 +12729,7 @@ Acked-by: jbeulich@novell.com
const char *devname,
void *dev_id);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-06-30/include/xen/net-util.h 2011-02-09 15:49:42.000000000 +0100
++++ head-2011-07-21/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__
@@ -12805,8 +12805,8 @@ Acked-by: jbeulich@novell.com
+}
+
+#endif /* __XEN_NETUTIL_H__ */
---- head-2011-06-30.orig/include/xen/xencons.h 2007-10-15 09:39:38.000000000 +0200
-+++ head-2011-06-30/include/xen/xencons.h 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/include/xen/xencons.h 2007-10-15 09:39:38.000000000 +0200
++++ head-2011-07-21/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);
@@ -12816,8 +12816,8 @@ Acked-by: jbeulich@novell.com
void xencons_tx(void);
int xencons_ring_init(void);
---- head-2011-06-30.orig/mm/mprotect.c 2011-06-30 15:38:52.000000000 +0200
-+++ head-2011-06-30/mm/mprotect.c 2011-01-31 17:29:16.000000000 +0100
+--- head-2011-07-21.orig/mm/mprotect.c 2011-06-30 15:38:52.000000000 +0200
++++ head-2011-07-21/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))
@@ -12827,8 +12827,8 @@ Acked-by: jbeulich@novell.com
continue;
change_pte_range(vma->vm_mm, pmd, addr, next, newprot,
dirty_accountable);
---- head-2011-06-30.orig/mm/page_alloc.c 2011-06-30 15:38:58.000000000 +0200
-+++ head-2011-06-30/mm/page_alloc.c 2011-06-30 16:03:09.000000000 +0200
+--- head-2011-07-21.orig/mm/page_alloc.c 2011-06-30 15:38:58.000000000 +0200
++++ head-2011-07-21/mm/page_alloc.c 2011-06-30 16:03:09.000000000 +0200
@@ -5116,6 +5116,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 013166f135..0457ffc193 100644
--- a/patches.xen/xen3-patch-2.6.20
+++ b/patches.xen/xen3-patch-2.6.20
@@ -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-06-30.orig/arch/x86/kernel/time-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/time-xen.c 2011-01-31 17:32:16.000000000 +0100
+--- head-2011-06-30.orig/arch/x86/kernel/time-xen.c 2011-07-12 11:10:26.000000000 +0200
++++ head-2011-06-30/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>
@@ -3937,7 +3937,7 @@ Acked-by: jbeulich@novell.com
/*
* GCC 4.3 can turn loops over an induction variable into division. We do
-@@ -542,10 +543,7 @@ static int set_rtc_mmss(unsigned long no
+@@ -569,10 +570,7 @@ static int set_rtc_mmss(unsigned long no
/* gets recalled with irq locally disabled */
/* XXX - does irqsave resolve this? -johnstul */
spin_lock_irqsave(&rtc_lock, flags);
@@ -3949,7 +3949,7 @@ Acked-by: jbeulich@novell.com
spin_unlock_irqrestore(&rtc_lock, flags);
return retval;
-@@ -876,10 +874,7 @@ unsigned long get_cmos_time(void)
+@@ -903,10 +901,7 @@ unsigned long get_cmos_time(void)
spin_lock_irqsave(&rtc_lock, flags);
@@ -3961,7 +3961,7 @@ Acked-by: jbeulich@novell.com
spin_unlock_irqrestore(&rtc_lock, flags);
-@@ -981,7 +976,7 @@ static void __init hpet_time_init(void)
+@@ -1008,7 +1003,7 @@ static void __init hpet_time_init(void)
printk("Using HPET for base-timer\n");
}
@@ -4308,7 +4308,7 @@ Acked-by: jbeulich@novell.com
-}
-__setup("call_trace=", call_trace_setup);
-#endif
---- head-2011-06-30.orig/arch/x86/kernel/vmlinux.lds.S 2011-06-30 15:04:43.000000000 +0200
+--- head-2011-06-30.orig/arch/x86/kernel/vmlinux.lds.S 2011-07-12 11:06:08.000000000 +0200
+++ head-2011-06-30/arch/x86/kernel/vmlinux.lds.S 2011-01-31 17:32:16.000000000 +0100
@@ -84,6 +84,10 @@ SECTIONS
{
@@ -4321,7 +4321,7 @@ Acked-by: jbeulich@novell.com
phys_startup_32 = startup_32 - LOAD_OFFSET;
#else
. = __START_KERNEL;
---- head-2011-06-30.orig/arch/x86/kvm/Kconfig 2011-03-15 02:20:32.000000000 +0100
+--- head-2011-06-30.orig/arch/x86/kvm/Kconfig 2011-07-12 11:06:08.000000000 +0200
+++ head-2011-06-30/arch/x86/kvm/Kconfig 2011-01-31 17:32:16.000000000 +0100
@@ -7,6 +7,7 @@ source "virt/kvm/Kconfig"
menuconfig VIRTUALIZATION
diff --git a/patches.xen/xen3-patch-2.6.21 b/patches.xen/xen3-patch-2.6.21
index 7d2b70378a..542c447328 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-06-30.orig/arch/x86/Kconfig 2011-06-30 16:03:27.000000000 +0200
-+++ head-2011-06-30/arch/x86/Kconfig 2011-06-30 16:04:41.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/Kconfig 2011-06-30 16:03:27.000000000 +0200
++++ head-2011-07-21/arch/x86/Kconfig 2011-06-30 16:04:41.000000000 +0200
@@ -89,13 +89,15 @@ config GENERIC_CMOS_UPDATE
config CLOCKSOURCE_WATCHDOG
@@ -25,8 +25,8 @@ Acked-by: jbeulich@novell.com
config LOCKDEP_SUPPORT
def_bool y
---- head-2011-06-30.orig/arch/x86/kernel/Makefile 2011-06-30 16:02:19.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/Makefile 2011-06-30 16:04:43.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/kernel/Makefile 2011-06-30 16:02:19.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/Makefile 2011-06-30 16:04:43.000000000 +0200
@@ -135,7 +135,7 @@ ifeq ($(CONFIG_X86_64),y)
pci-dma_64-$(CONFIG_XEN) += pci-dma_32.o
endif
@@ -37,8 +37,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-06-30.orig/arch/x86/kernel/apic/apic-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/apic/apic-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/apic/apic-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-07-21/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>
@@ -135,8 +135,8 @@ Acked-by: jbeulich@novell.com
int setup_profiling_timer(unsigned int multiplier)
{
return -EINVAL;
---- head-2011-06-30.orig/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/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)
{
@@ -182,8 +182,8 @@ Acked-by: jbeulich@novell.com
/* Clear all 6 debug registers: */
set_debugreg(0, 0);
---- head-2011-06-30.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/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>
@@ -223,8 +223,8 @@ Acked-by: jbeulich@novell.com
return sum == 0;
}
---- head-2011-06-30.orig/arch/x86/kernel/entry_32-xen.S 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:08:37.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/kernel/entry_32-xen.S 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/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
@@ -597,8 +597,8 @@ Acked-by: jbeulich@novell.com
ENTRY(kernel_thread_helper)
pushl $0 # fake return address for unwinder
---- head-2011-06-30.orig/arch/x86/kernel/head_32-xen.S 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/head_32-xen.S 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/head_32-xen.S 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/head_32-xen.S 2011-01-31 17:32:22.000000000 +0100
@@ -27,6 +27,7 @@
#define X86_CAPABILITY new_cpu_data+CPUINFO_x86_capability
#define X86_VENDOR_ID new_cpu_data+CPUINFO_x86_vendor_id
@@ -631,8 +631,8 @@ Acked-by: jbeulich@novell.com
/* get the PDA pointer */
movl $boot_pda, %eax
---- head-2011-06-30.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/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)
@@ -783,8 +783,8 @@ Acked-by: jbeulich@novell.com
spin_unlock_irqrestore(&ioapic_lock, flags);
return 0;
---- head-2011-06-30.orig/arch/x86/kernel/microcode-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/microcode-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/microcode-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/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;
}
@@ -794,8 +794,8 @@ Acked-by: jbeulich@novell.com
.owner = THIS_MODULE,
.write = microcode_write,
.open = microcode_open,
---- head-2011-06-30.orig/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/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];
@@ -814,8 +814,8 @@ Acked-by: jbeulich@novell.com
gsi = pci_irq++;
gsi_to_irq[irq] = gsi;
} else {
---- head-2011-06-30.orig/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/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;
@@ -825,8 +825,8 @@ Acked-by: jbeulich@novell.com
out:
if (mem_base)
iounmap(mem_base);
---- head-2011-06-30.orig/arch/x86/kernel/pcspeaker.c 2008-12-25 00:26:37.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/pcspeaker.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/pcspeaker.c 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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;
@@ -839,8 +839,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-06-30.orig/arch/x86/kernel/process_32-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/process_32-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/process_32-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/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>
@@ -953,8 +953,8 @@ Acked-by: jbeulich@novell.com
return prev_p;
}
---- head-2011-06-30.orig/arch/x86/kernel/setup_32-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/setup_32-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/setup_32-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/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>
@@ -1044,8 +1044,8 @@ Acked-by: jbeulich@novell.com
- * c-basic-offset:8
- * End:
- */
---- head-2011-06-30.orig/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/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
@@ -1065,8 +1065,8 @@ Acked-by: jbeulich@novell.com
flush_mm = NULL;
flush_va = 0;
---- head-2011-06-30.orig/arch/x86/kernel/time-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/time-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/time-xen.c 2011-07-12 11:10:37.000000000 +0200
++++ head-2011-07-21/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>
@@ -1131,7 +1131,25 @@ Acked-by: jbeulich@novell.com
static void __update_wallclock(time_t sec, long nsec)
{
long wtm_nsec, xtime_nsec;
-@@ -347,160 +330,6 @@ void rtc_cmos_write(unsigned char val, u
+@@ -258,7 +241,7 @@ static void __update_wallclock(time_t se
+ set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec);
+ }
+
+-static void update_wallclock(void)
++static void update_wallclock(bool local)
+ {
+ shared_info_t *s = HYPERVISOR_shared_info;
+
+@@ -270,7 +253,7 @@ static void update_wallclock(void)
+ rmb();
+ } while ((s->wc_version & 1) | (shadow_tv_version ^ s->wc_version));
+
+- if (!independent_wallclock)
++ if (local)
+ __update_wallclock(shadow_tv.tv_sec, shadow_tv.tv_nsec);
+ }
+
+@@ -347,134 +330,21 @@ void rtc_cmos_write(unsigned char val, u
}
EXPORT_SYMBOL(rtc_cmos_write);
@@ -1224,16 +1242,26 @@ Acked-by: jbeulich@novell.com
-}
-
-int do_settimeofday(struct timespec *tv)
--{
-- time_t sec;
-- s64 nsec;
-- unsigned int cpu;
-- struct shadow_time_info *shadow;
-- struct xen_platform_op op;
--
+-#elif defined(CONFIG_XEN_PRIVILEGED_GUEST)
++#ifdef CONFIG_XEN_PRIVILEGED_GUEST
+ int xen_update_wallclock(const struct timespec *tv)
+-#endif
+-#if defined(CONFIG_X86_64) || defined(CONFIG_XEN_PRIVILEGED_GUEST)
+ {
+ time_t sec;
+ s64 nsec;
+ unsigned int cpu;
+ struct shadow_time_info *shadow;
+ struct xen_platform_op op;
+-#ifdef CONFIG_X86_64
+- int warp = 0;
+
- if (unlikely(!tv)) {
- monotonic_reset();
-- return 0;
+- if (!is_initial_xendomain() || independent_wallclock)
+- return 0;
+- tv = &xtime;
+- warp = 1;
- }
-
- if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
@@ -1241,26 +1269,26 @@ Acked-by: jbeulich@novell.com
-
- if (!is_initial_xendomain() && !independent_wallclock)
- return -EPERM;
+-#else
+ if (!is_initial_xendomain() || independent_wallclock)
+ return -EPERM;
+-#endif
+
+ cpu = get_cpu();
+ shadow = &per_cpu(shadow_time, cpu);
+
+-#ifdef CONFIG_X86_64
+- if (!warp)
+- write_seqlock_irq(&xtime_lock);
+-#endif
-
-- cpu = get_cpu();
-- shadow = &per_cpu(shadow_time, cpu);
--
-- write_seqlock_irq(&xtime_lock);
--
-- /*
-- * Ensure we don't get blocked for a long time so that our time delta
-- * overflows. If that were to happen then our shadow time values would
-- * be stale, so we can retry with fresh ones.
-- */
-- for (;;) {
-- nsec = tv->tv_nsec - get_nsec_offset(shadow);
-- if (time_values_up_to_date(cpu))
-- break;
-- get_time_values_from_xen(cpu);
-- }
-- sec = tv->tv_sec;
-- __normalize_time(&sec, &nsec);
--
+ /*
+ * Ensure we don't get blocked for a long time so that our time delta
+ * overflows. If that were to happen then our shadow time values would
+@@ -489,45 +359,19 @@ int xen_update_wallclock(const struct ti
+ sec = tv->tv_sec;
+ __normalize_time(&sec, &nsec);
+
- if (is_initial_xendomain() && !independent_wallclock) {
- op.cmd = XENPF_settime;
- op.u.settime.secs = sec;
@@ -1268,31 +1296,57 @@ Acked-by: jbeulich@novell.com
- op.u.settime.system_time = shadow->system_timestamp;
- WARN_ON(HYPERVISOR_platform_op(&op));
- update_wallclock();
+-#ifdef CONFIG_X86_64
+- if (warp) {
+- put_cpu();
+- return 0;
+- }
+-#endif
- } else if (independent_wallclock) {
- nsec -= shadow->system_timestamp;
- __normalize_time(&sec, &nsec);
- __update_wallclock(sec, nsec);
- }
+-#ifdef CONFIG_X86_64
- ntp_clear();
-
- monotonic_reset();
-
- write_sequnlock_irq(&xtime_lock);
--
-- put_cpu();
--
+-#endif
++ op.cmd = XENPF_settime;
++ op.u.settime.secs = sec;
++ op.u.settime.nsecs = nsec;
++ op.u.settime.system_time = shadow->system_timestamp;
++ WARN_ON(HYPERVISOR_platform_op(&op));
++ update_wallclock(false);
+
+ put_cpu();
+
+-#ifdef CONFIG_X86_64
- clock_was_set();
-- return 0;
--}
--
+-#endif
+ return 0;
+ }
+ #endif
+
+-#ifdef CONFIG_X86_64
-EXPORT_SYMBOL(do_settimeofday);
--
-#endif
-
static void sync_xen_wallclock(unsigned long dummy);
static DEFINE_TIMER(sync_xen_wallclock_timer, sync_xen_wallclock, 0, 0);
static void sync_xen_wallclock(unsigned long dummy)
-@@ -549,15 +378,7 @@ static int set_rtc_mmss(unsigned long no
+@@ -551,7 +395,7 @@ static void sync_xen_wallclock(unsigned
+ op.u.settime.system_time = processed_system_time;
+ WARN_ON(HYPERVISOR_platform_op(&op));
+
+- update_wallclock();
++ update_wallclock(false);
+
+ write_sequnlock_irq(&xtime_lock);
+
+@@ -576,15 +420,7 @@ static int set_rtc_mmss(unsigned long no
return retval;
}
@@ -1308,7 +1362,7 @@ Acked-by: jbeulich@novell.com
{
unsigned int cpu = get_cpu();
struct shadow_time_info *shadow = &per_cpu(shadow_time, cpu);
-@@ -577,21 +398,18 @@ unsigned long long sched_clock(void)
+@@ -604,21 +440,18 @@ unsigned long long sched_clock(void)
return time;
}
@@ -1336,7 +1390,7 @@ Acked-by: jbeulich@novell.com
# ifdef CONFIG_FRAME_POINTER
# ifdef __i386__
return ((unsigned long *)regs->ebp)[1];
-@@ -600,14 +418,11 @@ unsigned long profile_pc(struct pt_regs
+@@ -627,14 +460,11 @@ unsigned long profile_pc(struct pt_regs
# endif
# else
# ifdef __i386__
@@ -1353,7 +1407,17 @@ Acked-by: jbeulich@novell.com
/* Return address is either directly at stack pointer
or above a saved eflags. Eflags has bits 22-31 zero,
kernel addresses don't. */
-@@ -764,19 +579,6 @@ irqreturn_t timer_interrupt(int irq, voi
+@@ -726,7 +556,8 @@ irqreturn_t timer_interrupt(int irq, voi
+ }
+
+ if (shadow_tv_version != HYPERVISOR_shared_info->wc_version) {
+- update_wallclock();
++ update_wallclock(!is_initial_xendomain()
++ && !independent_wallclock);
+ schedule_clock_was_set_work = 1;
+ }
+
+@@ -791,19 +622,6 @@ irqreturn_t timer_interrupt(int irq, voi
return IRQ_HANDLED;
}
@@ -1373,7 +1437,7 @@ Acked-by: jbeulich@novell.com
void mark_tsc_unstable(void)
{
#ifndef CONFIG_XEN /* XXX Should tell the hypervisor about this fact. */
-@@ -832,21 +634,9 @@ static struct clocksource clocksource_xe
+@@ -859,21 +677,9 @@ static struct clocksource clocksource_xe
.mask = CLOCKSOURCE_MASK(64),
.mult = 1 << XEN_SHIFT, /* time directly in nanoseconds */
.shift = XEN_SHIFT,
@@ -1396,7 +1460,7 @@ Acked-by: jbeulich@novell.com
static void init_missing_ticks_accounting(unsigned int cpu)
{
struct vcpu_register_runstate_memory_area area;
-@@ -867,7 +657,7 @@ static void init_missing_ticks_accountin
+@@ -894,7 +700,7 @@ static void init_missing_ticks_accountin
}
/* not static: needed by APM */
@@ -1405,7 +1469,7 @@ Acked-by: jbeulich@novell.com
{
unsigned long retval;
unsigned long flags;
-@@ -880,11 +670,11 @@ unsigned long get_cmos_time(void)
+@@ -907,11 +713,11 @@ unsigned long get_cmos_time(void)
return retval;
}
@@ -1418,7 +1482,7 @@ Acked-by: jbeulich@novell.com
static void sync_cmos_clock(unsigned long dummy)
{
-@@ -928,7 +718,8 @@ static void sync_cmos_clock(unsigned lon
+@@ -955,7 +761,8 @@ static void sync_cmos_clock(unsigned lon
void notify_arch_cmos_timer(void)
{
@@ -1428,7 +1492,7 @@ Acked-by: jbeulich@novell.com
mod_timer(&sync_xen_wallclock_timer, jiffies + 1);
}
-@@ -961,29 +752,11 @@ static int time_init_device(void)
+@@ -988,29 +795,11 @@ static int time_init_device(void)
device_initcall(time_init_device);
@@ -1458,7 +1522,7 @@ Acked-by: jbeulich@novell.com
static void setup_cpu0_timer_irq(void)
{
per_cpu(timer_irq, 0) =
-@@ -991,7 +764,7 @@ static void setup_cpu0_timer_irq(void)
+@@ -1018,7 +807,7 @@ static void setup_cpu0_timer_irq(void)
VIRQ_TIMER,
0,
timer_interrupt,
@@ -1467,7 +1531,7 @@ Acked-by: jbeulich@novell.com
"timer0",
NULL);
BUG_ON(per_cpu(timer_irq, 0) < 0);
-@@ -1003,16 +776,9 @@ static struct vcpu_set_periodic_timer xe
+@@ -1030,16 +819,9 @@ static struct vcpu_set_periodic_timer xe
void __init time_init(void)
{
@@ -1487,7 +1551,7 @@ Acked-by: jbeulich@novell.com
switch (HYPERVISOR_vcpu_op(VCPUOP_set_periodic_timer, 0,
&xen_set_periodic_tick)) {
-@@ -1031,18 +797,12 @@ void __init time_init(void)
+@@ -1058,18 +840,12 @@ void __init time_init(void)
per_cpu(processed_system_time, 0) = processed_system_time;
init_missing_ticks_accounting(0);
@@ -1498,7 +1562,7 @@ Acked-by: jbeulich@novell.com
- init_cpu_khz();
- printk(KERN_INFO "Xen reported: %u.%03u MHz processor.\n",
- cpu_khz / 1000, cpu_khz % 1000);
-+ update_wallclock();
++ update_wallclock(false);
- vxtime.mode = VXTIME_TSC;
- vxtime.quot = (1000000L << 32) / vxtime_hz;
@@ -1510,7 +1574,16 @@ Acked-by: jbeulich@novell.com
#endif
/* Cannot request_irq() until kmem is initialised. */
-@@ -1212,7 +972,7 @@ int __cpuinit local_setup_timer(unsigned
+@@ -1204,7 +980,7 @@ void time_resume(void)
+
+ processed_system_time = per_cpu(shadow_time, 0).system_timestamp;
+
+- update_wallclock();
++ update_wallclock(false);
+ }
+
+ #ifdef CONFIG_SMP
+@@ -1239,7 +1015,7 @@ int __cpuinit local_setup_timer(unsigned
irq = bind_virq_to_irqhandler(VIRQ_TIMER,
cpu,
timer_interrupt,
@@ -1519,7 +1592,7 @@ Acked-by: jbeulich@novell.com
timer_name[cpu],
NULL);
if (irq < 0)
-@@ -1301,7 +1061,7 @@ static ctl_table xen_table[] = {
+@@ -1328,7 +1104,7 @@ static ctl_table xen_table[] = {
};
static int __init xen_sysctl_init(void)
{
@@ -1528,8 +1601,8 @@ Acked-by: jbeulich@novell.com
return 0;
}
__initcall(xen_sysctl_init);
---- head-2011-06-30.orig/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/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);
@@ -1604,8 +1677,8 @@ Acked-by: jbeulich@novell.com
+ return 1;
+}
+__setup("code_bytes=", code_bytes_setup);
---- head-2011-06-30.orig/arch/x86/mm/fault_32-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/fault_32-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/fault_32-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/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);
@@ -1676,8 +1749,8 @@ Acked-by: jbeulich@novell.com
return;
/* It's safe to allow irq's after cr2 has been saved and the vmalloc
---- head-2011-06-30.orig/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/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 */
@@ -1706,8 +1779,8 @@ Acked-by: jbeulich@novell.com
return (void*) vaddr;
}
---- head-2011-06-30.orig/arch/x86/mm/init_32-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/init_32-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/init_32-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/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
@@ -1724,8 +1797,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-06-30.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/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)
{
@@ -1805,8 +1878,8 @@ Acked-by: jbeulich@novell.com
kmem_cache_free(pmd_cache, pmd);
}
---- head-2011-06-30.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-07-21/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
@@ -1831,8 +1904,8 @@ Acked-by: jbeulich@novell.com
.quad sys_getcpu
+ .quad sys_epoll_pwait
ia32_syscall_end:
---- head-2011-06-30.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-07-21/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;
}
@@ -1894,8 +1967,8 @@ Acked-by: jbeulich@novell.com
{
if (userdef) {
printk(KERN_INFO "user-defined physical RAM map:\n");
---- head-2011-06-30.orig/arch/x86/kernel/entry_64-xen.S 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/entry_64-xen.S 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/entry_64-xen.S 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/entry_64-xen.S 2011-01-31 17:32:22.000000000 +0100
@@ -629,6 +629,9 @@ END(invalidate_interrupt\num)
ENTRY(call_function_interrupt)
apicinterrupt CALL_FUNCTION_VECTOR,smp_call_function_interrupt
@@ -1906,8 +1979,8 @@ Acked-by: jbeulich@novell.com
#endif
ENTRY(apic_timer_interrupt)
---- head-2011-06-30.orig/arch/x86/kernel/head64-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/head64-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/head64-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/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
@@ -1935,8 +2008,8 @@ Acked-by: jbeulich@novell.com
#endif
}
---- head-2011-06-30.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/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
@@ -2751,8 +2824,8 @@ Acked-by: jbeulich@novell.com
else
set_ioapic_affinity_irq(irq, TARGET_CPUS);
}
---- head-2011-06-30.orig/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/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;
@@ -2774,8 +2847,8 @@ Acked-by: jbeulich@novell.com
return gsi;
ioapic = mp_find_ioapic(gsi);
---- head-2011-06-30.orig/arch/x86/kernel/process_64-xen.c 2011-02-02 08:30:59.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/process_64-xen.c 2011-02-02 08:31:05.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/process_64-xen.c 2011-02-02 08:30:59.000000000 +0100
++++ head-2011-07-21/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)
{
@@ -2799,8 +2872,8 @@ Acked-by: jbeulich@novell.com
tsk->thread.debugreg0 = 0;
tsk->thread.debugreg1 = 0;
---- head-2011-06-30.orig/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/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;
@@ -3074,8 +3147,8 @@ Acked-by: jbeulich@novell.com
-}
-device_initcall(add_pcspkr);
-#endif
---- head-2011-06-30.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/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>
@@ -3293,8 +3366,8 @@ Acked-by: jbeulich@novell.com
#endif
on_each_cpu(cpu_vsyscall_init, NULL, 0, 1);
hotcpu_notifier(cpu_vsyscall_notifier, 0);
---- head-2011-06-30.orig/arch/x86/mm/fault_64-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/fault_64-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/fault_64-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/arch/x86/mm/fault_64-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -56,38 +56,17 @@ int unregister_page_fault_notifier(struc
}
EXPORT_SYMBOL_GPL(unregister_page_fault_notifier);
@@ -3360,8 +3433,8 @@ Acked-by: jbeulich@novell.com
return;
if (likely(regs->eflags & X86_EFLAGS_IF))
---- head-2011-06-30.orig/arch/x86/mm/init_64-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/init_64-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/init_64-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/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;
@@ -3400,8 +3473,8 @@ Acked-by: jbeulich@novell.com
return 0;
}
__initcall(x8664_sysctl_init);
---- head-2011-06-30.orig/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/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)
@@ -3430,8 +3503,8 @@ Acked-by: jbeulich@novell.com
large_pte = pte_mkhuge(large_pte);
set_pte((pte_t *)pmd, large_pte);
}
---- head-2011-06-30.orig/drivers/acpi/processor_extcntl.c 2011-01-31 14:53:38.000000000 +0100
-+++ head-2011-06-30/drivers/acpi/processor_extcntl.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/drivers/acpi/processor_extcntl.c 2011-01-31 14:53:38.000000000 +0100
++++ head-2011-07-21/drivers/acpi/processor_extcntl.c 2011-01-31 17:32:22.000000000 +0100
@@ -32,9 +32,8 @@
#define ACPI_PROCESSOR_COMPONENT 0x01000000
@@ -3472,8 +3545,8 @@ Acked-by: jbeulich@novell.com
if (ACPI_FAILURE(status))
return status;
---- head-2011-06-30.orig/drivers/char/tpm/tpm_xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-06-30/drivers/char/tpm/tpm_xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/drivers/char/tpm/tpm_xen.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-07-21/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 = {
@@ -3494,8 +3567,8 @@ Acked-by: jbeulich@novell.com
}
static int tpmif_allocate_tx_buffers(struct tpm_private *tp)
---- head-2011-06-30.orig/drivers/pci/msi-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/drivers/pci/msi-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/drivers/pci/msi-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/drivers/pci/msi-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -36,8 +36,6 @@ struct msi_dev_list {
struct list_head list;
spinlock_t pirq_list_lock;
@@ -4040,8 +4113,8 @@ Acked-by: jbeulich@novell.com
dev->irq = msi_dev_entry->default_irq;
}
---- head-2011-06-30.orig/drivers/xen/balloon/sysfs.c 2009-06-09 15:01:37.000000000 +0200
-+++ head-2011-06-30/drivers/xen/balloon/sysfs.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/balloon/sysfs.c 2009-06-09 15:01:37.000000000 +0200
++++ head-2011-07-21/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>
@@ -4050,8 +4123,8 @@ Acked-by: jbeulich@novell.com
#include "common.h"
#ifdef HAVE_XEN_PLATFORM_COMPAT_H
---- head-2011-06-30.orig/drivers/xen/blkback/xenbus.c 2011-06-30 15:37:44.000000000 +0200
-+++ head-2011-06-30/drivers/xen/blkback/xenbus.c 2011-06-30 16:04:52.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/blkback/xenbus.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-07-21/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 = {
@@ -4068,9 +4141,9 @@ Acked-by: jbeulich@novell.com
+ if (xenbus_register_backend(&blkback))
+ BUG();
}
---- head-2011-06-30.orig/drivers/xen/blkfront/blkfront.c 2011-06-30 16:03:31.000000000 +0200
-+++ head-2011-06-30/drivers/xen/blkfront/blkfront.c 2011-06-30 16:04:57.000000000 +0200
-@@ -941,7 +941,6 @@ MODULE_ALIAS("xen:vbd");
+--- head-2011-07-21.orig/drivers/xen/blkfront/blkfront.c 2011-06-30 16:03:31.000000000 +0200
++++ head-2011-07-21/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 = {
.name = "vbd",
@@ -4078,8 +4151,8 @@ Acked-by: jbeulich@novell.com
.ids = blkfront_ids,
.probe = blkfront_probe,
.remove = blkfront_remove,
---- head-2011-06-30.orig/drivers/xen/blktap/xenbus.c 2011-06-30 15:37:44.000000000 +0200
-+++ head-2011-06-30/drivers/xen/blktap/xenbus.c 2011-06-30 16:05:02.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/blktap/xenbus.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-07-21/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 = {
@@ -4096,8 +4169,8 @@ Acked-by: jbeulich@novell.com
+ if (xenbus_register_backend(&blktap))
+ BUG();
}
---- head-2011-06-30.orig/drivers/xen/core/evtchn.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-06-30/drivers/xen/core/evtchn.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/core/evtchn.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-07-21/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));
@@ -4148,8 +4221,8 @@ Acked-by: jbeulich@novell.com
}
static struct irq_chip pirq_chip = {
---- head-2011-06-30.orig/drivers/xen/core/smpboot.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/drivers/xen/core/smpboot.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/core/smpboot.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/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,
@@ -4209,8 +4282,8 @@ Acked-by: jbeulich@novell.com
cpu_data[cpu] = boot_cpu_data;
cpu_data[cpu].apicid = apicid;
---- head-2011-06-30.orig/drivers/xen/fbfront/xenfb.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/drivers/xen/fbfront/xenfb.c 2011-02-17 10:08:20.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/fbfront/xenfb.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/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 = {
@@ -4219,8 +4292,8 @@ Acked-by: jbeulich@novell.com
.ids = xenfb_ids,
.probe = xenfb_probe,
.remove = xenfb_remove,
---- head-2011-06-30.orig/drivers/xen/fbfront/xenkbd.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-06-30/drivers/xen/fbfront/xenkbd.c 2011-05-23 11:08:11.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/fbfront/xenkbd.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-07-21/drivers/xen/fbfront/xenkbd.c 2011-05-23 11:08:11.000000000 +0200
@@ -336,7 +336,6 @@ MODULE_ALIAS("xen:vkbd");
static struct xenbus_driver xenkbd_driver = {
@@ -4229,8 +4302,8 @@ Acked-by: jbeulich@novell.com
.ids = xenkbd_ids,
.probe = xenkbd_probe,
.remove = xenkbd_remove,
---- head-2011-06-30.orig/drivers/xen/netback/interface.c 2011-04-11 14:28:07.000000000 +0200
-+++ head-2011-06-30/drivers/xen/netback/interface.c 2011-02-17 10:08:03.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/netback/interface.c 2011-04-11 14:28:07.000000000 +0200
++++ head-2011-07-21/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)
{
@@ -4240,8 +4313,8 @@ Acked-by: jbeulich@novell.com
}
static const struct netif_stat {
---- head-2011-06-30.orig/drivers/xen/netback/xenbus.c 2011-06-30 15:37:44.000000000 +0200
-+++ head-2011-06-30/drivers/xen/netback/xenbus.c 2011-02-17 10:08:09.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/netback/xenbus.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-07-21/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 = {
@@ -4258,8 +4331,8 @@ Acked-by: jbeulich@novell.com
+ if (xenbus_register_backend(&netback))
+ BUG();
}
---- head-2011-06-30.orig/drivers/xen/netfront/netfront.c 2011-06-30 16:02:48.000000000 +0200
-+++ head-2011-06-30/drivers/xen/netfront/netfront.c 2011-06-30 16:05:07.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/netfront/netfront.c 2011-06-30 16:02:48.000000000 +0200
++++ head-2011-07-21/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)
{
@@ -4386,8 +4459,8 @@ Acked-by: jbeulich@novell.com
.ids = netfront_ids,
.probe = netfront_probe,
.remove = __devexit_p(netfront_remove),
---- head-2011-06-30.orig/drivers/xen/pciback/xenbus.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/drivers/xen/pciback/xenbus.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/pciback/xenbus.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/drivers/xen/pciback/xenbus.c 2011-01-31 17:32:22.000000000 +0100
@@ -683,7 +683,6 @@ static const struct xenbus_device_id xen
static struct xenbus_driver xenbus_pciback_driver = {
@@ -4396,8 +4469,8 @@ Acked-by: jbeulich@novell.com
.ids = xenpci_ids,
.probe = pciback_xenbus_probe,
.remove = pciback_xenbus_remove,
---- head-2011-06-30.orig/drivers/xen/pcifront/xenbus.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/drivers/xen/pcifront/xenbus.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/pcifront/xenbus.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/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 = {
@@ -4406,8 +4479,8 @@ Acked-by: jbeulich@novell.com
.ids = xenpci_ids,
.probe = pcifront_xenbus_probe,
.remove = pcifront_xenbus_remove,
---- head-2011-06-30.orig/drivers/xen/scsiback/xenbus.c 2011-06-30 15:37:44.000000000 +0200
-+++ head-2011-06-30/drivers/xen/scsiback/xenbus.c 2011-06-30 16:05:16.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/scsiback/xenbus.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-07-21/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 = {
@@ -4416,8 +4489,8 @@ Acked-by: jbeulich@novell.com
.ids = scsiback_ids,
.probe = scsiback_probe,
.remove = scsiback_remove,
---- head-2011-06-30.orig/drivers/xen/scsifront/xenbus.c 2011-02-02 12:19:11.000000000 +0100
-+++ head-2011-06-30/drivers/xen/scsifront/xenbus.c 2011-02-08 10:03:34.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/scsifront/xenbus.c 2011-02-02 12:19:11.000000000 +0100
++++ head-2011-07-21/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 = {
@@ -4426,8 +4499,8 @@ Acked-by: jbeulich@novell.com
.ids = scsifront_ids,
.probe = scsifront_probe,
.remove = scsifront_remove,
---- head-2011-06-30.orig/drivers/xen/tpmback/common.h 2011-04-11 14:27:26.000000000 +0200
-+++ head-2011-06-30/drivers/xen/tpmback/common.h 2011-04-11 14:32:54.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/tpmback/common.h 2011-04-11 14:27:26.000000000 +0200
++++ head-2011-07-21/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);
@@ -4442,8 +4515,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-06-30.orig/drivers/xen/tpmback/interface.c 2011-04-11 14:30:27.000000000 +0200
-+++ head-2011-06-30/drivers/xen/tpmback/interface.c 2011-04-11 14:31:42.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/tpmback/interface.c 2011-04-11 14:30:27.000000000 +0200
++++ head-2011-07-21/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);
}
@@ -4461,8 +4534,8 @@ Acked-by: jbeulich@novell.com
{
kmem_cache_destroy(tpmif_cachep);
}
---- head-2011-06-30.orig/drivers/xen/tpmback/tpmback.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-06-30/drivers/xen/tpmback/tpmback.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/tpmback/tpmback.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-07-21/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);
@@ -4498,8 +4571,8 @@ Acked-by: jbeulich@novell.com
+module_exit(tpmback_exit)
MODULE_LICENSE("Dual BSD/GPL");
---- head-2011-06-30.orig/drivers/xen/tpmback/xenbus.c 2011-06-30 15:37:44.000000000 +0200
-+++ head-2011-06-30/drivers/xen/tpmback/xenbus.c 2011-06-30 16:05:25.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/tpmback/xenbus.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-07-21/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 = {
@@ -4520,8 +4593,8 @@ Acked-by: jbeulich@novell.com
}
void tpmif_xenbus_exit(void)
---- head-2011-06-30.orig/drivers/xen/usbback/xenbus.c 2011-06-30 15:37:44.000000000 +0200
-+++ head-2011-06-30/drivers/xen/usbback/xenbus.c 2011-06-30 16:05:31.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/usbback/xenbus.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-07-21/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 = {
@@ -4530,8 +4603,8 @@ Acked-by: jbeulich@novell.com
.ids = usbback_ids,
.probe = usbback_probe,
.otherend_changed = frontend_changed,
---- head-2011-06-30.orig/drivers/xen/usbfront/xenbus.c 2010-03-31 09:56:02.000000000 +0200
-+++ head-2011-06-30/drivers/xen/usbfront/xenbus.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/usbfront/xenbus.c 2010-03-31 09:56:02.000000000 +0200
++++ head-2011-07-21/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 = {
@@ -4540,8 +4613,8 @@ Acked-by: jbeulich@novell.com
.ids = usbfront_ids,
.probe = usbfront_probe,
.otherend_changed = backend_changed,
---- head-2011-06-30.orig/drivers/xen/xenbus/xenbus_probe.c 2011-06-30 16:03:51.000000000 +0200
-+++ head-2011-06-30/drivers/xen/xenbus/xenbus_probe.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/xenbus/xenbus_probe.c 2011-06-30 16:03:51.000000000 +0200
++++ head-2011-07-21/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
}
@@ -4592,8 +4665,8 @@ Acked-by: jbeulich@novell.com
void xenbus_unregister_driver(struct xenbus_driver *drv)
{
---- head-2011-06-30.orig/drivers/xen/xenbus/xenbus_probe.h 2011-01-31 16:11:24.000000000 +0100
-+++ head-2011-06-30/drivers/xen/xenbus/xenbus_probe.h 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/xenbus/xenbus_probe.h 2011-01-31 16:11:24.000000000 +0100
++++ head-2011-07-21/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);
@@ -4605,8 +4678,8 @@ Acked-by: jbeulich@novell.com
extern int xenbus_probe_node(struct xen_bus_type *bus,
const char *type,
const char *nodename);
---- head-2011-06-30.orig/drivers/xen/xenbus/xenbus_probe_backend.c 2011-02-01 14:49:58.000000000 +0100
-+++ head-2011-06-30/drivers/xen/xenbus/xenbus_probe_backend.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/xenbus/xenbus_probe_backend.c 2011-02-01 14:49:58.000000000 +0100
++++ head-2011-07-21/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;
}
@@ -4626,8 +4699,8 @@ Acked-by: jbeulich@novell.com
/* backend/<typename>/<frontend-uuid>/<name> */
static int xenbus_probe_backend_unit(const char *dir,
---- head-2011-06-30.orig/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-06-30/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-07-21/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,
@@ -4637,8 +4710,8 @@ Acked-by: jbeulich@novell.com
"xenoprof",
NULL);
---- head-2011-06-30.orig/arch/x86/include/asm/i8253.h 2011-06-30 15:04:05.000000000 +0200
-+++ head-2011-06-30/arch/x86/include/asm/i8253.h 2011-06-30 16:05:42.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/include/asm/i8253.h 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/arch/x86/include/asm/i8253.h 2011-06-30 16:05:42.000000000 +0200
@@ -10,10 +10,14 @@
extern raw_spinlock_t i8253_lock;
@@ -4654,8 +4727,8 @@ Acked-by: jbeulich@novell.com
#define inb_pit inb_p
#define outb_pit outb_p
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/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;
@@ -4665,8 +4738,8 @@ Acked-by: jbeulich@novell.com
static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
{
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/hypervisor.h 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/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
@@ -4696,8 +4769,8 @@ Acked-by: jbeulich@novell.com
HYPERVISOR_shutdown(
unsigned int reason)
{
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/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 ; \
@@ -4707,8 +4780,8 @@ Acked-by: jbeulich@novell.com
call evtchn_do_upcall ; \
add $4,%esp ; \
jmp ret_from_intr
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/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)
{
@@ -4736,8 +4809,8 @@ Acked-by: jbeulich@novell.com
static inline void activate_mm(struct mm_struct *prev, struct mm_struct *next)
{
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/pgalloc_32.h 2008-07-21 11:00:33.000000000 +0200
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pgalloc_32.h 2008-07-21 11:00:33.000000000 +0200
++++ head-2011-07-21/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 */
@@ -4777,8 +4850,8 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_X86_PAE
/*
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/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)
@@ -4818,8 +4891,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-06-30.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/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, \
@@ -4840,8 +4913,8 @@ Acked-by: jbeulich@novell.com
set_fs(USER_DS); \
regs->xds = __USER_DS; \
regs->xes = __USER_DS; \
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/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
@@ -4854,8 +4927,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-06-30.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/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)
@@ -4872,8 +4945,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-06-30.orig/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/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>
@@ -4891,8 +4964,8 @@ Acked-by: jbeulich@novell.com
#define NO_PROC_ID 0xFF /* No processor magic marker */
---- head-2011-06-30.orig/include/xen/xenbus.h 2011-06-30 15:37:44.000000000 +0200
-+++ head-2011-06-30/include/xen/xenbus.h 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/include/xen/xenbus.h 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-07-21/include/xen/xenbus.h 2011-01-31 17:32:22.000000000 +0100
@@ -93,8 +93,7 @@ struct xenbus_device_id
/* A xenbus driver. */
@@ -4931,8 +5004,8 @@ Acked-by: jbeulich@novell.com
void xenbus_unregister_driver(struct xenbus_driver *drv);
struct xenbus_transaction
---- head-2011-06-30.orig/lib/swiotlb-xen.c 2010-09-16 13:31:46.000000000 +0200
-+++ head-2011-06-30/lib/swiotlb-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- head-2011-07-21.orig/lib/swiotlb-xen.c 2010-09-16 13:31:46.000000000 +0200
++++ head-2011-07-21/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 da1f9608dd..e7aaf072f0 100644
--- a/patches.xen/xen3-patch-2.6.22
+++ b/patches.xen/xen3-patch-2.6.22
@@ -1389,8 +1389,8 @@ Acked-by: jbeulich@novell.com
- return 0;
-}
-EXPORT_SYMBOL(smp_call_function_single);
---- head-2011-06-30.orig/arch/x86/kernel/time-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/time-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-06-30.orig/arch/x86/kernel/time-xen.c 2011-07-11 11:00:11.000000000 +0200
++++ head-2011-06-30/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);
@@ -1436,7 +1436,7 @@ Acked-by: jbeulich@novell.com
static void init_cpu_khz(void)
{
u64 __cpu_khz = 1000000ULL << 32;
-@@ -378,7 +407,7 @@ static int set_rtc_mmss(unsigned long no
+@@ -420,7 +449,7 @@ static int set_rtc_mmss(unsigned long no
return retval;
}
@@ -1445,7 +1445,7 @@ Acked-by: jbeulich@novell.com
{
unsigned int cpu = get_cpu();
struct shadow_time_info *shadow = &per_cpu(shadow_time, cpu);
-@@ -399,6 +428,61 @@ unsigned long long sched_clock(void)
+@@ -441,6 +470,61 @@ unsigned long long sched_clock(void)
return time;
}
@@ -1507,7 +1507,7 @@ Acked-by: jbeulich@novell.com
unsigned long profile_pc(struct pt_regs *regs)
{
unsigned long pc = instruction_pointer(regs);
-@@ -446,11 +530,10 @@ EXPORT_SYMBOL(profile_pc);
+@@ -488,11 +572,10 @@ EXPORT_SYMBOL(profile_pc);
irqreturn_t timer_interrupt(int irq, void *dev_id)
{
s64 delta, delta_cpu, stolen, blocked;
@@ -1520,7 +1520,7 @@ Acked-by: jbeulich@novell.com
/*
* Here we are in the timer irq handler. We just have irqs locally
-@@ -470,20 +553,7 @@ irqreturn_t timer_interrupt(int irq, voi
+@@ -512,20 +595,7 @@ irqreturn_t timer_interrupt(int irq, voi
delta -= processed_system_time;
delta_cpu -= per_cpu(processed_system_time, cpu);
@@ -1542,7 +1542,7 @@ Acked-by: jbeulich@novell.com
} while (!time_values_up_to_date(cpu));
if ((unlikely(delta < -(s64)permitted_clock_jitter) ||
-@@ -528,6 +598,9 @@ irqreturn_t timer_interrupt(int irq, voi
+@@ -571,6 +641,9 @@ irqreturn_t timer_interrupt(int irq, voi
* HACK: Passing NULL to account_steal_time()
* ensures that the ticks are accounted as stolen.
*/
@@ -1552,7 +1552,7 @@ Acked-by: jbeulich@novell.com
if ((stolen > 0) && (delta_cpu > 0)) {
delta_cpu -= stolen;
if (unlikely(delta_cpu < 0))
-@@ -543,6 +616,8 @@ irqreturn_t timer_interrupt(int irq, voi
+@@ -586,6 +659,8 @@ irqreturn_t timer_interrupt(int irq, voi
* HACK: Passing idle_task to account_steal_time()
* ensures that the ticks are accounted as idle/wait.
*/
@@ -1561,7 +1561,7 @@ Acked-by: jbeulich@novell.com
if ((blocked > 0) && (delta_cpu > 0)) {
delta_cpu -= blocked;
if (unlikely(delta_cpu < 0))
-@@ -579,7 +654,7 @@ irqreturn_t timer_interrupt(int irq, voi
+@@ -622,7 +697,7 @@ irqreturn_t timer_interrupt(int irq, voi
return IRQ_HANDLED;
}
@@ -1570,7 +1570,7 @@ Acked-by: jbeulich@novell.com
{
#ifndef CONFIG_XEN /* XXX Should tell the hypervisor about this fact. */
tsc_unstable = 1;
-@@ -587,17 +662,13 @@ void mark_tsc_unstable(void)
+@@ -630,17 +705,13 @@ void mark_tsc_unstable(void)
}
EXPORT_SYMBOL_GPL(mark_tsc_unstable);
@@ -1592,7 +1592,7 @@ Acked-by: jbeulich@novell.com
if (unlikely((s64)(ret - last) < 0)) {
if (last - ret > permitted_clock_jitter
-@@ -616,17 +687,25 @@ static cycle_t xen_clocksource_read(void
+@@ -659,17 +730,25 @@ static cycle_t xen_clocksource_read(void
}
for (;;) {
@@ -1620,7 +1620,7 @@ Acked-by: jbeulich@novell.com
static struct clocksource clocksource_xen = {
.name = "xen",
.rating = 400,
-@@ -635,19 +714,29 @@ static struct clocksource clocksource_xe
+@@ -678,19 +757,29 @@ static struct clocksource clocksource_xe
.mult = 1 << XEN_SHIFT, /* time directly in nanoseconds */
.shift = XEN_SHIFT,
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
@@ -1655,7 +1655,7 @@ Acked-by: jbeulich@novell.com
per_cpu(processed_blocked_time, cpu) =
runstate->time[RUNSTATE_blocked];
-@@ -723,35 +812,6 @@ void notify_arch_cmos_timer(void)
+@@ -766,35 +855,6 @@ void notify_arch_cmos_timer(void)
mod_timer(&sync_xen_wallclock_timer, jiffies + 1);
}
@@ -1691,7 +1691,7 @@ Acked-by: jbeulich@novell.com
extern void (*late_time_init)(void);
/* Dynamically-mapped IRQ. */
-@@ -895,21 +955,21 @@ static void start_hz_timer(void)
+@@ -938,21 +998,21 @@ static void start_hz_timer(void)
cpu_clear(cpu, nohz_cpu_mask);
}
@@ -4073,7 +4073,7 @@ Acked-by: jbeulich@novell.com
if (err <= 0) {
WPRINTK("bind_listening_port_to_irqhandler failed "
"(err=%d)\n", err);
---- head-2011-06-30.orig/drivers/hwmon/Kconfig 2011-06-30 15:04:13.000000000 +0200
+--- head-2011-06-30.orig/drivers/hwmon/Kconfig 2011-07-11 10:17:28.000000000 +0200
+++ head-2011-06-30/drivers/hwmon/Kconfig 2011-06-30 16:06:09.000000000 +0200
@@ -412,7 +412,7 @@ config SENSORS_GPIO_FAN
@@ -5797,7 +5797,7 @@ Acked-by: jbeulich@novell.com
if (error)
return error;
---- head-2011-06-30.orig/arch/x86/include/asm/boot.h 2011-03-15 02:20:32.000000000 +0100
+--- head-2011-06-30.orig/arch/x86/include/asm/boot.h 2011-07-11 10:17:28.000000000 +0200
+++ head-2011-06-30/arch/x86/include/asm/boot.h 2011-01-31 17:32:29.000000000 +0100
@@ -16,7 +16,7 @@
& ~(CONFIG_PHYSICAL_ALIGN - 1))
@@ -8129,7 +8129,7 @@ Acked-by: jbeulich@novell.com
EXPORT_SYMBOL(swiotlb_map_single);
EXPORT_SYMBOL(swiotlb_unmap_single);
EXPORT_SYMBOL(swiotlb_map_sg);
---- head-2011-06-30.orig/mm/vmalloc.c 2011-06-30 15:04:41.000000000 +0200
+--- head-2011-06-30.orig/mm/vmalloc.c 2011-07-11 10:17:28.000000000 +0200
+++ head-2011-06-30/mm/vmalloc.c 2011-06-30 16:07:02.000000000 +0200
@@ -1538,6 +1538,13 @@ static void *__vmalloc_area_node(struct
struct page **pages;
diff --git a/patches.xen/xen3-patch-2.6.23 b/patches.xen/xen3-patch-2.6.23
index 7743e36e8b..4f7a6491ce 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-06-30.orig/arch/x86/Kbuild 2011-06-30 15:04:04.000000000 +0200
-+++ head-2011-06-30/arch/x86/Kbuild 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/Kbuild 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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-06-30.orig/arch/x86/kernel/asm-offsets.c 2011-05-19 06:06:34.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/asm-offsets.c 2011-04-13 12:42:43.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/kernel/asm-offsets.c 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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-06-30.orig/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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-06-30.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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-06-30.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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-06-30.orig/arch/x86/kernel/entry_32.S 2011-04-13 11:32:39.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/entry_32.S 2011-04-13 12:42:53.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/kernel/entry_32.S 2011-04-13 11:32:39.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/entry_32.S 2011-04-13 12:42:53.000000000 +0200
@@ -1049,7 +1049,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-06-30.orig/arch/x86/kernel/entry_32-xen.S 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/entry_32-xen.S 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/entry_32-xen.S 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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-06-30.orig/arch/x86/kernel/head_32-xen.S 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/head_32-xen.S 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/head_32-xen.S 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/head_32-xen.S 2011-01-31 17:49:31.000000000 +0100
@@ -86,7 +86,10 @@ ENTRY(_stext)
/*
* BSS section
@@ -220,8 +220,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-06-30.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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() */
@@ -335,8 +335,8 @@ Acked-by: jbeulich@novell.com
{
unsigned long t1 = jiffies;
---- head-2011-06-30.orig/arch/x86/kernel/microcode-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/microcode-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/microcode-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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>
@@ -345,8 +345,8 @@ Acked-by: jbeulich@novell.com
#include <linux/mutex.h>
#include <linux/cpu.h>
#include <linux/firmware.h>
---- head-2011-06-30.orig/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -24,7 +24,7 @@
#include <asm/bug.h>
@@ -356,8 +356,8 @@ Acked-by: jbeulich@novell.com
int iommu_merge __read_mostly = 0;
EXPORT_SYMBOL(iommu_merge);
---- head-2011-06-30.orig/arch/x86/kernel/process_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/process_32-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/process_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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)
{
@@ -473,8 +473,8 @@ Acked-by: jbeulich@novell.com
/*
* Leave lazy mode, flushing any hypercalls made here.
---- head-2011-06-30.orig/arch/x86/kernel/setup_32-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/setup_32-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/setup_32-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-07-21/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
@@ -561,8 +561,8 @@ Acked-by: jbeulich@novell.com
if (is_initial_xendomain()) {
#ifdef CONFIG_VT
---- head-2011-06-30.orig/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -22,6 +22,7 @@
#include <asm/mtrr.h>
@@ -587,8 +587,8 @@ Acked-by: jbeulich@novell.com
{
if (per_cpu(cpu_tlbstate, cpu).state == TLBSTATE_OK)
BUG();
---- head-2011-06-30.orig/arch/x86/kernel/time-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/time-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/time-xen.c 2011-07-11 11:10:56.000000000 +0200
++++ head-2011-07-21/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>
@@ -604,7 +604,7 @@ Acked-by: jbeulich@novell.com
volatile unsigned long __jiffies __section_jiffies = INITIAL_JIFFIES;
#endif
-@@ -760,56 +761,10 @@ unsigned long read_persistent_clock(void
+@@ -803,56 +804,10 @@ unsigned long read_persistent_clock(void
return retval;
}
@@ -663,8 +663,8 @@ Acked-by: jbeulich@novell.com
}
extern void (*late_time_init)(void);
---- head-2011-06-30.orig/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -41,6 +41,10 @@
#include <linux/mca.h>
#endif
@@ -871,8 +871,8 @@ Acked-by: jbeulich@novell.com
#ifndef CONFIG_MATH_EMULATION
---- head-2011-06-30.orig/arch/x86/mach-xen/setup.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/mach-xen/setup.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mach-xen/setup.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-07-21/arch/x86/mach-xen/setup.c 2011-01-31 17:49:31.000000000 +0100
@@ -12,6 +12,7 @@
#include <asm/e820.h>
#include <asm/setup.h>
@@ -909,8 +909,8 @@ Acked-by: jbeulich@novell.com
+ set_pmd(pmd, __pmd(__pa_symbol(swapper_pg_pmd) | _PAGE_TABLE));
+ }
}
---- head-2011-06-30.orig/arch/x86/mm/fault_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/fault_32-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/fault_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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))
@@ -996,8 +996,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-06-30.orig/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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();
@@ -1019,8 +1019,8 @@ Acked-by: jbeulich@novell.com
}
void *kmap_atomic(struct page *page, enum km_type type)
---- head-2011-06-30.orig/arch/x86/mm/init_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/init_32-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/init_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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);
@@ -1083,8 +1083,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-06-30.orig/arch/x86/mm/ioremap-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/ioremap-xen.c 2011-02-07 15:38:30.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/ioremap-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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 */
@@ -1096,8 +1096,8 @@ Acked-by: jbeulich@novell.com
PAGE_KERNEL);
global_flush_tlb();
}
---- head-2011-06-30.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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();
@@ -1196,8 +1196,8 @@ Acked-by: jbeulich@novell.com
(atomic_read(&mm->mm_count) == 1) &&
!mm->context.has_foreign_mappings)
mm_unpin(mm);
---- head-2011-06-30.orig/arch/x86/pci/irq-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/pci/irq-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/pci/irq-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/arch/x86/pci/irq-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -142,8 +142,9 @@ static void __init pirq_peer_trick(void)
for(i = 1; i < 256; i++) {
if (!busmap[i] || pci_find_bus(0, i))
@@ -1218,8 +1218,8 @@ Acked-by: jbeulich@novell.com
r->name = "PIIX/ICH";
r->get = pirq_piix_get;
r->set = pirq_piix_set;
---- head-2011-06-30.orig/arch/x86/xen/Kconfig 2011-05-19 06:06:34.000000000 +0200
-+++ head-2011-06-30/arch/x86/xen/Kconfig 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/xen/Kconfig 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/arch/x86/xen/Kconfig 2011-01-31 17:49:31.000000000 +0100
@@ -2,7 +2,7 @@
# This Kconfig describes xen options
#
@@ -1229,8 +1229,8 @@ Acked-by: jbeulich@novell.com
bool "Xen guest support"
select PARAVIRT
select PARAVIRT_CLOCK
---- head-2011-06-30.orig/arch/x86/xen/xen-head.S 2011-05-19 06:06:34.000000000 +0200
-+++ head-2011-06-30/arch/x86/xen/xen-head.S 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/xen/xen-head.S 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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 */
@@ -1246,8 +1246,8 @@ Acked-by: jbeulich@novell.com
-#endif /*CONFIG_XEN */
+#endif /* CONFIG_PARAVIRT_XEN */
---- head-2011-06-30.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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)
@@ -1289,8 +1289,8 @@ Acked-by: jbeulich@novell.com
.quad sys_eventfd
+ .quad sys32_fallocate
ia32_syscall_end:
---- head-2011-06-30.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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
}
@@ -1474,8 +1474,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-06-30.orig/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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.
*/
@@ -1510,8 +1510,8 @@ Acked-by: jbeulich@novell.com
}
if (keep_early)
---- head-2011-06-30.orig/arch/x86/kernel/entry_64-xen.S 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/entry_64-xen.S 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/entry_64-xen.S 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/entry_64-xen.S 2011-01-31 17:49:31.000000000 +0100
@@ -310,7 +310,7 @@ sysret_signal:
TRACE_IRQS_ON
/* sti */
@@ -1539,8 +1539,8 @@ Acked-by: jbeulich@novell.com
jz retint_restore_args
TRACE_IRQS_ON
XEN_UNBLOCK_EVENTS(%rsi)
---- head-2011-06-30.orig/arch/x86/kernel/head_64-xen.S 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/head_64-xen.S 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/head_64-xen.S 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/head_64-xen.S 2011-01-31 17:49:31.000000000 +0100
@@ -23,7 +23,7 @@
#include <asm/dwarf2.h>
#include <xen/interface/elfnote.h>
@@ -1603,8 +1603,8 @@ Acked-by: jbeulich@novell.com
+ ELFNOTE(Xen, XEN_ELFNOTE_FEATURES, .asciz "writable_page_tables|writable_descriptor_tables|auto_translated_physmap|supervisor_mode_kernel")
+ ELFNOTE(Xen, XEN_ELFNOTE_LOADER, .asciz "generic")
+ ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long 1)
---- head-2011-06-30.orig/arch/x86/kernel/head64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/head64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/head64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/head64-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -90,7 +90,7 @@ void __init x86_64_start_kernel(char * r
unsigned long machine_to_phys_nr_ents;
int i;
@@ -1614,8 +1614,8 @@ Acked-by: jbeulich@novell.com
xen_start_info = (struct start_info *)real_mode_data;
if (!xen_feature(XENFEAT_auto_translated_physmap))
---- head-2011-06-30.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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
}
@@ -1738,8 +1738,8 @@ Acked-by: jbeulich@novell.com
}
static struct irq_chip ioapic_chip __read_mostly = {
---- head-2011-06-30.orig/arch/x86/kernel/ldt_64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/ldt_64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/ldt_64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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);
@@ -1758,8 +1758,8 @@ Acked-by: jbeulich@novell.com
spin_lock(&mm_unpinned_lock);
list_del(&mm->context.unpinned);
spin_unlock(&mm_unpinned_lock);
---- head-2011-06-30.orig/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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 */
@@ -1816,8 +1816,8 @@ Acked-by: jbeulich@novell.com
}
void __init
---- head-2011-06-30.orig/arch/x86/kernel/process_64-xen.c 2011-02-02 08:31:39.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/process_64-xen.c 2011-02-02 08:31:50.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/process_64-xen.c 2011-02-02 08:31:39.000000000 +0100
++++ head-2011-07-21/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>
@@ -1849,8 +1849,8 @@ Acked-by: jbeulich@novell.com
}
void show_regs(struct pt_regs *regs)
---- head-2011-06-30.orig/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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))
@@ -1933,8 +1933,8 @@ Acked-by: jbeulich@novell.com
};
static char *x86_power_flags[] = {
"ts", /* temperature sensor */
---- head-2011-06-30.orig/arch/x86/kernel/setup64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/setup64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/setup64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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)
}
@@ -1961,8 +1961,8 @@ Acked-by: jbeulich@novell.com
/* others are initialized in smpboot.c */
pda->pcurrent = &init_task;
pda->irqstackptr = boot_cpu_stack;
---- head-2011-06-30.orig/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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
}
@@ -1999,8 +1999,8 @@ Acked-by: jbeulich@novell.com
put_cpu();
return 0;
}
---- head-2011-06-30.orig/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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>
@@ -2071,8 +2071,8 @@ Acked-by: jbeulich@novell.com
if (panic_on_unrecovered_nmi)
panic("NMI: Not continuing");
---- head-2011-06-30.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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>
@@ -2118,8 +2118,8 @@ Acked-by: jbeulich@novell.com
write_sequnlock_irqrestore(&vsyscall_gtod_data.lock, flags);
}
---- head-2011-06-30.orig/arch/x86/mm/fault_64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/fault_64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/fault_64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/arch/x86/mm/fault_64-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -159,7 +159,9 @@ void dump_pagetable(unsigned long addres
pmd_t *pmd;
pte_t *pte;
@@ -2241,8 +2241,8 @@ Acked-by: jbeulich@novell.com
goto no_context;
do_sigbus:
---- head-2011-06-30.orig/arch/x86/mm/init_64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/init_64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/init_64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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;
@@ -2366,8 +2366,8 @@ Acked-by: jbeulich@novell.com
+ return "[vsyscall]";
+ return NULL;
+}
---- head-2011-06-30.orig/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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 */
@@ -2472,8 +2472,8 @@ Acked-by: jbeulich@novell.com
ClearPagePrivate(pg);
__free_page(pg);
}
---- head-2011-06-30.orig/arch/x86/oprofile/xenoprof.c 2008-01-28 12:24:19.000000000 +0100
-+++ head-2011-06-30/arch/x86/oprofile/xenoprof.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/oprofile/xenoprof.c 2008-01-28 12:24:19.000000000 +0100
++++ head-2011-07-21/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>
@@ -2485,8 +2485,8 @@ Acked-by: jbeulich@novell.com
#include <xen/interface/xen.h>
#include <xen/interface/xenoprof.h>
#include <xen/xenoprof.h>
---- head-2011-06-30.orig/arch/x86/vdso/vdso32/note.S 2008-04-17 04:49:44.000000000 +0200
-+++ head-2011-06-30/arch/x86/vdso/vdso32/note.S 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/vdso/vdso32/note.S 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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
@@ -2509,8 +2509,8 @@ Acked-by: jbeulich@novell.com
.byte VDSO_NOTE_NONEGSEG_BIT; .asciz "nosegneg" /* bit, name */
ELFNOTE_END
#endif
---- head-2011-06-30.orig/drivers/Makefile 2011-06-30 15:36:40.000000000 +0200
-+++ head-2011-06-30/drivers/Makefile 2011-06-30 16:09:27.000000000 +0200
+--- head-2011-07-21.orig/drivers/Makefile 2011-06-30 15:36:40.000000000 +0200
++++ head-2011-07-21/drivers/Makefile 2011-06-30 16:09:27.000000000 +0200
@@ -22,7 +22,7 @@ obj-$(CONFIG_ARM_AMBA) += amba/
obj-$(CONFIG_DMA_ENGINE) += dma/
@@ -2520,8 +2520,8 @@ Acked-by: jbeulich@novell.com
# regulators early, since some subsystems rely on them to initialize
obj-$(CONFIG_REGULATOR) += regulator/
---- head-2011-06-30.orig/drivers/block/Kconfig 2011-06-30 15:04:12.000000000 +0200
-+++ head-2011-06-30/drivers/block/Kconfig 2011-04-11 14:51:31.000000000 +0200
+--- head-2011-07-21.orig/drivers/block/Kconfig 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/drivers/block/Kconfig 2011-04-11 14:51:31.000000000 +0200
@@ -460,9 +460,9 @@ config XILINX_SYSACE
help
Include support for the Xilinx SystemACE CompactFlash interface
@@ -2534,8 +2534,8 @@ Acked-by: jbeulich@novell.com
default y
select XEN_XENBUS_FRONTEND
help
---- head-2011-06-30.orig/drivers/block/Makefile 2011-06-30 15:04:12.000000000 +0200
-+++ head-2011-06-30/drivers/block/Makefile 2011-06-30 16:09:48.000000000 +0200
+--- head-2011-07-21.orig/drivers/block/Makefile 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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
@@ -2545,8 +2545,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-06-30.orig/drivers/block/xen-blkfront.c 2011-06-30 15:04:12.000000000 +0200
-+++ head-2011-06-30/drivers/block/xen-blkfront.c 2011-06-30 16:09:40.000000000 +0200
+--- head-2011-07-21.orig/drivers/block/xen-blkfront.c 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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 = {
@@ -2555,8 +2555,8 @@ Acked-by: jbeulich@novell.com
.ids = blkfront_ids,
.probe = blkfront_probe,
.remove = blkfront_remove,
---- head-2011-06-30.orig/drivers/tty/hvc/Kconfig 2011-05-19 06:06:34.000000000 +0200
-+++ head-2011-06-30/drivers/tty/hvc/Kconfig 2011-04-13 12:42:05.000000000 +0200
+--- head-2011-07-21.orig/drivers/tty/hvc/Kconfig 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/drivers/tty/hvc/Kconfig 2011-04-13 12:42:05.000000000 +0200
@@ -55,7 +55,7 @@ config HVC_IUCV
config HVC_XEN
@@ -2566,8 +2566,8 @@ Acked-by: jbeulich@novell.com
select HVC_DRIVER
select HVC_IRQ
default y
---- head-2011-06-30.orig/drivers/net/Kconfig 2011-06-30 15:04:13.000000000 +0200
-+++ head-2011-06-30/drivers/net/Kconfig 2011-06-30 16:09:58.000000000 +0200
+--- head-2011-07-21.orig/drivers/net/Kconfig 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/drivers/net/Kconfig 2011-06-30 16:09:58.000000000 +0200
@@ -2961,9 +2961,9 @@ config TILE_NET
To compile this driver as a module, choose M here: the module
will be called tile_net.
@@ -2580,8 +2580,8 @@ Acked-by: jbeulich@novell.com
select XEN_XENBUS_FRONTEND
default y
help
---- head-2011-06-30.orig/drivers/net/Makefile 2011-06-30 15:04:13.000000000 +0200
-+++ head-2011-06-30/drivers/net/Makefile 2011-04-13 12:41:54.000000000 +0200
+--- head-2011-07-21.orig/drivers/net/Makefile 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/drivers/net/Makefile 2011-04-13 12:41:54.000000000 +0200
@@ -172,7 +172,7 @@ obj-$(CONFIG_PPTP) += pppox.o pptp.o
obj-$(CONFIG_SLIP) += slip.o
obj-$(CONFIG_SLHC) += slhc.o
@@ -2591,8 +2591,8 @@ Acked-by: jbeulich@novell.com
obj-$(CONFIG_XEN_NETDEV_BACKEND) += xen-netback/
obj-$(CONFIG_DUMMY) += dummy.o
---- head-2011-06-30.orig/drivers/net/xen-netfront.c 2011-06-30 15:04:14.000000000 +0200
-+++ head-2011-06-30/drivers/net/xen-netfront.c 2011-06-30 16:10:07.000000000 +0200
+--- head-2011-07-21.orig/drivers/net/xen-netfront.c 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/drivers/net/xen-netfront.c 2011-06-30 16:10:07.000000000 +0200
@@ -1876,7 +1876,6 @@ static int __devexit xennet_remove(struc
static struct xenbus_driver netfront_driver = {
@@ -2601,8 +2601,8 @@ Acked-by: jbeulich@novell.com
.ids = netfront_ids,
.probe = netfront_probe,
.remove = __devexit_p(xennet_remove),
---- head-2011-06-30.orig/drivers/xen/Kconfig 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-06-30/drivers/xen/Kconfig 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/Kconfig 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-07-21/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
@@ -2613,8 +2613,8 @@ Acked-by: jbeulich@novell.com
config XEN_PRIVCMD
def_bool y
---- head-2011-06-30.orig/drivers/xen/Makefile 2011-02-24 13:56:24.000000000 +0100
-+++ head-2011-06-30/drivers/xen/Makefile 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/Makefile 2011-02-24 13:56:24.000000000 +0100
++++ head-2011-07-21/drivers/xen/Makefile 2011-01-31 17:49:31.000000000 +0100
@@ -1,10 +1,14 @@
-obj-y += core/
-obj-y += console/
@@ -2636,8 +2636,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-06-30.orig/drivers/xen/balloon/balloon.c 2011-03-23 08:51:42.000000000 +0100
-+++ head-2011-06-30/drivers/xen/balloon/balloon.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/balloon/balloon.c 2011-03-23 08:51:42.000000000 +0100
++++ head-2011-07-21/drivers/xen/balloon/balloon.c 2011-01-31 17:49:31.000000000 +0100
@@ -324,13 +324,9 @@ static int increase_reservation(unsigned
#ifndef MODULE
@@ -2652,8 +2652,8 @@ Acked-by: jbeulich@novell.com
vm_total_pages = nr_free_pagecache_pages();
#endif
---- head-2011-06-30.orig/drivers/xen/blkback/blkback.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/drivers/xen/blkback/blkback.c 2011-04-11 14:51:40.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/blkback/blkback.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/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)
@@ -2663,8 +2663,8 @@ Acked-by: jbeulich@novell.com
if (q == blkif->plug)
return;
---- head-2011-06-30.orig/drivers/xen/blkback/common.h 2011-04-11 14:28:27.000000000 +0200
-+++ head-2011-06-30/drivers/xen/blkback/common.h 2011-04-11 14:51:44.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/blkback/common.h 2011-04-11 14:28:27.000000000 +0200
++++ head-2011-07-21/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>
@@ -2682,8 +2682,8 @@ Acked-by: jbeulich@novell.com
/* statistics */
unsigned long st_print;
---- head-2011-06-30.orig/drivers/xen/blkback/interface.c 2011-04-11 14:29:25.000000000 +0200
-+++ head-2011-06-30/drivers/xen/blkback/interface.c 2011-04-11 14:51:52.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/blkback/interface.c 2011-04-11 14:29:25.000000000 +0200
++++ head-2011-07-21/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)
{
@@ -2691,8 +2691,8 @@ Acked-by: jbeulich@novell.com
- 0, 0, NULL, NULL);
+ 0, 0, NULL);
}
---- head-2011-06-30.orig/drivers/xen/blkback/xenbus.c 2011-06-30 16:04:52.000000000 +0200
-+++ head-2011-06-30/drivers/xen/blkback/xenbus.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/blkback/xenbus.c 2011-06-30 16:04:52.000000000 +0200
++++ head-2011-07-21/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)
@@ -2729,11 +2729,11 @@ Acked-by: jbeulich@novell.com
return 0;
}
---- head-2011-06-30.orig/drivers/xen/blkfront/blkfront.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/drivers/xen/blkfront/blkfront.c 2011-06-30 16:10:17.000000000 +0200
-@@ -573,14 +573,20 @@ int blkif_ioctl(struct inode *inode, str
+--- head-2011-07-21.orig/drivers/xen/blkfront/blkfront.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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;
- }
+
default:
- if (info->mi && info->gd) {
+ if (info->mi && info->gd && info->rq) {
@@ -2753,7 +2753,7 @@ Acked-by: jbeulich@novell.com
}
}
-@@ -697,7 +703,7 @@ static int blkif_queue_request(struct re
+@@ -696,7 +702,7 @@ static int blkif_queue_request(struct re
* do_blkif_request
* read a block; request is in a request queue
*/
@@ -2762,8 +2762,8 @@ Acked-by: jbeulich@novell.com
{
struct blkfront_info *info = NULL;
struct request *req;
---- head-2011-06-30.orig/drivers/xen/blkfront/block.h 2010-02-24 13:13:46.000000000 +0100
-+++ head-2011-06-30/drivers/xen/blkfront/block.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/blkfront/block.h 2010-02-24 13:13:46.000000000 +0100
++++ head-2011-07-21/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;
@@ -2782,8 +2782,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-06-30.orig/drivers/xen/blkfront/vbd.c 2010-01-18 15:23:12.000000000 +0100
-+++ head-2011-06-30/drivers/xen/blkfront/vbd.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/blkfront/vbd.c 2010-01-18 15:23:12.000000000 +0100
++++ head-2011-07-21/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)
@@ -2793,8 +2793,8 @@ Acked-by: jbeulich@novell.com
rq = blk_init_queue(do_blkif_request, &blkif_io_lock);
if (rq == NULL)
---- head-2011-06-30.orig/drivers/xen/blktap/common.h 2011-04-11 14:28:19.000000000 +0200
-+++ head-2011-06-30/drivers/xen/blktap/common.h 2011-04-11 14:51:59.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/blktap/common.h 2011-04-11 14:28:19.000000000 +0200
++++ head-2011-07-21/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>
@@ -2812,8 +2812,8 @@ Acked-by: jbeulich@novell.com
/* statistics */
unsigned long st_print;
---- head-2011-06-30.orig/drivers/xen/blktap/interface.c 2011-04-11 14:29:39.000000000 +0200
-+++ head-2011-06-30/drivers/xen/blktap/interface.c 2011-04-11 14:52:00.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/blktap/interface.c 2011-04-11 14:29:39.000000000 +0200
++++ head-2011-07-21/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)
{
@@ -2821,8 +2821,8 @@ Acked-by: jbeulich@novell.com
- 0, 0, NULL, NULL);
+ 0, 0, NULL);
}
---- head-2011-06-30.orig/drivers/xen/blktap/xenbus.c 2011-06-30 16:05:02.000000000 +0200
-+++ head-2011-06-30/drivers/xen/blktap/xenbus.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/blktap/xenbus.c 2011-06-30 16:05:02.000000000 +0200
++++ head-2011-07-21/drivers/xen/blktap/xenbus.c 2011-01-31 17:49:31.000000000 +0100
@@ -50,8 +50,6 @@ struct backend_info
int group_added;
};
@@ -2859,8 +2859,8 @@ Acked-by: jbeulich@novell.com
return 0;
}
---- head-2011-06-30.orig/drivers/xen/blktap2/blktap.h 2010-02-24 13:13:46.000000000 +0100
-+++ head-2011-06-30/drivers/xen/blktap2/blktap.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/blktap2/blktap.h 2010-02-24 13:13:46.000000000 +0100
++++ head-2011-07-21/drivers/xen/blktap2/blktap.h 2011-01-31 17:49:31.000000000 +0100
@@ -203,6 +203,7 @@ blktap_validate_params(struct blktap *ta
}
@@ -2869,8 +2869,8 @@ Acked-by: jbeulich@novell.com
int blktap_ring_init(int *);
int blktap_ring_free(void);
---- head-2011-06-30.orig/drivers/xen/blktap2/control.c 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-06-30/drivers/xen/blktap2/control.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/blktap2/control.c 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-07-21/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);
@@ -2895,8 +2895,8 @@ Acked-by: jbeulich@novell.com
static int __init
blktap_control_init(void)
{
---- head-2011-06-30.orig/drivers/xen/blktap2/device.c 2010-11-25 09:36:37.000000000 +0100
-+++ head-2011-06-30/drivers/xen/blktap2/device.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/blktap2/device.c 2010-11-25 09:36:37.000000000 +0100
++++ head-2011-07-21/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)
{
@@ -2923,8 +2923,8 @@ Acked-by: jbeulich@novell.com
- BTERR("blktap device unregister failed\n");
+ unregister_blkdev(blktap_device_major, "tapdev");
}
---- head-2011-06-30.orig/drivers/xen/blktap2/sysfs.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-06-30/drivers/xen/blktap2/sysfs.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/blktap2/sysfs.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-07-21/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;
}
@@ -2969,8 +2969,8 @@ Acked-by: jbeulich@novell.com
}
static ssize_t
---- head-2011-06-30.orig/drivers/xen/core/gnttab.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-06-30/drivers/xen/core/gnttab.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/core/gnttab.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-07-21/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>
@@ -2979,8 +2979,8 @@ Acked-by: jbeulich@novell.com
#include <asm/gnttab_dma.h>
#ifdef HAVE_XEN_PLATFORM_COMPAT_H
---- head-2011-06-30.orig/drivers/xen/core/reboot.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/drivers/xen/core/reboot.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/core/reboot.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/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>
@@ -2989,8 +2989,8 @@ Acked-by: jbeulich@novell.com
#include <linux/sysrq.h>
#include <asm/hypervisor.h>
#include <xen/xenbus.h>
---- head-2011-06-30.orig/drivers/xen/core/xen_proc.c 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-06-30/drivers/xen/core/xen_proc.c 2011-04-01 13:07:57.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/core/xen_proc.c 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-07-21/drivers/xen/core/xen_proc.c 2011-04-01 13:07:57.000000000 +0200
@@ -1,11 +1,15 @@
-
+#include <linux/init.h>
@@ -3018,8 +3018,8 @@ Acked-by: jbeulich@novell.com
void remove_xen_proc_entry(const char *name)
{
---- head-2011-06-30.orig/drivers/xen/netback/common.h 2011-04-11 14:38:17.000000000 +0200
-+++ head-2011-06-30/drivers/xen/netback/common.h 2011-04-11 14:52:16.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/netback/common.h 2011-04-11 14:38:17.000000000 +0200
++++ head-2011-07-21/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>
@@ -3028,8 +3028,8 @@ Acked-by: jbeulich@novell.com
#include <xen/xenbus.h>
#include <xen/interface/event_channel.h>
---- head-2011-06-30.orig/drivers/xen/scsiback/common.h 2011-04-11 14:27:49.000000000 +0200
-+++ head-2011-06-30/drivers/xen/scsiback/common.h 2011-04-11 14:52:20.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/scsiback/common.h 2011-04-11 14:27:49.000000000 +0200
++++ head-2011-07-21/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>
@@ -3038,8 +3038,8 @@ Acked-by: jbeulich@novell.com
#include <xen/xenbus.h>
#include <xen/interface/io/ring.h>
#include <xen/interface/io/vscsiif.h>
---- head-2011-06-30.orig/drivers/xen/scsiback/interface.c 2011-04-11 14:30:02.000000000 +0200
-+++ head-2011-06-30/drivers/xen/scsiback/interface.c 2011-04-11 14:52:22.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/scsiback/interface.c 2011-04-11 14:30:02.000000000 +0200
++++ head-2011-07-21/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)
{
@@ -3049,8 +3049,8 @@ Acked-by: jbeulich@novell.com
if (!scsiback_cachep) {
printk(KERN_ERR "scsiback: can't init scsi cache\n");
return -ENOMEM;
---- head-2011-06-30.orig/drivers/xen/scsifront/scsifront.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-06-30/drivers/xen/scsifront/scsifront.c 2011-02-08 10:03:55.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/scsifront/scsifront.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-07-21/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);
@@ -3080,8 +3080,8 @@ Acked-by: jbeulich@novell.com
vscsiif_request_t *ring_req;
uint16_t rqid;
---- head-2011-06-30.orig/drivers/xen/sfc_netback/accel_solarflare.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/drivers/xen/sfc_netback/accel_solarflare.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/sfc_netback/accel_solarflare.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/drivers/xen/sfc_netback/accel_solarflare.c 2011-01-31 17:49:31.000000000 +0100
@@ -37,7 +37,6 @@
#include "ci/efhw/public.h"
@@ -3090,8 +3090,8 @@ Acked-by: jbeulich@novell.com
#include <linux/list.h>
#include <linux/mutex.h>
---- head-2011-06-30.orig/drivers/xen/sfc_netutil/accel_util.c 2010-09-23 15:39:04.000000000 +0200
-+++ head-2011-06-30/drivers/xen/sfc_netutil/accel_util.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/sfc_netutil/accel_util.c 2010-09-23 15:39:04.000000000 +0200
++++ head-2011-07-21/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>
@@ -3100,8 +3100,8 @@ Acked-by: jbeulich@novell.com
#include <xen/gnttab.h>
#include "accel_util.h"
---- head-2011-06-30.orig/drivers/xen/tpmback/common.h 2011-04-11 14:32:54.000000000 +0200
-+++ head-2011-06-30/drivers/xen/tpmback/common.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/tpmback/common.h 2011-04-11 14:32:54.000000000 +0200
++++ head-2011-07-21/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>
@@ -3110,8 +3110,8 @@ Acked-by: jbeulich@novell.com
#include <xen/xenbus.h>
#include <xen/interface/event_channel.h>
#include <xen/interface/io/tpmif.h>
---- head-2011-06-30.orig/drivers/xen/tpmback/interface.c 2011-04-11 14:31:42.000000000 +0200
-+++ head-2011-06-30/drivers/xen/tpmback/interface.c 2011-04-11 14:52:30.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/tpmback/interface.c 2011-04-11 14:31:42.000000000 +0200
++++ head-2011-07-21/drivers/xen/tpmback/interface.c 2011-04-11 14:52:30.000000000 +0200
@@ -13,6 +13,7 @@
#include "common.h"
@@ -3129,8 +3129,8 @@ Acked-by: jbeulich@novell.com
return tpmif_cachep ? 0 : -ENOMEM;
}
---- head-2011-06-30.orig/drivers/xen/usbback/usbback.h 2011-04-11 14:27:35.000000000 +0200
-+++ head-2011-06-30/drivers/xen/usbback/usbback.h 2011-04-11 14:52:41.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/usbback/usbback.h 2011-04-11 14:27:35.000000000 +0200
++++ head-2011-07-21/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>
@@ -3139,8 +3139,8 @@ Acked-by: jbeulich@novell.com
#include <xen/xenbus.h>
#include <xen/interface/event_channel.h>
#include <xen/interface/io/usbif.h>
---- head-2011-06-30.orig/drivers/xen/usbfront/xenbus.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/drivers/xen/usbfront/xenbus.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/usbfront/xenbus.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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;
@@ -3150,8 +3150,8 @@ Acked-by: jbeulich@novell.com
if (!xenhcd_urbp_cachep) {
printk(KERN_ERR "usbfront failed to create kmem cache\n");
return -ENOMEM;
---- head-2011-06-30.orig/drivers/xen/util.c 2007-07-10 09:42:30.000000000 +0200
-+++ head-2011-06-30/drivers/xen/util.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/util.c 2007-07-10 09:42:30.000000000 +0200
++++ head-2011-07-21/drivers/xen/util.c 2011-01-31 17:49:31.000000000 +0100
@@ -1,8 +1,5 @@
-#include <linux/mm.h>
+#include <linux/err.h>
@@ -3208,8 +3208,8 @@ Acked-by: jbeulich@novell.com
-}
-EXPORT_SYMBOL_GPL(free_vm_area);
-#endif /* CONFIG_X86 */
---- head-2011-06-30.orig/drivers/xen/xenbus/xenbus_backend_client.c 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-06-30/drivers/xen/xenbus/xenbus_backend_client.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/xenbus/xenbus_backend_client.c 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-07-21/drivers/xen/xenbus/xenbus_backend_client.c 2011-01-31 17:49:31.000000000 +0100
@@ -32,9 +32,9 @@
#include <linux/err.h>
@@ -3221,8 +3221,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-06-30.orig/drivers/xen/xenbus/xenbus_client.c 2011-06-30 15:37:44.000000000 +0200
-+++ head-2011-06-30/drivers/xen/xenbus/xenbus_client.c 2011-06-30 16:10:27.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/xenbus/xenbus_client.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-07-21/drivers/xen/xenbus/xenbus_client.c 2011-06-30 16:10:27.000000000 +0200
@@ -30,19 +30,25 @@
* IN THE SOFTWARE.
*/
@@ -3668,8 +3668,8 @@ Acked-by: jbeulich@novell.com
enum xenbus_state xenbus_read_driver_state(const char *path)
{
int result;
---- head-2011-06-30.orig/drivers/xen/xenbus/xenbus_comms.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/drivers/xen/xenbus/xenbus_comms.c 2011-04-11 14:52:53.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/xenbus/xenbus_comms.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/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>
@@ -3735,8 +3735,8 @@ Acked-by: jbeulich@novell.com
xen_store_evtchn, wake_waiting,
0, "xenbus", &xb_waitq);
if (err <= 0) {
---- head-2011-06-30.orig/drivers/xen/xenbus/xenbus_dev.c 2011-06-30 15:37:44.000000000 +0200
-+++ head-2011-06-30/drivers/xen/xenbus/xenbus_dev.c 2011-06-30 16:10:32.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/xenbus/xenbus_dev.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-07-21/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
};
@@ -3752,8 +3752,8 @@ Acked-by: jbeulich@novell.com
{
xenbus_dev_intf = create_xen_proc_entry("xenbus", 0400);
if (xenbus_dev_intf)
---- head-2011-06-30.orig/drivers/xen/xenbus/xenbus_probe.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-06-30/drivers/xen/xenbus/xenbus_probe.c 2011-06-30 16:10:35.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/xenbus/xenbus_probe.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-07-21/drivers/xen/xenbus/xenbus_probe.c 2011-06-30 16:10:35.000000000 +0200
@@ -43,21 +43,26 @@
#include <linux/mm.h>
#include <linux/notifier.h>
@@ -4053,8 +4053,8 @@ Acked-by: jbeulich@novell.com
{
return xenbus_probe_init();
}
---- head-2011-06-30.orig/drivers/xen/xenbus/xenbus_probe.h 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-06-30/drivers/xen/xenbus/xenbus_probe.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/xenbus/xenbus_probe.h 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-07-21/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);
@@ -4073,8 +4073,8 @@ Acked-by: jbeulich@novell.com
+extern void xenbus_dev_changed(const char *node, struct xen_bus_type *bus);
#endif
---- head-2011-06-30.orig/drivers/xen/xenbus/xenbus_probe_backend.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-06-30/drivers/xen/xenbus/xenbus_probe_backend.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/xenbus/xenbus_probe_backend.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-07-21/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("");
@@ -4084,8 +4084,8 @@ Acked-by: jbeulich@novell.com
}
static struct xenbus_watch be_watch = {
---- head-2011-06-30.orig/drivers/xen/xenbus/xenbus_xs.c 2011-06-30 16:06:45.000000000 +0200
-+++ head-2011-06-30/drivers/xen/xenbus/xenbus_xs.c 2011-06-30 16:10:38.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/xenbus/xenbus_xs.c 2011-06-30 16:06:45.000000000 +0200
++++ head-2011-07-21/drivers/xen/xenbus/xenbus_xs.c 2011-06-30 16:10:38.000000000 +0200
@@ -661,7 +661,9 @@ void unregister_xenbus_watch(struct xenb
char token[sizeof(watch) * 2 + 1];
int err;
@@ -4161,8 +4161,8 @@ Acked-by: jbeulich@novell.com
}
return 0;
---- head-2011-06-30.orig/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-06-30/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-07-21/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>
@@ -4171,8 +4171,8 @@ Acked-by: jbeulich@novell.com
#include <xen/interface/xen.h>
#include <xen/interface/xenoprof.h>
#include "../../../drivers/oprofile/cpu_buffer.h"
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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,
@@ -4182,8 +4182,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-06-30.orig/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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) \
@@ -4194,8 +4194,8 @@ Acked-by: jbeulich@novell.com
#define flush_cache_kmaps() do { } while (0)
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/maddr_32.h 2008-04-02 12:34:02.000000000 +0200
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/maddr_32.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/maddr_32.h 2008-04-02 12:34:02.000000000 +0200
++++ head-2011-07-21/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
@@ -4204,8 +4204,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-06-30.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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)
@@ -4233,8 +4233,8 @@ Acked-by: jbeulich@novell.com
/* stop flush ipis for the previous mm */
cpu_clear(cpu, prev->cpu_vm_mask);
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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 */
@@ -4263,8 +4263,8 @@ Acked-by: jbeulich@novell.com
if (!PageHighMem(pte)) \
BUG_ON(HYPERVISOR_update_va_mapping( \
(unsigned long)__va(pfn << PAGE_SHIFT), \
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:38:07.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:38:23.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:38:07.000000000 +0100
++++ head-2011-07-21/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>
@@ -4396,8 +4396,8 @@ Acked-by: jbeulich@novell.com
xen_l1_entry_update(ptep, __pte(0)); \
else \
*(ptep) = __pte(0); \
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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
@@ -4426,8 +4426,8 @@ Acked-by: jbeulich@novell.com
}
/* Rules for using set_pte: the pte being assigned *must* be
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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
@@ -4473,8 +4473,8 @@ Acked-by: jbeulich@novell.com
/*
* Size of io_bitmap.
*/
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/system_32.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/system_32.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/system_32.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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
*/
@@ -4503,8 +4503,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-06-30.orig/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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 */
@@ -4518,8 +4518,8 @@ Acked-by: jbeulich@novell.com
static inline void flush_tlb_pgtables(struct mm_struct *mm,
unsigned long start, unsigned long end)
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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.
@@ -4551,8 +4551,8 @@ Acked-by: jbeulich@novell.com
}
#endif
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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)) {
@@ -4571,8 +4571,8 @@ Acked-by: jbeulich@novell.com
mm_pin(next);
switch_mm(prev, next, NULL);
}
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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)
@@ -4600,8 +4600,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-06-30.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-02-07 15:38:08.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-02-07 15:38:18.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-02-07 15:38:08.000000000 +0100
++++ head-2011-07-21/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) {
@@ -4692,8 +4692,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-06-30.orig/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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
@@ -4742,8 +4742,8 @@ Acked-by: jbeulich@novell.com
static inline void serialize_cpu(void)
{
__asm__ __volatile__ ("cpuid" : : : "ax", "bx", "cx", "dx");
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/system_64.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/system_64.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/system_64.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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));
@@ -4804,8 +4804,8 @@ Acked-by: jbeulich@novell.com
#endif /* __KERNEL__ */
#define nop() __asm__ __volatile__ ("nop")
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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
@@ -4819,8 +4819,8 @@ Acked-by: jbeulich@novell.com
static inline void flush_tlb_pgtables(struct mm_struct *mm,
unsigned long start, unsigned long end)
---- head-2011-06-30.orig/arch/x86/include/asm/thread_info.h 2011-01-31 17:02:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/asm/thread_info.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/asm/thread_info.h 2011-01-31 17:02:29.000000000 +0100
++++ head-2011-07-21/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)
@@ -4831,8 +4831,8 @@ Acked-by: jbeulich@novell.com
#endif
#define PREEMPT_ACTIVE 0x10000000
---- head-2011-06-30.orig/arch/x86/include/asm/xen/interface.h 2011-05-19 06:06:34.000000000 +0200
-+++ head-2011-06-30/arch/x86/include/asm/xen/interface.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/asm/xen/interface.h 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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
@@ -4885,8 +4885,8 @@ Acked-by: jbeulich@novell.com
/*
* SEGMENT DESCRIPTOR TABLES
---- head-2011-06-30.orig/include/linux/elfnote.h 2008-04-17 04:49:44.000000000 +0200
-+++ head-2011-06-30/include/linux/elfnote.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/include/linux/elfnote.h 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/include/linux/elfnote.h 2011-01-31 17:49:31.000000000 +0100
@@ -52,7 +52,7 @@
4484:.balign 4 ; \
.popsection ;
@@ -4896,8 +4896,8 @@ Acked-by: jbeulich@novell.com
ELFNOTE_START(name, type, "") \
desc ; \
ELFNOTE_END
---- head-2011-06-30.orig/include/linux/page-flags.h 2011-04-28 11:08:54.000000000 +0200
-+++ head-2011-06-30/include/linux/page-flags.h 2011-04-28 11:09:56.000000000 +0200
+--- head-2011-07-21.orig/include/linux/page-flags.h 2011-04-28 11:08:54.000000000 +0200
++++ head-2011-07-21/include/linux/page-flags.h 2011-04-28 11:09:56.000000000 +0200
@@ -124,8 +124,15 @@ enum pageflags {
PG_fscache = PG_private_2, /* page backed by cache */
@@ -4926,8 +4926,8 @@ Acked-by: jbeulich@novell.com
#else
# define __PG_XEN (1 << PG_foreign)
#endif
---- head-2011-06-30.orig/include/xen/driver_util.h 2007-06-12 13:14:19.000000000 +0200
-+++ head-2011-06-30/include/xen/driver_util.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/include/xen/driver_util.h 2007-06-12 13:14:19.000000000 +0200
++++ head-2011-07-21/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__
@@ -4946,8 +4946,8 @@ Acked-by: jbeulich@novell.com
-#endif /* __ASM_XEN_DRIVER_UTIL_H__ */
+#endif /* __XEN_DRIVER_UTIL_H__ */
---- head-2011-06-30.orig/include/xen/features.h 2007-10-09 22:31:38.000000000 +0200
-+++ head-2011-06-30/include/xen/features.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/include/xen/features.h 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/include/xen/features.h 2011-01-31 17:49:31.000000000 +0100
@@ -10,6 +10,7 @@
#define __XEN_FEATURES_H__
@@ -4962,8 +4962,8 @@ Acked-by: jbeulich@novell.com
-#endif /* __ASM_XEN_FEATURES_H__ */
+#endif /* __XEN_FEATURES_H__ */
---- head-2011-06-30.orig/include/xen/interface/arch-x86/xen.h 2011-03-17 13:50:24.000000000 +0100
-+++ head-2011-06-30/include/xen/interface/arch-x86/xen.h 2011-03-17 14:11:48.000000000 +0100
+--- head-2011-07-21.orig/include/xen/interface/arch-x86/xen.h 2011-03-17 13:50:24.000000000 +0100
++++ head-2011-07-21/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)
@@ -4974,8 +4974,8 @@ Acked-by: jbeulich@novell.com
#if defined(__i386__)
#include "xen-x86_32.h"
#elif defined(__x86_64__)
---- head-2011-06-30.orig/include/xen/interface/event_channel.h 2011-01-31 15:14:12.000000000 +0100
-+++ head-2011-06-30/include/xen/interface/event_channel.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/include/xen/interface/event_channel.h 2011-01-31 15:14:12.000000000 +0100
++++ head-2011-07-21/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;
@@ -4984,8 +4984,8 @@ Acked-by: jbeulich@novell.com
typedef struct evtchn_op evtchn_op_t;
DEFINE_XEN_GUEST_HANDLE(evtchn_op_t);
---- head-2011-06-30.orig/include/xen/interface/io/netif.h 2011-01-31 15:14:12.000000000 +0100
-+++ head-2011-06-30/include/xen/interface/io/netif.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/include/xen/interface/io/netif.h 2011-01-31 15:14:12.000000000 +0100
++++ head-2011-07-21/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.
*/
@@ -5009,8 +5009,8 @@ Acked-by: jbeulich@novell.com
#define NETIF_RSP_DROPPED -2
#define NETIF_RSP_ERROR -1
---- head-2011-06-30.orig/include/xen/interface/memory.h 2011-01-31 15:14:12.000000000 +0100
-+++ head-2011-06-30/include/xen/interface/memory.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/include/xen/interface/memory.h 2011-01-31 15:14:12.000000000 +0100
++++ head-2011-07-21/include/xen/interface/memory.h 2011-01-31 17:49:31.000000000 +0100
@@ -88,6 +88,7 @@ struct xen_memory_reservation {
*/
domid_t domid;
@@ -5035,8 +5035,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-06-30.orig/include/xen/interface/sched.h 2011-01-31 15:14:12.000000000 +0100
-+++ head-2011-06-30/include/xen/interface/sched.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/include/xen/interface/sched.h 2011-01-31 15:14:12.000000000 +0100
++++ head-2011-07-21/include/xen/interface/sched.h 2011-01-31 17:49:31.000000000 +0100
@@ -67,6 +67,7 @@
struct sched_shutdown {
unsigned int reason; /* SHUTDOWN_* */
@@ -5053,8 +5053,8 @@ Acked-by: jbeulich@novell.com
typedef struct sched_poll sched_poll_t;
DEFINE_XEN_GUEST_HANDLE(sched_poll_t);
---- head-2011-06-30.orig/include/xen/interface/version.h 2011-01-31 15:14:12.000000000 +0100
-+++ head-2011-06-30/include/xen/interface/version.h 2011-01-31 17:49:31.000000000 +0100
+--- head-2011-07-21.orig/include/xen/interface/version.h 2011-01-31 15:14:12.000000000 +0100
++++ head-2011-07-21/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
@@ -5082,8 +5082,8 @@ Acked-by: jbeulich@novell.com
#define XEN_CHANGESET_INFO_LEN (sizeof(xen_changeset_info_t))
#define XENVER_platform_parameters 5
---- head-2011-06-30.orig/include/xen/interface/xen.h 2011-06-30 15:56:26.000000000 +0200
-+++ head-2011-06-30/include/xen/interface/xen.h 2011-04-13 12:42:17.000000000 +0200
+--- head-2011-07-21.orig/include/xen/interface/xen.h 2011-06-30 15:56:26.000000000 +0200
++++ head-2011-07-21/include/xen/interface/xen.h 2011-04-13 12:42:17.000000000 +0200
@@ -32,7 +32,9 @@
#include <asm/pvclock-abi.h>
#endif
@@ -5146,8 +5146,8 @@ Acked-by: jbeulich@novell.com
typedef struct multicall_entry multicall_entry_t;
DEFINE_XEN_GUEST_HANDLE(multicall_entry_t);
---- head-2011-06-30.orig/include/xen/xenbus.h 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-06-30/include/xen/xenbus.h 2011-04-11 14:54:41.000000000 +0200
+--- head-2011-07-21.orig/include/xen/xenbus.h 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-07-21/include/xen/xenbus.h 2011-04-11 14:54:41.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 2dd9fd7384..7c525d0933 100644
--- a/patches.xen/xen3-patch-2.6.24
+++ b/patches.xen/xen3-patch-2.6.24
@@ -6,8 +6,8 @@ Automatically created from "patches.kernel.org/patch-2.6.24" by xen-port-patches
Acked-by: jbeulich@novell.com
---- head-2011-06-30.orig/arch/x86/Kconfig 2011-06-30 16:05:57.000000000 +0200
-+++ head-2011-06-30/arch/x86/Kconfig 2011-06-30 16:31:31.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/Kconfig 2011-06-30 16:05:57.000000000 +0200
++++ head-2011-07-21/arch/x86/Kconfig 2011-06-30 16:31:31.000000000 +0200
@@ -89,15 +89,16 @@ config GENERIC_CMOS_UPDATE
config CLOCKSOURCE_WATCHDOG
@@ -121,8 +121,8 @@ Acked-by: jbeulich@novell.com
help
DMA remapping (DMAR) devices support enables independent address
translations for Direct Memory Access (DMA) from devices.
---- head-2011-06-30.orig/arch/x86/Makefile 2011-04-13 11:31:41.000000000 +0200
-+++ head-2011-06-30/arch/x86/Makefile 2011-02-01 14:11:04.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/Makefile 2011-04-13 11:31:41.000000000 +0200
++++ head-2011-07-21/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)
@@ -143,8 +143,8 @@ Acked-by: jbeulich@novell.com
else
# Default kernel to build
all: bzImage
---- head-2011-06-30.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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
@@ -193,16 +193,16 @@ Acked-by: jbeulich@novell.com
jmp cstar_do_call
END(ia32_cstar_target)
---- head-2011-06-30.orig/arch/x86/kernel/Makefile 2011-06-30 16:06:01.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/Makefile 2011-06-30 16:31:37.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/kernel/Makefile 2011-06-30 16:06:01.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/Makefile 2011-06-30 16:31:37.000000000 +0200
@@ -138,4 +138,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-06-30.orig/arch/x86/kernel/acpi/processor_extcntl_xen.c 2010-03-22 12:00:53.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/acpi/processor_extcntl_xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/acpi/processor_extcntl_xen.c 2010-03-22 12:00:53.000000000 +0100
++++ head-2011-07-21/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 */
@@ -221,8 +221,8 @@ Acked-by: jbeulich@novell.com
kfree(buf);
return -EINVAL;
}
---- head-2011-06-30.orig/arch/x86/kernel/cpu/Makefile 2011-06-30 15:04:08.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/cpu/Makefile 2011-06-30 16:31:56.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/kernel/cpu/Makefile 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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
@@ -232,8 +232,8 @@ Acked-by: jbeulich@novell.com
quiet_cmd_mkcapflags = MKCAP $@
cmd_mkcapflags = $(PERL) $(srctree)/$(src)/mkcapflags.pl $< $@
---- head-2011-06-30.orig/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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)
@@ -253,8 +253,8 @@ Acked-by: jbeulich@novell.com
c->x86_clflush_size = 32;
memset(&c->x86_capability, 0, sizeof c->x86_capability);
---- head-2011-06-30.orig/arch/x86/kernel/cpu/intel.c 2011-06-30 15:04:08.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/cpu/intel.c 2011-06-30 16:32:02.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/kernel/cpu/intel.c 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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
}
@@ -287,8 +287,8 @@ Acked-by: jbeulich@novell.com
/* Work around errata */
srat_detect_node(c);
---- head-2011-06-30.orig/arch/x86/kernel/cpu/intel_cacheinfo.c 2011-06-30 16:01:36.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/cpu/intel_cacheinfo.c 2011-06-30 16:32:06.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/kernel/cpu/intel_cacheinfo.c 2011-06-30 16:01:36.000000000 +0200
++++ head-2011-07-21/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];
@@ -331,8 +331,8 @@ Acked-by: jbeulich@novell.com
break;
default:
break;
---- head-2011-06-30.orig/arch/x86/kernel/cpu/mcheck/mce_dom0.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/cpu/mcheck/mce_dom0.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/cpu/mcheck/mce_dom0.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/cpu/mcheck/mce_dom0.c 2011-01-31 17:56:27.000000000 +0100
@@ -17,7 +17,7 @@ static int convert_log(struct mc_info *m
x86_mcinfo_lookup(mic, mi, MC_TYPE_GLOBAL);
if (mic == NULL)
@@ -369,8 +369,8 @@ Acked-by: jbeulich@novell.com
/* Log the machine checks left over from the previous reset. */
mce_dom0_interrupt(VIRQ_MCA, NULL);
---- head-2011-06-30.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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
};
@@ -432,8 +432,8 @@ Acked-by: jbeulich@novell.com
* memory space.
*/
last = 0x100000000ull;
---- head-2011-06-30.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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>
@@ -514,8 +514,8 @@ Acked-by: jbeulich@novell.com
+ max_pfn << PAGE_SHIFT) - *addr;
+ return i + 1;
+}
---- head-2011-06-30.orig/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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>
@@ -549,8 +549,8 @@ Acked-by: jbeulich@novell.com
#endif
early_console = &early_vga_console;
} else if (!strncmp(buf, "simnow", 6)) {
---- head-2011-06-30.orig/arch/x86/kernel/entry_32-xen.S 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:10:06.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/kernel/entry_32-xen.S 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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
@@ -600,8 +600,8 @@ Acked-by: jbeulich@novell.com
+#include "syscall_table_32.S"
syscall_table_size=(.-sys_call_table)
---- head-2011-06-30.orig/arch/x86/kernel/entry_64-xen.S 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/entry_64-xen.S 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/entry_64-xen.S 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/entry_64-xen.S 2011-01-31 17:56:27.000000000 +0100
@@ -57,7 +57,7 @@
#include <xen/interface/arch-x86_64.h>
#include <xen/interface/features.h>
@@ -675,8 +675,8 @@ Acked-by: jbeulich@novell.com
call do_exit
CFI_ENDPROC
ENDPROC(child_rip)
---- head-2011-06-30.orig/arch/x86/kernel/fixup.c 2008-01-28 12:24:18.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/fixup.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/fixup.c 2008-01-28 12:24:18.000000000 +0100
++++ head-2011-07-21/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>
@@ -686,8 +686,8 @@ Acked-by: jbeulich@novell.com
fastcall void do_fixup_4gb_segment(struct pt_regs *regs, long error_code)
{
---- head-2011-06-30.orig/arch/x86/kernel/head64-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/head64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/head64-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/head64-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * linux/arch/x86_64/kernel/head64.c -- prepare to run common code
@@ -744,8 +744,8 @@ Acked-by: jbeulich@novell.com
#endif
early_printk("Kernel alive\n");
---- head-2011-06-30.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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)
@@ -936,8 +936,8 @@ Acked-by: jbeulich@novell.com
#endif /* CONFIG_ACPI */
static int __init parse_disable_timer_pin_1(char *arg)
---- head-2011-06-30.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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>
@@ -1181,8 +1181,8 @@ Acked-by: jbeulich@novell.com
#endif
#endif /* !CONFIG_XEN */
+
---- head-2011-06-30.orig/arch/x86/kernel/ioport_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/ioport_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/ioport_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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
@@ -1190,8 +1190,8 @@ Acked-by: jbeulich@novell.com
* This contains the io-permission bitmap code - written by obz, with changes
* by Linus.
*/
---- head-2011-06-30.orig/arch/x86/kernel/ioport_64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/ioport_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/ioport_64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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
@@ -1199,8 +1199,8 @@ Acked-by: jbeulich@novell.com
* This contains the io-permission bitmap code - written by obz, with changes
* by Linus.
*/
---- head-2011-06-30.orig/arch/x86/kernel/ldt_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/ldt_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/ldt_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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
@@ -1262,8 +1262,8 @@ Acked-by: jbeulich@novell.com
out:
return error;
}
---- head-2011-06-30.orig/arch/x86/kernel/ldt_64-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/ldt_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/ldt_64-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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
@@ -1342,8 +1342,8 @@ Acked-by: jbeulich@novell.com
out:
return error;
}
---- head-2011-06-30.orig/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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;
@@ -1393,8 +1393,8 @@ Acked-by: jbeulich@novell.com
*/
for (i = 0; i < 16; i++) {
int idx;
---- head-2011-06-30.orig/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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;
@@ -1459,8 +1459,8 @@ Acked-by: jbeulich@novell.com
processor.mpc_type = MP_PROCESSOR;
processor.mpc_apicid = id;
processor.mpc_apicver = 0;
---- head-2011-06-30.orig/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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>
@@ -1553,8 +1553,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-06-30.orig/arch/x86/kernel/process_32-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/process_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/process_32-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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
@@ -1681,8 +1681,8 @@ Acked-by: jbeulich@novell.com
show_trace(NULL, regs, &regs->esp);
}
---- head-2011-06-30.orig/arch/x86/kernel/process_64-xen.c 2011-02-02 08:31:50.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/process_64-xen.c 2011-02-02 08:32:00.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/process_64-xen.c 2011-02-02 08:31:50.000000000 +0100
++++ head-2011-07-21/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
@@ -1749,8 +1749,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-06-30.orig/arch/x86/kernel/quirks.c 2011-02-28 15:04:15.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/quirks.c 2011-02-28 15:11:55.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/quirks.c 2011-02-28 15:04:15.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/quirks.c 2011-02-28 15:11:55.000000000 +0100
@@ -4,8 +4,6 @@
#include <linux/pci.h>
#include <linux/irq.h>
@@ -1769,8 +1769,8 @@ Acked-by: jbeulich@novell.com
unsigned long force_hpet_address;
static enum {
---- head-2011-06-30.orig/arch/x86/kernel/setup64-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/setup64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/setup64-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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>
@@ -1819,8 +1819,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-06-30.orig/arch/x86/kernel/setup_32-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/setup_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/setup_32-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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
@@ -2077,8 +2077,8 @@ Acked-by: jbeulich@novell.com
#endif
#ifdef CONFIG_ACPI
---- head-2011-06-30.orig/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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
@@ -2528,8 +2528,8 @@ Acked-by: jbeulich@novell.com
return c_start(m, pos);
}
---- head-2011-06-30.orig/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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
@@ -2581,8 +2581,8 @@ Acked-by: jbeulich@novell.com
irq_exit();
if (wait) {
---- head-2011-06-30.orig/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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();
@@ -2789,8 +2789,8 @@ Acked-by: jbeulich@novell.com
irq_exit();
if (wait) {
mb();
---- head-2011-06-30.orig/arch/x86/kernel/time-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/time-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/time-xen.c 2011-07-11 11:22:42.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/time-xen.c 2011-07-11 11:22:52.000000000 +0200
@@ -1,6 +1,4 @@
/*
- * linux/arch/i386/kernel/time.c
@@ -2806,7 +2806,7 @@ Acked-by: jbeulich@novell.com
#include <xen/interface/vcpu.h>
#include <asm/i8253.h>
-@@ -536,6 +535,13 @@ irqreturn_t timer_interrupt(int irq, voi
+@@ -578,6 +577,13 @@ irqreturn_t timer_interrupt(int irq, voi
struct shadow_time_info *shadow = &per_cpu(shadow_time, cpu);
struct vcpu_runstate_info runstate;
@@ -2820,7 +2820,7 @@ Acked-by: jbeulich@novell.com
/*
* Here we are in the timer irq handler. We just have irqs locally
* disabled but we don't know if the timer_bh is running on the other
-@@ -1011,7 +1017,7 @@ static int time_cpufreq_notifier(struct
+@@ -1054,7 +1060,7 @@ static int time_cpufreq_notifier(struct
struct cpufreq_freqs *freq = data;
struct xen_platform_op op;
@@ -2829,7 +2829,7 @@ Acked-by: jbeulich@novell.com
return 0;
if (val == CPUFREQ_PRECHANGE)
-@@ -1049,30 +1055,33 @@ core_initcall(cpufreq_time_setup);
+@@ -1092,30 +1098,33 @@ core_initcall(cpufreq_time_setup);
*/
static ctl_table xen_subtable[] = {
{
@@ -2869,8 +2869,8 @@ Acked-by: jbeulich@novell.com
};
static int __init xen_sysctl_init(void)
{
---- head-2011-06-30.orig/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * linux/arch/i386/traps.c
@@ -3113,8 +3113,8 @@ Acked-by: jbeulich@novell.com
/*
* NB. All these are "trap gates" (i.e. events_mask isn't set) except
---- head-2011-06-30.orig/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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
@@ -3267,8 +3267,8 @@ Acked-by: jbeulich@novell.com
get_debugreg(condition, 6);
if (notify_die(DIE_DEBUG, "debug", regs, condition, error_code,
---- head-2011-06-30.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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
@@ -3358,8 +3358,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-06-30.orig/arch/x86/mm/fault_32-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/fault_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/fault_32-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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>
@@ -3541,8 +3541,8 @@ Acked-by: jbeulich@novell.com
goto no_context;
do_sigbus:
---- head-2011-06-30.orig/arch/x86/mm/fault_64-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/fault_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/fault_64-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/arch/x86/mm/fault_64-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -25,6 +25,7 @@
#include <linux/kprobes.h>
#include <linux/uaccess.h>
@@ -3705,8 +3705,8 @@ Acked-by: jbeulich@novell.com
- return 1;
-}
-__setup("pagefaulttrace", enable_pagefaulttrace);
---- head-2011-06-30.orig/arch/x86/mm/hypervisor.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/hypervisor.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/hypervisor.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/arch/x86/mm/hypervisor.c 2011-01-31 17:56:27.000000000 +0100
@@ -71,8 +71,8 @@ static inline bool use_lazy_mmu_mode(voi
static void multicall_failed(const multicall_entry_t *mc, int rc)
@@ -3796,8 +3796,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-06-30.orig/arch/x86/mm/init_32-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/init_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/init_32-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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)) {
@@ -3880,8 +3880,8 @@ Acked-by: jbeulich@novell.com
}
/*
---- head-2011-06-30.orig/arch/x86/mm/init_64-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/init_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/init_64-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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
@@ -3968,8 +3968,8 @@ Acked-by: jbeulich@novell.com
+ return 0;
+}
+#endif
---- head-2011-06-30.orig/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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>
@@ -4191,8 +4191,8 @@ Acked-by: jbeulich@novell.com
flush_map(&l);
---- head-2011-06-30.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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>
@@ -4219,8 +4219,8 @@ Acked-by: jbeulich@novell.com
{
memset(pmd, 0, PTRS_PER_PMD*sizeof(pmd_t));
}
---- head-2011-06-30.orig/arch/x86/pci/irq-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/pci/irq-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/pci/irq-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/arch/x86/pci/irq-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -173,7 +173,7 @@ void eisa_set_level_irq(unsigned int irq
}
@@ -4317,8 +4317,8 @@ Acked-by: jbeulich@novell.com
{
if (!acer_tm360_irqrouting) {
acer_tm360_irqrouting = 1;
---- head-2011-06-30.orig/arch/x86/pci/pcifront.c 2009-03-18 10:39:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/pci/pcifront.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/pci/pcifront.c 2009-03-18 10:39:31.000000000 +0100
++++ head-2011-07-21/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;
@@ -4328,8 +4328,8 @@ Acked-by: jbeulich@novell.com
/* Copied from arch/i386/pci/common.c */
pci_cache_line_size = 32 >> 2;
---- head-2011-06-30.orig/drivers/acpi/processor_core.c 2011-06-30 15:04:12.000000000 +0200
-+++ head-2011-06-30/drivers/acpi/processor_core.c 2011-06-30 16:32:20.000000000 +0200
+--- head-2011-07-21.orig/drivers/acpi/processor_core.c 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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;
@@ -4352,8 +4352,8 @@ Acked-by: jbeulich@novell.com
/* In UP kernel, only processor 0 is valid */
if (apic_id == 0)
return apic_id;
---- head-2011-06-30.orig/drivers/acpi/processor_extcntl.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-06-30/drivers/acpi/processor_extcntl.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/acpi/processor_extcntl.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-07-21/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;
@@ -4363,8 +4363,8 @@ Acked-by: jbeulich@novell.com
break;
}
---- head-2011-06-30.orig/drivers/acpi/processor_idle.c 2011-04-13 11:25:29.000000000 +0200
-+++ head-2011-06-30/drivers/acpi/processor_idle.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/acpi/processor_idle.c 2011-04-13 11:25:29.000000000 +0200
++++ head-2011-07-21/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;
@@ -4380,8 +4380,8 @@ Acked-by: jbeulich@novell.com
cpuidle_pause_and_lock();
cpuidle_disable_device(&pr->power.dev);
acpi_processor_get_power_info(pr);
---- head-2011-06-30.orig/drivers/char/tpm/tpm_xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/drivers/char/tpm/tpm_xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/char/tpm/tpm_xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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)
@@ -4394,8 +4394,8 @@ Acked-by: jbeulich@novell.com
#define GRANT_INVALID_REF 0
---- head-2011-06-30.orig/drivers/cpuidle/Kconfig 2008-04-17 04:49:44.000000000 +0200
-+++ head-2011-06-30/drivers/cpuidle/Kconfig 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/cpuidle/Kconfig 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/drivers/cpuidle/Kconfig 2011-01-31 17:56:27.000000000 +0100
@@ -1,6 +1,7 @@
config CPU_IDLE
@@ -4404,8 +4404,8 @@ Acked-by: jbeulich@novell.com
default ACPI
help
CPU idle is a generic framework for supporting software-controlled
---- head-2011-06-30.orig/drivers/dma/Kconfig 2011-06-30 15:04:12.000000000 +0200
-+++ head-2011-06-30/drivers/dma/Kconfig 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/dma/Kconfig 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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
@@ -4415,15 +4415,15 @@ Acked-by: jbeulich@novell.com
select ASYNC_TX_DISABLE_PQ_VAL_DMA
select ASYNC_TX_DISABLE_XOR_VAL_DMA
help
---- head-2011-06-30.orig/drivers/dma/ioat/Makefile 2011-01-05 01:50:19.000000000 +0100
-+++ head-2011-06-30/drivers/dma/ioat/Makefile 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/dma/ioat/Makefile 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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-06-30.orig/drivers/dma/ioat/dca.c 2009-12-03 04:51:21.000000000 +0100
-+++ head-2011-06-30/drivers/dma/ioat/dca.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/dma/ioat/dca.c 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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;
@@ -4440,8 +4440,8 @@ Acked-by: jbeulich@novell.com
+ free_dca_provider(device->dca);
+ device->dca = NULL;
+}
---- head-2011-06-30.orig/drivers/dma/ioat/dma.h 2010-10-20 22:30:22.000000000 +0200
-+++ head-2011-06-30/drivers/dma/ioat/dma.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/dma/ioat/dma.h 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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;
@@ -4465,8 +4465,8 @@ Acked-by: jbeulich@novell.com
+#endif
+
#endif /* IOATDMA_H */
---- head-2011-06-30.orig/drivers/dma/ioat/pci.c 2010-08-02 00:11:14.000000000 +0200
-+++ head-2011-06-30/drivers/dma/ioat/pci.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/dma/ioat/pci.c 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/drivers/dma/ioat/pci.c 2011-01-31 17:56:27.000000000 +0100
@@ -29,7 +29,6 @@
#include <linux/module.h>
#include <linux/pci.h>
@@ -4488,8 +4488,8 @@ Acked-by: jbeulich@novell.com
ioat_dma_remove(device);
}
---- head-2011-06-30.orig/drivers/firmware/dell_rbu.c 2011-04-13 11:25:29.000000000 +0200
-+++ head-2011-06-30/drivers/firmware/dell_rbu.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/firmware/dell_rbu.c 2011-04-13 11:25:29.000000000 +0200
++++ head-2011-07-21/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,
@@ -4502,8 +4502,8 @@ Acked-by: jbeulich@novell.com
retval = -ENOMEM;
spin_lock(&rbu_data.lock);
goto out_alloc_packet_array;
---- head-2011-06-30.orig/drivers/hwmon/coretemp-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/drivers/hwmon/coretemp-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/hwmon/coretemp-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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;
@@ -4557,8 +4557,8 @@ Acked-by: jbeulich@novell.com
/* supported CPU not found, but report the unknown
family 6 CPU */
---- head-2011-06-30.orig/drivers/oprofile/cpu_buffer.c 2011-04-13 12:22:07.000000000 +0200
-+++ head-2011-06-30/drivers/oprofile/cpu_buffer.c 2011-04-13 12:44:01.000000000 +0200
+--- head-2011-07-21.orig/drivers/oprofile/cpu_buffer.c 2011-04-13 12:22:07.000000000 +0200
++++ head-2011-07-21/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);
}
@@ -4599,8 +4599,8 @@ 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-06-30.orig/drivers/pci/msi-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/drivers/pci/msi-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/pci/msi-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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
map_irq.pirq : evtchn_map_pirq(-1, map_irq.pirq));
}
@@ -4659,8 +4659,8 @@ Acked-by: jbeulich@novell.com
dev->msix_enabled = 0;
}
EXPORT_SYMBOL(pci_disable_msix);
---- head-2011-06-30.orig/drivers/xen/balloon/balloon.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/drivers/xen/balloon/balloon.c 2011-03-23 08:52:11.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/balloon/balloon.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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)
@@ -4692,8 +4692,8 @@ Acked-by: jbeulich@novell.com
return NOTIFY_DONE;
}
---- head-2011-06-30.orig/drivers/xen/blkback/blkback.c 2011-04-11 14:51:40.000000000 +0200
-+++ head-2011-06-30/drivers/xen/blkback/blkback.c 2011-04-11 15:01:24.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/blkback/blkback.c 2011-04-11 14:51:40.000000000 +0200
++++ head-2011-07-21/drivers/xen/blkback/blkback.c 2011-04-11 15:01:24.000000000 +0200
@@ -278,13 +278,10 @@ static void __end_block_io_op(pending_re
}
}
@@ -4718,8 +4718,8 @@ Acked-by: jbeulich@novell.com
return -ENOMEM;
}
---- head-2011-06-30.orig/drivers/xen/blkback/blkback-pagemap.c 2009-06-09 15:01:37.000000000 +0200
-+++ head-2011-06-30/drivers/xen/blkback/blkback-pagemap.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/blkback/blkback-pagemap.c 2009-06-09 15:01:37.000000000 +0200
++++ head-2011-07-21/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;
@@ -4749,8 +4749,8 @@ Acked-by: jbeulich@novell.com
BUG();
}
---- head-2011-06-30.orig/drivers/xen/blkback/vbd.c 2011-06-30 15:37:44.000000000 +0200
-+++ head-2011-06-30/drivers/xen/blkback/vbd.c 2011-06-30 16:32:27.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/blkback/vbd.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-07-21/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);
@@ -4791,8 +4791,8 @@ Acked-by: jbeulich@novell.com
return;
abort:
xenbus_transaction_end(xbt, 1);
---- head-2011-06-30.orig/drivers/xen/blkback/xenbus.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/drivers/xen/blkback/xenbus.c 2011-06-30 16:32:30.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/blkback/xenbus.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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) &&
@@ -4832,8 +4832,8 @@ Acked-by: jbeulich@novell.com
kfree(protocol);
/* Map the shared frame, irq etc. */
---- head-2011-06-30.orig/drivers/xen/blkfront/blkfront.c 2011-06-30 16:10:17.000000000 +0200
-+++ head-2011-06-30/drivers/xen/blkfront/blkfront.c 2011-06-30 16:32:34.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/blkfront/blkfront.c 2011-07-21 12:08:17.000000000 +0200
++++ head-2011-07-21/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);
@@ -4853,7 +4853,7 @@ Acked-by: jbeulich@novell.com
set_capacity(info->gd, sectors);
/* fall through */
-@@ -590,8 +589,6 @@ int blkif_ioctl(struct inode *inode, str
+@@ -589,8 +588,6 @@ int blkif_ioctl(struct inode *inode, str
}
}
@@ -4862,7 +4862,7 @@ Acked-by: jbeulich@novell.com
return -EINVAL; /* same return as native Linux */
}
-@@ -666,9 +663,8 @@ static int blkif_queue_request(struct re
+@@ -665,9 +662,8 @@ static int blkif_queue_request(struct re
ring_req->nr_segments = blk_rq_map_sg(req->q, req, info->sg);
BUG_ON(ring_req->nr_segments > BLKIF_MAX_SEGMENTS_PER_REQUEST);
@@ -4874,7 +4874,7 @@ Acked-by: jbeulich@novell.com
fsect = sg->offset >> 9;
lsect = fsect + (sg->length >> 9) - 1;
/* install a grant reference. */
-@@ -784,8 +780,9 @@ static irqreturn_t blkif_int(int irq, vo
+@@ -783,8 +779,9 @@ static irqreturn_t blkif_int(int irq, vo
switch (bret->operation) {
case BLKIF_OP_WRITE_BARRIER:
if (unlikely(bret->status == BLKIF_RSP_EOPNOTSUPP)) {
@@ -4886,8 +4886,8 @@ Acked-by: jbeulich@novell.com
uptodate = -EOPNOTSUPP;
info->feature_barrier = 0;
xlvbd_barrier(info);
---- head-2011-06-30.orig/drivers/xen/blkfront/block.h 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/drivers/xen/blkfront/block.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/blkfront/block.h 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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)
@@ -4897,8 +4897,8 @@ Acked-by: jbeulich@novell.com
#else
#define DPRINTK_IOCTL(_f, _a...) ((void)0)
#endif
---- head-2011-06-30.orig/drivers/xen/blkfront/vbd.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/drivers/xen/blkfront/vbd.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/blkfront/vbd.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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;
}
@@ -4939,8 +4939,8 @@ Acked-by: jbeulich@novell.com
return -ENOSYS;
}
#endif
---- head-2011-06-30.orig/drivers/xen/blktap/blktap.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/drivers/xen/blktap/blktap.c 2011-04-11 15:01:34.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/blktap/blktap.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/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:
{
@@ -4952,8 +4952,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-06-30.orig/drivers/xen/blktap/common.h 2011-04-11 14:51:59.000000000 +0200
-+++ head-2011-06-30/drivers/xen/blktap/common.h 2011-04-11 15:01:35.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/blktap/common.h 2011-04-11 14:51:59.000000000 +0200
++++ head-2011-07-21/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 )
@@ -4963,8 +4963,8 @@ Acked-by: jbeulich@novell.com
struct backend_info;
---- head-2011-06-30.orig/drivers/xen/blktap/xenbus.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/drivers/xen/blktap/xenbus.c 2011-06-30 16:32:38.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/blktap/xenbus.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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:
@@ -4990,8 +4990,8 @@ Acked-by: jbeulich@novell.com
kfree(protocol);
/* Map the shared frame, irq etc. */
---- head-2011-06-30.orig/drivers/xen/blktap2/control.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/drivers/xen/blktap2/control.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/blktap2/control.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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);
@@ -5000,8 +5000,8 @@ Acked-by: jbeulich@novell.com
init_waitqueue_head(&tap->wq);
atomic_set(&tap->refcnt, 0);
---- head-2011-06-30.orig/drivers/xen/blktap2/device.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/drivers/xen/blktap2/device.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/blktap2/device.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/drivers/xen/blktap2/device.c 2011-01-31 17:56:27.000000000 +0100
@@ -16,7 +16,7 @@
#include "../blkback/blkback-pagemap.h"
@@ -5055,8 +5055,8 @@ Acked-by: jbeulich@novell.com
goto out;
}
---- head-2011-06-30.orig/drivers/xen/console/console.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/drivers/xen/console/console.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/console/console.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/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);
@@ -5083,8 +5083,8 @@ Acked-by: jbeulich@novell.com
return 0;
}
---- head-2011-06-30.orig/drivers/xen/console/xencons_ring.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-06-30/drivers/xen/console/xencons_ring.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/console/xencons_ring.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-07-21/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);
@@ -5094,8 +5094,8 @@ Acked-by: jbeulich@novell.com
return irq;
}
---- head-2011-06-30.orig/drivers/xen/core/cpu_hotplug.c 2011-01-24 12:06:05.000000000 +0100
-+++ head-2011-06-30/drivers/xen/core/cpu_hotplug.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/core/cpu_hotplug.c 2011-01-24 12:06:05.000000000 +0100
++++ head-2011-07-21/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);
@@ -5145,8 +5145,8 @@ Acked-by: jbeulich@novell.com
rc = -EBUSY;
}
} else if (!cpu_isset(cpu, local_allowed_cpumask) ||
---- head-2011-06-30.orig/drivers/xen/core/evtchn.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-06-30/drivers/xen/core/evtchn.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/core/evtchn.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-07-21/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) {
@@ -5179,16 +5179,16 @@ Acked-by: jbeulich@novell.com
irq, type_from_irq(irq), index_from_irq(irq), xen_pirq);
return -EINVAL;
}
---- head-2011-06-30.orig/drivers/xen/core/firmware.c 2007-06-22 09:08:06.000000000 +0200
-+++ head-2011-06-30/drivers/xen/core/firmware.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/core/firmware.c 2007-06-22 09:08:06.000000000 +0200
++++ head-2011-07-21/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-06-30.orig/drivers/xen/core/gnttab.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/drivers/xen/core/gnttab.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/core/gnttab.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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);
@@ -5198,8 +5198,8 @@ Acked-by: jbeulich@novell.com
return -1;
}
}
---- head-2011-06-30.orig/drivers/xen/core/machine_kexec.c 2009-07-13 14:25:35.000000000 +0200
-+++ head-2011-06-30/drivers/xen/core/machine_kexec.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/core/machine_kexec.c 2009-07-13 14:25:35.000000000 +0200
++++ head-2011-07-21/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;
@@ -5239,8 +5239,8 @@ Acked-by: jbeulich@novell.com
void machine_shutdown(void)
{
/* do nothing */
---- head-2011-06-30.orig/drivers/xen/core/machine_reboot.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/drivers/xen/core/machine_reboot.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/core/machine_reboot.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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__)
@@ -5251,8 +5251,8 @@ Acked-by: jbeulich@novell.com
return -EOPNOTSUPP;
}
#endif
---- head-2011-06-30.orig/drivers/xen/core/reboot.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/drivers/xen/core/reboot.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/core/reboot.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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));
@@ -5335,8 +5335,8 @@ Acked-by: jbeulich@novell.com
return err;
}
---- head-2011-06-30.orig/drivers/xen/core/smpboot.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/drivers/xen/core/smpboot.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/core/smpboot.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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 *);
@@ -5484,8 +5484,8 @@ Acked-by: jbeulich@novell.com
cpu_set(cpu, cpu_online_map);
---- head-2011-06-30.orig/drivers/xen/fbfront/xenfb.c 2011-02-17 10:08:20.000000000 +0100
-+++ head-2011-06-30/drivers/xen/fbfront/xenfb.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/fbfront/xenfb.c 2011-02-17 10:08:20.000000000 +0100
++++ head-2011-07-21/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);
@@ -5497,8 +5497,8 @@ Acked-by: jbeulich@novell.com
WARN_ON(1);
}
xenfb_do_update(info, x1, y1, x2 - x1, y2 - y1);
---- head-2011-06-30.orig/drivers/xen/fbfront/xenkbd.c 2011-05-23 11:08:11.000000000 +0200
-+++ head-2011-06-30/drivers/xen/fbfront/xenkbd.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/fbfront/xenkbd.c 2011-05-23 11:08:11.000000000 +0200
++++ head-2011-07-21/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);
@@ -5510,8 +5510,8 @@ Acked-by: jbeulich@novell.com
break;
case XENKBD_TYPE_POS:
if (event->pos.rel_z)
---- head-2011-06-30.orig/drivers/xen/gntdev/gntdev.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-06-30/drivers/xen/gntdev/gntdev.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/gntdev/gntdev.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-07-21/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;
@@ -5724,8 +5724,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-06-30.orig/drivers/xen/netback/common.h 2011-04-11 14:52:16.000000000 +0200
-+++ head-2011-06-30/drivers/xen/netback/common.h 2011-04-11 15:01:09.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/netback/common.h 2011-04-11 14:52:16.000000000 +0200
++++ head-2011-07-21/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, \
@@ -5739,8 +5739,8 @@ Acked-by: jbeulich@novell.com
typedef struct netif_st {
/* Unique identifier for this interface. */
---- head-2011-06-30.orig/drivers/xen/netback/interface.c 2011-04-11 14:38:22.000000000 +0200
-+++ head-2011-06-30/drivers/xen/netback/interface.c 2011-04-11 15:01:11.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/netback/interface.c 2011-04-11 14:38:22.000000000 +0200
++++ head-2011-07-21/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) },
};
@@ -5766,8 +5766,8 @@ Acked-by: jbeulich@novell.com
.get_ethtool_stats = netbk_get_ethtool_stats,
.get_strings = netbk_get_strings,
};
---- head-2011-06-30.orig/drivers/xen/netback/netback.c 2011-04-11 14:38:25.000000000 +0200
-+++ head-2011-06-30/drivers/xen/netback/netback.c 2011-04-11 15:01:12.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/netback/netback.c 2011-04-11 14:38:25.000000000 +0200
++++ head-2011-07-21/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;
@@ -5833,8 +5833,8 @@ Acked-by: jbeulich@novell.com
return -ENOMEM;
}
---- head-2011-06-30.orig/drivers/xen/netback/xenbus.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/drivers/xen/netback/xenbus.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/netback/xenbus.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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.
@@ -5885,8 +5885,8 @@ Acked-by: jbeulich@novell.com
xenbus_switch_state(dev, XenbusStateInitWait);
}
break;
---- head-2011-06-30.orig/drivers/xen/netfront/accel.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/drivers/xen/netfront/accel.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/netfront/accel.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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, \
@@ -5936,8 +5936,8 @@ Acked-by: jbeulich@novell.com
}
---- head-2011-06-30.orig/drivers/xen/netfront/netfront.c 2011-06-30 16:06:26.000000000 +0200
-+++ head-2011-06-30/drivers/xen/netfront/netfront.c 2011-06-30 16:32:46.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/netfront/netfront.c 2011-06-30 16:06:26.000000000 +0200
++++ head-2011-07-21/drivers/xen/netfront/netfront.c 2011-06-30 16:32:46.000000000 +0200
@@ -207,10 +207,8 @@ static inline grant_ref_t xennet_get_rx_
#define DPRINTK(fmt, args...) \
pr_debug("netfront (%s:%d) " fmt, \
@@ -6170,8 +6170,8 @@ Acked-by: jbeulich@novell.com
SET_NETDEV_DEV(netdev, &dev->dev);
np->netdev = netdev;
---- head-2011-06-30.orig/drivers/xen/netfront/netfront.h 2011-02-09 15:54:19.000000000 +0100
-+++ head-2011-06-30/drivers/xen/netfront/netfront.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/netfront/netfront.h 2011-02-09 15:54:19.000000000 +0100
++++ head-2011-07-21/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;
@@ -6181,8 +6181,8 @@ Acked-by: jbeulich@novell.com
unsigned int irq;
unsigned int copying_receiver;
unsigned int carrier;
---- head-2011-06-30.orig/drivers/xen/pciback/Makefile 2008-07-21 11:00:33.000000000 +0200
-+++ head-2011-06-30/drivers/xen/pciback/Makefile 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/pciback/Makefile 2008-07-21 11:00:33.000000000 +0200
++++ head-2011-07-21/drivers/xen/pciback/Makefile 2011-01-31 17:56:27.000000000 +0100
@@ -12,6 +12,4 @@ pciback-$(CONFIG_XEN_PCIDEV_BACKEND_SLOT
pciback-$(CONFIG_XEN_PCIDEV_BACKEND_PASS) += passthrough.o
pciback-$(CONFIG_XEN_PCIDEV_BACKEND_CONTROLLER) += controller.o
@@ -6191,8 +6191,8 @@ Acked-by: jbeulich@novell.com
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_XEN_PCIDEV_BE_DEBUG) += -DDEBUG
---- head-2011-06-30.orig/drivers/xen/pciback/conf_space_capability_msi.c 2008-09-15 13:40:15.000000000 +0200
-+++ head-2011-06-30/drivers/xen/pciback/conf_space_capability_msi.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/pciback/conf_space_capability_msi.c 2008-09-15 13:40:15.000000000 +0200
++++ head-2011-07-21/drivers/xen/pciback/conf_space_capability_msi.c 2011-01-31 17:56:27.000000000 +0100
@@ -17,7 +17,8 @@ int pciback_enable_msi(struct pciback_de
status = pci_enable_msi(dev);
@@ -6203,8 +6203,8 @@ Acked-by: jbeulich@novell.com
op->value = 0;
return XEN_PCI_ERR_op_failed;
}
---- head-2011-06-30.orig/drivers/xen/pciback/conf_space_header.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/drivers/xen/pciback/conf_space_header.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/pciback/conf_space_header.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/drivers/xen/pciback/conf_space_header.c 2011-01-31 17:56:27.000000000 +0100
@@ -69,9 +69,9 @@ static int command_write(struct pci_dev
pci_name(dev));
err = pci_set_mwi(dev);
@@ -6260,8 +6260,8 @@ Acked-by: jbeulich@novell.com
pci_name(dev), dev->hdr_type);
break;
}
---- head-2011-06-30.orig/drivers/xen/pciback/pci_stub.c 2011-03-02 12:00:16.000000000 +0100
-+++ head-2011-06-30/drivers/xen/pciback/pci_stub.c 2011-03-11 10:55:55.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/pciback/pci_stub.c 2011-03-02 12:00:16.000000000 +0100
++++ head-2011-07-21/drivers/xen/pciback/pci_stub.c 2011-03-11 10:55:55.000000000 +0100
@@ -470,15 +470,15 @@ static void pcistub_remove(struct pci_de
found_psdev->pdev);
@@ -6296,8 +6296,8 @@ Acked-by: jbeulich@novell.com
pci_devs_to_hide + pos);
return -EINVAL;
}
---- head-2011-06-30.orig/drivers/xen/pciback/slot.c 2009-03-18 10:39:32.000000000 +0100
-+++ head-2011-06-30/drivers/xen/pciback/slot.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/pciback/slot.c 2009-03-18 10:39:32.000000000 +0100
++++ head-2011-07-21/drivers/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++) {
@@ -6311,8 +6311,8 @@ Acked-by: jbeulich@novell.com
slot_dev->slots[bus][slot] = dev;
goto unlock;
}
---- head-2011-06-30.orig/drivers/xen/pciback/vpci.c 2011-06-30 15:37:44.000000000 +0200
-+++ head-2011-06-30/drivers/xen/pciback/vpci.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/pciback/vpci.c 2011-06-30 15:37:44.000000000 +0200
++++ head-2011-07-21/drivers/xen/pciback/vpci.c 2011-01-31 17:56:27.000000000 +0100
@@ -111,9 +111,9 @@ int pciback_add_pci_dev(struct pciback_d
/* Assign to a new slot on the virtual PCI bus */
for (slot = 0; slot < PCI_SLOT_MAX; slot++) {
@@ -6326,8 +6326,8 @@ Acked-by: jbeulich@novell.com
list_add_tail(&dev_entry->list,
&vpci_dev->dev_list[slot]);
func = PCI_FUNC(dev->devfn);
---- head-2011-06-30.orig/drivers/xen/pciback/xenbus.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/drivers/xen/pciback/xenbus.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/pciback/xenbus.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/drivers/xen/pciback/xenbus.c 2011-01-31 17:56:27.000000000 +0100
@@ -695,8 +695,7 @@ int __init pciback_xenbus_register(void)
return -ENODEV;
pciback_wq = create_workqueue("pciback_workqueue");
@@ -6338,8 +6338,8 @@ Acked-by: jbeulich@novell.com
return -EFAULT;
}
return xenbus_register_backend(&xenbus_pciback_driver);
---- head-2011-06-30.orig/drivers/xen/pcifront/Makefile 2007-06-12 13:13:45.000000000 +0200
-+++ head-2011-06-30/drivers/xen/pcifront/Makefile 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/pcifront/Makefile 2007-06-12 13:13:45.000000000 +0200
++++ head-2011-07-21/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
@@ -6348,8 +6348,8 @@ Acked-by: jbeulich@novell.com
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_XEN_PCIDEV_FE_DEBUG) += -DDEBUG
---- head-2011-06-30.orig/drivers/xen/pcifront/pci_op.c 2011-01-31 17:32:16.000000000 +0100
-+++ head-2011-06-30/drivers/xen/pcifront/pci_op.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/pcifront/pci_op.c 2011-01-31 17:32:16.000000000 +0100
++++ head-2011-07-21/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 */
@@ -6433,8 +6433,8 @@ Acked-by: jbeulich@novell.com
}
#endif /* CONFIG_PCI_MSI */
---- head-2011-06-30.orig/drivers/xen/scsiback/emulate.c 2011-02-02 12:19:11.000000000 +0100
-+++ head-2011-06-30/drivers/xen/scsiback/emulate.c 2011-02-08 10:04:09.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/scsiback/emulate.c 2011-02-02 12:19:11.000000000 +0100
++++ head-2011-07-21/drivers/xen/scsiback/emulate.c 2011-02-08 10:04:09.000000000 +0100
@@ -114,9 +114,10 @@ static void resp_not_supported_cmd(pendi
}
@@ -6538,8 +6538,8 @@ Acked-by: jbeulich@novell.com
goto fail;
}
---- head-2011-06-30.orig/drivers/xen/scsiback/interface.c 2011-04-11 14:52:22.000000000 +0200
-+++ head-2011-06-30/drivers/xen/scsiback/interface.c 2011-04-11 15:00:59.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/scsiback/interface.c 2011-04-11 14:52:22.000000000 +0200
++++ head-2011-07-21/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;
@@ -6558,8 +6558,8 @@ Acked-by: jbeulich@novell.com
return -ENOMEM;
}
---- head-2011-06-30.orig/drivers/xen/scsiback/scsiback.c 2011-04-11 14:30:08.000000000 +0200
-+++ head-2011-06-30/drivers/xen/scsiback/scsiback.c 2011-04-11 15:01:00.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/scsiback/scsiback.c 2011-04-11 14:30:08.000000000 +0200
++++ head-2011-07-21/drivers/xen/scsiback/scsiback.c 2011-04-11 15:01:00.000000000 +0200
@@ -204,14 +204,14 @@ static void scsiback_print_status(char *
{
struct scsi_device *sdev = pending_req->sdev;
@@ -6738,8 +6738,8 @@ Acked-by: jbeulich@novell.com
return -ENOMEM;
}
---- head-2011-06-30.orig/drivers/xen/scsiback/translate.c 2008-07-21 11:00:33.000000000 +0200
-+++ head-2011-06-30/drivers/xen/scsiback/translate.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/scsiback/translate.c 2008-07-21 11:00:33.000000000 +0200
++++ head-2011-07-21/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) &&
@@ -6760,8 +6760,8 @@ Acked-by: jbeulich@novell.com
err = -ENOMEM;
goto out;
}
---- head-2011-06-30.orig/drivers/xen/scsiback/xenbus.c 2011-06-30 16:05:16.000000000 +0200
-+++ head-2011-06-30/drivers/xen/scsiback/xenbus.c 2011-06-30 16:32:56.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/scsiback/xenbus.c 2011-06-30 16:05:16.000000000 +0200
++++ head-2011-07-21/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);
@@ -6819,8 +6819,8 @@ Acked-by: jbeulich@novell.com
scsiback_remove(dev);
return err;
---- head-2011-06-30.orig/drivers/xen/scsifront/scsifront.c 2011-02-08 10:03:55.000000000 +0100
-+++ head-2011-06-30/drivers/xen/scsifront/scsifront.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/scsifront/scsifront.c 2011-02-08 10:03:55.000000000 +0100
++++ head-2011-07-21/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(
@@ -6901,8 +6901,8 @@ Acked-by: jbeulich@novell.com
off = 0;
ref_cnt++;
}
---- head-2011-06-30.orig/drivers/xen/scsifront/xenbus.c 2011-02-08 10:03:46.000000000 +0100
-+++ head-2011-06-30/drivers/xen/scsifront/xenbus.c 2011-02-08 10:04:06.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/scsifront/xenbus.c 2011-02-08 10:03:46.000000000 +0100
++++ head-2011-07-21/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);
@@ -6930,8 +6930,8 @@ Acked-by: jbeulich@novell.com
scsi_device_put(sdev);
xenbus_printf(XBT_NIL, dev->nodename,
state_str, "%d", XenbusStateClosed);
---- head-2011-06-30.orig/drivers/xen/sfc_netback/accel_fwd.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/drivers/xen/sfc_netback/accel_fwd.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/sfc_netback/accel_fwd.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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);
@@ -6986,8 +6986,8 @@ Acked-by: jbeulich@novell.com
spin_lock_irqsave(&fwd_set->fwd_lock, flags);
/*
---- head-2011-06-30.orig/drivers/xen/sfc_netback/accel_msg.c 2008-02-20 09:32:49.000000000 +0100
-+++ head-2011-06-30/drivers/xen/sfc_netback/accel_msg.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/sfc_netback/accel_msg.c 2008-02-20 09:32:49.000000000 +0100
++++ head-2011-07-21/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;
@@ -7002,8 +7002,8 @@ Acked-by: jbeulich@novell.com
msg = net_accel_msg_start_send(bend->shared_page, &bend->to_domU,
&lock_state);
---- head-2011-06-30.orig/drivers/xen/sfc_netfront/accel_msg.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-06-30/drivers/xen/sfc_netfront/accel_msg.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/sfc_netfront/accel_msg.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-07-21/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);
@@ -7084,8 +7084,8 @@ Acked-by: jbeulich@novell.com
}
else {
spin_unlock_irqrestore(&vnic->irq_enabled_lock, flags);
---- head-2011-06-30.orig/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 16:06:37.000000000 +0200
-+++ head-2011-06-30/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 16:33:02.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 16:06:37.000000000 +0200
++++ head-2011-07-21/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);
@@ -7112,8 +7112,8 @@ Acked-by: jbeulich@novell.com
if (ip->protocol == IPPROTO_TCP) {
struct tcphdr *tcp = (struct tcphdr *)
---- head-2011-06-30.orig/drivers/xen/sfc_netutil/accel_msg_iface.c 2008-02-20 09:32:49.000000000 +0100
-+++ head-2011-06-30/drivers/xen/sfc_netutil/accel_msg_iface.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/sfc_netutil/accel_msg_iface.c 2008-02-20 09:32:49.000000000 +0100
++++ head-2011-07-21/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) \
@@ -7123,8 +7123,8 @@ Acked-by: jbeulich@novell.com
__FUNCTION__, _p); \
return _errval; \
}
---- head-2011-06-30.orig/drivers/xen/sfc_netutil/accel_util.h 2008-02-20 09:32:49.000000000 +0100
-+++ head-2011-06-30/drivers/xen/sfc_netutil/accel_util.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/sfc_netutil/accel_util.h 2008-02-20 09:32:49.000000000 +0100
++++ head-2011-07-21/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)
@@ -7135,8 +7135,8 @@ Acked-by: jbeulich@novell.com
#include <xen/xenbus.h>
/*! Map a set of pages from another domain
---- head-2011-06-30.orig/drivers/xen/tpmback/interface.c 2011-04-11 14:52:30.000000000 +0200
-+++ head-2011-06-30/drivers/xen/tpmback/interface.c 2011-04-11 15:00:49.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/tpmback/interface.c 2011-04-11 14:52:30.000000000 +0200
++++ head-2011-07-21/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)
@@ -7146,8 +7146,8 @@ Acked-by: jbeulich@novell.com
return ERR_PTR(-ENOMEM);
}
---- head-2011-06-30.orig/drivers/xen/tpmback/tpmback.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-06-30/drivers/xen/tpmback/tpmback.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/tpmback/tpmback.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-07-21/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;
@@ -7167,8 +7167,8 @@ Acked-by: jbeulich@novell.com
return 0;
}
---- head-2011-06-30.orig/drivers/xen/usbback/usbback.c 2011-04-11 14:30:35.000000000 +0200
-+++ head-2011-06-30/drivers/xen/usbback/usbback.c 2011-04-11 15:00:38.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/usbback/usbback.c 2011-04-11 14:30:35.000000000 +0200
++++ head-2011-07-21/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;
@@ -7308,8 +7308,8 @@ Acked-by: jbeulich@novell.com
usbif->xenusbd = NULL;
usbif_put(usbif);
---- head-2011-06-30.orig/drivers/xen/usbback/usbstub.c 2011-03-11 10:54:35.000000000 +0100
-+++ head-2011-06-30/drivers/xen/usbback/usbstub.c 2011-03-11 10:55:46.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/usbback/usbstub.c 2011-03-11 10:54:35.000000000 +0100
++++ head-2011-07-21/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);
@@ -7328,8 +7328,8 @@ Acked-by: jbeulich@novell.com
goto out;
}
---- head-2011-06-30.orig/drivers/xen/usbback/xenbus.c 2011-06-30 16:05:31.000000000 +0200
-+++ head-2011-06-30/drivers/xen/usbback/xenbus.c 2011-06-30 16:33:08.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/usbback/xenbus.c 2011-06-30 16:05:31.000000000 +0200
++++ head-2011-07-21/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;
}
@@ -7354,8 +7354,8 @@ Acked-by: jbeulich@novell.com
xenbus_switch_state(dev, XenbusStateInitWait);
}
break;
---- head-2011-06-30.orig/drivers/xen/usbfront/usbfront.h 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-06-30/drivers/xen/usbfront/usbfront.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/usbfront/usbfront.h 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-07-21/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 */
@@ -7364,8 +7364,8 @@ Acked-by: jbeulich@novell.com
unsigned unlinked:1; /* dequeued marker */
};
---- head-2011-06-30.orig/drivers/xen/usbfront/usbfront-dbg.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-06-30/drivers/xen/usbfront/usbfront-dbg.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/usbfront/usbfront-dbg.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-07-21/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;
@@ -7377,8 +7377,8 @@ Acked-by: jbeulich@novell.com
}
static inline void remove_debug_file(struct usbfront_info *info)
---- head-2011-06-30.orig/drivers/xen/usbfront/usbfront-hcd.c 2009-10-15 11:45:41.000000000 +0200
-+++ head-2011-06-30/drivers/xen/usbfront/usbfront-hcd.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/usbfront/usbfront-hcd.c 2009-10-15 11:45:41.000000000 +0200
++++ head-2011-07-21/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
*/
@@ -7412,8 +7412,8 @@ Acked-by: jbeulich@novell.com
ret = xenhcd_unlink_urb(info, urbp);
done:
---- head-2011-06-30.orig/drivers/xen/usbfront/usbfront-q.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-06-30/drivers/xen/usbfront/usbfront-q.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/usbfront/usbfront-q.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-07-21/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);
@@ -7433,8 +7433,8 @@ Acked-by: jbeulich@novell.com
spin_lock(&info->lock);
}
---- head-2011-06-30.orig/drivers/xen/usbfront/xenbus.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/drivers/xen/usbfront/xenbus.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/usbfront/xenbus.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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);
@@ -7444,8 +7444,8 @@ Acked-by: jbeulich@novell.com
return -ENOMEM;
}
---- head-2011-06-30.orig/drivers/xen/util.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/drivers/xen/util.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/util.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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");
@@ -7455,8 +7455,8 @@ Acked-by: jbeulich@novell.com
xen_class = NULL;
}
---- head-2011-06-30.orig/drivers/xen/xenbus/xenbus_comms.c 2011-04-11 14:52:53.000000000 +0200
-+++ head-2011-06-30/drivers/xen/xenbus/xenbus_comms.c 2011-04-11 15:00:27.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/xenbus/xenbus_comms.c 2011-04-11 14:52:53.000000000 +0200
++++ head-2011-07-21/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;
@@ -7484,8 +7484,8 @@ Acked-by: jbeulich@novell.com
return err;
}
---- head-2011-06-30.orig/drivers/xen/xenbus/xenbus_probe.c 2011-06-30 16:10:35.000000000 +0200
-+++ head-2011-06-30/drivers/xen/xenbus/xenbus_probe.c 2011-06-30 16:33:16.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/xenbus/xenbus_probe.c 2011-06-30 16:10:35.000000000 +0200
++++ head-2011-07-21/drivers/xen/xenbus/xenbus_probe.c 2011-06-30 16:33:16.000000000 +0200
@@ -112,13 +112,13 @@ static int frontend_bus_id(char bus_id[X
{
nodename = strchr(nodename, '/');
@@ -7706,8 +7706,8 @@ Acked-by: jbeulich@novell.com
seconds_waited += 5;
printk("%us...", 300 - seconds_waited);
if (seconds_waited == 300)
---- head-2011-06-30.orig/drivers/xen/xenbus/xenbus_probe_backend.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/drivers/xen/xenbus/xenbus_probe_backend.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/xenbus/xenbus_probe_backend.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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
@@ -7789,8 +7789,8 @@ Acked-by: jbeulich@novell.com
}
}
---- head-2011-06-30.orig/drivers/xen/xenbus/xenbus_xs.c 2011-06-30 16:10:38.000000000 +0200
-+++ head-2011-06-30/drivers/xen/xenbus/xenbus_xs.c 2011-06-30 16:33:20.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/xenbus/xenbus_xs.c 2011-06-30 16:10:38.000000000 +0200
++++ head-2011-07-21/drivers/xen/xenbus/xenbus_xs.c 2011-06-30 16:33:20.000000000 +0200
@@ -135,9 +135,8 @@ static int get_error(const char *errorst
for (i = 0; strcmp(errorstring, xsd_errors[i].errstring) != 0; i++) {
@@ -7839,8 +7839,8 @@ Acked-by: jbeulich@novell.com
if (kthread_should_stop())
break;
}
---- head-2011-06-30.orig/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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>
@@ -7870,8 +7870,8 @@ Acked-by: jbeulich@novell.com
return ret;
}
---- head-2011-06-30.orig/arch/x86/include/asm/acpi.h 2011-06-30 15:41:07.000000000 +0200
-+++ head-2011-06-30/arch/x86/include/asm/acpi.h 2011-06-30 16:33:29.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/include/asm/acpi.h 2011-06-30 15:41:07.000000000 +0200
++++ head-2011-07-21/arch/x86/include/asm/acpi.h 2011-06-30 16:33:29.000000000 +0200
@@ -153,6 +153,7 @@ static inline int acpi_notify_hypervisor
*/
static inline unsigned int acpi_processor_cstate_check(unsigned int max_cstate)
@@ -7888,8 +7888,8 @@ Acked-by: jbeulich@novell.com
return max_cstate;
}
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/agp.h 2007-06-22 09:08:06.000000000 +0200
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/agp.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/agp.h 2007-06-22 09:08:06.000000000 +0200
++++ head-2011-07-21/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
@@ -7939,15 +7939,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-06-30/arch/x86/include/mach-xen/asm/desc.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/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-06-30.orig/arch/x86/include/mach-xen/asm/desc_64.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/desc_64.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/desc_64.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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();
}
@@ -8004,7 +8004,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-06-30/arch/x86/include/mach-xen/asm/dma-mapping.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/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"
@@ -8012,7 +8012,7 @@ Acked-by: jbeulich@novell.com
+# include "dma-mapping_64.h"
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/fixmap.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/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"
@@ -8020,8 +8020,8 @@ Acked-by: jbeulich@novell.com
+# include "fixmap_64.h"
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/hypercall.h 2011-01-31 17:56:27.000000000 +0100
-@@ -0,0 +1,420 @@
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/hypercall.h 2011-07-20 15:39:42.000000000 +0200
+@@ -0,0 +1,424 @@
+/******************************************************************************
+ * hypercall.h
+ *
@@ -8067,6 +8067,8 @@ Acked-by: jbeulich@novell.com
+
+#if CONFIG_XEN_COMPAT <= 0x030002
+# include <linux/string.h> /* memcpy() */
++# include <xen/interface/event_channel.h>
++# include <xen/interface/physdev.h>
+#endif
+
+#ifdef CONFIG_XEN
@@ -8434,16 +8436,18 @@ Acked-by: jbeulich@novell.com
+ return _hypercall2(int, kexec_op, op, args);
+}
+
++struct tmem_op;
++
+static inline int __must_check
+HYPERVISOR_tmem_op(
+ struct tmem_op *op)
+{
-+ return _hypercall1(int, tmem_op, op);
++ return _hypercall1(int, tmem_op, (void *)op);
+}
+
+#endif /* __HYPERCALL_H__ */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/hypercall_32.h 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/hypercall_32.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/hypercall_32.h 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/hypercall_32.h 2011-01-31 17:56:27.000000000 +0100
@@ -1,191 +1,10 @@
-/******************************************************************************
- * hypercall.h
@@ -8885,8 +8889,8 @@ Acked-by: jbeulich@novell.com
-
-
-#endif /* __HYPERCALL_H__ */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/hypercall_64.h 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/hypercall_64.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/hypercall_64.h 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/hypercall_64.h 2011-01-31 17:56:27.000000000 +0100
@@ -1,198 +1,10 @@
-/******************************************************************************
- * hypercall.h
@@ -9338,17 +9342,22 @@ Acked-by: jbeulich@novell.com
-}
-
-#endif /* __HYPERCALL_H__ */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/hypervisor.h 2011-01-31 17:56:27.000000000 +0100
-@@ -44,6 +44,7 @@
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/hypervisor.h 2011-07-20 15:40:13.000000000 +0200
+@@ -39,11 +39,8 @@
+ #include <linux/errno.h>
+ #include <xen/interface/xen.h>
+ #include <xen/interface/platform.h>
+-#include <xen/interface/event_channel.h>
+-#include <xen/interface/physdev.h>
#include <xen/interface/sched.h>
- #include <xen/interface/nmi.h>
- #include <xen/interface/tmem.h>
+-#include <xen/interface/nmi.h>
+-#include <xen/interface/tmem.h>
+#include <xen/interface/arch-x86/xen-mca.h>
#include <asm/percpu.h>
#include <asm/ptrace.h>
#include <asm/page.h>
-@@ -200,7 +201,6 @@ static inline void xen_multicall_flush(b
+@@ -200,7 +197,6 @@ static inline void xen_multicall_flush(b
extern char hypercall_page[PAGE_SIZE];
#else
extern char *hypercall_stubs;
@@ -9357,7 +9366,7 @@ Acked-by: jbeulich@novell.com
#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/io.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/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"
@@ -9365,15 +9374,15 @@ Acked-by: jbeulich@novell.com
+# include "io_64.h"
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/irqflags.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/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-06-30.orig/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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); \
@@ -9416,8 +9425,8 @@ Acked-by: jbeulich@novell.com
+#endif
+
#endif
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/irqflags_64.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/irqflags_64.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/irqflags_64.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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
})
@@ -9463,7 +9472,7 @@ Acked-by: jbeulich@novell.com
#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/maddr.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/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"
@@ -9471,7 +9480,7 @@ Acked-by: jbeulich@novell.com
+# include "maddr_64.h"
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/mmu_context.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/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"
@@ -9479,7 +9488,7 @@ Acked-by: jbeulich@novell.com
+# include "mmu_context_64.h"
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pci.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/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
@@ -9582,15 +9591,15 @@ Acked-by: jbeulich@novell.com
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pgalloc.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/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-06-30.orig/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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);
}
@@ -9640,15 +9649,15 @@ Acked-by: jbeulich@novell.com
}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pgtable.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/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-06-30.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:38:23.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:38:23.000000000 +0100
++++ head-2011-07-21/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>
@@ -9670,8 +9679,8 @@ Acked-by: jbeulich@novell.com
void pgtable_cache_init(void);
void paging_init(void);
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-02-07 15:38:18.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-02-07 15:38:18.000000000 +0100
++++ head-2011-07-21/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.
*/
@@ -9690,15 +9699,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-06-30/arch/x86/include/mach-xen/asm/processor.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/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-06-30.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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;
@@ -9807,8 +9816,8 @@ Acked-by: jbeulich@novell.com
#else
#define ASM_NOP1 GENERIC_NOP1
#define ASM_NOP2 GENERIC_NOP2
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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)*/
@@ -9924,15 +9933,15 @@ Acked-by: jbeulich@novell.com
unsigned long edx)
{
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/smp.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/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-06-30.orig/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:56:27.000000000 +0100
@@ -11,7 +11,7 @@
#endif
@@ -9977,8 +9986,8 @@ Acked-by: jbeulich@novell.com
#define NO_PROC_ID 0xFF /* No processor magic marker */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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);
@@ -10038,7 +10047,7 @@ Acked-by: jbeulich@novell.com
#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/swiotlb.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/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"
@@ -10046,15 +10055,15 @@ Acked-by: jbeulich@novell.com
+# include_next <asm/swiotlb.h>
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/system.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/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-06-30.orig/arch/x86/include/mach-xen/asm/system_32.h 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/system_32.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/system_32.h 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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>
@@ -10127,8 +10136,8 @@ Acked-by: jbeulich@novell.com
+void __show_registers(struct pt_regs *, int all);
#endif
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/system_64.h 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/system_64.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/system_64.h 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/system_64.h 2011-01-31 17:56:27.000000000 +0100
@@ -11,8 +11,12 @@
#ifdef __KERNEL__
@@ -10197,15 +10206,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-06-30/arch/x86/include/mach-xen/asm/tlbflush.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/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-06-30.orig/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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
@@ -10225,8 +10234,8 @@ Acked-by: jbeulich@novell.com
-}
-
#endif /* _I386_TLBFLUSH_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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
@@ -10249,15 +10258,15 @@ Acked-by: jbeulich@novell.com
-
#endif /* _X8664_TLBFLUSH_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/xor.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/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-06-30.orig/arch/x86/include/asm/mmu.h 2011-06-30 15:04:06.000000000 +0200
-+++ head-2011-06-30/arch/x86/include/asm/mmu.h 2011-06-30 16:30:20.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/include/asm/mmu.h 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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;
@@ -10268,8 +10277,8 @@ Acked-by: jbeulich@novell.com
struct mutex lock;
void *vdso;
---- head-2011-06-30.orig/include/linux/kexec.h 2011-04-13 11:25:29.000000000 +0200
-+++ head-2011-06-30/include/linux/kexec.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/include/linux/kexec.h 2011-04-13 11:25:29.000000000 +0200
++++ head-2011-07-21/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"
@@ -10286,8 +10295,8 @@ Acked-by: jbeulich@novell.com
/* Location of a reserved region to hold the crash kernel.
*/
---- head-2011-06-30.orig/include/linux/oprofile.h 2011-02-17 10:06:04.000000000 +0100
-+++ head-2011-06-30/include/linux/oprofile.h 2011-04-13 12:44:12.000000000 +0200
+--- head-2011-07-21.orig/include/linux/oprofile.h 2011-02-17 10:06:04.000000000 +0100
++++ head-2011-07-21/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);
@@ -10297,8 +10306,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-06-30.orig/include/linux/sysctl.h 2011-03-15 02:20:32.000000000 +0100
-+++ head-2011-06-30/include/linux/sysctl.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/include/linux/sysctl.h 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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 */
@@ -10307,8 +10316,8 @@ Acked-by: jbeulich@novell.com
CTL_ARLAN=254, /* arlan wireless driver */
CTL_S390DBF=5677, /* s390 debug */
CTL_SUNRPC=7249, /* sunrpc debug */
---- head-2011-06-30.orig/include/xen/cpu_hotplug.h 2007-08-16 18:07:01.000000000 +0200
-+++ head-2011-06-30/include/xen/cpu_hotplug.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/include/xen/cpu_hotplug.h 2007-08-16 18:07:01.000000000 +0200
++++ head-2011-07-21/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)
{
@@ -10320,8 +10329,8 @@ Acked-by: jbeulich@novell.com
return -EOPNOTSUPP;
}
return 0;
---- head-2011-06-30.orig/include/xen/gnttab.h 2010-09-23 15:39:04.000000000 +0200
-+++ head-2011-06-30/include/xen/gnttab.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/include/xen/gnttab.h 2010-09-23 15:39:04.000000000 +0200
++++ head-2011-07-21/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); \
} \
@@ -10350,8 +10359,8 @@ Acked-by: jbeulich@novell.com
__func__, current->comm, (__HCarg_p)->status); \
}
---- head-2011-06-30.orig/include/xen/hvm.h 2011-01-31 15:14:12.000000000 +0100
-+++ head-2011-06-30/include/xen/hvm.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/include/xen/hvm.h 2011-01-31 15:14:12.000000000 +0100
++++ head-2011-07-21/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);
@@ -10362,8 +10371,8 @@ Acked-by: jbeulich@novell.com
return 0;
}
return xhv.value;
---- head-2011-06-30.orig/include/xen/net-util.h 2011-02-09 15:53:07.000000000 +0100
-+++ head-2011-06-30/include/xen/net-util.h 2011-02-09 15:55:10.000000000 +0100
+--- head-2011-07-21.orig/include/xen/net-util.h 2011-02-09 15:53:07.000000000 +0100
++++ head-2011-07-21/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:
@@ -10373,8 +10382,8 @@ Acked-by: jbeulich@novell.com
"TCP/UDP packet, dropping a protocol"
" %d packet\n", iph->protocol);
goto out;
---- head-2011-06-30.orig/include/xen/pcifront.h 2007-06-18 08:38:13.000000000 +0200
-+++ head-2011-06-30/include/xen/pcifront.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/include/xen/pcifront.h 2007-06-18 08:38:13.000000000 +0200
++++ head-2011-07-21/include/xen/pcifront.h 2011-01-31 17:56:27.000000000 +0100
@@ -12,13 +12,11 @@
#ifndef __ia64__
@@ -10412,7 +10421,7 @@ Acked-by: jbeulich@novell.com
struct pcifront_sd *sd)
{
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-06-30/include/xen/sysctl.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/include/xen/sysctl.h 2011-01-31 17:56:27.000000000 +0100
@@ -0,0 +1,11 @@
+#ifndef _XEN_SYSCTL_H
+#define _XEN_SYSCTL_H
@@ -10425,8 +10434,8 @@ Acked-by: jbeulich@novell.com
+};
+
+#endif /* _XEN_SYSCTL_H */
---- head-2011-06-30.orig/include/xen/xenbus.h 2011-04-11 14:54:41.000000000 +0200
-+++ head-2011-06-30/include/xen/xenbus.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/include/xen/xenbus.h 2011-04-11 14:54:41.000000000 +0200
++++ head-2011-07-21/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);
@@ -10436,8 +10445,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-06-30.orig/kernel/kexec.c 2011-04-28 11:09:21.000000000 +0200
-+++ head-2011-06-30/kernel/kexec.c 2011-04-28 11:10:13.000000000 +0200
+--- head-2011-07-21.orig/kernel/kexec.c 2011-04-28 11:09:21.000000000 +0200
++++ head-2011-07-21/kernel/kexec.c 2011-04-28 11:10:13.000000000 +0200
@@ -48,7 +48,11 @@ note_buf_t __percpu *crash_notes;
/* vmcoreinfo stuff */
@@ -10487,8 +10496,8 @@ Acked-by: jbeulich@novell.com
VMCOREINFO_SYMBOL(_stext);
VMCOREINFO_SYMBOL(vmlist);
---- head-2011-06-30.orig/kernel/sysctl_binary.c 2011-06-30 15:04:42.000000000 +0200
-+++ head-2011-06-30/kernel/sysctl_binary.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/kernel/sysctl_binary.c 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/kernel/sysctl_binary.c 2011-01-31 17:56:27.000000000 +0100
@@ -873,6 +873,14 @@ static const struct bin_table bin_bus_ta
};
@@ -10514,8 +10523,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-06-30.orig/kernel/sysctl_check.c 2011-05-19 06:06:34.000000000 +0200
-+++ head-2011-06-30/kernel/sysctl_check.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/kernel/sysctl_check.c 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/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>
@@ -10524,8 +10533,8 @@ Acked-by: jbeulich@novell.com
static int sysctl_depth(struct ctl_table *table)
---- head-2011-06-30.orig/lib/swiotlb-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/lib/swiotlb-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/lib/swiotlb-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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 98ed819067..d10b677e8f 100644
--- a/patches.xen/xen3-patch-2.6.25
+++ b/patches.xen/xen3-patch-2.6.25
@@ -6,8 +6,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches.py
---- head-2011-06-30.orig/arch/x86/Kconfig 2011-06-30 16:31:31.000000000 +0200
-+++ head-2011-06-30/arch/x86/Kconfig 2011-06-30 16:33:50.000000000 +0200
+2.6.32/arch/x86/kernel/rtc.c (hooks in {update,read}_persistent_clock() removed)
+
+--- head-2011-07-21.orig/arch/x86/Kconfig 2011-06-30 16:31:31.000000000 +0200
++++ head-2011-07-21/arch/x86/Kconfig 2011-06-30 16:33:50.000000000 +0200
@@ -39,7 +39,7 @@ config X86
select HAVE_FUNCTION_TRACE_MCOUNT_TEST
select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE
@@ -75,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-06-30.orig/arch/x86/Kconfig.debug 2011-06-30 15:35:42.000000000 +0200
-+++ head-2011-06-30/arch/x86/Kconfig.debug 2011-06-30 16:33:56.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/Kconfig.debug 2011-06-30 15:35:42.000000000 +0200
++++ head-2011-07-21/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
@@ -85,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-06-30.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/ia32/ia32entry-xen.S 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/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>
@@ -130,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-06-30.orig/arch/x86/kernel/Makefile 2011-06-30 16:31:37.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/Makefile 2011-06-30 16:34:04.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/kernel/Makefile 2011-06-30 16:31:37.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/Makefile 2011-06-30 16:34:04.000000000 +0200
@@ -131,11 +131,10 @@ ifeq ($(CONFIG_X86_64),y)
obj-$(CONFIG_PCI_MMCONFIG) += mmconf-fam10h_64.o
obj-y += vsmp_64.o
@@ -145,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-06-30.orig/arch/x86/kernel/acpi/boot.c 2011-04-13 12:23:45.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/acpi/boot.c 2011-03-11 10:56:21.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/acpi/boot.c 2011-04-13 12:23:45.000000000 +0200
++++ head-2011-07-21/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;
@@ -159,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-06-30.orig/arch/x86/kernel/apic/apic-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/apic/apic-xen.c 2011-02-24 15:45:13.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/apic/apic-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/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;
}
@@ -180,8 +182,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
return 0;
}
+#endif
---- head-2011-06-30.orig/arch/x86/kernel/asm-offsets_32.c 2011-04-13 12:31:22.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/asm-offsets_32.c 2011-04-13 12:45:37.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/kernel/asm-offsets_32.c 2011-04-13 12:31:22.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/asm-offsets_32.c 2011-04-13 12:45:37.000000000 +0200
@@ -1,7 +1,9 @@
#include <asm/ucontext.h>
@@ -192,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-06-30.orig/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/cpu/common-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/cpu/common-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -27,45 +27,50 @@
#include "cpu.h"
@@ -595,8 +597,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
load_LDT(&init_mm.context);
---- head-2011-06-30.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/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;
@@ -658,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-06-30.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/e820_32-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/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>
@@ -1030,8 +1032,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+ print_memory_map("modified");
+}
+#endif
---- head-2011-06-30.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/e820_64-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/e820_64-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -1,4 +1,4 @@
-/*
+/*
@@ -1830,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-06-30.orig/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/early_printk-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/early_printk-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -222,7 +222,7 @@ static struct console simnow_console = {
};
@@ -1841,8 +1843,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
static int early_console_initialized = 0;
void early_printk(const char *fmt, ...)
---- head-2011-06-30.orig/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:10:06.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:10:15.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:10:06.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:10:15.000000000 +0200
@@ -59,7 +59,7 @@
* for paravirtualization. The following will never clobber any registers:
* INTERRUPT_RETURN (aka. "iret")
@@ -2183,8 +2185,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+#undef sys_fork
+#undef sys_clone
+#undef sys_vfork
---- head-2011-06-30.orig/arch/x86/kernel/entry_64-xen.S 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/entry_64-xen.S 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/entry_64-xen.S 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/entry_64-xen.S 2011-01-31 18:01:51.000000000 +0100
@@ -54,11 +54,9 @@
#include <asm/page.h>
#include <asm/irqflags.h>
@@ -2485,8 +2487,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
TRACE_IRQS_OFF
GET_THREAD_INFO(%rcx)
jmp retint_restore_args
---- head-2011-06-30.orig/arch/x86/kernel/fixup.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/fixup.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/fixup.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/fixup.c 2011-01-31 18:01:51.000000000 +0100
@@ -36,7 +36,7 @@
#define DP(_f, _args...) pr_alert(" " _f "\n" , ## _args )
@@ -2496,8 +2498,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
{
static unsigned long printed = 0;
char info[100];
---- head-2011-06-30.orig/arch/x86/kernel/head64-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/head64-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/head64-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/head64-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -16,6 +16,7 @@
#include <linux/kernel.h>
#include <linux/string.h>
@@ -2603,8 +2605,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+
start_kernel();
}
---- head-2011-06-30.orig/arch/x86/kernel/head_32-xen.S 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/head_32-xen.S 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/head_32-xen.S 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/head_32-xen.S 2011-01-31 18:01:51.000000000 +0100
@@ -3,6 +3,7 @@
.text
#include <linux/elfnote.h>
@@ -2622,8 +2624,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
.fill 1024,4,0
ENTRY(empty_zero_page)
.fill 4096,1,0
---- head-2011-06-30.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -35,6 +35,7 @@
#include <linux/htirq.h>
#include <linux/freezer.h>
@@ -2695,8 +2697,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
.suspend = ioapic_suspend,
.resume = ioapic_resume,
};
---- head-2011-06-30.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -32,9 +32,11 @@
#include <linux/msi.h>
#include <linux/htirq.h>
@@ -2886,7 +2888,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+late_initcall(ioapic_insert_resources);
+#endif /* !CONFIG_XEN */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-06-30/arch/x86/kernel/ioport-xen.c 2011-01-31 18:01:51.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/ioport-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -0,0 +1,112 @@
+/*
+ * This contains the io-permission bitmap code - written by obz, with changes
@@ -3000,7 +3002,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+out:
+ return rc;
+}
---- head-2011-06-30.orig/arch/x86/kernel/ioport_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/ioport_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,121 +0,0 @@
-/*
@@ -3124,7 +3126,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
- set_iopl_mask(t->iopl);
- return 0;
-}
---- head-2011-06-30.orig/arch/x86/kernel/ioport_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/ioport_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,99 +0,0 @@
-/*
@@ -3227,7 +3229,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
- return 0;
-}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-06-30/arch/x86/kernel/ldt-xen.c 2011-01-31 18:01:51.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/ldt-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -0,0 +1,272 @@
+/*
+ * Copyright (C) 1992 Krishna Balasubramanian and Linus Torvalds
@@ -3501,7 +3503,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+ }
+ return ret;
+}
---- head-2011-06-30.orig/arch/x86/kernel/ldt_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/ldt_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,265 +0,0 @@
-/*
@@ -3769,7 +3771,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
- }
- return ret;
-}
---- head-2011-06-30.orig/arch/x86/kernel/ldt_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/ldt_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,271 +0,0 @@
-/*
@@ -4043,8 +4045,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
- }
- return ret;
-}
---- head-2011-06-30.orig/arch/x86/kernel/machine_kexec_64.c 2010-04-15 09:44:51.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/machine_kexec_64.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/machine_kexec_64.c 2010-04-15 09:44:51.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/machine_kexec_64.c 2011-01-31 18:01:51.000000000 +0100
@@ -407,7 +407,9 @@ void machine_kexec(struct kimage *image)
void arch_crash_save_vmcoreinfo(void)
@@ -4055,8 +4057,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
VMCOREINFO_SYMBOL(init_level4_pgt);
#ifdef CONFIG_NUMA
---- head-2011-06-30.orig/arch/x86/kernel/microcode-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/microcode-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/microcode-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/microcode-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -167,7 +167,7 @@ static int request_microcode(void)
}
@@ -4066,8 +4068,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
op.u.microcode.length = firmware->size;
error = HYPERVISOR_platform_op(&op);
---- head-2011-06-30.orig/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -70,7 +70,7 @@ unsigned int def_to_bigsmp = 0;
unsigned int boot_cpu_physical_apicid = -1U;
#endif
@@ -4196,8 +4198,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
/*
* For PCI devices assign IRQs in order, avoiding gaps
* due to unused I/O APIC pins.
---- head-2011-06-30.orig/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -61,14 +61,20 @@ EXPORT_SYMBOL(boot_cpu_id);
#endif
@@ -4255,8 +4257,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
}
cpu_set(cpu, cpu_possible_map);
---- head-2011-06-30.orig/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/pci-dma-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/pci-dma-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -431,3 +431,23 @@ dma_sync_single_for_device(struct device
swiotlb_sync_single_for_device(dev, dma_handle, size, direction);
}
@@ -4281,8 +4283,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+ flush_write_buffers();
+}
+EXPORT_SYMBOL(dma_sync_sg_for_device);
---- head-2011-06-30.orig/arch/x86/kernel/process_32-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/process_32-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/process_32-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/process_32-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -23,7 +23,6 @@
#include <linux/slab.h>
#include <linux/vmalloc.h>
@@ -4978,8 +4980,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+ unsigned long range_end = mm->brk + 0x02000000;
+ return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
+}
---- head-2011-06-30.orig/arch/x86/kernel/process_64-xen.c 2011-02-02 08:32:00.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/process_64-xen.c 2011-02-02 08:32:11.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/process_64-xen.c 2011-02-02 08:32:00.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/process_64-xen.c 2011-02-02 08:32:11.000000000 +0100
@@ -3,7 +3,7 @@
*
* Pentium III FXSR, SSE support
@@ -5641,33 +5643,26 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+ unsigned long range_end = mm->brk + 0x02000000;
+ return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
+}
---- head-2011-06-30.orig/arch/x86/kernel/rtc.c 2011-05-19 06:06:34.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/rtc.c 2011-04-13 12:46:26.000000000 +0200
-@@ -172,6 +172,11 @@ int update_persistent_clock(struct times
- unsigned long flags;
- int retval;
+--- head-2011-07-21.orig/arch/x86/kernel/rtc.c 2011-07-21 12:00:00.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/rtc.c 2011-07-11 12:50:41.000000000 +0200
+@@ -28,6 +28,7 @@ EXPORT_SYMBOL(cmos_lock);
+ DEFINE_SPINLOCK(rtc_lock);
+ EXPORT_SYMBOL(rtc_lock);
-+#ifdef CONFIG_XEN
-+ if (xen_update_persistent_clock() < 0 || xen_independent_wallclock())
-+ return 0;
-+#endif
-+
- spin_lock_irqsave(&rtc_lock, flags);
- retval = x86_platform.set_wallclock(now.tv_sec);
- spin_unlock_irqrestore(&rtc_lock, flags);
-@@ -184,6 +189,10 @@ void read_persistent_clock(struct timesp
- {
- unsigned long retval, flags;
++#ifndef CONFIG_XEN_UNPRIVILEGED_GUEST
+ /*
+ * In order to set the CMOS clock precisely, set_rtc_mmss has to be
+ * called 500 ms after the second nowtime has started, because when
+@@ -143,6 +144,7 @@ unsigned long mach_get_cmos_time(void)
-+#ifdef CONFIG_XEN
-+ if (!is_initial_xendomain())
-+ return xen_read_persistent_clock();
-+#endif
- spin_lock_irqsave(&rtc_lock, flags);
- retval = x86_platform.get_wallclock();
- spin_unlock_irqrestore(&rtc_lock, flags);
---- head-2011-06-30.orig/arch/x86/kernel/setup64-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/setup64-xen.c 2011-01-31 18:01:51.000000000 +0100
+ return mktime(year, mon, day, hour, min, sec);
+ }
++#endif /* CONFIG_XEN_UNPRIVILEGED_GUEST */
+
+ /* Routines for accessing the CMOS RAM/RTC. */
+ unsigned char rtc_cmos_read(unsigned char addr)
+--- head-2011-07-21.orig/arch/x86/kernel/setup64-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/setup64-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -31,7 +31,11 @@
#include <asm/hypervisor.h>
#endif
@@ -5797,8 +5792,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
/*
* <= is required because the CPU will access up to
* 8 bits beyond the end of the IO permission bitmap.
---- head-2011-06-30.orig/arch/x86/kernel/setup_32-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/setup_32-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/setup_32-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/setup_32-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -47,9 +47,12 @@
#include <linux/crash_dump.h>
#include <linux/dmi.h>
@@ -6293,8 +6288,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+}
+
+subsys_initcall(request_standard_resources);
---- head-2011-06-30.orig/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/setup_64-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/setup_64-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -15,7 +15,6 @@
#include <linux/ptrace.h>
#include <linux/slab.h>
@@ -7534,8 +7529,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
.next = c_next,
.stop = c_stop,
.show = show_cpuinfo,
---- head-2011-06-30.orig/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/smp_32-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/smp_32-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -168,7 +168,7 @@ void __send_IPI_shortcut(unsigned int sh
}
}
@@ -7561,8 +7556,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
/*
*
---- head-2011-06-30.orig/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/smp_64-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/smp_64-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -33,7 +33,7 @@
#ifndef CONFIG_XEN
@@ -7815,8 +7810,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
void smp_send_stop(void)
{
---- head-2011-06-30.orig/arch/x86/kernel/time-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/time-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/time-xen.c 2011-07-11 11:22:52.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/time-xen.c 2011-07-11 11:37:23.000000000 +0200
@@ -28,47 +28,19 @@
* serialize accesses to xtime/lost_ticks).
*/
@@ -7877,19 +7872,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
/* These are peridically updated in shared_info, and then copied here. */
struct shadow_time_info {
u64 tsc_timestamp; /* TSC at last update of time vals. */
-@@ -153,6 +122,11 @@ static int __init __independent_wallcloc
- }
- __setup("independent_wallclock", __independent_wallclock);
-
-+int xen_independent_wallclock(void)
-+{
-+ return independent_wallclock;
-+}
-+
- /* Permitted clock jitter, in nsecs, beyond which a warning will be printed. */
- static unsigned long permitted_clock_jitter = 10000000UL; /* 10ms */
- static int __init __permitted_clock_jitter(char *str)
-@@ -209,7 +183,6 @@ static inline u64 get64(volatile u64 *pt
+@@ -209,7 +178,6 @@ static inline u64 get64(volatile u64 *pt
return res;
#else
return *ptr;
@@ -7897,7 +7880,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
#endif
}
-@@ -224,7 +197,6 @@ static inline u64 get64_local(volatile u
+@@ -224,7 +192,6 @@ static inline u64 get64_local(volatile u
return res;
#else
return *ptr;
@@ -7905,7 +7888,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
#endif
}
-@@ -330,35 +302,6 @@ static inline int time_values_up_to_date
+@@ -330,35 +297,6 @@ static inline int time_values_up_to_date
return (dst->version == src->version);
}
@@ -7938,10 +7921,22 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-}
-EXPORT_SYMBOL(rtc_cmos_write);
-
- static void sync_xen_wallclock(unsigned long dummy);
- static DEFINE_TIMER(sync_xen_wallclock_timer, sync_xen_wallclock, 0, 0);
- static void sync_xen_wallclock(unsigned long dummy)
-@@ -367,7 +310,8 @@ static void sync_xen_wallclock(unsigned
+ #ifdef CONFIG_XEN_PRIVILEGED_GUEST
+ int xen_update_wallclock(const struct timespec *tv)
+ {
+@@ -371,6 +309,11 @@ int xen_update_wallclock(const struct ti
+ if (!is_initial_xendomain() || independent_wallclock)
+ return -EPERM;
+
++ if (!tv) {
++ mod_timer(&sync_xen_wallclock_timer, jiffies + 1);
++ return 0;
++ }
++
+ cpu = get_cpu();
+ shadow = &per_cpu(shadow_time, cpu);
+
+@@ -409,7 +352,8 @@ static void sync_xen_wallclock(unsigned
s64 nsec;
struct xen_platform_op op;
@@ -7951,7 +7946,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
return;
write_seqlock_irq(&xtime_lock);
-@@ -390,23 +334,6 @@ static void sync_xen_wallclock(unsigned
+@@ -432,23 +376,6 @@ static void sync_xen_wallclock(unsigned
mod_timer(&sync_xen_wallclock_timer, jiffies + 60*HZ);
}
@@ -7975,7 +7970,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
static unsigned long long local_clock(void)
{
unsigned int cpu = get_cpu();
-@@ -416,7 +343,7 @@ static unsigned long long local_clock(vo
+@@ -458,7 +385,7 @@ static unsigned long long local_clock(vo
do {
local_time_version = shadow->version;
@@ -7984,7 +7979,34 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
time = shadow->system_timestamp + get_nsec_offset(shadow);
if (!time_values_up_to_date(cpu))
get_time_values_from_xen(cpu);
-@@ -489,28 +416,24 @@ unsigned long profile_pc(struct pt_regs
+@@ -470,6 +397,26 @@ static unsigned long long local_clock(vo
+ return time;
+ }
+
++unsigned long xen_read_wallclock(void)
++{
++ const shared_info_t *s = HYPERVISOR_shared_info;
++ u32 version, sec, nsec;
++ u64 delta;
++
++ do {
++ version = s->wc_version;
++ rmb();
++ sec = s->wc_sec;
++ nsec = s->wc_nsec;
++ rmb();
++ } while ((s->wc_version & 1) | (version ^ s->wc_version));
++
++ delta = local_clock() + (u64)sec * NSEC_PER_SEC + nsec;
++ do_div(delta, NSEC_PER_SEC);
++
++ return delta;
++}
++
+ /*
+ * Runstate accounting
+ */
+@@ -531,28 +478,24 @@ unsigned long profile_pc(struct pt_regs
#if defined(CONFIG_SMP) || defined(__x86_64__)
# ifdef __i386__
@@ -8019,52 +8041,36 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
return sp[0];
if (sp[1] >> 22)
return sp[1];
-@@ -752,25 +675,32 @@ static void init_missing_ticks_accountin
+@@ -795,27 +738,6 @@ static void init_missing_ticks_accountin
runstate->time[RUNSTATE_offline];
}
-/* not static: needed by APM */
-unsigned long read_persistent_clock(void)
-+unsigned long xen_read_persistent_clock(void)
- {
+-{
- unsigned long retval;
- unsigned long flags;
-
- spin_lock_irqsave(&rtc_lock, flags);
-+ const shared_info_t *s = HYPERVISOR_shared_info;
-+ u32 version, sec, nsec;
-+ u64 delta;
-
+-
- retval = get_wallclock();
-+ do {
-+ version = s->wc_version;
-+ rmb();
-+ sec = s->wc_sec;
-+ nsec = s->wc_nsec;
-+ rmb();
-+ } while ((s->wc_version & 1) | (version ^ s->wc_version));
-
+-
- spin_unlock_irqrestore(&rtc_lock, flags);
-+ delta = local_clock() + (u64)sec * NSEC_PER_SEC + nsec;
-+ do_div(delta, NSEC_PER_SEC);
-
+-
- return retval;
-+ return delta;
- }
-
+-}
+-
-int update_persistent_clock(struct timespec now)
-+int xen_update_persistent_clock(void)
- {
-+ if (!is_initial_xendomain())
-+ return -1;
- mod_timer(&sync_xen_wallclock_timer, jiffies + 1);
+-{
+- mod_timer(&sync_xen_wallclock_timer, jiffies + 1);
- return set_rtc_mmss(now.tv_sec);
-+ return 0;
- }
-
+-}
+-
extern void (*late_time_init)(void);
---- head-2011-06-30.orig/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/traps_32-xen.c 2011-01-31 18:01:51.000000000 +0100
+
+ /* Dynamically-mapped IRQ. */
+--- head-2011-07-21.orig/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/traps_32-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -79,7 +79,8 @@ char ignore_fpu_irq = 0;
* F0 0F bug workaround.. We have a special link segment
* for this.
@@ -8749,8 +8755,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
printk(KERN_INFO "Enabling fast FPU save and restore... ");
set_in_cr4(X86_CR4_OSFXSR);
printk("done.\n");
---- head-2011-06-30.orig/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/traps_64-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/traps_64-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -74,38 +74,41 @@ asmlinkage void alignment_check(void);
asmlinkage void machine_check(void);
asmlinkage void spurious_interrupt_bug(void);
@@ -9486,8 +9492,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+ return 1;
+}
+__setup("code_bytes=", code_bytes_setup);
---- head-2011-06-30.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -43,12 +43,7 @@
#include <asm/vgtod.h>
@@ -9619,7 +9625,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
#ifdef CONFIG_XEN
vsyscall_gtod_data.sysctl_enabled = 0; /* disable vgettimeofay() */
if (boot_cpu_has(X86_FEATURE_RDTSCP))
---- head-2011-06-30.orig/arch/x86/kernel/xen_entry_64.S 2008-04-02 12:34:02.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/kernel/xen_entry_64.S 2008-04-02 12:34:02.000000000 +0200
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-/*
@@ -9658,8 +9664,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
- XEN_LOCKED_UNBLOCK_EVENTS(reg) ; \
- XEN_PUT_VCPU_INFO(reg)
-#define XEN_TEST_PENDING(reg) testb $0xFF,evtchn_upcall_pending(reg)
---- head-2011-06-30.orig/arch/x86/mach-xen/setup.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/mach-xen/setup.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mach-xen/setup.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/arch/x86/mach-xen/setup.c 2011-01-31 18:01:51.000000000 +0100
@@ -161,15 +161,12 @@ void __init machine_specific_arch_setup(
/* Do an early initialization of the fixmap area */
@@ -9681,7 +9687,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
}
}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-06-30/arch/x86/mm/fault-xen.c 2011-01-31 18:01:51.000000000 +0100
++++ head-2011-07-21/arch/x86/mm/fault-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -0,0 +1,1036 @@
+/*
+ * Copyright (C) 1995 Linus Torvalds
@@ -10719,7 +10725,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+ (__START_KERNEL & PGDIR_MASK)));
+#endif
+}
---- head-2011-06-30.orig/arch/x86/mm/fault_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/fault_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,770 +0,0 @@
-/*
@@ -11492,7 +11498,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
- start = address + (1UL << PMD_SHIFT);
- }
-}
---- head-2011-06-30.orig/arch/x86/mm/fault_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/fault_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,692 +0,0 @@
-/*
@@ -12187,8 +12193,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
- BUILD_BUG_ON(!(((MODULES_END - 1) & PGDIR_MASK) ==
- (__START_KERNEL & PGDIR_MASK)));
-}
---- head-2011-06-30.orig/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/highmem_32-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/arch/x86/mm/highmem_32-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -18,6 +18,49 @@ void kunmap(struct page *page)
kunmap_high(page);
}
@@ -12248,8 +12254,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
idx = type + KM_TYPE_NR*smp_processor_id();
vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
BUG_ON(!pte_none(*(kmap_pte-idx)));
---- head-2011-06-30.orig/arch/x86/mm/hypervisor.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/hypervisor.c 2011-03-23 09:49:05.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/hypervisor.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/mm/hypervisor.c 2011-03-23 09:49:05.000000000 +0100
@@ -871,15 +871,17 @@ int xen_limit_pages_to_max_mfn(
}
EXPORT_SYMBOL_GPL(xen_limit_pages_to_max_mfn);
@@ -12275,8 +12281,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
#define MAX_BATCHED_FULL_PTES 32
---- head-2011-06-30.orig/arch/x86/mm/init_32-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/init_32-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/init_32-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/mm/init_32-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -27,13 +27,13 @@
#include <linux/bootmem.h>
#include <linux/slab.h>
@@ -13162,8 +13168,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
}
#endif
-
---- head-2011-06-30.orig/arch/x86/mm/init_64-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/init_64-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/init_64-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/mm/init_64-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -46,14 +46,13 @@
#include <asm/proto.h>
#include <asm/smp.h>
@@ -14153,8 +14159,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
return 0;
}
#endif
---- head-2011-06-30.orig/arch/x86/mm/ioremap-xen.c 2011-02-07 15:38:30.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/ioremap-xen.c 2011-02-07 15:38:58.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/ioremap-xen.c 2011-02-07 15:38:30.000000000 +0100
++++ head-2011-07-21/arch/x86/mm/ioremap-xen.c 2011-02-07 15:38:58.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * arch/i386/mm/ioremap.c
@@ -14853,7 +14859,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+ WARN_ON(1);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-06-30/arch/x86/mm/pageattr-xen.c 2011-03-23 09:46:36.000000000 +0100
++++ head-2011-07-21/arch/x86/mm/pageattr-xen.c 2011-03-23 09:46:36.000000000 +0100
@@ -0,0 +1,1436 @@
+/*
+ * Copyright 2002 Andi Kleen, SuSE Labs.
@@ -16291,7 +16297,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+#ifdef CONFIG_CPA_DEBUG
+#include "pageattr-test.c"
+#endif
---- head-2011-06-30.orig/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,542 +0,0 @@
-/*
@@ -16836,8 +16842,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-
-EXPORT_SYMBOL(change_page_attr);
-EXPORT_SYMBOL(global_flush_tlb);
---- head-2011-06-30.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/pgtable_32-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/mm/pgtable_32-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -29,8 +29,6 @@
#include <xen/features.h>
#include <asm/hypervisor.h>
@@ -17638,8 +17644,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
- !mm->context.has_foreign_mappings)
- mm_unpin(mm);
-}
---- head-2011-06-30.orig/arch/x86/pci/irq-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/pci/irq-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/pci/irq-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/pci/irq-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -204,6 +204,7 @@ static int pirq_ali_get(struct pci_dev *
{
static const unsigned char irqmap[16] = { 0, 9, 3, 10, 4, 5, 7, 6, 1, 11, 0, 12, 0, 14, 0, 15 };
@@ -17737,8 +17743,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
r->name = "PIIX/ICH";
r->get = pirq_piix_get;
r->set = pirq_piix_set;
---- head-2011-06-30.orig/arch/x86/vdso/Makefile 2011-06-30 15:41:26.000000000 +0200
-+++ head-2011-06-30/arch/x86/vdso/Makefile 2011-06-30 16:34:12.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/vdso/Makefile 2011-06-30 15:41:26.000000000 +0200
++++ head-2011-07-21/arch/x86/vdso/Makefile 2011-06-30 16:34:12.000000000 +0200
@@ -79,6 +79,7 @@ vdso32.so-$(VDSO32-y) += int80
vdso32.so-$(CONFIG_COMPAT) += syscall
vdso32.so-$(VDSO32-y) += sysenter
@@ -17747,8 +17753,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
vdso32.so-$(CONFIG_XEN) += $(xen-vdso32-y)
vdso32-images = $(vdso32.so-y:%=vdso32-%.so)
---- head-2011-06-30.orig/arch/x86/vdso/vdso32/syscall.S 2008-04-17 04:49:44.000000000 +0200
-+++ head-2011-06-30/arch/x86/vdso/vdso32/syscall.S 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/vdso/vdso32/syscall.S 2011-07-21 12:00:00.000000000 +0200
++++ head-2011-07-21/arch/x86/vdso/vdso32/syscall.S 2011-01-31 18:01:51.000000000 +0100
@@ -19,8 +19,10 @@ __kernel_vsyscall:
.Lpush_ebp:
movl %ecx, %ebp
@@ -17760,8 +17766,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
movl %ebp, %ecx
popl %ebp
.Lpop_ebp:
---- head-2011-06-30.orig/arch/x86/vdso/vdso32.S 2008-10-10 00:13:53.000000000 +0200
-+++ head-2011-06-30/arch/x86/vdso/vdso32.S 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/vdso/vdso32.S 2011-07-21 12:00:00.000000000 +0200
++++ head-2011-07-21/arch/x86/vdso/vdso32.S 2011-01-31 18:01:51.000000000 +0100
@@ -19,4 +19,16 @@ vdso32_sysenter_start:
.incbin "arch/x86/vdso/vdso32-sysenter.so"
vdso32_sysenter_end:
@@ -17779,8 +17785,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+#endif
+
__FINIT
---- head-2011-06-30.orig/arch/x86/vdso/vdso32-setup.c 2011-04-13 11:31:41.000000000 +0200
-+++ head-2011-06-30/arch/x86/vdso/vdso32-setup.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/vdso/vdso32-setup.c 2011-04-13 11:31:41.000000000 +0200
++++ head-2011-07-21/arch/x86/vdso/vdso32-setup.c 2011-01-31 18:01:51.000000000 +0100
@@ -26,10 +26,6 @@
#include <asm/vdso.h>
#include <asm/proto.h>
@@ -17837,7 +17843,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
static struct vm_area_struct gate_vma;
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-06-30/arch/x86/vdso/vdso32-setup-xen.c 2011-01-31 18:01:51.000000000 +0100
++++ head-2011-07-21/arch/x86/vdso/vdso32-setup-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -0,0 +1,506 @@
+/*
+ * (C) Copyright 2002 Linus Torvalds
@@ -18345,8 +18351,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+}
+
+#endif /* CONFIG_X86_64 */
---- head-2011-06-30.orig/drivers/hwmon/coretemp-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/drivers/hwmon/coretemp-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/drivers/hwmon/coretemp-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/drivers/hwmon/coretemp-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -38,7 +38,8 @@
#define DRVNAME "coretemp"
#define coretemp_data pdev_entry
@@ -18537,8 +18543,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
/* supported CPU not found, but report the unknown
family 6 CPU */
---- head-2011-06-30.orig/drivers/pci/msi-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/drivers/pci/msi-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/drivers/pci/msi-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/drivers/pci/msi-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -45,6 +45,14 @@ struct msi_pirq_entry {
int entry_nr;
};
@@ -18584,8 +18590,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-{
- return 0;
-}
---- head-2011-06-30.orig/drivers/pci/pci.c 2011-06-30 15:22:15.000000000 +0200
-+++ head-2011-06-30/drivers/pci/pci.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/drivers/pci/pci.c 2011-06-30 15:22:15.000000000 +0200
++++ head-2011-07-21/drivers/pci/pci.c 2011-01-31 18:01:51.000000000 +0100
@@ -471,7 +471,12 @@ pci_find_parent_resource(const struct pc
* Restore the BAR values for a given device, so as to make it
* accessible by its driver.
@@ -18599,8 +18605,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
pci_restore_bars(struct pci_dev *dev)
{
int i;
---- head-2011-06-30.orig/drivers/xen/balloon/sysfs.c 2011-01-31 17:32:22.000000000 +0100
-+++ head-2011-06-30/drivers/xen/balloon/sysfs.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/balloon/sysfs.c 2011-01-31 17:32:22.000000000 +0100
++++ head-2011-07-21/drivers/xen/balloon/sysfs.c 2011-01-31 18:01:51.000000000 +0100
@@ -104,7 +104,7 @@ static struct attribute_group balloon_in
};
@@ -18610,8 +18616,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
};
static struct sys_device balloon_sysdev;
---- head-2011-06-30.orig/drivers/xen/blkback/blkback.c 2011-04-11 15:01:24.000000000 +0200
-+++ head-2011-06-30/drivers/xen/blkback/blkback.c 2011-04-11 15:02:05.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/blkback/blkback.c 2011-04-11 15:01:24.000000000 +0200
++++ head-2011-07-21/drivers/xen/blkback/blkback.c 2011-04-11 15:02:05.000000000 +0200
@@ -151,7 +151,7 @@ static void unplug_queue(blkif_t *blkif)
return;
if (blkif->plug->unplug_fn)
@@ -18631,9 +18637,9 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
blkif->plug = q;
}
---- head-2011-06-30.orig/drivers/xen/blkfront/blkfront.c 2011-06-30 16:32:34.000000000 +0200
-+++ head-2011-06-30/drivers/xen/blkfront/blkfront.c 2011-06-30 16:34:18.000000000 +0200
-@@ -751,7 +751,6 @@ static irqreturn_t blkif_int(int irq, vo
+--- head-2011-07-21.orig/drivers/xen/blkfront/blkfront.c 2011-07-21 12:16:23.000000000 +0200
++++ head-2011-07-21/drivers/xen/blkfront/blkfront.c 2011-07-21 12:17:10.000000000 +0200
+@@ -750,7 +750,6 @@ static irqreturn_t blkif_int(int irq, vo
RING_IDX i, rp;
unsigned long flags;
struct blkfront_info *info = (struct blkfront_info *)dev_id;
@@ -18641,7 +18647,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
spin_lock_irqsave(&blkif_io_lock, flags);
-@@ -776,14 +775,14 @@ static irqreturn_t blkif_int(int irq, vo
+@@ -775,14 +774,14 @@ static irqreturn_t blkif_int(int irq, vo
ADD_ID_TO_FREELIST(info, id);
@@ -18658,7 +18664,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
info->feature_barrier = 0;
xlvbd_barrier(info);
}
-@@ -794,10 +793,8 @@ static irqreturn_t blkif_int(int irq, vo
+@@ -793,10 +792,8 @@ static irqreturn_t blkif_int(int irq, vo
DPRINTK("Bad return from blkdev data "
"request: %x\n", bret->status);
@@ -18670,8 +18676,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
break;
default:
BUG();
---- head-2011-06-30.orig/drivers/xen/blktap/blktap.c 2011-04-11 15:01:34.000000000 +0200
-+++ head-2011-06-30/drivers/xen/blktap/blktap.c 2011-04-11 15:02:02.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/blktap/blktap.c 2011-04-11 15:01:34.000000000 +0200
++++ head-2011-07-21/drivers/xen/blktap/blktap.c 2011-04-11 15:02:02.000000000 +0200
@@ -310,8 +310,8 @@ static pte_t blktap_clear_pte(struct vm_
uvstart = info->rings_vstart + (RING_PAGES << PAGE_SHIFT);
}
@@ -18694,8 +18700,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
}
if (count) {
---- head-2011-06-30.orig/drivers/xen/blktap2/device.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/drivers/xen/blktap2/device.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/blktap2/device.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/drivers/xen/blktap2/device.c 2011-01-31 18:01:51.000000000 +0100
@@ -161,9 +161,9 @@ blktap_map_uaddr_fn(pte_t *ptep, struct
}
@@ -18831,8 +18837,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
blktap_request_free(tap, request);
}
---- head-2011-06-30.orig/drivers/xen/blktap2/ring.c 2011-04-11 13:43:15.000000000 +0200
-+++ head-2011-06-30/drivers/xen/blktap2/ring.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/blktap2/ring.c 2011-04-11 13:43:15.000000000 +0200
++++ head-2011-07-21/drivers/xen/blktap2/ring.c 2011-01-31 18:01:51.000000000 +0100
@@ -103,8 +103,8 @@ blktap_ring_clear_pte(struct vm_area_str
* mapped region.
*/
@@ -18855,8 +18861,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
if (count)
if (HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref,
---- head-2011-06-30.orig/drivers/xen/core/Makefile 2008-07-21 11:00:33.000000000 +0200
-+++ head-2011-06-30/drivers/xen/core/Makefile 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/core/Makefile 2008-07-21 11:00:33.000000000 +0200
++++ head-2011-07-21/drivers/xen/core/Makefile 2011-01-31 18:01:51.000000000 +0100
@@ -10,5 +10,6 @@ obj-$(CONFIG_SYS_HYPERVISOR) += hypervis
obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o
obj-$(CONFIG_XEN_SYSFS) += xen_sysfs.o
@@ -18864,8 +18870,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+obj-$(CONFIG_X86_SMP) += spinlock.o
obj-$(CONFIG_KEXEC) += machine_kexec.o
obj-$(CONFIG_XEN_XENCOMM) += xencomm.o
---- head-2011-06-30.orig/drivers/xen/core/evtchn.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/drivers/xen/core/evtchn.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/core/evtchn.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/drivers/xen/core/evtchn.c 2011-01-31 18:01:51.000000000 +0100
@@ -197,7 +197,7 @@ static inline unsigned int cpu_from_evtc
/* Upcall to generic IRQ layer. */
@@ -18916,8 +18922,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
}
}
---- head-2011-06-30.orig/drivers/xen/core/hypervisor_sysfs.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/drivers/xen/core/hypervisor_sysfs.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/core/hypervisor_sysfs.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/drivers/xen/core/hypervisor_sysfs.c 2011-01-31 18:01:51.000000000 +0100
@@ -50,7 +50,7 @@ static int __init hypervisor_subsys_init
if (!is_running_on_xen())
return -ENODEV;
@@ -18927,8 +18933,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
return 0;
}
---- head-2011-06-30.orig/drivers/xen/core/machine_reboot.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/drivers/xen/core/machine_reboot.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/core/machine_reboot.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/drivers/xen/core/machine_reboot.c 2011-01-31 18:01:51.000000000 +0100
@@ -174,6 +174,9 @@ static int take_machine_down(void *_susp
post_suspend(suspend_cancelled);
gnttab_resume();
@@ -18939,8 +18945,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
irq_resume();
#ifdef __x86_64__
/*
---- head-2011-06-30.orig/drivers/xen/core/smpboot.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/drivers/xen/core/smpboot.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/core/smpboot.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/drivers/xen/core/smpboot.c 2011-01-31 18:01:51.000000000 +0100
@@ -59,6 +59,10 @@ void __init prefill_possible_map(void)
return;
@@ -19023,7 +19029,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
ctxt.ctrlreg[3] = xen_pfn_to_cr3(virt_to_mfn(init_level4_pgt));
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-06-30/drivers/xen/core/spinlock.c 2011-03-15 16:52:48.000000000 +0100
++++ head-2011-07-21/drivers/xen/core/spinlock.c 2011-03-15 16:52:48.000000000 +0100
@@ -0,0 +1,285 @@
+/*
+ * Xen spinlock functions
@@ -19310,8 +19316,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+ }
+}
+EXPORT_SYMBOL(xen_spin_kick);
---- head-2011-06-30.orig/drivers/xen/core/xen_sysfs.c 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/drivers/xen/core/xen_sysfs.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/core/xen_sysfs.c 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/drivers/xen/core/xen_sysfs.c 2011-01-31 18:01:51.000000000 +0100
@@ -30,12 +30,12 @@ HYPERVISOR_ATTR_RO(type);
static int __init xen_sysfs_type_init(void)
@@ -19408,8 +19414,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
}
#endif
---- head-2011-06-30.orig/drivers/xen/gntdev/gntdev.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/drivers/xen/gntdev/gntdev.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/gntdev/gntdev.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/drivers/xen/gntdev/gntdev.c 2011-01-31 18:01:51.000000000 +0100
@@ -771,7 +771,7 @@ static pte_t gntdev_clear_pte(struct vm_
op.status);
} else {
@@ -19428,8 +19434,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
}
return copy;
---- head-2011-06-30.orig/drivers/xen/pciback/pci_stub.c 2011-03-11 10:55:55.000000000 +0100
-+++ head-2011-06-30/drivers/xen/pciback/pci_stub.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/pciback/pci_stub.c 2011-03-11 10:55:55.000000000 +0100
++++ head-2011-07-21/drivers/xen/pciback/pci_stub.c 2011-01-31 18:01:51.000000000 +0100
@@ -493,7 +493,7 @@ static void pcistub_remove(struct pci_de
}
}
@@ -19439,8 +19445,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
{
.vendor = PCI_ANY_ID,
.device = PCI_ANY_ID,
---- head-2011-06-30.orig/drivers/xen/scsifront/scsifront.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/drivers/xen/scsifront/scsifront.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/scsifront/scsifront.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/drivers/xen/scsifront/scsifront.c 2011-01-31 18:01:51.000000000 +0100
@@ -260,19 +260,19 @@ static int map_data_for_request(struct v
return -ENOMEM;
}
@@ -19512,8 +19518,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
}
big_to_sg:
---- head-2011-06-30.orig/drivers/xen/usbfront/usbfront-dbg.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/drivers/xen/usbfront/usbfront-dbg.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/usbfront/usbfront-dbg.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/drivers/xen/usbfront/usbfront-dbg.c 2011-01-31 18:01:51.000000000 +0100
@@ -43,17 +43,16 @@
* DEALINGS IN THE SOFTWARE.
*/
@@ -19559,8 +19565,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+ struct device *dev = info_to_hcd(info)->self.controller;
+ device_remove_file(dev, &dev_attr_statistics);
}
---- head-2011-06-30.orig/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 18:01:51.000000000 +0100
@@ -77,7 +77,7 @@ static int xenoprof_resume(struct sys_de
@@ -19570,8 +19576,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
.resume = xenoprof_resume,
.suspend = xenoprof_suspend
};
---- head-2011-06-30.orig/arch/x86/include/asm/e820.h 2011-05-19 06:06:34.000000000 +0200
-+++ head-2011-06-30/arch/x86/include/asm/e820.h 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/asm/e820.h 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/arch/x86/include/asm/e820.h 2011-01-31 18:01:51.000000000 +0100
@@ -66,7 +66,11 @@ struct e820map {
struct e820entry map[E820_X_MAX];
};
@@ -19584,8 +19590,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
#define ISA_END_ADDRESS 0x100000
#define BIOS_BEGIN 0x000a0000
---- head-2011-06-30.orig/arch/x86/include/asm/hardirq.h 2011-01-05 01:50:19.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/asm/hardirq.h 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/asm/hardirq.h 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/arch/x86/include/asm/hardirq.h 2011-01-31 18:01:51.000000000 +0100
@@ -18,7 +18,11 @@ typedef struct {
#ifdef CONFIG_SMP
unsigned int irq_resched_count;
@@ -19598,8 +19604,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
#endif
#ifdef CONFIG_X86_THERMAL_VECTOR
unsigned int irq_thermal_count;
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/agp.h 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/agp.h 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/agp.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/agp.h 2011-01-31 18:01:51.000000000 +0100
@@ -13,18 +13,13 @@
* page. This avoids data corruption on some CPUs.
*/
@@ -19621,8 +19627,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
/*
* Could use CLFLUSH here if the cpu supports it. But then it would
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/desc.h 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/desc.h 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/desc.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/desc.h 2011-01-31 18:01:51.000000000 +0100
@@ -1,5 +1,404 @@
+#ifndef _ASM_DESC_H_
+#define _ASM_DESC_H_
@@ -20030,7 +20036,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+#endif /* __ASSEMBLY__ */
+
#endif
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:32:29.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:32:29.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,262 +0,0 @@
-#ifndef __ARCH_DESC_H
@@ -20295,7 +20301,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-#endif /* !__ASSEMBLY__ */
-
-#endif
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/desc_64.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/desc_64.h 2011-01-31 17:56:27.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,228 +0,0 @@
-/* Written 2000 by Andi Kleen */
@@ -20526,8 +20532,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-#endif /* !__ASSEMBLY__ */
-
-#endif
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 18:01:51.000000000 +0100
@@ -64,7 +64,7 @@ enum fixed_addresses {
#endif
#ifdef CONFIG_X86_VISWS_APIC
@@ -20574,8 +20580,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
__end_of_fixed_addresses
};
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 18:01:51.000000000 +0100
@@ -15,6 +15,7 @@
#include <asm/apicdef.h>
#include <asm/page.h>
@@ -20622,8 +20628,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
__end_of_fixed_addresses
};
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 18:01:51.000000000 +0100
@@ -37,11 +37,6 @@ extern pte_t *pkmap_page_table;
* easily, subsequent pte tables have to be allocated in one physical
* chunk of RAM.
@@ -20652,9 +20658,9 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
void *kmap(struct page *page);
void kunmap(struct page *page);
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/hypervisor.h 2011-03-23 09:49:17.000000000 +0100
-@@ -125,6 +125,8 @@ struct page;
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-07-20 15:40:13.000000000 +0200
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/hypervisor.h 2011-07-21 12:16:58.000000000 +0200
+@@ -121,6 +121,8 @@ struct page;
int xen_limit_pages_to_max_mfn(
struct page *pages, unsigned int order, unsigned int address_bits);
@@ -20663,7 +20669,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
/* Turn jiffies into Xen system time. */
u64 jiffies_to_st(unsigned long jiffies);
-@@ -271,6 +273,25 @@ HYPERVISOR_poll(
+@@ -267,6 +269,25 @@ HYPERVISOR_poll(
return rc;
}
@@ -20689,15 +20695,15 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
#ifdef CONFIG_XEN
static inline void
-@@ -310,4 +331,6 @@ MULTI_grant_table_op(multicall_entry_t *
+@@ -306,4 +327,6 @@ MULTI_grant_table_op(multicall_entry_t *
#endif
+#define uvm_multi(cpumask) ((unsigned long)cpus_addr(cpumask) | UVMF_MULTI)
+
#endif /* __HYPERVISOR_H__ */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/irqflags.h 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/irqflags.h 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/irqflags.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/irqflags.h 2011-01-31 18:01:51.000000000 +0100
@@ -1,5 +1,249 @@
-#ifdef CONFIG_X86_32
-# include "irqflags_32.h"
@@ -20951,7 +20957,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+
+#endif /* __ASSEMBLY__ */
#endif
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:56:27.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,214 +0,0 @@
-/*
@@ -21168,7 +21174,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-#endif
-
-#endif
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/irqflags_64.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/irqflags_64.h 2011-01-31 17:56:27.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,178 +0,0 @@
-/*
@@ -21349,8 +21355,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-#endif
-
-#endif
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/maddr.h 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/maddr.h 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/maddr.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/maddr.h 2011-01-31 18:01:51.000000000 +0100
@@ -1,5 +1,155 @@
+#ifndef _X86_MADDR_H
+#define _X86_MADDR_H
@@ -21507,8 +21513,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+#define mfn_to_virt(m) __va(mfn_to_pfn(m) << PAGE_SHIFT)
+
+#endif /* _X86_MADDR_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/maddr_32.h 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/maddr_32.h 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/maddr_32.h 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/maddr_32.h 2011-01-31 18:01:51.000000000 +0100
@@ -1,130 +1,6 @@
#ifndef _I386_MADDR_H
#define _I386_MADDR_H
@@ -21687,8 +21693,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-#define mfn_to_virt(m) (__va(mfn_to_pfn(m) << PAGE_SHIFT))
-
#endif /* _I386_MADDR_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/maddr_64.h 2007-06-12 13:14:13.000000000 +0200
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/maddr_64.h 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/maddr_64.h 2007-06-12 13:14:13.000000000 +0200
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/maddr_64.h 2011-01-31 18:01:51.000000000 +0100
@@ -1,124 +1,6 @@
#ifndef _X86_64_MADDR_H
#define _X86_64_MADDR_H
@@ -21842,8 +21848,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-
#endif /* _X86_64_MADDR_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 18:01:51.000000000 +0100
@@ -51,8 +51,6 @@ static inline void __prepare_arch_switch
: : "r" (0) );
}
@@ -21853,8 +21859,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
static inline void switch_mm(struct mm_struct *prev,
struct mm_struct *next,
struct task_struct *tsk)
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 18:01:51.000000000 +0100
@@ -62,12 +62,6 @@ extern void mm_pin(struct mm_struct *mm)
extern void mm_unpin(struct mm_struct *mm);
void mm_pin_all(void);
@@ -21895,8 +21901,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
}
}
#endif
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/pci.h 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pci.h 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pci.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/pci.h 2011-01-31 18:01:51.000000000 +0100
@@ -71,6 +71,7 @@ extern int pci_mmap_page_range(struct pc
@@ -21937,8 +21943,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+#endif
#endif
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 18:01:51.000000000 +0100
@@ -3,69 +3,109 @@
#include <linux/threads.h>
@@ -22087,8 +22093,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+#endif /* CONFIG_X86_PAE */
#endif /* _I386_PGALLOC_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 18:01:51.000000000 +0100
@@ -6,30 +6,13 @@
#include <linux/mm.h>
#include <asm/io.h> /* for phys_to_virt and page_to_pseudophys */
@@ -22247,8 +22253,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
#define __pmd_free_tlb(tlb,x) tlb_remove_page((tlb),virt_to_page(x))
#define __pud_free_tlb(tlb,x) tlb_remove_page((tlb),virt_to_page(x))
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/pgtable.h 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pgtable.h 2011-03-23 09:14:47.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pgtable.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/pgtable.h 2011-03-23 09:14:47.000000000 +0100
@@ -1,5 +1,461 @@
+#ifndef _ASM_X86_PGTABLE_H
+#define _ASM_X86_PGTABLE_H
@@ -22711,8 +22717,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+#endif /* __ASSEMBLY__ */
+
+#endif /* _ASM_X86_PGTABLE_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-03-23 09:14:16.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-03-23 09:14:16.000000000 +0100
@@ -18,16 +18,18 @@
printk("%s:%d: bad pgd %p(%016Lx pfn %08Lx).\n", __FILE__, __LINE__, \
&(e), __pgd_val(e), (pgd_val(e) & PTE_MASK) >> PAGE_SHIFT)
@@ -22881,8 +22887,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+#define __swp_entry_to_pte(x) ((pte_t){ { .pte_high = (x).val } })
#endif /* _I386_PGTABLE_3LEVEL_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:38:52.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:38:52.000000000 +0100
@@ -1,8 +1,6 @@
#ifndef _I386_PGTABLE_H
#define _I386_PGTABLE_H
@@ -23343,8 +23349,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-#include <asm-generic/pgtable.h>
-
#endif /* _I386_PGTABLE_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 09:14:24.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 09:14:24.000000000 +0100
@@ -13,49 +13,26 @@
#include <linux/threads.h>
#include <linux/sched.h>
@@ -23880,8 +23886,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
#endif /* !__ASSEMBLY__ */
#endif /* _X86_64_PGTABLE_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/processor.h 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/processor.h 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/processor.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/processor.h 2011-01-31 18:01:51.000000000 +0100
@@ -1,5 +1,795 @@
+#ifndef __ASM_X86_PROCESSOR_H
+#define __ASM_X86_PROCESSOR_H
@@ -24680,7 +24686,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+#define KSTK_ESP(task) (task_pt_regs(task)->sp)
+
#endif
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:56:27.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,755 +0,0 @@
-/*
@@ -25438,7 +25444,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-extern int force_mwait;
-
-#endif /* __ASM_I386_PROCESSOR_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:56:27.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,467 +0,0 @@
-/*
@@ -25908,8 +25914,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-#define HAVE_ARCH_PICK_MMAP_LAYOUT 1
-
-#endif /* __ASM_X86_64_PROCESSOR_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 18:01:51.000000000 +0100
@@ -1,55 +1,50 @@
#ifndef __ASM_SMP_H
#define __ASM_SMP_H
@@ -26100,8 +26106,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-
+#endif /* !ASSEMBLY */
#endif
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 18:01:51.000000000 +0100
@@ -1,130 +1,101 @@
#ifndef __ASM_SMP_H
#define __ASM_SMP_H
@@ -26285,8 +26291,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/spinlock.h 2011-01-31 18:01:51.000000000 +0100
-@@ -0,0 +1,341 @@
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/spinlock.h 2011-07-12 10:55:12.000000000 +0200
+@@ -0,0 +1,345 @@
+#ifndef _X86_SPINLOCK_H_
+#define _X86_SPINLOCK_H_
+
@@ -26316,9 +26322,13 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+# define REG_PTR_MODE "q"
+#endif
+
-+#if defined(CONFIG_X86_32) && \
-+ (defined(CONFIG_X86_OOSTORE) || defined(CONFIG_X86_PPRO_FENCE))
++#if defined(CONFIG_XEN) || (defined(CONFIG_X86_32) && \
++ (defined(CONFIG_X86_OOSTORE) || defined(CONFIG_X86_PPRO_FENCE)))
+/*
++ * On Xen, as we read back the result of the unlocking increment, we must use
++ * a locked access (or insert a full memory barrier) in all cases (so that we
++ * read what is globally visible).
++ *
+ * On PPro SMP or if we are using OOSTORE, we use a locked operation to unlock
+ * (PPro errata 66, 92)
+ */
@@ -26629,7 +26639,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/spinlock_types.h 2011-01-31 18:01:51.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/spinlock_types.h 2011-01-31 18:01:51.000000000 +0100
@@ -0,0 +1,36 @@
+#ifndef __ASM_SPINLOCK_TYPES_H
+#define __ASM_SPINLOCK_TYPES_H
@@ -26667,8 +26677,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+#define __RAW_RW_LOCK_UNLOCKED { RW_LOCK_BIAS }
+
+#endif
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/system.h 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/system.h 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/system.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/system.h 2011-01-31 18:01:51.000000000 +0100
@@ -1,5 +1,393 @@
+#ifndef _ASM_X86_SYSTEM_H_
+#define _ASM_X86_SYSTEM_H_
@@ -27065,7 +27075,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+}
+
#endif
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/system_32.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/system_32.h 2011-01-31 17:56:27.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,312 +0,0 @@
-#ifndef __ASM_SYSTEM_H
@@ -27380,7 +27390,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-void __show_registers(struct pt_regs *, int all);
-
-#endif
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/system_64.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/system_64.h 2011-01-31 17:56:27.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,179 +0,0 @@
-#ifndef __ASM_SYSTEM_H
@@ -27562,8 +27572,29 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
-
-#endif
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/tlbflush.h 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/tlbflush.h 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/time.h 2011-07-11 10:35:24.000000000 +0200
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/time.h 2011-07-11 11:48:04.000000000 +0200
+@@ -1,6 +1,17 @@
+-#ifdef CONFIG_XEN_PRIVILEGED_GUEST
++#ifndef _XEN_ASM_TIME_H
++#define _XEN_ASM_TIME_H
++
++unsigned long xen_read_wallclock(void);
++
+ struct timespec;
++#ifdef CONFIG_XEN_PRIVILEGED_GUEST
+ int xen_update_wallclock(const struct timespec *);
++#else
++static inline int xen_update_wallclock(const struct timespec *tv) {
++ return -EPERM;
++}
+ #endif
+
++#endif /* _XEN_ASM_TIME_H */
++
+ #include_next <asm/time.h>
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/tlbflush.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/tlbflush.h 2011-01-31 18:01:51.000000000 +0100
@@ -1,5 +1,106 @@
+#ifndef _ASM_X86_TLBFLUSH_H
+#define _ASM_X86_TLBFLUSH_H
@@ -27673,7 +27704,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+}
+
+#endif /* _ASM_X86_TLBFLUSH_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:56:27.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,99 +0,0 @@
-#ifndef _I386_TLBFLUSH_H
@@ -27775,7 +27806,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-}
-
-#endif /* _I386_TLBFLUSH_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:56:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:56:27.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,97 +0,0 @@
-#ifndef _X8664_TLBFLUSH_H
@@ -27875,8 +27906,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-}
-
-#endif /* _X8664_TLBFLUSH_H */
---- head-2011-06-30.orig/arch/x86/include/asm/mmu.h 2011-06-30 16:30:20.000000000 +0200
-+++ head-2011-06-30/arch/x86/include/asm/mmu.h 2011-06-30 16:34:46.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/include/asm/mmu.h 2011-06-30 16:30:20.000000000 +0200
++++ head-2011-07-21/arch/x86/include/asm/mmu.h 2011-06-30 16:34:46.000000000 +0200
@@ -24,7 +24,7 @@ typedef struct {
void *vdso;
} mm_context_t;
@@ -27886,8 +27917,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
void leave_mm(int cpu);
#else
static inline void leave_mm(int cpu)
---- head-2011-06-30.orig/arch/x86/include/asm/ptrace.h 2011-06-30 15:04:06.000000000 +0200
-+++ head-2011-06-30/arch/x86/include/asm/ptrace.h 2011-06-30 16:34:54.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/include/asm/ptrace.h 2011-07-21 12:00:01.000000000 +0200
++++ head-2011-07-21/arch/x86/include/asm/ptrace.h 2011-06-30 16:34:54.000000000 +0200
@@ -267,7 +267,9 @@ static inline unsigned long regs_get_ker
}
@@ -27899,8 +27930,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
#define arch_has_block_step() (1)
#else
#define arch_has_block_step() (boot_cpu_data.x86 >= 6)
---- head-2011-06-30.orig/arch/x86/include/asm/thread_info.h 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/asm/thread_info.h 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/asm/thread_info.h 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/arch/x86/include/asm/thread_info.h 2011-01-31 18:01:51.000000000 +0100
@@ -95,6 +95,9 @@ struct thread_info {
#define TIF_BLOCKSTEP 25 /* set when we want DEBUGCTLMSR_BTF */
#define TIF_LAZY_MMU_UPDATES 27 /* task is updating the mmu lazily */
@@ -27936,21 +27967,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
#define PREEMPT_ACTIVE 0x10000000
---- head-2011-06-30.orig/arch/x86/include/asm/time.h 2009-12-03 04:51:21.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/asm/time.h 2011-01-31 18:01:51.000000000 +0100
-@@ -7,4 +7,10 @@ extern void hpet_time_init(void);
-
- extern void time_init(void);
-
-+#ifdef CONFIG_XEN
-+extern int xen_independent_wallclock(void);
-+extern unsigned long xen_read_persistent_clock(void);
-+extern int xen_update_persistent_clock(void);
-+#endif
-+
- #endif /* _ASM_X86_TIME_H */
---- head-2011-06-30.orig/include/linux/page-flags.h 2011-04-28 11:09:56.000000000 +0200
-+++ head-2011-06-30/include/linux/page-flags.h 2011-04-28 11:10:46.000000000 +0200
+--- head-2011-07-21.orig/include/linux/page-flags.h 2011-04-28 11:09:56.000000000 +0200
++++ head-2011-07-21/include/linux/page-flags.h 2011-04-28 11:10:46.000000000 +0200
@@ -127,8 +127,8 @@ enum pageflags {
#ifdef CONFIG_XEN
PG_pinned = PG_locked, /* Cannot alias with PG_owner_priv_1 since
@@ -27962,8 +27980,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
#else
PG_pinned = PG_owner_priv_1,
PG_savepinned = PG_dirty,
---- head-2011-06-30.orig/include/linux/pci.h 2011-06-30 16:06:54.000000000 +0200
-+++ head-2011-06-30/include/linux/pci.h 2011-06-30 16:35:02.000000000 +0200
+--- head-2011-07-21.orig/include/linux/pci.h 2011-06-30 16:06:54.000000000 +0200
++++ head-2011-07-21/include/linux/pci.h 2011-06-30 16:35:02.000000000 +0200
@@ -801,6 +801,9 @@ int pci_reset_function(struct pci_dev *d
void pci_update_resource(struct pci_dev *dev, int resno);
int __must_check pci_assign_resource(struct pci_dev *dev, int i);
@@ -27974,8 +27992,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
/* ROM control related routines */
int pci_enable_rom(struct pci_dev *pdev);
---- head-2011-06-30.orig/include/xen/evtchn.h 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-06-30/include/xen/evtchn.h 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/include/xen/evtchn.h 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-07-21/include/xen/evtchn.h 2011-01-31 18:01:51.000000000 +0100
@@ -133,6 +133,18 @@ static inline void clear_evtchn(int port
synch_clear_bit(port, s->evtchn_pending);
}
@@ -27995,8 +28013,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
static inline void notify_remote_via_evtchn(int port)
{
struct evtchn_send send = { .port = port };
---- head-2011-06-30.orig/kernel/sysctl_binary.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/kernel/sysctl_binary.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/kernel/sysctl_binary.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/kernel/sysctl_binary.c 2011-01-31 18:01:51.000000000 +0100
@@ -874,7 +874,7 @@ static const struct bin_table bin_bus_ta
@@ -28006,8 +28024,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
{ CTL_XEN_INDEPENDENT_WALLCLOCK, "independent_wallclock" },
{ CTL_XEN_PERMITTED_CLOCK_JITTER, "permitted_clock_jitter" },
{}
---- head-2011-06-30.orig/lib/swiotlb-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/lib/swiotlb-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- head-2011-07-21.orig/lib/swiotlb-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/lib/swiotlb-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -30,7 +30,6 @@
#include <asm/gnttab_dma.h>
@@ -28081,9 +28099,9 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
spin_unlock_irqrestore(&io_tlb_lock, flags);
return NULL;
}
---- head-2011-06-30.orig/mm/memory.c 2011-06-30 16:01:18.000000000 +0200
-+++ head-2011-06-30/mm/memory.c 2011-06-30 16:35:07.000000000 +0200
-@@ -2373,6 +2373,10 @@ int apply_to_page_range(struct mm_struct
+--- head-2011-07-21.orig/mm/memory.c 2011-07-21 12:07:22.000000000 +0200
++++ head-2011-07-21/mm/memory.c 2011-07-21 12:17:05.000000000 +0200
+@@ -2374,6 +2374,10 @@ int apply_to_page_range(struct mm_struct
unsigned long end = addr + size;
int err;
diff --git a/patches.xen/xen3-patch-2.6.26 b/patches.xen/xen3-patch-2.6.26
index 4cdda6d054..815a0ace97 100644
--- a/patches.xen/xen3-patch-2.6.26
+++ b/patches.xen/xen3-patch-2.6.26
@@ -5,7 +5,7 @@ Patch-mainline: 2.6.26
Acked-by: Jeff Mahoney <jeffm@suse.com>
Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches.py
-2.6.35: arch/x86/include/asm/scatterlist.h change removed (would need to be reverted there)
+2.6.35/arch/x86/include/asm/scatterlist.h (would need to be reverted there)
--- head-2011-06-30.orig/arch/x86/Kconfig 2011-06-30 16:33:50.000000000 +0200
+++ head-2011-06-30/arch/x86/Kconfig 2011-06-30 16:36:09.000000000 +0200
@@ -694,7 +694,7 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
}
void mtrr_ap_init(void)
---- head-2011-06-30.orig/arch/x86/kernel/cpu/bugs.c 2011-06-30 15:04:08.000000000 +0200
+--- head-2011-06-30.orig/arch/x86/kernel/cpu/bugs.c 2011-07-12 11:05:58.000000000 +0200
+++ head-2011-06-30/arch/x86/kernel/cpu/bugs.c 2011-06-30 16:36:18.000000000 +0200
@@ -17,6 +17,7 @@
#include <asm/paravirt.h>
@@ -737,7 +737,7 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
}
/*
---- head-2011-06-30.orig/arch/x86/kernel/cpu/proc.c 2009-12-03 04:51:21.000000000 +0100
+--- head-2011-06-30.orig/arch/x86/kernel/cpu/proc.c 2011-07-12 11:05:58.000000000 +0200
+++ head-2011-06-30/arch/x86/kernel/cpu/proc.c 2011-03-03 16:38:42.000000000 +0100
@@ -10,7 +10,7 @@
static void show_cpuinfo_core(struct seq_file *m, struct cpuinfo_x86 *c,
@@ -2214,7 +2214,7 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
return error;
}
---- head-2011-06-30.orig/arch/x86/kernel/mmconf-fam10h_64.c 2011-01-05 01:50:19.000000000 +0100
+--- head-2011-06-30.orig/arch/x86/kernel/mmconf-fam10h_64.c 2011-07-12 11:05:58.000000000 +0200
+++ head-2011-06-30/arch/x86/kernel/mmconf-fam10h_64.c 2011-01-31 18:07:35.000000000 +0100
@@ -205,12 +205,20 @@ void __cpuinit fam10h_check_enable_mmcfg
return;
@@ -7072,6 +7072,33 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
math_state_restore();
return prev_p;
}
+--- head-2011-06-30.orig/arch/x86/kernel/rtc.c 2011-07-11 12:50:41.000000000 +0200
++++ head-2011-06-30/arch/x86/kernel/rtc.c 2011-07-11 12:44:11.000000000 +0200
+@@ -201,6 +201,7 @@ unsigned long long native_read_tsc(void)
+ EXPORT_SYMBOL(native_read_tsc);
+
+
++#ifndef CONFIG_XEN_UNPRIVILEGED_GUEST
+ static struct resource rtc_resources[] = {
+ [0] = {
+ .start = RTC_PORT(0),
+@@ -242,6 +243,11 @@ static __init int add_rtc_cmos(void)
+ if (of_have_populated_dt())
+ return 0;
+
++#ifdef CONFIG_XEN
++ if (!is_initial_xendomain())
++ return 0;
++#endif
++
+ platform_device_register(&rtc_device);
+ dev_info(&rtc_device.dev,
+ "registered platform RTC device (no PNP device found)\n");
+@@ -249,3 +255,4 @@ static __init int add_rtc_cmos(void)
+ return 0;
+ }
+ device_initcall(add_rtc_cmos);
++#endif /* CONFIG_XEN_UNPRIVILEGED_GUEST */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ head-2011-06-30/arch/x86/kernel/setup-xen.c 2011-01-31 18:07:35.000000000 +0100
@@ -0,0 +1,143 @@
@@ -9744,10 +9771,10 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
- return IRQ_HANDLED;
-#endif
-}
---- head-2011-06-30.orig/arch/x86/kernel/time-xen.c 2011-01-31 18:01:51.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/time-xen.c 2011-01-31 18:07:35.000000000 +0100
-@@ -703,8 +703,6 @@ int xen_update_persistent_clock(void)
- return 0;
+--- head-2011-06-30.orig/arch/x86/kernel/time-xen.c 2011-07-11 11:37:23.000000000 +0200
++++ head-2011-06-30/arch/x86/kernel/time-xen.c 2011-07-11 11:49:22.000000000 +0200
+@@ -738,8 +738,6 @@ static void init_missing_ticks_accountin
+ runstate->time[RUNSTATE_offline];
}
-extern void (*late_time_init)(void);
@@ -9755,7 +9782,7 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
/* Dynamically-mapped IRQ. */
DEFINE_PER_CPU(int, timer_irq);
-@@ -933,7 +931,7 @@ int __cpuinit local_setup_timer(unsigned
+@@ -968,7 +966,7 @@ int __cpuinit local_setup_timer(unsigned
return 0;
}
@@ -14884,7 +14911,7 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
arch_fix_phys_package_id(pr->id, object.integer.value);
return 0;
---- head-2011-06-30.orig/drivers/firmware/Kconfig 2011-06-30 15:04:12.000000000 +0200
+--- head-2011-06-30.orig/drivers/firmware/Kconfig 2011-07-12 11:05:58.000000000 +0200
+++ head-2011-06-30/drivers/firmware/Kconfig 2011-04-13 12:52:07.000000000 +0200
@@ -126,7 +126,7 @@ config DMI_SYSFS
@@ -14895,7 +14922,7 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
default n
help
This option enables the kernel to find the region of memory
---- head-2011-06-30.orig/drivers/input/misc/xen-kbdfront.c 2011-05-19 06:06:34.000000000 +0200
+--- head-2011-06-30.orig/drivers/input/misc/xen-kbdfront.c 2011-07-12 11:05:58.000000000 +0200
+++ head-2011-06-30/drivers/input/misc/xen-kbdfront.c 2011-04-28 11:11:14.000000000 +0200
@@ -363,7 +363,6 @@ static const struct xenbus_device_id xen
@@ -14958,7 +14985,7 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
EXPORT_SYMBOL(pci_disable_msix);
/**
---- head-2011-06-30.orig/drivers/video/Kconfig 2011-06-30 15:04:43.000000000 +0200
+--- head-2011-06-30.orig/drivers/video/Kconfig 2011-07-12 11:05:58.000000000 +0200
+++ head-2011-06-30/drivers/video/Kconfig 2011-06-30 16:35:51.000000000 +0200
@@ -2237,7 +2237,7 @@ config FB_VIRTUAL
@@ -14969,7 +14996,7 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
select FB_SYS_FILLRECT
select FB_SYS_COPYAREA
select FB_SYS_IMAGEBLIT
---- head-2011-06-30.orig/drivers/video/xen-fbfront.c 2011-06-30 15:04:19.000000000 +0200
+--- head-2011-06-30.orig/drivers/video/xen-fbfront.c 2011-07-12 11:05:58.000000000 +0200
+++ head-2011-06-30/drivers/video/xen-fbfront.c 2011-06-30 16:35:45.000000000 +0200
@@ -678,7 +678,6 @@ static struct xenbus_device_id xenfb_ids
@@ -15848,7 +15875,7 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
};
static int xenfb_mmap(struct fb_info *fb_info, struct vm_area_struct *vma)
---- head-2011-06-30.orig/drivers/xen/features.c 2009-03-24 00:12:14.000000000 +0100
+--- head-2011-06-30.orig/drivers/xen/features.c 2011-07-12 11:05:58.000000000 +0200
+++ head-2011-06-30/drivers/xen/features.c 2011-01-31 18:07:35.000000000 +0100
@@ -9,14 +9,21 @@
#include <linux/cache.h>
@@ -19630,9 +19657,9 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
-
-#endif
-
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/spinlock.h 2011-01-31 18:01:51.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/spinlock.h 2011-01-31 18:07:35.000000000 +0100
-@@ -95,7 +95,7 @@ void xen_spin_kick(raw_spinlock_t *, uns
+--- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/spinlock.h 2011-07-12 10:55:12.000000000 +0200
++++ head-2011-06-30/arch/x86/include/mach-xen/asm/spinlock.h 2011-07-12 11:14:18.000000000 +0200
+@@ -99,7 +99,7 @@ void xen_spin_kick(raw_spinlock_t *, uns
: \
: "memory", "cc")
@@ -19641,7 +19668,7 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
{
int tmp, new;
-@@ -158,7 +158,7 @@ static inline int __raw_spin_trylock(raw
+@@ -162,7 +162,7 @@ static inline int __raw_spin_trylock(raw
: "memory", "cc"); \
} while (0)
@@ -19650,7 +19677,7 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
{
int tmp;
int new;
-@@ -183,19 +183,19 @@ static inline int __raw_spin_trylock(raw
+@@ -187,19 +187,19 @@ static inline int __raw_spin_trylock(raw
static inline int __raw_spin_is_locked(raw_spinlock_t *lock)
{
@@ -19673,7 +19700,7 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
{
unsigned int token, count;
unsigned int flags = __raw_local_irq_save();
-@@ -214,8 +214,8 @@ static inline void __raw_spin_lock(raw_s
+@@ -218,8 +218,8 @@ static inline void __raw_spin_lock(raw_s
} while (unlikely(!count) && !xen_spin_wait(lock, &token, flags));
}
@@ -19684,7 +19711,7 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
{
unsigned int token, count;
bool free;
-@@ -230,7 +230,7 @@ static inline void __raw_spin_lock_flags
+@@ -234,7 +234,7 @@ static inline void __raw_spin_lock_flags
} while (unlikely(!count) && !xen_spin_wait(lock, &token, flags));
}
@@ -20617,7 +20644,7 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
typedef struct vcpu_register_vcpu_info vcpu_register_vcpu_info_t;
DEFINE_XEN_GUEST_HANDLE(vcpu_register_vcpu_info_t);
---- head-2011-06-30.orig/init/Kconfig 2011-06-30 15:04:42.000000000 +0200
+--- head-2011-06-30.orig/init/Kconfig 2011-07-12 11:05:58.000000000 +0200
+++ head-2011-06-30/init/Kconfig 2011-06-30 16:35:19.000000000 +0200
@@ -1049,6 +1049,7 @@ config ELF_CORE
config PCSPKR_PLATFORM
diff --git a/patches.xen/xen3-patch-2.6.27 b/patches.xen/xen3-patch-2.6.27
index 0d3f2d9c6b..b63501f871 100644
--- a/patches.xen/xen3-patch-2.6.27
+++ b/patches.xen/xen3-patch-2.6.27
@@ -11,8 +11,8 @@ Removed adjustments NO_HZ -> NO_HZ || NO_IDLE_HZ from kernel/{hr,}timer.c,
as they would get removed again by xen-clockevents (and really shouldn't
have been needed - see SLE11 SPn).
---- head-2011-06-30.orig/arch/x86/Kconfig 2011-06-30 16:36:09.000000000 +0200
-+++ head-2011-06-30/arch/x86/Kconfig 2011-06-30 16:39:04.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/Kconfig 2011-06-30 16:36:09.000000000 +0200
++++ head-2011-07-21/arch/x86/Kconfig 2011-06-30 16:39:04.000000000 +0200
@@ -720,7 +720,7 @@ config AMD_IOMMU
select SWIOTLB
select PCI_MSI
@@ -31,8 +31,8 @@ have been needed - see SLE11 SPn).
---help---
Convert MTRR layout from continuous to discrete, so X drivers can
add writeback entries.
---- head-2011-06-30.orig/arch/x86/Kconfig.debug 2011-06-30 16:33:56.000000000 +0200
-+++ head-2011-06-30/arch/x86/Kconfig.debug 2011-06-30 16:39:08.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/Kconfig.debug 2011-06-30 16:33:56.000000000 +0200
++++ head-2011-07-21/arch/x86/Kconfig.debug 2011-06-30 16:39:08.000000000 +0200
@@ -25,6 +25,7 @@ config STRICT_DEVMEM
config X86_VERBOSE_BOOTUP
bool "Enable verbose x86 bootup info messages"
@@ -49,8 +49,8 @@ have been needed - see SLE11 SPn).
config X86_DECODER_SELFTEST
bool "x86 instruction decoder selftest"
---- head-2011-06-30.orig/arch/x86/Makefile 2011-02-01 14:11:04.000000000 +0100
-+++ head-2011-06-30/arch/x86/Makefile 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/Makefile 2011-02-01 14:11:04.000000000 +0100
++++ head-2011-07-21/arch/x86/Makefile 2011-02-01 14:38:38.000000000 +0100
@@ -117,8 +117,8 @@ endif
KBUILD_CFLAGS += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,)
@@ -62,8 +62,8 @@ have been needed - see SLE11 SPn).
KBUILD_CFLAGS += $(mflags-y)
KBUILD_AFLAGS += $(mflags-y)
---- head-2011-06-30.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/ia32/ia32entry-xen.S 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/ia32/ia32entry-xen.S 2011-02-01 14:38:38.000000000 +0100
@@ -15,6 +15,16 @@
#include <asm/irqflags.h>
#include <linux/linkage.h>
@@ -305,8 +305,8 @@ have been needed - see SLE11 SPn).
+ .quad sys_pipe2
+ .quad sys_inotify_init1
ia32_syscall_end:
---- head-2011-06-30.orig/arch/x86/kernel/Makefile 2011-06-30 16:36:14.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/Makefile 2011-06-30 16:39:13.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/kernel/Makefile 2011-06-30 16:36:14.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/Makefile 2011-06-30 16:39:13.000000000 +0200
@@ -131,9 +131,11 @@ ifeq ($(CONFIG_X86_64),y)
obj-$(CONFIG_PCI_MMCONFIG) += mmconf-fam10h_64.o
obj-y += vsmp_64.o
@@ -322,8 +322,8 @@ have been needed - see SLE11 SPn).
+ i8259.o irqinit_$(BITS).o pci-swiotlb_64.o reboot.o smpboot.o \
+ tlb_$(BITS).o tsc.o tsc_sync.o vsmp_64.o
+disabled-obj-$(CONFIG_XEN_UNPRIVILEGED_GUEST) += probe_roms_32.o
---- head-2011-06-30.orig/arch/x86/kernel/acpi/boot.c 2011-03-11 10:59:02.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/acpi/boot.c 2011-04-13 13:47:31.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/kernel/acpi/boot.c 2011-03-11 10:59:02.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/acpi/boot.c 2011-04-13 13:47:31.000000000 +0200
@@ -1343,6 +1343,7 @@ static int __init dmi_disable_acpi(const
return 0;
}
@@ -367,8 +367,8 @@ have been needed - see SLE11 SPn).
/*
* If acpi_disabled, bail out
---- head-2011-06-30.orig/arch/x86/kernel/amd_nb.c 2011-05-19 06:06:34.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/amd_nb.c 2011-04-13 13:47:56.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/kernel/amd_nb.c 2011-07-21 11:59:59.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/amd_nb.c 2011-04-13 13:47:56.000000000 +0200
@@ -15,6 +15,10 @@ static u32 *flush_words;
const struct pci_device_id amd_nb_misc_ids[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB_MISC) },
@@ -380,8 +380,8 @@ have been needed - see SLE11 SPn).
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F3) },
{}
};
---- head-2011-06-30.orig/arch/x86/kernel/apic/apic-xen.c 2011-02-24 15:45:13.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/apic/apic-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/apic/apic-xen.c 2011-02-24 15:45:13.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/apic/apic-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -59,7 +59,10 @@ static cpumask_t timer_bcast_ipi;
/*
* Debug level, exported for io_apic.c
@@ -394,8 +394,8 @@ have been needed - see SLE11 SPn).
#ifndef CONFIG_XEN
static int modern_apic(void)
---- head-2011-06-30.orig/arch/x86/kernel/cpu/amd.c 2011-06-30 15:04:08.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/cpu/amd.c 2011-06-30 16:40:20.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/kernel/cpu/amd.c 2011-07-21 11:59:59.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/cpu/amd.c 2011-06-30 16:40:20.000000000 +0200
@@ -592,6 +592,7 @@ static void __cpuinit init_amd(struct cp
fam10h_check_enable_mmcfg();
}
@@ -412,8 +412,8 @@ have been needed - see SLE11 SPn).
/*
* Family 0x12 and above processors have APIC timer
---- head-2011-06-30.orig/arch/x86/kernel/cpu/bugs_64.c 2009-12-03 04:51:21.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/cpu/bugs_64.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/cpu/bugs_64.c 2011-07-21 11:59:59.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/cpu/bugs_64.c 2011-02-01 14:38:38.000000000 +0100
@@ -20,6 +20,7 @@ void __init check_bugs(void)
#endif
alternative_instructions();
@@ -428,8 +428,8 @@ have been needed - see SLE11 SPn).
set_memory_4k((unsigned long)__va(0), 1);
+#endif
}
---- head-2011-06-30.orig/arch/x86/kernel/cpu/common-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/cpu/common-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/cpu/common-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/cpu/common-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -13,6 +13,7 @@
#include <asm/mtrr.h>
#include <asm/mce.h>
@@ -493,7 +493,7 @@ have been needed - see SLE11 SPn).
if (!have_cpuid_p()) {
/*
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-06-30/arch/x86/kernel/cpu/common_64-xen.c 2011-02-01 14:38:38.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/cpu/common_64-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -0,0 +1,777 @@
+#include <linux/init.h>
+#include <linux/kernel.h>
@@ -1273,7 +1273,7 @@ have been needed - see SLE11 SPn).
+ uv_cpu_init();
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-06-30/arch/x86/kernel/e820-xen.c 2011-02-01 14:38:38.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/e820-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -0,0 +1,1553 @@
+/*
+ * Handle the memory map.
@@ -2828,7 +2828,7 @@ have been needed - see SLE11 SPn).
+ printk(KERN_INFO "Xen-provided physical RAM map:\n");
+ _e820_print_map(&e820, who);
+}
---- head-2011-06-30.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 18:07:35.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 18:07:35.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,860 +0,0 @@
-#include <linux/kernel.h>
@@ -3691,7 +3691,7 @@ have been needed - see SLE11 SPn).
- print_memory_map("modified");
-}
-#endif
---- head-2011-06-30.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 18:07:35.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 18:07:35.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,1052 +0,0 @@
-/*
@@ -4746,8 +4746,8 @@ have been needed - see SLE11 SPn).
- max_pfn << PAGE_SHIFT) - *addr;
- return i + 1;
-}
---- head-2011-06-30.orig/arch/x86/kernel/early_printk-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/early_printk-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/early_printk-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/early_printk-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -225,7 +225,7 @@ static struct console simnow_console = {
static struct console *early_console = &early_vga_console;
static int early_console_initialized;
@@ -4757,8 +4757,8 @@ have been needed - see SLE11 SPn).
{
char buf[512];
int n;
---- head-2011-06-30.orig/arch/x86/kernel/entry_32-xen.S 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:10:27.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/kernel/entry_32-xen.S 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:10:27.000000000 +0200
@@ -51,15 +51,26 @@
#include <asm/percpu.h>
#include <asm/dwarf2.h>
@@ -5056,8 +5056,8 @@ have been needed - see SLE11 SPn).
cmpl $nr_syscalls,%eax
jb syscall_call
jmp syscall_exit
---- head-2011-06-30.orig/arch/x86/kernel/entry_64.S 2011-06-30 15:04:43.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/entry_64.S 2011-04-13 13:48:13.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/kernel/entry_64.S 2011-07-21 11:59:59.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/entry_64.S 2011-04-13 13:48:13.000000000 +0200
@@ -1258,7 +1258,7 @@ ENTRY(arch_unwind_init_running)
END(arch_unwind_init_running)
#endif
@@ -5076,8 +5076,8 @@ have been needed - see SLE11 SPn).
/*
* Some functions should be protected against kprobes
---- head-2011-06-30.orig/arch/x86/kernel/entry_64-xen.S 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/entry_64-xen.S 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/entry_64-xen.S 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/entry_64-xen.S 2011-02-01 14:38:38.000000000 +0100
@@ -53,12 +53,124 @@
#include <asm/hw_irq.h>
#include <asm/page.h>
@@ -5515,8 +5515,8 @@ have been needed - see SLE11 SPn).
paranoidentry do_stack_segment */
errorentry do_stack_segment
/* jmp paranoid_exit1
---- head-2011-06-30.orig/arch/x86/kernel/fixup.c 2011-01-31 18:01:51.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/fixup.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/fixup.c 2011-01-31 18:01:51.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/fixup.c 2011-02-01 14:38:38.000000000 +0100
@@ -33,6 +33,7 @@
#include <linux/kernel.h>
#include <linux/delay.h>
@@ -5526,7 +5526,7 @@ have been needed - see SLE11 SPn).
#define DP(_f, _args...) pr_alert(" " _f "\n" , ## _args )
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-06-30/arch/x86/kernel/head-xen.c 2011-02-01 14:38:38.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/head-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -0,0 +1,57 @@
+#include <linux/kernel.h>
+#include <linux/init.h>
@@ -5586,7 +5586,7 @@ have been needed - see SLE11 SPn).
+#endif
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-06-30/arch/x86/kernel/head32-xen.c 2011-02-01 14:38:38.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/head32-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -0,0 +1,56 @@
+/*
+ * linux/arch/i386/kernel/head32.c -- prepare to run common code
@@ -5644,8 +5644,8 @@ have been needed - see SLE11 SPn).
+
+ start_kernel();
+}
---- head-2011-06-30.orig/arch/x86/kernel/head64-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/head64-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/head64-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/head64-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -32,7 +32,26 @@
#include <asm/e820.h>
#include <asm/bios_ebda.h>
@@ -5806,8 +5806,8 @@ have been needed - see SLE11 SPn).
/*
* At this point everything still needed from the boot loader
---- head-2011-06-30.orig/arch/x86/kernel/head_32-xen.S 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/head_32-xen.S 2011-03-03 16:19:21.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/head_32-xen.S 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/head_32-xen.S 2011-03-03 16:19:21.000000000 +0100
@@ -61,8 +61,6 @@ ENTRY(startup_32)
movb %cl,X86_MASK
movl %edx,X86_CAPABILITY
@@ -5817,8 +5817,8 @@ have been needed - see SLE11 SPn).
xorl %eax,%eax # Clear GS
movl %eax,%gs
---- head-2011-06-30.orig/arch/x86/kernel/head_64-xen.S 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/head_64-xen.S 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/head_64-xen.S 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/head_64-xen.S 2011-02-01 14:38:38.000000000 +0100
@@ -92,53 +92,6 @@ NEXT_PAGE(hypercall_page)
#undef NEXT_PAGE
@@ -5873,8 +5873,8 @@ have been needed - see SLE11 SPn).
.section .bss.page_aligned, "aw", @nobits
.align PAGE_SIZE
ENTRY(empty_zero_page)
---- head-2011-06-30.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/io_apic_32-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/io_apic_32-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -25,6 +25,7 @@
#include <linux/init.h>
#include <linux/delay.h>
@@ -7499,8 +7499,8 @@ have been needed - see SLE11 SPn).
+ }
+}
+#endif
---- head-2011-06-30.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/io_apic_64-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/io_apic_64-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -45,6 +45,7 @@
#include <asm/proto.h>
#include <asm/acpi.h>
@@ -8264,8 +8264,8 @@ have been needed - see SLE11 SPn).
} else {
ioapic_phys = (unsigned long)
alloc_bootmem_pages(PAGE_SIZE);
---- head-2011-06-30.orig/arch/x86/kernel/ldt-xen.c 2011-01-31 18:01:51.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/ldt-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/ldt-xen.c 2011-01-31 18:01:51.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/ldt-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -20,9 +20,9 @@
#include <asm/mmu_context.h>
@@ -8300,8 +8300,8 @@ have been needed - see SLE11 SPn).
preempt_enable();
#endif
}
---- head-2011-06-30.orig/arch/x86/kernel/machine_kexec_32.c 2011-01-31 14:54:00.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/machine_kexec_32.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/machine_kexec_32.c 2011-01-31 14:54:00.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/machine_kexec_32.c 2011-02-01 14:38:38.000000000 +0100
@@ -131,6 +131,8 @@ void machine_kexec_setup_load_arg(xen_ke
xki->page_list[PA_PTE_0] = __ma(kexec_pte0);
xki->page_list[PA_PTE_1] = __ma(kexec_pte1);
@@ -8311,8 +8311,8 @@ have been needed - see SLE11 SPn).
}
int __init machine_kexec_setup_resources(struct resource *hypervisor,
---- head-2011-06-30.orig/arch/x86/kernel/microcode-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/microcode-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/microcode-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/microcode-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -5,13 +5,14 @@
* 2006 Shaohua Li <shaohua.li@intel.com>
*
@@ -8377,8 +8377,8 @@ have been needed - see SLE11 SPn).
return 0;
}
---- head-2011-06-30.orig/arch/x86/kernel/mpparse-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/mpparse-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/mpparse-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/mpparse-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -25,6 +25,9 @@
#include <asm/proto.h>
#include <asm/acpi.h>
@@ -9588,8 +9588,8 @@ have been needed - see SLE11 SPn).
-#endif /* CONFIG_X86_IO_APIC */
-#endif /* CONFIG_ACPI */
+late_initcall(update_mp_table);
---- head-2011-06-30.orig/arch/x86/kernel/pci-dma-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/pci-dma-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/pci-dma-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/pci-dma-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -5,13 +5,13 @@
#include <asm/proto.h>
@@ -9945,8 +9945,8 @@ have been needed - see SLE11 SPn).
no_iommu_init();
return 0;
---- head-2011-06-30.orig/arch/x86/kernel/pci-nommu-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/pci-nommu-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/pci-nommu-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/pci-nommu-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -84,18 +84,12 @@ static int nommu_dma_supported(struct de
return 1;
}
@@ -9967,8 +9967,8 @@ have been needed - see SLE11 SPn).
};
void __init no_iommu_init(void)
---- head-2011-06-30.orig/arch/x86/kernel/probe_roms.c 2011-06-30 15:04:09.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/probe_roms.c 2011-06-30 16:40:28.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/kernel/probe_roms.c 2011-07-21 11:59:59.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/probe_roms.c 2011-06-30 16:40:28.000000000 +0200
@@ -232,7 +232,7 @@ void __init probe_roms(void)
upper = system_rom_resource.start;
@@ -9978,8 +9978,8 @@ have been needed - see SLE11 SPn).
if (romsignature(rom)) {
length = extension_rom_resource.end - extension_rom_resource.start + 1;
if (romchecksum(rom, length)) {
---- head-2011-06-30.orig/arch/x86/kernel/process-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/process-xen.c 2011-03-03 15:59:49.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/process-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/process-xen.c 2011-03-03 15:59:49.000000000 +0100
@@ -6,6 +6,13 @@
#include <linux/sched.h>
#include <linux/module.h>
@@ -10241,8 +10241,8 @@ have been needed - see SLE11 SPn).
return -1;
boot_option_idle_override = 1;
---- head-2011-06-30.orig/arch/x86/kernel/process_32-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/process_32-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/process_32-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/process_32-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -59,15 +59,11 @@
#include <asm/tlbflush.h>
#include <asm/cpu.h>
@@ -10346,8 +10346,8 @@ have been needed - see SLE11 SPn).
}
tick_nohz_restart_sched_tick();
preempt_enable_no_resched();
---- head-2011-06-30.orig/arch/x86/kernel/process_64-xen.c 2011-02-02 08:32:46.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/process_64-xen.c 2011-02-02 08:34:01.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/process_64-xen.c 2011-02-02 08:32:46.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/process_64-xen.c 2011-02-02 08:34:01.000000000 +0100
@@ -64,15 +64,6 @@ asmlinkage extern void ret_from_fork(voi
unsigned long kernel_thread_flags = CLONE_VM | CLONE_UNTRACED;
@@ -10530,8 +10530,8 @@ have been needed - see SLE11 SPn).
if (gsindex)
rdmsrl(MSR_KERNEL_GS_BASE, base);
else
---- head-2011-06-30.orig/arch/x86/kernel/setup-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/setup-xen.c 2011-06-10 11:59:07.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/kernel/setup-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/setup-xen.c 2011-06-10 11:59:07.000000000 +0200
@@ -1,143 +1,1126 @@
-#include <linux/kernel.h>
+/*
@@ -11749,7 +11749,7 @@ have been needed - see SLE11 SPn).
+ return NOTIFY_DONE;
+}
+#endif /* !CONFIG_XEN */
---- head-2011-06-30.orig/arch/x86/kernel/setup64-xen.c 2011-01-31 18:07:35.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/setup64-xen.c 2011-01-31 18:07:35.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,370 +0,0 @@
-/*
@@ -12122,7 +12122,7 @@ have been needed - see SLE11 SPn).
- if (is_uv_system())
- uv_cpu_init();
-}
---- head-2011-06-30.orig/arch/x86/kernel/setup_32-xen.c 2011-03-04 15:07:31.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/setup_32-xen.c 2011-03-04 15:07:31.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,1153 +0,0 @@
-/*
@@ -13278,7 +13278,7 @@ have been needed - see SLE11 SPn).
-}
-
-subsys_initcall(request_standard_resources);
---- head-2011-06-30.orig/arch/x86/kernel/setup_64-xen.c 2011-01-31 18:07:35.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/setup_64-xen.c 2011-01-31 18:07:35.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,1442 +0,0 @@
-/*
@@ -14723,8 +14723,8 @@ have been needed - see SLE11 SPn).
- return 1;
-}
-__setup("clearcpuid=", setup_disablecpuid);
---- head-2011-06-30.orig/arch/x86/kernel/smp-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/smp-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/smp-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/smp-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -121,132 +121,14 @@ void xen_smp_send_reschedule(int cpu)
send_IPI_mask(cpumask_of_cpu(cpu), RESCHEDULE_VECTOR);
}
@@ -14922,9 +14922,9 @@ have been needed - see SLE11 SPn).
return IRQ_HANDLED;
}
---- head-2011-06-30.orig/arch/x86/kernel/time-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/time-xen.c 2011-02-01 14:38:38.000000000 +0100
-@@ -460,7 +460,7 @@ irqreturn_t timer_interrupt(int irq, voi
+--- head-2011-07-21.orig/arch/x86/kernel/time-xen.c 2011-07-11 11:49:22.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/time-xen.c 2011-07-11 11:50:40.000000000 +0200
+@@ -522,7 +522,7 @@ irqreturn_t timer_interrupt(int irq, voi
/* Keep nmi watchdog up to date */
#ifdef __i386__
@@ -14933,9 +14933,9 @@ have been needed - see SLE11 SPn).
#else
add_pda(irq0_irqs, 1);
#endif
-@@ -750,9 +750,7 @@ void __init time_init(void)
+@@ -785,9 +785,7 @@ void __init time_init(void)
- update_wallclock();
+ update_wallclock(false);
-#ifndef CONFIG_X86_64
use_tsc_delay();
@@ -14943,7 +14943,7 @@ have been needed - see SLE11 SPn).
/* Cannot request_irq() until kmem is initialised. */
late_time_init = setup_cpu0_timer_irq;
-@@ -809,7 +807,8 @@ static void stop_hz_timer(void)
+@@ -844,7 +842,8 @@ static void stop_hz_timer(void)
/* Leave ourselves in tick mode if rcu or softirq or timer pending. */
if (rcu_needs_cpu(cpu) || local_softirq_pending() ||
@@ -14953,8 +14953,8 @@ have been needed - see SLE11 SPn).
cpu_clear(cpu, nohz_cpu_mask);
j = jiffies + 1;
}
---- head-2011-06-30.orig/arch/x86/kernel/traps_32-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/traps_32-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/traps_32-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/traps_32-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -1,5 +1,6 @@
/*
* Copyright (C) 1991, 1992 Linus Torvalds
@@ -15531,8 +15531,8 @@ have been needed - see SLE11 SPn).
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-06-30.orig/arch/x86/kernel/traps_64-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/traps_64-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/traps_64-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/traps_64-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -10,73 +10,56 @@
* 'Traps.c' handles hardware traps and faults after we have saved some
* state in 'entry.S'.
@@ -16493,8 +16493,8 @@ have been needed - see SLE11 SPn).
static int __init code_bytes_setup(char *s)
{
code_bytes = simple_strtoul(s, NULL, 0);
---- head-2011-06-30.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/vsyscall_64-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/vsyscall_64-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -42,7 +42,8 @@
#include <asm/topology.h>
#include <asm/vgtod.h>
@@ -16535,8 +16535,8 @@ have been needed - see SLE11 SPn).
hotcpu_notifier(cpu_vsyscall_notifier, 0);
return 0;
}
---- head-2011-06-30.orig/arch/x86/mach-xen/setup.c 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/mach-xen/setup.c 2011-02-03 14:23:14.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mach-xen/setup.c 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/mach-xen/setup.c 2011-02-03 14:23:14.000000000 +0100
@@ -17,6 +17,8 @@
#include <xen/interface/callback.h>
#include <xen/interface/memory.h>
@@ -16700,8 +16700,8 @@ have been needed - see SLE11 SPn).
}
+#endif
}
---- head-2011-06-30.orig/arch/x86/mm/Makefile 2011-06-30 15:40:00.000000000 +0200
-+++ head-2011-06-30/arch/x86/mm/Makefile 2011-04-13 13:48:19.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/mm/Makefile 2011-06-30 15:40:00.000000000 +0200
++++ head-2011-07-21/arch/x86/mm/Makefile 2011-04-13 13:48:19.000000000 +0200
@@ -28,6 +28,7 @@ obj-$(CONFIG_ACPI_NUMA) += srat.o
obj-$(CONFIG_NUMA_EMU) += numa_emulation.o
@@ -16710,8 +16710,8 @@ have been needed - see SLE11 SPn).
obj-$(CONFIG_HAVE_MEMBLOCK) += memblock.o
---- head-2011-06-30.orig/arch/x86/mm/dump_pagetables-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/dump_pagetables-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/dump_pagetables-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/mm/dump_pagetables-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -45,7 +45,7 @@ static struct addr_marker address_marker
{ 0, "User Space" },
#ifdef CONFIG_X86_64
@@ -16759,8 +16759,8 @@ have been needed - see SLE11 SPn).
if (pgd_large(*start) || !pgd_present(*start))
note_page(m, &st, __pgprot(prot), 1);
---- head-2011-06-30.orig/arch/x86/mm/fault-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/fault-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/fault-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/mm/fault-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -10,6 +10,7 @@
#include <linux/string.h>
#include <linux/types.h>
@@ -16961,8 +16961,8 @@ have been needed - see SLE11 SPn).
}
#endif
}
---- head-2011-06-30.orig/arch/x86/mm/hypervisor.c 2011-03-23 09:49:05.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/hypervisor.c 2011-03-23 09:54:27.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/hypervisor.c 2011-03-23 09:49:05.000000000 +0100
++++ head-2011-07-21/arch/x86/mm/hypervisor.c 2011-03-23 09:54:27.000000000 +0100
@@ -711,6 +711,72 @@ void xen_destroy_contiguous_region(unsig
}
EXPORT_SYMBOL_GPL(xen_destroy_contiguous_region);
@@ -17084,8 +17084,8 @@ have been needed - see SLE11 SPn).
+ maddr_t mach_gp = virt_to_machine(gdt + entry);
+ return HYPERVISOR_update_descriptor(mach_gp, *(const u64*)desc);
}
---- head-2011-06-30.orig/arch/x86/mm/init_32-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/init_32-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/init_32-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/mm/init_32-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -54,6 +54,7 @@
unsigned int __VMALLOC_RESERVE = 128 << 20;
@@ -17915,8 +17915,8 @@ have been needed - see SLE11 SPn).
+{
+ return reserve_bootmem(phys, len, flags);
+}
---- head-2011-06-30.orig/arch/x86/mm/init_64-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/init_64-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/init_64-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/mm/init_64-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -21,6 +21,7 @@
#include <linux/swap.h>
#include <linux/smp.h>
@@ -19285,8 +19285,8 @@ have been needed - see SLE11 SPn).
}
return 0;
}
---- head-2011-06-30.orig/arch/x86/mm/ioremap-xen.c 2011-02-07 15:39:13.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/ioremap-xen.c 2011-02-07 15:40:39.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/ioremap-xen.c 2011-02-07 15:39:13.000000000 +0100
++++ head-2011-07-21/arch/x86/mm/ioremap-xen.c 2011-02-07 15:40:39.000000000 +0100
@@ -13,6 +13,7 @@
#include <linux/pfn.h>
#include <linux/slab.h>
@@ -19459,8 +19459,8 @@ have been needed - see SLE11 SPn).
return 1;
}
---- head-2011-06-30.orig/arch/x86/mm/pageattr-xen.c 2011-03-23 09:53:18.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/pageattr-xen.c 2011-03-23 09:54:23.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/pageattr-xen.c 2011-03-23 09:53:18.000000000 +0100
++++ head-2011-07-21/arch/x86/mm/pageattr-xen.c 2011-03-23 09:54:23.000000000 +0100
@@ -34,6 +34,47 @@ struct cpa_data {
unsigned force_split : 1;
};
@@ -19675,8 +19675,8 @@ have been needed - see SLE11 SPn).
return _set_memory_wb(addr, numpages);
}
---- head-2011-06-30.orig/arch/x86/mm/pat-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/pat-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/pat-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/mm/pat-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -12,6 +12,8 @@
#include <linux/gfp.h>
#include <linux/fs.h>
@@ -20386,8 +20386,8 @@ have been needed - see SLE11 SPn).
+late_initcall(pat_memtype_list_init);
+
+#endif /* CONFIG_DEBUG_FS */
---- head-2011-06-30.orig/arch/x86/mm/pgtable-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/pgtable-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/pgtable-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/mm/pgtable-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -4,6 +4,7 @@
#include <asm/pgalloc.h>
#include <asm/pgtable.h>
@@ -20755,8 +20755,8 @@ have been needed - see SLE11 SPn).
+ set_pte_vaddr(address, pte);
+ fixmaps_set++;
+}
---- head-2011-06-30.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/mm/pgtable_32-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/mm/pgtable_32-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -25,51 +25,49 @@
#include <xen/features.h>
#include <asm/hypervisor.h>
@@ -20937,8 +20937,8 @@ have been needed - see SLE11 SPn).
void make_lowmem_page_readonly(void *va, unsigned int feature)
{
pte_t *pte;
---- head-2011-06-30.orig/arch/x86/pci/amd_bus.c 2011-05-19 06:06:34.000000000 +0200
-+++ head-2011-06-30/arch/x86/pci/amd_bus.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/pci/amd_bus.c 2011-07-21 11:59:59.000000000 +0200
++++ head-2011-07-21/arch/x86/pci/amd_bus.c 2011-02-01 14:38:38.000000000 +0100
@@ -350,6 +350,7 @@ static int __init early_fill_mp_bus_info
#define ENABLE_CF8_EXT_CFG (1ULL << 46)
@@ -20986,8 +20986,8 @@ have been needed - see SLE11 SPn).
if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD)
return 0;
---- head-2011-06-30.orig/arch/x86/pci/irq-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/pci/irq-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/pci/irq-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/pci/irq-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -11,8 +11,8 @@
#include <linux/slab.h>
#include <linux/interrupt.h>
@@ -21862,8 +21862,8 @@ have been needed - see SLE11 SPn).
}
return 0;
}
---- head-2011-06-30.orig/arch/x86/vdso/Makefile 2011-06-30 16:34:12.000000000 +0200
-+++ head-2011-06-30/arch/x86/vdso/Makefile 2011-06-30 16:40:55.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/vdso/Makefile 2011-06-30 16:34:12.000000000 +0200
++++ head-2011-07-21/arch/x86/vdso/Makefile 2011-06-30 16:40:55.000000000 +0200
@@ -78,9 +78,7 @@ obj-$(VDSO32-y) += vdso32-syms.lds
vdso32.so-$(VDSO32-y) += int80
vdso32.so-$(CONFIG_COMPAT) += syscall
@@ -21875,8 +21875,8 @@ have been needed - see SLE11 SPn).
vdso32-images = $(vdso32.so-y:%=vdso32-%.so)
---- head-2011-06-30.orig/arch/x86/vdso/vdso32.S 2011-01-31 18:01:51.000000000 +0100
-+++ head-2011-06-30/arch/x86/vdso/vdso32.S 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/vdso/vdso32.S 2011-01-31 18:01:51.000000000 +0100
++++ head-2011-07-21/arch/x86/vdso/vdso32.S 2011-02-01 14:38:38.000000000 +0100
@@ -9,7 +9,7 @@ vdso32_int80_end:
.globl vdso32_syscall_start, vdso32_syscall_end
@@ -21903,8 +21903,8 @@ have been needed - see SLE11 SPn).
-#endif
-
__FINIT
---- head-2011-06-30.orig/arch/x86/vdso/vdso32-setup-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/vdso/vdso32-setup-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/vdso/vdso32-setup-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/vdso/vdso32-setup-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -195,50 +195,28 @@ static __init void relocate_vdso(Elf32_E
}
}
@@ -22038,8 +22038,8 @@ have been needed - see SLE11 SPn).
}
memcpy(syscall_page, vsyscall, vsyscall_len);
---- head-2011-06-30.orig/arch/x86/xen/Kconfig 2011-01-31 17:49:31.000000000 +0100
-+++ head-2011-06-30/arch/x86/xen/Kconfig 2011-04-28 11:12:57.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/xen/Kconfig 2011-01-31 17:49:31.000000000 +0100
++++ head-2011-07-21/arch/x86/xen/Kconfig 2011-04-28 11:12:57.000000000 +0200
@@ -31,14 +31,14 @@ config XEN_PVHVM
config XEN_MAX_DOMAIN_MEMORY
int
@@ -22057,8 +22057,8 @@ have been needed - see SLE11 SPn).
select HIBERNATE_CALLBACKS
default y
---- head-2011-06-30.orig/drivers/acpi/processor_driver.c 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/drivers/acpi/processor_driver.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/drivers/acpi/processor_driver.c 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/drivers/acpi/processor_driver.c 2011-02-01 14:38:38.000000000 +0100
@@ -512,10 +512,12 @@ static int __cpuinit acpi_processor_add(
per_cpu(processors, pr->id) = pr;
#endif
@@ -22086,8 +22086,8 @@ have been needed - see SLE11 SPn).
if (pr->cdev) {
sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
---- head-2011-06-30.orig/drivers/acpi/processor_perflib.c 2011-06-30 16:02:05.000000000 +0200
-+++ head-2011-06-30/drivers/acpi/processor_perflib.c 2011-06-30 16:41:01.000000000 +0200
+--- head-2011-07-21.orig/drivers/acpi/processor_perflib.c 2011-06-30 16:02:05.000000000 +0200
++++ head-2011-07-21/drivers/acpi/processor_perflib.c 2011-06-30 16:41:01.000000000 +0200
@@ -183,6 +183,12 @@ int acpi_processor_ppc_has_changed(struc
{
int ret;
@@ -22101,8 +22101,8 @@ have been needed - see SLE11 SPn).
if (ignore_ppc) {
/*
* Only when it is notification event, the _OST object
---- head-2011-06-30.orig/drivers/char/tpm/tpm_vtpm.c 2011-01-31 14:53:38.000000000 +0100
-+++ head-2011-06-30/drivers/char/tpm/tpm_vtpm.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/drivers/char/tpm/tpm_vtpm.c 2011-01-31 14:53:38.000000000 +0100
++++ head-2011-07-21/drivers/char/tpm/tpm_vtpm.c 2011-02-01 14:38:38.000000000 +0100
@@ -347,7 +347,7 @@ static int _vtpm_send_queued(struct tpm_
{
int rc;
@@ -22112,8 +22112,8 @@ have been needed - see SLE11 SPn).
unsigned char buffer[1];
struct vtpm_state *vtpms;
vtpms = (struct vtpm_state *)chip_get_private(chip);
---- head-2011-06-30.orig/drivers/dma/ioat/dma.h 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/drivers/dma/ioat/dma.h 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/drivers/dma/ioat/dma.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/drivers/dma/ioat/dma.h 2011-02-01 14:38:38.000000000 +0100
@@ -363,6 +363,7 @@ __ioat_dca_init(struct pci_dev *pdev, vo
}
#define ioat_dca_init __ioat_dca_init
@@ -22122,8 +22122,8 @@ have been needed - see SLE11 SPn).
#endif
#endif /* IOATDMA_H */
---- head-2011-06-30.orig/drivers/hwmon/coretemp-xen.c 2011-01-31 18:01:51.000000000 +0100
-+++ head-2011-06-30/drivers/hwmon/coretemp-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/drivers/hwmon/coretemp-xen.c 2011-01-31 18:01:51.000000000 +0100
++++ head-2011-07-21/drivers/hwmon/coretemp-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -360,10 +360,11 @@ static int coretemp_device_add(unsigned
if (err)
goto exit_entry_free;
@@ -22138,8 +22138,8 @@ have been needed - see SLE11 SPn).
/* supported CPU not found, but report the unknown
family 6 CPU */
---- head-2011-06-30.orig/drivers/pci/msi-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/drivers/pci/msi-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/drivers/pci/msi-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/drivers/pci/msi-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -53,12 +53,10 @@ arch_msi_check_device(struct pci_dev *de
return 0;
}
@@ -22242,16 +22242,16 @@ have been needed - see SLE11 SPn).
return -EINVAL;
}
---- head-2011-06-30.orig/drivers/xen/Makefile 2011-02-28 15:13:33.000000000 +0100
-+++ head-2011-06-30/drivers/xen/Makefile 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/Makefile 2011-02-28 15:13:33.000000000 +0100
++++ head-2011-07-21/drivers/xen/Makefile 2011-02-01 14:38:38.000000000 +0100
@@ -1,4 +1,4 @@
-obj-$(CONFIG_PARAVIRT_XEN) += grant-table.o features.o events.o
+obj-$(CONFIG_PARAVIRT_XEN) += grant-table.o features.o events.o manage.o
xen-balloon-$(CONFIG_PARAVIRT_XEN) := balloon.o
xen-balloon-$(CONFIG_XEN) := balloon/
---- head-2011-06-30.orig/drivers/xen/balloon/balloon.c 2011-03-23 08:52:11.000000000 +0100
-+++ head-2011-06-30/drivers/xen/balloon/balloon.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/balloon/balloon.c 2011-03-23 08:52:11.000000000 +0100
++++ head-2011-07-21/drivers/xen/balloon/balloon.c 2011-02-01 14:38:38.000000000 +0100
@@ -82,7 +82,7 @@ struct balloon_stats balloon_stats;
/* We increase/decrease in batches which fit in a page */
static unsigned long frame_list[PAGE_SIZE / sizeof(unsigned long)];
@@ -22261,8 +22261,8 @@ have been needed - see SLE11 SPn).
#define inc_totalhigh_pages() (totalhigh_pages++)
#define dec_totalhigh_pages() (totalhigh_pages--)
#else
---- head-2011-06-30.orig/drivers/xen/balloon/sysfs.c 2011-01-31 18:01:51.000000000 +0100
-+++ head-2011-06-30/drivers/xen/balloon/sysfs.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/balloon/sysfs.c 2011-01-31 18:01:51.000000000 +0100
++++ head-2011-07-21/drivers/xen/balloon/sysfs.c 2011-02-01 14:38:38.000000000 +0100
@@ -45,6 +45,7 @@
#define BALLOON_SHOW(name, format, args...) \
@@ -22290,8 +22290,8 @@ have been needed - see SLE11 SPn).
{
char memstring[64], *endchar;
unsigned long long target_bytes;
---- head-2011-06-30.orig/drivers/xen/blktap/blktap.c 2011-06-30 16:35:35.000000000 +0200
-+++ head-2011-06-30/drivers/xen/blktap/blktap.c 2011-06-30 16:41:05.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/blktap/blktap.c 2011-06-30 16:35:35.000000000 +0200
++++ head-2011-07-21/drivers/xen/blktap/blktap.c 2011-06-30 16:41:05.000000000 +0200
@@ -56,6 +56,7 @@
#include <linux/gfp.h>
#include <linux/poll.h>
@@ -22319,8 +22319,8 @@ have been needed - see SLE11 SPn).
} else {
/* this is bad, but not fatal */
WPRINTK("blktap: sysfs xen_class not created\n");
---- head-2011-06-30.orig/drivers/xen/blktap2/device.c 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/drivers/xen/blktap2/device.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/blktap2/device.c 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/drivers/xen/blktap2/device.c 2011-02-01 14:38:38.000000000 +0100
@@ -3,6 +3,7 @@
#include <linux/cdrom.h>
#include <linux/hdreg.h>
@@ -22329,8 +22329,8 @@ have been needed - see SLE11 SPn).
#include <asm/tlbflush.h>
#include <scsi/scsi.h>
---- head-2011-06-30.orig/drivers/xen/blktap2/sysfs.c 2011-03-11 10:58:58.000000000 +0100
-+++ head-2011-06-30/drivers/xen/blktap2/sysfs.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/blktap2/sysfs.c 2011-03-11 10:58:58.000000000 +0100
++++ head-2011-07-21/drivers/xen/blktap2/sysfs.c 2011-02-01 14:38:38.000000000 +0100
@@ -307,8 +307,8 @@ blktap_sysfs_create(struct blktap *tap)
ring = &tap->ring;
@@ -22342,8 +22342,8 @@ have been needed - see SLE11 SPn).
if (IS_ERR(dev))
return PTR_ERR(dev);
---- head-2011-06-30.orig/drivers/xen/char/mem.c 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/drivers/xen/char/mem.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/char/mem.c 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/drivers/xen/char/mem.c 2011-02-01 14:38:38.000000000 +0100
@@ -35,7 +35,7 @@ static inline int uncached_access(struct
static inline int range_is_allowed(unsigned long pfn, unsigned long size)
@@ -22365,8 +22365,8 @@ have been needed - see SLE11 SPn).
};
static int xen_mmap_mem(struct file * file, struct vm_area_struct * vma)
---- head-2011-06-30.orig/drivers/xen/console/console.c 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/drivers/xen/console/console.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/console/console.c 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/drivers/xen/console/console.c 2011-02-01 14:38:38.000000000 +0100
@@ -431,9 +431,7 @@ static void __xencons_tx_flush(void)
if (work_done && (xencons_tty != NULL)) {
@@ -22389,8 +22389,8 @@ have been needed - see SLE11 SPn).
tty->closing = 0;
spin_lock_irqsave(&xencons_lock, flags);
xencons_tty = NULL;
---- head-2011-06-30.orig/drivers/xen/core/evtchn.c 2011-01-31 18:01:51.000000000 +0100
-+++ head-2011-06-30/drivers/xen/core/evtchn.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/core/evtchn.c 2011-01-31 18:01:51.000000000 +0100
++++ head-2011-07-21/drivers/xen/core/evtchn.c 2011-02-01 14:38:38.000000000 +0100
@@ -126,7 +126,11 @@ static int irq_bindcount[NR_IRQS];
#ifdef CONFIG_SMP
@@ -22487,8 +22487,8 @@ have been needed - see SLE11 SPn).
/* No event channels are 'live' right now. */
for (i = 0; i < NR_EVENT_CHANNELS; i++)
---- head-2011-06-30.orig/drivers/xen/core/gnttab.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/drivers/xen/core/gnttab.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/core/gnttab.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/drivers/xen/core/gnttab.c 2011-02-01 14:38:38.000000000 +0100
@@ -448,6 +448,7 @@ static int map_pte_fn(pte_t *pte, struct
return 0;
}
@@ -22616,8 +22616,8 @@ have been needed - see SLE11 SPn).
return 0;
ini_nomem:
---- head-2011-06-30.orig/drivers/xen/core/machine_kexec.c 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/drivers/xen/core/machine_kexec.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/core/machine_kexec.c 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/drivers/xen/core/machine_kexec.c 2011-02-01 14:38:38.000000000 +0100
@@ -57,8 +57,7 @@ void __init xen_machine_kexec_setup_reso
/* allocate xen_phys_cpus */
@@ -22672,8 +22672,8 @@ have been needed - see SLE11 SPn).
void __init xen_machine_kexec_register_resources(struct resource *res)
{
int k;
---- head-2011-06-30.orig/drivers/xen/core/machine_reboot.c 2011-01-31 18:01:51.000000000 +0100
-+++ head-2011-06-30/drivers/xen/core/machine_reboot.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/core/machine_reboot.c 2011-01-31 18:01:51.000000000 +0100
++++ head-2011-07-21/drivers/xen/core/machine_reboot.c 2011-02-01 14:38:38.000000000 +0100
@@ -52,6 +52,7 @@ void machine_power_off(void)
HYPERVISOR_shutdown(SHUTDOWN_poweroff);
}
@@ -22713,8 +22713,8 @@ have been needed - see SLE11 SPn).
return 0;
}
+#endif
---- head-2011-06-30.orig/drivers/xen/core/reboot.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/drivers/xen/core/reboot.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/core/reboot.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/drivers/xen/core/reboot.c 2011-02-01 14:38:38.000000000 +0100
@@ -28,17 +28,12 @@ MODULE_LICENSE("Dual BSD/GPL");
/* Ignore multiple shutdown requests. */
static int shutting_down = SHUTDOWN_INVALID;
@@ -22787,8 +22787,8 @@ have been needed - see SLE11 SPn).
static int setup_shutdown_watcher(void)
{
---- head-2011-06-30.orig/drivers/xen/core/smpboot.c 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/drivers/xen/core/smpboot.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/core/smpboot.c 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/drivers/xen/core/smpboot.c 2011-02-01 14:38:38.000000000 +0100
@@ -27,6 +27,7 @@
extern irqreturn_t smp_reschedule_interrupt(int, void *);
@@ -22924,8 +22924,8 @@ have been needed - see SLE11 SPn).
prefill_possible_map();
}
---- head-2011-06-30.orig/drivers/xen/core/spinlock.c 2011-03-15 16:52:48.000000000 +0100
-+++ head-2011-06-30/drivers/xen/core/spinlock.c 2011-03-15 16:51:35.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/core/spinlock.c 2011-03-15 16:52:48.000000000 +0100
++++ head-2011-07-21/drivers/xen/core/spinlock.c 2011-03-15 16:51:35.000000000 +0100
@@ -5,6 +5,10 @@
* portions of this file.
*/
@@ -23060,8 +23060,8 @@ have been needed - see SLE11 SPn).
EXPORT_SYMBOL(xen_spin_kick);
+
+#endif /* TICKET_SHIFT */
---- head-2011-06-30.orig/drivers/xen/fbfront/xenfb.c 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/drivers/xen/fbfront/xenfb.c 2011-02-17 10:11:23.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/fbfront/xenfb.c 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/drivers/xen/fbfront/xenfb.c 2011-02-17 10:11:23.000000000 +0100
@@ -18,6 +18,7 @@
* frame buffer.
*/
@@ -23113,16 +23113,16 @@ have been needed - see SLE11 SPn).
+MODULE_DESCRIPTION("Xen virtual framebuffer device frontend");
MODULE_LICENSE("GPL");
---- head-2011-06-30.orig/drivers/xen/fbfront/xenkbd.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/drivers/xen/fbfront/xenkbd.c 2011-05-23 11:10:58.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/fbfront/xenkbd.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/drivers/xen/fbfront/xenkbd.c 2011-05-23 11:10:58.000000000 +0200
@@ -363,4 +363,5 @@ static void __exit xenkbd_cleanup(void)
module_init(xenkbd_init);
module_exit(xenkbd_cleanup);
+MODULE_DESCRIPTION("Xen virtual keyboard/pointer device frontend");
MODULE_LICENSE("GPL");
---- head-2011-06-30.orig/drivers/xen/gntdev/gntdev.c 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/drivers/xen/gntdev/gntdev.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/gntdev/gntdev.c 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/drivers/xen/gntdev/gntdev.c 2011-02-01 14:38:38.000000000 +0100
@@ -400,7 +400,7 @@ static int __init gntdev_init(void)
}
@@ -23132,8 +23132,8 @@ have been needed - see SLE11 SPn).
if (IS_ERR(device)) {
pr_err("Error creating gntdev device in xen_class\n");
pr_err("gntdev created, major number = %d\n", gntdev_major);
---- head-2011-06-30.orig/drivers/xen/netback/netback.c 2011-04-11 15:01:12.000000000 +0200
-+++ head-2011-06-30/drivers/xen/netback/netback.c 2011-04-11 15:03:06.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/netback/netback.c 2011-04-11 15:01:12.000000000 +0200
++++ head-2011-07-21/drivers/xen/netback/netback.c 2011-04-11 15:03:06.000000000 +0200
@@ -36,7 +36,7 @@
#include "common.h"
@@ -23152,8 +23152,8 @@ have been needed - see SLE11 SPn).
static struct pending_tx_info {
netif_tx_request_t req;
---- head-2011-06-30.orig/drivers/xen/netfront/accel.c 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/drivers/xen/netfront/accel.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/netfront/accel.c 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/drivers/xen/netfront/accel.c 2011-02-01 14:38:38.000000000 +0100
@@ -28,6 +28,7 @@
* IN THE SOFTWARE.
*/
@@ -23162,8 +23162,8 @@ have been needed - see SLE11 SPn).
#include <linux/netdevice.h>
#include <linux/skbuff.h>
#include <linux/list.h>
---- head-2011-06-30.orig/drivers/xen/netfront/netfront.c 2011-06-30 16:35:25.000000000 +0200
-+++ head-2011-06-30/drivers/xen/netfront/netfront.c 2011-06-30 16:41:13.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/netfront/netfront.c 2011-06-30 16:35:25.000000000 +0200
++++ head-2011-07-21/drivers/xen/netfront/netfront.c 2011-06-30 16:41:13.000000000 +0200
@@ -639,7 +639,7 @@ static int network_open(struct net_devic
}
spin_unlock_bh(&np->rx_lock);
@@ -23173,8 +23173,8 @@ have been needed - see SLE11 SPn).
return 0;
}
---- head-2011-06-30.orig/drivers/xen/sfc_netback/accel.h 2010-01-18 15:23:12.000000000 +0100
-+++ head-2011-06-30/drivers/xen/sfc_netback/accel.h 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/sfc_netback/accel.h 2010-01-18 15:23:12.000000000 +0100
++++ head-2011-07-21/drivers/xen/sfc_netback/accel.h 2011-02-01 14:38:38.000000000 +0100
@@ -25,6 +25,7 @@
#ifndef NETBACK_ACCEL_H
#define NETBACK_ACCEL_H
@@ -23183,8 +23183,8 @@ have been needed - see SLE11 SPn).
#include <linux/slab.h>
#include <linux/ip.h>
#include <linux/tcp.h>
---- head-2011-06-30.orig/drivers/xen/sfc_netfront/accel.h 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-06-30/drivers/xen/sfc_netfront/accel.h 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/sfc_netfront/accel.h 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-07-21/drivers/xen/sfc_netfront/accel.h 2011-02-01 14:38:38.000000000 +0100
@@ -35,6 +35,7 @@
#include <xen/evtchn.h>
@@ -23193,8 +23193,8 @@ have been needed - see SLE11 SPn).
#include <linux/list.h>
enum netfront_accel_post_status {
---- head-2011-06-30.orig/drivers/xen/xenbus/xenbus_client.c 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/drivers/xen/xenbus/xenbus_client.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/drivers/xen/xenbus/xenbus_client.c 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/drivers/xen/xenbus/xenbus_client.c 2011-02-01 14:38:38.000000000 +0100
@@ -149,7 +149,7 @@ int xenbus_watch_pathfmt(struct xenbus_d
char *path;
@@ -23204,8 +23204,8 @@ have been needed - see SLE11 SPn).
va_end(ap);
if (!path) {
---- head-2011-06-30.orig/drivers/xen/xenbus/xenbus_comms.c 2011-04-11 15:00:27.000000000 +0200
-+++ head-2011-06-30/drivers/xen/xenbus/xenbus_comms.c 2011-04-11 15:03:17.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/xenbus/xenbus_comms.c 2011-04-11 15:00:27.000000000 +0200
++++ head-2011-07-21/drivers/xen/xenbus/xenbus_comms.c 2011-04-11 15:03:17.000000000 +0200
@@ -250,14 +250,11 @@ int xb_init_comms(void)
intf->rsp_cons = intf->rsp_prod;
}
@@ -23243,8 +23243,8 @@ have been needed - see SLE11 SPn).
return 0;
}
---- head-2011-06-30.orig/drivers/xen/xenbus/xenbus_dev.c 2011-06-30 16:10:32.000000000 +0200
-+++ head-2011-06-30/drivers/xen/xenbus/xenbus_dev.c 2011-06-30 16:41:18.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/xenbus/xenbus_dev.c 2011-06-30 16:10:32.000000000 +0200
++++ head-2011-07-21/drivers/xen/xenbus/xenbus_dev.c 2011-06-30 16:41:18.000000000 +0200
@@ -158,8 +158,7 @@ static void queue_flush(struct xenbus_de
int err)
{
@@ -23255,8 +23255,8 @@ have been needed - see SLE11 SPn).
wake_up(&u->read_waitq);
} else
while (!list_empty(queue)) {
---- head-2011-06-30.orig/drivers/xen/xenbus/xenbus_probe.c 2011-06-10 11:53:57.000000000 +0200
-+++ head-2011-06-30/drivers/xen/xenbus/xenbus_probe.c 2011-06-10 11:54:17.000000000 +0200
+--- head-2011-07-21.orig/drivers/xen/xenbus/xenbus_probe.c 2011-06-10 11:53:57.000000000 +0200
++++ head-2011-07-21/drivers/xen/xenbus/xenbus_probe.c 2011-06-10 11:54:17.000000000 +0200
@@ -36,6 +36,7 @@
__FUNCTION__, __LINE__, ##args)
@@ -23265,8 +23265,8 @@ have been needed - see SLE11 SPn).
#include <linux/err.h>
#include <linux/string.h>
#include <linux/ctype.h>
---- head-2011-06-30.orig/fs/aio.c 2011-04-13 12:51:57.000000000 +0200
-+++ head-2011-06-30/fs/aio.c 2011-04-13 13:48:30.000000000 +0200
+--- head-2011-07-21.orig/fs/aio.c 2011-04-13 12:51:57.000000000 +0200
++++ head-2011-07-21/fs/aio.c 2011-04-13 13:48:30.000000000 +0200
@@ -1296,7 +1296,7 @@ static int make_aio_fd(struct kioctx *io
int fd;
struct file *file;
@@ -23276,8 +23276,8 @@ have been needed - see SLE11 SPn).
if (fd < 0)
return fd;
---- head-2011-06-30.orig/include/Kbuild 2009-09-10 00:13:59.000000000 +0200
-+++ head-2011-06-30/include/Kbuild 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/include/Kbuild 2011-07-21 11:59:59.000000000 +0200
++++ head-2011-07-21/include/Kbuild 2011-02-01 14:38:38.000000000 +0100
@@ -8,5 +8,6 @@ header-y += mtd/
header-y += rdma/
header-y += video/
@@ -23285,8 +23285,8 @@ have been needed - see SLE11 SPn).
+header-y += xen/public/
header-y += xen/
header-y += scsi/
---- head-2011-06-30.orig/include/asm-generic/pgtable.h 2011-03-11 10:54:24.000000000 +0100
-+++ head-2011-06-30/include/asm-generic/pgtable.h 2011-03-11 10:59:22.000000000 +0100
+--- head-2011-07-21.orig/include/asm-generic/pgtable.h 2011-03-11 10:54:24.000000000 +0100
++++ head-2011-07-21/include/asm-generic/pgtable.h 2011-03-11 10:59:22.000000000 +0100
@@ -156,10 +156,6 @@ static inline void pmdp_set_wrprotect(st
#endif /* CONFIG_TRANSPARENT_HUGEPAGE */
#endif
@@ -23298,8 +23298,8 @@ have been needed - see SLE11 SPn).
#ifndef __HAVE_ARCH_PMDP_SPLITTING_FLUSH
extern pmd_t pmdp_splitting_flush(struct vm_area_struct *vma,
unsigned long address,
---- head-2011-06-30.orig/arch/x86/include/asm/kexec.h 2011-04-13 11:31:41.000000000 +0200
-+++ head-2011-06-30/arch/x86/include/asm/kexec.h 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/asm/kexec.h 2011-04-13 11:31:41.000000000 +0200
++++ head-2011-07-21/arch/x86/include/asm/kexec.h 2011-02-01 14:38:38.000000000 +0100
@@ -5,8 +5,21 @@
# define PA_CONTROL_PAGE 0
# define VA_CONTROL_PAGE 1
@@ -23322,8 +23322,8 @@ have been needed - see SLE11 SPn).
#else
# define PA_CONTROL_PAGE 0
# define VA_CONTROL_PAGE 1
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/desc.h 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/desc.h 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/desc.h 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/desc.h 2011-02-01 14:38:38.000000000 +0100
@@ -31,11 +31,17 @@ extern struct desc_ptr idt_descr;
extern gate_desc idt_table[];
#endif
@@ -23392,8 +23392,8 @@ have been needed - see SLE11 SPn).
/*
* This routine sets up an interrupt gate at directory privilege level 3.
*/
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/fixmap.h 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/fixmap.h 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/fixmap.h 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/fixmap.h 2011-02-01 14:38:38.000000000 +0100
@@ -7,7 +7,58 @@
# include "fixmap_64.h"
#endif
@@ -23453,8 +23453,8 @@ have been needed - see SLE11 SPn).
+ return __virt_to_fix(vaddr);
+}
#endif
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-02-01 14:38:38.000000000 +0100
@@ -58,10 +58,17 @@ enum fixed_addresses {
#ifdef CONFIG_X86_LOCAL_APIC
FIX_APIC_BASE, /* local (CPU) APIC) -- required for SMP or not */
@@ -23572,8 +23572,8 @@ have been needed - see SLE11 SPn).
-
#endif /* !__ASSEMBLY__ */
#endif
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-02-01 14:38:38.000000000 +0100
@@ -12,6 +12,7 @@
#define _ASM_FIXMAP_64_H
@@ -23673,8 +23673,8 @@ have been needed - see SLE11 SPn).
-}
-
#endif
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/highmem.h 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/highmem.h 2011-02-01 14:38:38.000000000 +0100
@@ -73,6 +73,9 @@ struct page *kmap_atomic_to_page(void *p
#define flush_cache_kmaps() do { } while (0)
@@ -23685,9 +23685,9 @@ have been needed - see SLE11 SPn).
void clear_highpage(struct page *);
static inline void clear_user_highpage(struct page *page, unsigned long vaddr)
{
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/hypercall.h 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/hypercall.h 2011-02-01 14:38:38.000000000 +0100
-@@ -332,9 +332,19 @@ static inline int __must_check
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/hypercall.h 2011-07-20 15:39:42.000000000 +0200
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/hypercall.h 2011-07-21 12:17:27.000000000 +0200
+@@ -334,9 +334,19 @@ static inline int __must_check
HYPERVISOR_grant_table_op(
unsigned int cmd, void *uop, unsigned int count)
{
@@ -23708,8 +23708,8 @@ have been needed - see SLE11 SPn).
}
static inline int __must_check
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-03-23 09:49:17.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/hypervisor.h 2011-03-23 09:54:15.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-07-21 12:16:58.000000000 +0200
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/hypervisor.h 2011-07-21 12:17:26.000000000 +0200
@@ -35,7 +35,6 @@
#include <linux/types.h>
@@ -23718,7 +23718,7 @@ have been needed - see SLE11 SPn).
#include <linux/errno.h>
#include <xen/interface/xen.h>
#include <xen/interface/platform.h>
-@@ -119,6 +118,8 @@ int xen_create_contiguous_region(
+@@ -115,6 +114,8 @@ int xen_create_contiguous_region(
unsigned long vstart, unsigned int order, unsigned int address_bits);
void xen_destroy_contiguous_region(
unsigned long vstart, unsigned int order);
@@ -23727,7 +23727,7 @@ have been needed - see SLE11 SPn).
struct page;
-@@ -190,6 +191,29 @@ static inline void xen_multicall_flush(b
+@@ -186,6 +187,29 @@ static inline void xen_multicall_flush(b
#endif /* CONFIG_XEN && !MODULE */
@@ -23757,8 +23757,8 @@ have been needed - see SLE11 SPn).
#if defined(CONFIG_X86_64)
#define MULTI_UVMFLAGS_INDEX 2
#define MULTI_UVMDOMID_INDEX 3
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/io.h 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/io.h 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/io.h 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/io.h 2011-02-01 14:38:38.000000000 +0100
@@ -3,20 +3,140 @@
#define ARCH_HAS_IOREMAP_WC
@@ -23906,7 +23906,7 @@ have been needed - see SLE11 SPn).
+
#endif /* _ASM_X86_IO_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/irq_vectors.h 2011-02-15 17:27:18.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/irq_vectors.h 2011-02-15 17:27:18.000000000 +0100
@@ -0,0 +1,52 @@
+#ifndef _ASM_IRQ_VECTORS_H
+#define _ASM_IRQ_VECTORS_H
@@ -23960,8 +23960,8 @@ have been needed - see SLE11 SPn).
+#define NR_IRQ_VECTORS NR_IRQS
+
+#endif /* _ASM_IRQ_VECTORS_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/irqflags.h 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/irqflags.h 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/irqflags.h 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/irqflags.h 2011-02-01 14:38:38.000000000 +0100
@@ -118,7 +118,7 @@ static inline void halt(void)
#ifndef CONFIG_X86_64
@@ -24026,8 +24026,8 @@ have been needed - see SLE11 SPn).
#else
# define TRACE_IRQS_ON
# define TRACE_IRQS_OFF
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/mmu_context.h 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/mmu_context.h 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/mmu_context.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/mmu_context.h 2011-02-01 14:38:38.000000000 +0100
@@ -1,5 +1,42 @@
+#ifndef __ASM_X86_MMU_CONTEXT_H
+#define __ASM_X86_MMU_CONTEXT_H
@@ -24071,8 +24071,8 @@ have been needed - see SLE11 SPn).
+
+
+#endif /* __ASM_X86_MMU_CONTEXT_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-02-01 14:38:38.000000000 +0100
@@ -1,32 +1,6 @@
#ifndef __I386_SCHED_H
#define __I386_SCHED_H
@@ -24117,8 +24117,8 @@ have been needed - see SLE11 SPn).
-} while (0)
-
#endif
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-02-01 14:38:38.000000000 +0100
@@ -1,23 +1,6 @@
#ifndef __X86_64_MMU_CONTEXT_H
#define __X86_64_MMU_CONTEXT_H
@@ -24166,8 +24166,8 @@ have been needed - see SLE11 SPn).
-}
-
#endif
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/pci.h 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pci.h 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pci.h 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/pci.h 2011-02-01 14:38:38.000000000 +0100
@@ -21,6 +21,8 @@ struct pci_sysdata {
#endif
};
@@ -24177,8 +24177,8 @@ have been needed - see SLE11 SPn).
/* scan a bus after allocating a pci_sysdata for it */
extern struct pci_bus *pci_scan_bus_on_node(int busno, struct pci_ops *ops,
int node);
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/pgalloc.h 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pgalloc.h 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pgalloc.h 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/pgalloc.h 2011-02-01 14:38:38.000000000 +0100
@@ -7,6 +7,9 @@
#include <asm/io.h> /* for phys_to_virt and page_to_pseudophys */
@@ -24189,8 +24189,8 @@ have been needed - see SLE11 SPn).
static inline void paravirt_alloc_pte(struct mm_struct *mm, unsigned long pfn) {}
static inline void paravirt_alloc_pmd(struct mm_struct *mm, unsigned long pfn) {}
static inline void paravirt_alloc_pmd_clone(unsigned long pfn, unsigned long clonepfn,
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/pgtable.h 2011-03-23 09:52:33.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pgtable.h 2011-03-23 09:54:13.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pgtable.h 2011-03-23 09:52:33.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/pgtable.h 2011-03-23 09:54:13.000000000 +0100
@@ -13,11 +13,12 @@
#define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
#define _PAGE_BIT_PAT 7 /* on 4KB pages */
@@ -24614,8 +24614,8 @@ have been needed - see SLE11 SPn).
#endif /* __ASSEMBLY__ */
#endif /* _ASM_X86_PGTABLE_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-03-23 09:52:36.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-03-23 09:54:10.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-03-23 09:52:36.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-03-23 09:54:10.000000000 +0100
@@ -14,11 +14,11 @@
#define pmd_ERROR(e) \
printk("%s:%d: bad pmd %p(%016Lx pfn %08Lx).\n", \
@@ -24651,8 +24651,8 @@ have been needed - see SLE11 SPn).
/* Find an entry in the second-level page table.. */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-01 14:38:38.000000000 +0100
@@ -89,10 +89,10 @@ extern unsigned long pg0[];
/* pmd_present doesn't just test the _PAGE_PRESENT bit since wr.p.t.
can temporarily clear it. */
@@ -24702,8 +24702,8 @@ have been needed - see SLE11 SPn).
#if defined(CONFIG_HIGHPTE)
#define pte_offset_map(dir, address) \
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 09:52:37.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 09:54:07.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 09:52:37.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 09:54:07.000000000 +0100
@@ -23,6 +23,8 @@ extern void xen_init_pt(void);
extern pud_t level3_kernel_pgt[512];
extern pud_t level3_ident_pgt[512];
@@ -24784,8 +24784,8 @@ have been needed - see SLE11 SPn).
#define pmd_page(pmd) (pfn_to_page(pmd_val((pmd)) >> PAGE_SHIFT))
#define pmd_index(address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD - 1))
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/processor.h 2011-03-03 16:42:13.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/processor.h 2011-03-03 16:44:23.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/processor.h 2011-03-03 16:42:13.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/processor.h 2011-03-03 16:44:23.000000000 +0100
@@ -144,7 +144,7 @@ extern __u32 cleared_cpu_caps[NCAPINTS
#ifdef CONFIG_SMP
DECLARE_PER_CPU(struct cpuinfo_x86, cpu_info);
@@ -24860,8 +24860,8 @@ have been needed - see SLE11 SPn).
extern void enable_sep_cpu(void);
extern int sysenter_setup(void);
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/smp.h 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/smp.h 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/smp.h 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/smp.h 2011-02-01 14:38:38.000000000 +0100
@@ -25,25 +25,18 @@ extern cpumask_t cpu_initialized;
extern void (*mtrr_hook)(void);
extern void zap_low_mappings(void);
@@ -24981,9 +24981,9 @@ have been needed - see SLE11 SPn).
-extern void unlock_ipi_call_lock(void);
#endif /* __ASSEMBLY__ */
#endif
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/spinlock.h 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/spinlock.h 2011-02-01 14:38:38.000000000 +0100
-@@ -38,6 +38,8 @@
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/spinlock.h 2011-07-12 11:14:18.000000000 +0200
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/spinlock.h 2011-07-12 11:14:29.000000000 +0200
+@@ -42,6 +42,8 @@
# define UNLOCK_LOCK_PREFIX
#endif
@@ -24992,7 +24992,7 @@ have been needed - see SLE11 SPn).
#include <asm/irqflags.h>
int xen_spinlock_init(unsigned int cpu);
-@@ -65,14 +67,14 @@ void xen_spin_kick(raw_spinlock_t *, uns
+@@ -69,14 +71,14 @@ void xen_spin_kick(raw_spinlock_t *, uns
* much between them in performance though, especially as locks are out of line.
*/
#if TICKET_SHIFT == 8
@@ -25009,7 +25009,7 @@ have been needed - see SLE11 SPn).
asm("1:\t" \
"cmpb %h0, %b0\n\t" \
"je 2f\n\t" \
-@@ -86,7 +88,7 @@ void xen_spin_kick(raw_spinlock_t *, uns
+@@ -90,7 +92,7 @@ void xen_spin_kick(raw_spinlock_t *, uns
: "+Q" (token), "+g" (count) \
: "m" (lock->slock) \
: "memory", "cc")
@@ -25018,7 +25018,7 @@ have been needed - see SLE11 SPn).
asm(UNLOCK_LOCK_PREFIX "incb %2\n\t" \
"movzwl %2, %0\n\t" \
"cmpb %h0, %b0\n\t" \
-@@ -95,7 +97,7 @@ void xen_spin_kick(raw_spinlock_t *, uns
+@@ -99,7 +101,7 @@ void xen_spin_kick(raw_spinlock_t *, uns
: \
: "memory", "cc")
@@ -25027,7 +25027,7 @@ have been needed - see SLE11 SPn).
{
int tmp, new;
-@@ -114,7 +116,7 @@ static __always_inline int __raw_spin_tr
+@@ -118,7 +120,7 @@ static __always_inline int __raw_spin_tr
return tmp;
}
#elif TICKET_SHIFT == 16
@@ -25036,7 +25036,7 @@ have been needed - see SLE11 SPn).
do { \
unsigned int tmp; \
asm(LOCK_PREFIX "xaddl %0, %2\n\t" \
-@@ -126,7 +128,7 @@ static __always_inline int __raw_spin_tr
+@@ -130,7 +132,7 @@ static __always_inline int __raw_spin_tr
: "0" (0x00010000) \
: "memory", "cc"); \
} while (0)
@@ -25045,7 +25045,7 @@ have been needed - see SLE11 SPn).
do { \
unsigned int tmp; \
asm("shldl $16, %0, %2\n" \
-@@ -144,7 +146,7 @@ static __always_inline int __raw_spin_tr
+@@ -148,7 +150,7 @@ static __always_inline int __raw_spin_tr
: "m" (lock->slock) \
: "memory", "cc"); \
} while (0)
@@ -25054,7 +25054,7 @@ have been needed - see SLE11 SPn).
do { \
unsigned int tmp; \
asm(UNLOCK_LOCK_PREFIX "incw %2\n\t" \
-@@ -158,7 +160,7 @@ static __always_inline int __raw_spin_tr
+@@ -162,7 +164,7 @@ static __always_inline int __raw_spin_tr
: "memory", "cc"); \
} while (0)
@@ -25063,7 +25063,7 @@ have been needed - see SLE11 SPn).
{
int tmp;
int new;
-@@ -181,27 +183,27 @@ static __always_inline int __raw_spin_tr
+@@ -185,27 +187,27 @@ static __always_inline int __raw_spin_tr
}
#endif
@@ -25095,7 +25095,7 @@ have been needed - see SLE11 SPn).
if (likely(free)) {
raw_local_irq_restore(flags);
return;
-@@ -210,41 +212,154 @@ static __always_inline void __raw_spin_l
+@@ -214,41 +216,154 @@ static __always_inline void __raw_spin_l
raw_local_irq_restore(flags);
do {
count = 1 << 10;
@@ -25260,8 +25260,8 @@ have been needed - see SLE11 SPn).
static inline void __raw_spin_unlock_wait(raw_spinlock_t *lock)
{
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/spinlock_types.h 2011-01-31 18:01:51.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/spinlock_types.h 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/spinlock_types.h 2011-01-31 18:01:51.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/spinlock_types.h 2011-02-01 14:38:38.000000000 +0100
@@ -11,6 +11,10 @@ typedef union {
unsigned int slock;
struct {
@@ -25281,8 +25281,8 @@ have been needed - see SLE11 SPn).
};
} raw_spinlock_t;
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/system.h 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/system.h 2011-03-03 15:58:55.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/system.h 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/system.h 2011-03-03 15:58:55.000000000 +0100
@@ -68,10 +68,12 @@ do { \
[next] "d" (next)); \
} while (0)
@@ -25345,8 +25345,8 @@ have been needed - see SLE11 SPn).
/*
* Force strict CPU ordering.
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/xor_64.h 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/xor_64.h 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/xor_64.h 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/xor_64.h 2011-02-01 14:38:38.000000000 +0100
@@ -1,3 +1,6 @@
+#ifndef ASM_X86__XOR_64_H
+#define ASM_X86__XOR_64_H
@@ -25360,7 +25360,7 @@ have been needed - see SLE11 SPn).
#define XOR_SELECT_TEMPLATE(FASTEST) (&xor_block_sse)
+
+#endif /* ASM_X86__XOR_64_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/irq_vectors.h 2008-09-25 13:55:32.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/irq_vectors.h 2008-09-25 13:55:32.000000000 +0200
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,125 +0,0 @@
-/*
@@ -25488,7 +25488,7 @@ have been needed - see SLE11 SPn).
-#define NR_IRQ_VECTORS NR_IRQS
-
-#endif /* _ASM_IRQ_VECTORS_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/setup_arch_post.h 2007-06-12 13:14:13.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/setup_arch_post.h 2007-06-12 13:14:13.000000000 +0200
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-/**
@@ -25554,7 +25554,7 @@ have been needed - see SLE11 SPn).
-#endif
-#endif
-}
---- head-2011-06-30.orig/arch/x86/include/mach-xen/setup_arch_pre.h 2007-06-12 13:14:13.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/setup_arch_pre.h 2007-06-12 13:14:13.000000000 +0200
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-/* Hook to call BIOS initialisation function */
@@ -25562,8 +25562,8 @@ have been needed - see SLE11 SPn).
-#define ARCH_SETUP machine_specific_arch_setup();
-
-static void __init machine_specific_arch_setup(void);
---- head-2011-06-30.orig/arch/x86/include/asm/traps.h 2011-03-15 02:20:32.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/asm/traps.h 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/asm/traps.h 2011-07-21 11:59:59.000000000 +0200
++++ head-2011-07-21/arch/x86/include/asm/traps.h 2011-02-01 14:38:38.000000000 +0100
@@ -38,6 +38,9 @@ asmlinkage void alignment_check(void);
asmlinkage void machine_check(void);
#endif /* CONFIG_X86_MCE */
@@ -25584,8 +25584,8 @@ have been needed - see SLE11 SPn).
#endif
static inline int get_si_code(unsigned long condition)
---- head-2011-06-30.orig/include/linux/page-flags.h 2011-04-28 11:11:00.000000000 +0200
-+++ head-2011-06-30/include/linux/page-flags.h 2011-04-28 11:12:39.000000000 +0200
+--- head-2011-07-21.orig/include/linux/page-flags.h 2011-04-28 11:11:00.000000000 +0200
++++ head-2011-07-21/include/linux/page-flags.h 2011-04-28 11:12:39.000000000 +0200
@@ -124,12 +124,12 @@ enum pageflags {
PG_fscache = PG_private_2, /* page backed by cache */
@@ -25614,8 +25614,8 @@ have been needed - see SLE11 SPn).
PAGEFLAG(Reserved, reserved) __CLEARPAGEFLAG(Reserved, reserved)
PAGEFLAG(SwapBacked, swapbacked) __CLEARPAGEFLAG(SwapBacked, swapbacked)
---- head-2011-06-30.orig/include/xen/interface/memory.h 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/include/xen/interface/memory.h 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/include/xen/interface/memory.h 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/include/xen/interface/memory.h 2011-02-01 14:38:38.000000000 +0100
@@ -88,6 +88,7 @@ struct xen_memory_reservation {
*/
domid_t domid;
@@ -25652,16 +25652,16 @@ have been needed - see SLE11 SPn).
typedef struct xen_add_to_physmap xen_add_to_physmap_t;
DEFINE_XEN_GUEST_HANDLE(xen_add_to_physmap_t);
---- head-2011-06-30.orig/include/xen/public/Kbuild 2011-01-31 14:31:28.000000000 +0100
-+++ head-2011-06-30/include/xen/public/Kbuild 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/include/xen/public/Kbuild 2011-01-31 14:31:28.000000000 +0100
++++ head-2011-07-21/include/xen/public/Kbuild 2011-02-01 14:38:38.000000000 +0100
@@ -1 +1,5 @@
+header-y += evtchn.h
+header-y += gntdev.h
header-y += iomulti.h
+header-y += privcmd.h
+header-y += xenbus.h
---- head-2011-06-30.orig/include/xen/public/privcmd.h 2010-01-18 15:23:12.000000000 +0100
-+++ head-2011-06-30/include/xen/public/privcmd.h 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/include/xen/public/privcmd.h 2010-01-18 15:23:12.000000000 +0100
++++ head-2011-07-21/include/xen/public/privcmd.h 2011-02-01 14:38:38.000000000 +0100
@@ -35,10 +35,6 @@
#include <linux/types.h>
@@ -25673,8 +25673,8 @@ have been needed - see SLE11 SPn).
typedef struct privcmd_hypercall
{
__u64 op;
---- head-2011-06-30.orig/include/xen/public/xenbus.h 2009-05-29 10:25:53.000000000 +0200
-+++ head-2011-06-30/include/xen/public/xenbus.h 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/include/xen/public/xenbus.h 2009-05-29 10:25:53.000000000 +0200
++++ head-2011-07-21/include/xen/public/xenbus.h 2011-02-01 14:38:38.000000000 +0100
@@ -35,10 +35,6 @@
#include <linux/types.h>
@@ -25686,8 +25686,8 @@ have been needed - see SLE11 SPn).
typedef struct xenbus_alloc {
domid_t dom;
__u32 port;
---- head-2011-06-30.orig/kernel/kexec.c 2011-04-28 11:10:13.000000000 +0200
-+++ head-2011-06-30/kernel/kexec.c 2011-04-28 11:12:45.000000000 +0200
+--- head-2011-07-21.orig/kernel/kexec.c 2011-04-28 11:10:13.000000000 +0200
++++ head-2011-07-21/kernel/kexec.c 2011-04-28 11:12:45.000000000 +0200
@@ -50,7 +50,7 @@ note_buf_t __percpu *crash_notes;
static unsigned char vmcoreinfo_data[VMCOREINFO_BYTES];
u32
@@ -25697,8 +25697,8 @@ have been needed - see SLE11 SPn).
#endif
vmcoreinfo_note[VMCOREINFO_NOTE_SIZE/4];
size_t vmcoreinfo_size;
---- head-2011-06-30.orig/lib/swiotlb-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/lib/swiotlb-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/lib/swiotlb-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/lib/swiotlb-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -788,7 +788,7 @@ swiotlb_sync_sg_for_device(struct device
}
@@ -25708,8 +25708,8 @@ have been needed - see SLE11 SPn).
{
return (dma_addr == virt_to_bus(io_tlb_overflow_buffer));
}
---- head-2011-06-30.orig/mm/mprotect.c 2011-01-31 17:29:16.000000000 +0100
-+++ head-2011-06-30/mm/mprotect.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/mm/mprotect.c 2011-01-31 17:29:16.000000000 +0100
++++ head-2011-07-21/mm/mprotect.c 2011-02-01 14:38:38.000000000 +0100
@@ -97,8 +97,6 @@ static inline void change_pmd_range(stru
}
if (pmd_none_or_clear_bad(pmd))
diff --git a/patches.xen/xen3-patch-2.6.28 b/patches.xen/xen3-patch-2.6.28
index 73ddfbf4bc..c914eb0493 100644
--- a/patches.xen/xen3-patch-2.6.28
+++ b/patches.xen/xen3-patch-2.6.28
@@ -7,8 +7,8 @@ Patch-mainline: 2.6.28
Acked-by: Jeff Mahoney <jeffm@suse.com>
Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches.py
---- head-2011-06-30.orig/arch/ia64/Kconfig 2011-06-30 15:04:43.000000000 +0200
-+++ head-2011-06-30/arch/ia64/Kconfig 2011-06-30 16:47:27.000000000 +0200
+--- head-2011-07-21.orig/arch/ia64/Kconfig 2011-07-21 11:59:59.000000000 +0200
++++ head-2011-07-21/arch/ia64/Kconfig 2011-06-30 16:47:27.000000000 +0200
@@ -227,7 +227,7 @@ config IA64_HP_SIM
config IA64_XEN_GUEST
bool "Xen guest"
@@ -18,8 +18,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
help
Build a kernel that runs on Xen guest domain. At this moment only
16KB page size in supported.
---- head-2011-06-30.orig/arch/ia64/Makefile 2010-10-20 22:30:22.000000000 +0200
-+++ head-2011-06-30/arch/ia64/Makefile 2011-02-01 14:39:24.000000000 +0100
+--- head-2011-07-21.orig/arch/ia64/Makefile 2011-07-21 11:59:59.000000000 +0200
++++ head-2011-07-21/arch/ia64/Makefile 2011-02-01 14:39:24.000000000 +0100
@@ -55,7 +55,7 @@ core-$(CONFIG_IA64_XEN_GUEST) += arch/ia
core-$(CONFIG_IA64_SGI_SN2) += arch/ia64/sn/
core-$(CONFIG_IA64_SGI_UV) += arch/ia64/uv/
@@ -29,8 +29,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
drivers-$(CONFIG_PCI) += arch/ia64/pci/
drivers-$(CONFIG_IA64_HP_SIM) += arch/ia64/hp/sim/
---- head-2011-06-30.orig/arch/ia64/include/asm/xen/hypervisor.h 2010-02-24 19:52:17.000000000 +0100
-+++ head-2011-06-30/arch/ia64/include/asm/xen/hypervisor.h 2011-02-01 14:39:24.000000000 +0100
+--- head-2011-07-21.orig/arch/ia64/include/asm/xen/hypervisor.h 2011-07-21 11:59:59.000000000 +0200
++++ head-2011-07-21/arch/ia64/include/asm/xen/hypervisor.h 2011-02-01 14:39:24.000000000 +0100
@@ -40,7 +40,7 @@
#include <xen/xen.h>
#include <asm/xen/hypercall.h>
@@ -40,8 +40,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
extern struct shared_info *HYPERVISOR_shared_info;
extern struct start_info *xen_start_info;
---- head-2011-06-30.orig/arch/ia64/include/asm/xen/interface.h 2009-06-10 05:05:27.000000000 +0200
-+++ head-2011-06-30/arch/ia64/include/asm/xen/interface.h 2011-02-01 14:39:24.000000000 +0100
+--- head-2011-07-21.orig/arch/ia64/include/asm/xen/interface.h 2011-07-21 11:59:59.000000000 +0200
++++ head-2011-07-21/arch/ia64/include/asm/xen/interface.h 2011-02-01 14:39:24.000000000 +0100
@@ -56,29 +56,21 @@
#ifndef _ASM_IA64_XEN_INTERFACE_H
#define _ASM_IA64_XEN_INTERFACE_H
@@ -88,8 +88,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
#ifndef __ASSEMBLY__
---- head-2011-06-30.orig/arch/ia64/kernel/asm-offsets.c 2009-06-10 05:05:27.000000000 +0200
-+++ head-2011-06-30/arch/ia64/kernel/asm-offsets.c 2011-02-01 14:39:24.000000000 +0100
+--- head-2011-07-21.orig/arch/ia64/kernel/asm-offsets.c 2011-07-21 11:59:59.000000000 +0200
++++ head-2011-07-21/arch/ia64/kernel/asm-offsets.c 2011-02-01 14:39:24.000000000 +0100
@@ -290,7 +290,7 @@ void foo(void)
DEFINE(IA64_ITC_LASTCYCLE_OFFSET,
offsetof (struct itc_jitter_data_t, itc_lastcycle));
@@ -99,8 +99,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
BLANK();
DEFINE(XEN_NATIVE_ASM, XEN_NATIVE);
---- head-2011-06-30.orig/arch/ia64/xen/Kconfig 2009-03-24 00:12:14.000000000 +0100
-+++ head-2011-06-30/arch/ia64/xen/Kconfig 2011-02-02 15:36:46.000000000 +0100
+--- head-2011-07-21.orig/arch/ia64/xen/Kconfig 2011-07-21 11:59:59.000000000 +0200
++++ head-2011-07-21/arch/ia64/xen/Kconfig 2011-02-02 15:36:46.000000000 +0100
@@ -2,7 +2,7 @@
# This Kconfig describes xen/ia64 options
#
@@ -122,8 +122,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
- depends on XEN
+ depends on PARAVIRT_XEN
bool
---- head-2011-06-30.orig/arch/ia64/xen/xcom_hcall.c 2008-12-25 00:26:37.000000000 +0100
-+++ head-2011-06-30/arch/ia64/xen/xcom_hcall.c 2011-02-01 14:39:24.000000000 +0100
+--- head-2011-07-21.orig/arch/ia64/xen/xcom_hcall.c 2011-07-21 11:59:59.000000000 +0200
++++ head-2011-07-21/arch/ia64/xen/xcom_hcall.c 2011-02-01 14:39:24.000000000 +0100
@@ -343,7 +343,7 @@ xencommize_memory_reservation(struct xen
int
xencomm_hypercall_memory_op(unsigned int cmd, void *arg)
@@ -133,8 +133,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
struct xen_memory_reservation *xmr = NULL;
int rc;
struct xencomm_handle *desc;
---- head-2011-06-30.orig/arch/x86/Kconfig 2011-06-30 16:39:04.000000000 +0200
-+++ head-2011-06-30/arch/x86/Kconfig 2011-06-30 16:47:31.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/Kconfig 2011-06-30 16:39:04.000000000 +0200
++++ head-2011-07-21/arch/x86/Kconfig 2011-06-30 16:47:31.000000000 +0200
@@ -1018,7 +1018,7 @@ config MICROCODE
config MICROCODE_INTEL
@@ -189,8 +189,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
---help---
Supports Interrupt remapping for IO-APIC and MSI devices.
To use x2apic mode in the CPU's which support x2APIC enhancements or
---- head-2011-06-30.orig/arch/x86/Kconfig.cpu 2011-06-30 16:00:44.000000000 +0200
-+++ head-2011-06-30/arch/x86/Kconfig.cpu 2011-06-30 16:47:34.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/Kconfig.cpu 2011-06-30 16:00:44.000000000 +0200
++++ head-2011-07-21/arch/x86/Kconfig.cpu 2011-06-30 16:47:34.000000000 +0200
@@ -445,7 +445,7 @@ config CPU_SUP_INTEL
config CPU_SUP_CYRIX_32
default y
@@ -209,8 +209,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
---help---
This enables detection, tunings and quirks for UMC processors
---- head-2011-06-30.orig/arch/x86/Makefile 2011-02-01 14:38:38.000000000 +0100
-+++ head-2011-06-30/arch/x86/Makefile 2011-02-01 14:39:24.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/Makefile 2011-02-01 14:38:38.000000000 +0100
++++ head-2011-07-21/arch/x86/Makefile 2011-02-01 14:39:24.000000000 +0100
@@ -117,7 +117,7 @@ endif
KBUILD_CFLAGS += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,)
@@ -229,8 +229,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
ifdef CONFIG_X86_64
LDFLAGS_vmlinux := -e startup_64
---- head-2011-06-30.orig/arch/x86/ia32/ia32entry-xen.S 2011-02-01 14:38:38.000000000 +0100
-+++ head-2011-06-30/arch/x86/ia32/ia32entry-xen.S 2011-02-01 14:39:24.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/ia32/ia32entry-xen.S 2011-02-01 14:38:38.000000000 +0100
++++ head-2011-07-21/arch/x86/ia32/ia32entry-xen.S 2011-02-01 14:39:24.000000000 +0100
@@ -39,11 +39,11 @@
.endm
@@ -339,8 +339,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
.quad sys_getgroups16 /* 80 */
.quad sys_setgroups16
.quad sys32_old_select
---- head-2011-06-30.orig/arch/x86/include/asm/agp.h 2009-12-03 04:51:21.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/asm/agp.h 2011-02-01 14:39:24.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/asm/agp.h 2011-07-21 11:59:59.000000000 +0200
++++ head-2011-07-21/arch/x86/include/asm/agp.h 2011-02-01 14:39:24.000000000 +0100
@@ -15,6 +15,9 @@
#define map_page_into_agp(page) set_pages_uc(page, 1)
#define unmap_page_from_agp(page) set_pages_wb(page, 1)
@@ -351,8 +351,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
/*
* Could use CLFLUSH here if the cpu supports it. But then it would
* need to be called for each cacheline of the whole page so it may
---- head-2011-06-30.orig/arch/x86/include/asm/cpufeature.h 2011-06-30 15:04:05.000000000 +0200
-+++ head-2011-06-30/arch/x86/include/asm/cpufeature.h 2011-06-30 16:47:42.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/include/asm/cpufeature.h 2011-07-21 11:59:59.000000000 +0200
++++ head-2011-07-21/arch/x86/include/asm/cpufeature.h 2011-06-30 16:47:42.000000000 +0200
@@ -284,7 +284,11 @@ extern const char * const x86_power_flag
#define cpu_has_xmm4_1 boot_cpu_has(X86_FEATURE_XMM4_1)
#define cpu_has_xmm4_2 boot_cpu_has(X86_FEATURE_XMM4_2)
@@ -365,8 +365,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
#define cpu_has_hypervisor boot_cpu_has(X86_FEATURE_HYPERVISOR)
#define cpu_has_pclmulqdq boot_cpu_has(X86_FEATURE_PCLMULQDQ)
#define cpu_has_perfctr_core boot_cpu_has(X86_FEATURE_PERFCTR_CORE)
---- head-2011-06-30.orig/arch/x86/include/asm/hw_irq.h 2011-05-19 06:06:34.000000000 +0200
-+++ head-2011-06-30/arch/x86/include/asm/hw_irq.h 2011-04-13 13:50:37.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/include/asm/hw_irq.h 2011-07-21 11:59:59.000000000 +0200
++++ head-2011-07-21/arch/x86/include/asm/hw_irq.h 2011-04-13 13:50:37.000000000 +0200
@@ -152,6 +152,7 @@ extern void smp_error_interrupt(struct p
extern asmlinkage void smp_irq_move_cleanup_interrupt(void);
#endif
@@ -388,8 +388,19 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
#endif
extern void (*__initconst interrupt[NR_VECTORS-FIRST_EXTERNAL_VECTOR])(void);
---- head-2011-06-30.orig/arch/x86/include/asm/segment.h 2011-05-19 06:06:34.000000000 +0200
-+++ head-2011-06-30/arch/x86/include/asm/segment.h 2011-04-13 13:50:26.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/include/asm/mc146818rtc.h 2008-12-25 00:26:37.000000000 +0100
++++ head-2011-07-21/arch/x86/include/asm/mc146818rtc.h 2011-07-15 12:38:27.000000000 +0200
+@@ -14,7 +14,7 @@
+ #define RTC_ALWAYS_BCD 1 /* RTC operates in binary mode */
+ #endif
+
+-#if defined(CONFIG_X86_32) && defined(__HAVE_ARCH_CMPXCHG)
++#if defined(CONFIG_X86_32) && !defined(CONFIG_XEN) && defined(__HAVE_ARCH_CMPXCHG)
+ /*
+ * This lock provides nmi access to the CMOS/RTC registers. It has some
+ * special properties. It is owned by a CPU and stores the index register
+--- head-2011-07-21.orig/arch/x86/include/asm/segment.h 2011-07-21 11:59:59.000000000 +0200
++++ head-2011-07-21/arch/x86/include/asm/segment.h 2011-04-13 13:50:26.000000000 +0200
@@ -188,7 +188,9 @@
#define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
#define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8+3)
@@ -401,8 +412,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
#define get_kernel_rpl() 0
#endif
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/agp.h 2011-01-31 18:01:51.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/agp.h 2011-02-01 14:39:24.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/agp.h 2011-01-31 18:01:51.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/agp.h 2011-02-01 14:39:24.000000000 +0100
@@ -21,6 +21,23 @@
/* only a fallback: xen_destroy_contiguous_region uses PAGE_KERNEL */ \
set_pages_wb(page, 1))
@@ -433,8 +444,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif
+#endif /* _ASM_X86_AGP_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/desc.h 2011-02-01 14:38:38.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/desc.h 2011-02-01 14:39:24.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/desc.h 2011-02-01 14:38:38.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/desc.h 2011-02-01 14:39:24.000000000 +0100
@@ -1,5 +1,5 @@
-#ifndef _ASM_DESC_H_
-#define _ASM_DESC_H_
@@ -510,8 +521,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif
+#endif /* _ASM_X86_DESC_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/dma-mapping.h 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/dma-mapping.h 2011-02-01 14:39:24.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/dma-mapping.h 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/dma-mapping.h 2011-02-01 14:39:24.000000000 +0100
@@ -1,17 +1,12 @@
-#ifndef _ASM_DMA_MAPPING_H_
+#ifndef _ASM_X86_DMA_MAPPING_H_
@@ -536,8 +547,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif /* _ASM_DMA_MAPPING_H_ */
+#endif /* _ASM_X86_DMA_MAPPING_H_ */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/fixmap.h 2011-02-01 14:38:38.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/fixmap.h 2011-02-01 14:39:24.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/fixmap.h 2011-02-01 14:38:38.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/fixmap.h 2011-02-01 14:39:24.000000000 +0100
@@ -1,5 +1,5 @@
-#ifndef _ASM_FIXMAP_H
-#define _ASM_FIXMAP_H
@@ -563,8 +574,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
}
-#endif
+#endif /* _ASM_X86_FIXMAP_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-02-01 14:38:38.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-02-01 14:39:24.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-02-01 14:38:38.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-02-01 14:39:24.000000000 +0100
@@ -10,8 +10,8 @@
* Support of BIGMEM added by Gerhard Wichert, Siemens AG, July 1999
*/
@@ -617,8 +628,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
#endif /* !__ASSEMBLY__ */
-#endif
+#endif /* _ASM_X86_FIXMAP_32_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-02-01 14:38:38.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-02-01 14:39:24.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-02-01 14:38:38.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-02-01 14:39:24.000000000 +0100
@@ -8,8 +8,8 @@
* Copyright (C) 1998 Ingo Molnar
*/
@@ -683,8 +694,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif
+#endif /* _ASM_X86_FIXMAP_64_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/highmem.h 2011-02-01 14:38:38.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/highmem.h 2011-02-01 14:39:24.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/highmem.h 2011-02-01 14:38:38.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/highmem.h 2011-02-01 14:39:24.000000000 +0100
@@ -15,8 +15,8 @@
* Copyright (C) 1999 Ingo Molnar <mingo@redhat.com>
*/
@@ -718,8 +729,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif /* _ASM_HIGHMEM_H */
+#endif /* _ASM_X86_HIGHMEM_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/io.h 2011-02-01 14:38:38.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/io.h 2011-02-01 14:39:24.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/io.h 2011-02-01 14:38:38.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/io.h 2011-02-01 14:39:24.000000000 +0100
@@ -5,20 +5,6 @@
#include <linux/compiler.h>
@@ -779,8 +790,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
extern void __iomem *fix_ioremap(unsigned idx, unsigned long phys);
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/irq_vectors.h 2011-02-15 17:27:18.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/irq_vectors.h 2011-02-15 17:31:50.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/irq_vectors.h 2011-02-15 17:27:18.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/irq_vectors.h 2011-02-15 17:31:50.000000000 +0100
@@ -1,5 +1,5 @@
-#ifndef _ASM_IRQ_VECTORS_H
-#define _ASM_IRQ_VECTORS_H
@@ -797,8 +808,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif /* _ASM_IRQ_VECTORS_H */
+#endif /* _ASM_X86_IRQ_VECTORS_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/irqflags.h 2011-02-01 14:38:38.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/irqflags.h 2011-02-01 14:39:24.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/irqflags.h 2011-02-01 14:38:38.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/irqflags.h 2011-02-01 14:39:24.000000000 +0100
@@ -157,23 +157,6 @@ static inline int raw_irqs_disabled_flag
raw_irqs_disabled_flags(flags); \
})
@@ -823,8 +834,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
#else
#ifdef CONFIG_X86_64
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/maddr.h 2011-01-31 18:01:51.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/maddr.h 2011-02-01 14:39:24.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/maddr.h 2011-01-31 18:01:51.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/maddr.h 2011-02-01 14:39:24.000000000 +0100
@@ -59,10 +59,10 @@ static inline unsigned long mfn_to_pfn(u
/* The array access can fail (e.g., device space beyond end of RAM). */
@@ -838,8 +849,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
" jmp 2b\n"
".previous\n"
_ASM_EXTABLE(1b,3b)
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/mmu_context.h 2011-02-01 14:38:38.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/mmu_context.h 2011-02-01 14:39:24.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/mmu_context.h 2011-02-01 14:38:38.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/mmu_context.h 2011-02-01 14:39:24.000000000 +0100
@@ -1,5 +1,5 @@
-#ifndef __ASM_X86_MMU_CONTEXT_H
-#define __ASM_X86_MMU_CONTEXT_H
@@ -854,8 +865,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif /* __ASM_X86_MMU_CONTEXT_H */
+#endif /* _ASM_X86_MMU_CONTEXT_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-02-01 14:38:38.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-02-01 14:39:24.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-02-01 14:38:38.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-02-01 14:39:24.000000000 +0100
@@ -1,5 +1,5 @@
-#ifndef __I386_SCHED_H
-#define __I386_SCHED_H
@@ -870,8 +881,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif
+#endif /* _ASM_X86_MMU_CONTEXT_32_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-02-01 14:38:38.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-02-01 14:39:24.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-02-01 14:38:38.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-02-01 14:39:24.000000000 +0100
@@ -1,5 +1,5 @@
-#ifndef __X86_64_MMU_CONTEXT_H
-#define __X86_64_MMU_CONTEXT_H
@@ -886,8 +897,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif
+#endif /* _ASM_X86_MMU_CONTEXT_64_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/pci.h 2011-02-01 14:38:38.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pci.h 2011-02-01 14:39:24.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pci.h 2011-02-01 14:38:38.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/pci.h 2011-02-01 14:39:24.000000000 +0100
@@ -1,5 +1,5 @@
-#ifndef __x86_PCI_H
-#define __x86_PCI_H
@@ -911,16 +922,16 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif
+#endif /* _ASM_X86_PCI_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/pgalloc.h 2011-02-01 14:38:38.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pgalloc.h 2011-02-01 14:39:24.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pgalloc.h 2011-02-01 14:38:38.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/pgalloc.h 2011-02-01 14:39:24.000000000 +0100
@@ -149,4 +149,4 @@ extern void __pud_free_tlb(struct mmu_ga
#endif /* PAGETABLE_LEVELS > 3 */
#endif /* PAGETABLE_LEVELS > 2 */
-#endif /* _ASM_X86_PGALLOC_H */
+#endif /* _ASM_X86_PGALLOC_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/pgtable.h 2011-03-23 09:54:13.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pgtable.h 2011-03-23 09:56:09.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pgtable.h 2011-03-23 09:54:13.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/pgtable.h 2011-03-23 09:56:09.000000000 +0100
@@ -14,11 +14,11 @@
#define _PAGE_BIT_PAT 7 /* on 4KB pages */
#define _PAGE_BIT_GLOBAL 8 /* Global TLB entry PPro+ */
@@ -1039,8 +1050,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif /* _ASM_X86_PGTABLE_H */
+#endif /* _ASM_X86_PGTABLE_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-03-23 09:54:10.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-03-23 09:56:12.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-03-23 09:54:10.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-03-23 09:56:12.000000000 +0100
@@ -1,5 +1,5 @@
-#ifndef _I386_PGTABLE_3LEVEL_H
-#define _I386_PGTABLE_3LEVEL_H
@@ -1093,8 +1104,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif /* _I386_PGTABLE_3LEVEL_H */
+#endif /* _ASM_X86_PGTABLE_3LEVEL_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/pgtable-3level-defs.h 2011-01-31 17:32:29.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pgtable-3level-defs.h 2011-02-01 14:39:24.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pgtable-3level-defs.h 2011-01-31 17:32:29.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/pgtable-3level-defs.h 2011-02-01 14:39:24.000000000 +0100
@@ -1,5 +1,5 @@
-#ifndef _I386_PGTABLE_3LEVEL_DEFS_H
-#define _I386_PGTABLE_3LEVEL_DEFS_H
@@ -1109,8 +1120,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif /* _I386_PGTABLE_3LEVEL_DEFS_H */
+#endif /* _ASM_X86_PGTABLE_3LEVEL_DEFS_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-01 14:38:38.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-01 14:39:24.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-01 14:38:38.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-01 14:39:24.000000000 +0100
@@ -1,5 +1,5 @@
-#ifndef _I386_PGTABLE_H
-#define _I386_PGTABLE_H
@@ -1152,8 +1163,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif /* _I386_PGTABLE_H */
+#endif /* _ASM_X86_PGTABLE_32_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 09:54:07.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 09:56:14.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 09:54:07.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 09:56:14.000000000 +0100
@@ -1,5 +1,5 @@
-#ifndef _X86_64_PGTABLE_H
-#define _X86_64_PGTABLE_H
@@ -1201,8 +1212,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif /* _X86_64_PGTABLE_H */
+#endif /* _ASM_X86_PGTABLE_64_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/processor.h 2011-03-03 16:44:23.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/processor.h 2011-03-03 16:45:14.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/processor.h 2011-03-03 16:44:23.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/processor.h 2011-03-03 16:45:14.000000000 +0100
@@ -1,5 +1,5 @@
-#ifndef __ASM_X86_PROCESSOR_H
-#define __ASM_X86_PROCESSOR_H
@@ -1378,8 +1389,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif
+#endif /* _ASM_X86_PROCESSOR_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/smp.h 2011-02-01 14:38:38.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/smp.h 2011-02-01 14:39:24.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/smp.h 2011-02-01 14:38:38.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/smp.h 2011-02-01 14:39:24.000000000 +0100
@@ -1,5 +1,5 @@
-#ifndef _ASM_X86_SMP_H_
-#define _ASM_X86_SMP_H_
@@ -1557,8 +1568,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
#endif /* __ASSEMBLY__ */
-#endif
+#endif /* _ASM_X86_SMP_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/spinlock.h 2011-02-01 14:38:38.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/spinlock.h 2011-02-01 14:39:24.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/spinlock.h 2011-07-12 11:14:29.000000000 +0200
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/spinlock.h 2011-07-12 11:14:42.000000000 +0200
@@ -1,5 +1,5 @@
-#ifndef _X86_SPINLOCK_H_
-#define _X86_SPINLOCK_H_
@@ -1567,14 +1578,14 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
#include <asm/atomic.h>
#include <asm/rwlock.h>
-@@ -453,4 +453,4 @@ static inline void __raw_write_unlock(ra
+@@ -457,4 +457,4 @@ static inline void __raw_write_unlock(ra
#define _raw_read_relax(lock) cpu_relax()
#define _raw_write_relax(lock) cpu_relax()
-#endif
+#endif /* _ASM_X86_SPINLOCK_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/spinlock_types.h 2011-02-01 14:38:38.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/spinlock_types.h 2011-02-01 14:39:24.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/spinlock_types.h 2011-02-01 14:38:38.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/spinlock_types.h 2011-02-01 14:39:24.000000000 +0100
@@ -1,5 +1,5 @@
-#ifndef __ASM_SPINLOCK_TYPES_H
-#define __ASM_SPINLOCK_TYPES_H
@@ -1589,8 +1600,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif
+#endif /* _ASM_X86_SPINLOCK_TYPES_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/system.h 2011-03-03 15:58:55.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/system.h 2011-03-03 16:01:23.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/system.h 2011-03-03 15:58:55.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/system.h 2011-03-03 16:01:23.000000000 +0100
@@ -1,5 +1,5 @@
-#ifndef _ASM_X86_SYSTEM_H_
-#define _ASM_X86_SYSTEM_H_
@@ -1617,8 +1628,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif
+#endif /* _ASM_X86_SYSTEM_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/tlbflush.h 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/tlbflush.h 2011-02-01 14:39:24.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/tlbflush.h 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/tlbflush.h 2011-02-01 14:39:24.000000000 +0100
@@ -63,6 +63,10 @@ static inline void flush_tlb_range(struc
__flush_tlb();
}
@@ -1643,8 +1654,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
#endif
#endif /* SMP */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/vga.h 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/vga.h 2011-02-01 14:39:24.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/vga.h 2011-01-31 18:07:35.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/vga.h 2011-02-01 14:39:24.000000000 +0100
@@ -4,8 +4,8 @@
* (c) 1998 Martin Mares <mj@ucw.cz>
*/
@@ -1662,8 +1673,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif
+#endif /* _ASM_X86_VGA_H */
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/xor.h 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/xor.h 2011-02-01 14:39:24.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/xor.h 2011-01-31 17:56:27.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/xor.h 2011-02-01 14:39:24.000000000 +0100
@@ -1,5 +1,5 @@
#ifdef CONFIG_X86_32
-# include "../../xor_32.h"
@@ -1671,8 +1682,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
#else
# include "xor_64.h"
#endif
---- head-2011-06-30.orig/arch/x86/include/mach-xen/asm/xor_64.h 2011-02-01 14:38:38.000000000 +0100
-+++ head-2011-06-30/arch/x86/include/mach-xen/asm/xor_64.h 2011-02-01 14:39:24.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/xor_64.h 2011-02-01 14:38:38.000000000 +0100
++++ head-2011-07-21/arch/x86/include/mach-xen/asm/xor_64.h 2011-02-01 14:39:24.000000000 +0100
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__XOR_64_H
-#define ASM_X86__XOR_64_H
@@ -1687,8 +1698,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif /* ASM_X86__XOR_64_H */
+#endif /* _ASM_X86_XOR_64_H */
---- head-2011-06-30.orig/arch/x86/kernel/Makefile 2011-06-30 16:39:13.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/Makefile 2011-06-30 16:47:51.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/kernel/Makefile 2011-06-30 16:39:13.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/Makefile 2011-06-30 16:47:51.000000000 +0200
@@ -135,7 +135,7 @@ ifeq ($(CONFIG_X86_64),y)
time_64-$(CONFIG_XEN) += time_32.o
endif
@@ -1700,8 +1711,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
+ hpet.o i8253.o i8259.o irqinit_$(BITS).o pci-swiotlb_64.o reboot.o \
+ smpboot.o tlb_$(BITS).o tsc.o tsc_sync.o uv_%.o vsmp_64.o
disabled-obj-$(CONFIG_XEN_UNPRIVILEGED_GUEST) += probe_roms_32.o
---- head-2011-06-30.orig/arch/x86/kernel/apic/apic-xen.c 2011-02-01 14:38:38.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/apic/apic-xen.c 2011-02-24 15:49:32.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/apic/apic-xen.c 2011-02-01 14:38:38.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/apic/apic-xen.c 2011-02-24 15:49:32.000000000 +0100
@@ -1,60 +1,13 @@
/*
- * Local APIC handling, local APIC timers
@@ -1824,8 +1835,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
#endif
return 0;
---- head-2011-06-30.orig/arch/x86/kernel/cpu/topology.c 2010-10-20 22:30:22.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/cpu/topology.c 2011-02-01 14:39:24.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/cpu/topology.c 2011-07-21 11:59:59.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/cpu/topology.c 2011-02-01 14:39:24.000000000 +0100
@@ -28,7 +28,7 @@
*/
void __cpuinit detect_extended_topology(struct cpuinfo_x86 *c)
@@ -1835,8 +1846,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
unsigned int eax, ebx, ecx, edx, sub_index;
unsigned int ht_mask_width, core_plus_mask_width;
unsigned int core_select_mask, core_level_siblings;
---- head-2011-06-30.orig/arch/x86/kernel/cpu/common-xen.c 2011-02-01 14:38:38.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/cpu/common-xen.c 2011-03-17 14:40:32.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/cpu/common-xen.c 2011-02-01 14:38:38.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/cpu/common-xen.c 2011-03-17 14:40:32.000000000 +0100
@@ -1,33 +1,73 @@
#include <linux/init.h>
+#include <linux/kernel.h>
@@ -3229,7 +3240,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
+
+
#endif
---- head-2011-06-30.orig/arch/x86/kernel/cpu/common_64-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/cpu/common_64-xen.c 2011-02-01 14:38:38.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,777 +0,0 @@
-#include <linux/init.h>
@@ -4009,8 +4020,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
- if (is_uv_system())
- uv_cpu_init();
-}
---- head-2011-06-30.orig/arch/x86/kernel/dumpstack_64.c 2011-06-30 15:04:43.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/dumpstack_64.c 2011-02-01 14:39:24.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/dumpstack_64.c 2011-07-21 11:59:59.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/dumpstack_64.c 2011-02-01 14:39:24.000000000 +0100
@@ -21,6 +21,7 @@
#define N_EXCEPTION_STACKS_END \
(N_EXCEPTION_STACKS + DEBUG_STKSZ/EXCEPTION_STKSZ - 2)
@@ -4040,8 +4051,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
return NULL;
}
---- head-2011-06-30.orig/arch/x86/kernel/e820-xen.c 2011-02-01 14:38:38.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/e820-xen.c 2011-02-01 14:39:24.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/e820-xen.c 2011-02-01 14:38:38.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/e820-xen.c 2011-02-01 14:39:24.000000000 +0100
@@ -167,6 +167,9 @@ static void __init _e820_print_map(const
case E820_NVS:
printk(KERN_CONT "(ACPI NVS)\n");
@@ -4122,8 +4133,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
#undef e820
#ifndef CONFIG_XEN
---- head-2011-06-30.orig/arch/x86/kernel/early_printk-xen.c 2011-02-01 14:38:38.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/early_printk-xen.c 2011-02-01 14:39:24.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/early_printk-xen.c 2011-02-01 14:38:38.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/early_printk-xen.c 2011-02-01 14:39:24.000000000 +0100
@@ -3,10 +3,18 @@
#include <linux/init.h>
#include <linux/string.h>
@@ -4954,8 +4965,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
}
+
early_param("earlyprintk", setup_early_printk);
---- head-2011-06-30.orig/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:10:27.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:10:36.000000000 +0200
+--- head-2011-07-21.orig/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:10:27.000000000 +0200
++++ head-2011-07-21/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:10:36.000000000 +0200
@@ -700,7 +700,7 @@ ENTRY(interrupt)
ENTRY(irq_entries_start)
RING0_INT_FRAME
@@ -5065,8 +5076,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
#include <asm/alternative-asm.h>
---- head-2011-06-30.orig/arch/x86/kernel/entry_64-xen.S 2011-02-01 14:38:38.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/entry_64-xen.S 2011-02-01 14:39:24.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/entry_64-xen.S 2011-02-01 14:38:38.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/entry_64-xen.S 2011-02-01 14:39:24.000000000 +0100
@@ -66,35 +66,9 @@
.code64
@@ -5156,8 +5167,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
#ifdef CONFIG_X86_MCE
/* runs on exception stack */
---- head-2011-06-30.orig/arch/x86/kernel/fixup.c 2011-02-01 14:38:38.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/fixup.c 2011-02-01 14:39:24.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/fixup.c 2011-02-01 14:38:38.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/fixup.c 2011-02-01 14:39:24.000000000 +0100
@@ -37,7 +37,7 @@
#define DP(_f, _args...) pr_alert(" " _f "\n" , ## _args )
@@ -5167,8 +5178,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
{
static unsigned long printed = 0;
char info[100];
---- head-2011-06-30.orig/arch/x86/kernel/head-xen.c 2011-02-01 14:38:38.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/head-xen.c 2011-02-01 14:39:24.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/head-xen.c 2011-02-01 14:38:38.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/head-xen.c 2011-02-01 14:39:24.000000000 +0100
@@ -36,6 +36,7 @@ void __init reserve_ebda_region(void)
/* start of EBDA area */
@@ -5177,8 +5188,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
/* Fixup: bios puts an EBDA in the top 64K segment */
/* of conventional memory, but does not adjust lowmem. */
---- head-2011-06-30.orig/arch/x86/kernel/head64-xen.c 2011-02-01 14:38:38.000000000 +0100
-+++ head-2011-06-30/arch/x86/kernel/head64-xen.c 2011-02-01 14:39:24.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/head64-xen.c 2011-02-01 14:38:38.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/head64-xen.c 2011-02-01 14:39:24.000000000 +0100
@@ -151,12 +151,11 @@ void __init x86_64_start_kernel(char * r
load_idt((const struct desc_ptr *)&idt_descr);
#endif
@@ -5195,7 +5206,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-06-30/arch/x86/kernel/apic/io_apic-xen.c 2011-02-01 14:39:24.000000000 +0100
++++ head-2011-07-21/arch/x86/kernel/apic/io_apic-xen.c 2011-02-01 14:39:24.000000000 +0100
@@ -0,0 +1,3937 @@
+/*
+ * Intel IO-APIC support for multi-Pentium hosts.
@@ -9134,7 +9145,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
+ * IO APICS that are mapped in on a BAR in PCI space. */
+late_initcall(ioapic_insert_resources);
+#endif /* !CONFIG_XEN */
---- head-2011-06-30.orig/arch/x86/kernel/io_apic_32-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- head-2011-07-21.orig/arch/x86/kernel/io_apic_32-xen.c 2011-02-01 14:38:38.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,2985 +0,0 @@
-/*
@@ -12122,7 +12133,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
- }