Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@suse.com>2014-07-30 08:21:30 +0200
committerJan Beulich <jbeulich@suse.com>2014-07-30 08:21:30 +0200
commita2720a703b0a3eed0f5fcb76084ca20487cc62d1 (patch)
treeeda1878c34530a3d6339cf7039ed076b37e887b7
parentf509af67eb3a98665e0134eaadb91e93420d9e04 (diff)
- Update Xen patches to 3.16-rc7 and c/s 1263.
- netbk: Don't destroy the netdev until the vif is shut down (bnc#881008).
-rw-r--r--patches.xen/pci-guestdev8
-rw-r--r--patches.xen/xen-netback-defer-netdev-destruction150
-rw-r--r--patches.xen/xen-netback-generalize2
-rw-r--r--patches.xen/xen-netback-kernel-threads2
-rw-r--r--patches.xen/xen-netback-multiple-tasklets6
-rw-r--r--patches.xen/xen-privcmd-hcall-preemption2
-rw-r--r--patches.xen/xen-spinlock-poll-early2
-rw-r--r--patches.xen/xen-unpriv-build10
-rw-r--r--patches.xen/xen-x86-EFI6
-rw-r--r--patches.xen/xen-x86-bzImage18
-rw-r--r--patches.xen/xen-x86-pcpu2
-rw-r--r--patches.xen/xen-x86-per-cpu-vcpu-info4
-rw-r--r--patches.xen/xen-x86_64-vread-pvclock4
-rw-r--r--patches.xen/xen3-auto-arch-i386.diff8
-rw-r--r--patches.xen/xen3-auto-arch-x86.diff8
-rw-r--r--patches.xen/xen3-auto-arch-x86_64.diff2
-rw-r--r--patches.xen/xen3-auto-common.diff20
-rw-r--r--patches.xen/xen3-auto-include-xen-interface.diff2
-rw-r--r--patches.xen/xen3-auto-xen-arch.diff2
-rw-r--r--patches.xen/xen3-auto-xen-drivers.diff71
-rw-r--r--patches.xen/xen3-auto-xen-kconfig.diff68
-rw-r--r--patches.xen/xen3-fixup-arch-x864
-rw-r--r--patches.xen/xen3-fixup-kconfig2
-rw-r--r--patches.xen/xen3-fixup-xen2
-rw-r--r--patches.xen/xen3-patch-2.6.1810
-rw-r--r--patches.xen/xen3-patch-2.6.1912
-rw-r--r--patches.xen/xen3-patch-2.6.204
-rw-r--r--patches.xen/xen3-patch-2.6.228
-rw-r--r--patches.xen/xen3-patch-2.6.234
-rw-r--r--patches.xen/xen3-patch-2.6.2464
-rw-r--r--patches.xen/xen3-patch-2.6.2512
-rw-r--r--patches.xen/xen3-patch-2.6.2610
-rw-r--r--patches.xen/xen3-patch-2.6.274
-rw-r--r--patches.xen/xen3-patch-2.6.2810
-rw-r--r--patches.xen/xen3-patch-2.6.2914
-rw-r--r--patches.xen/xen3-patch-2.6.3014
-rw-r--r--patches.xen/xen3-patch-2.6.3144
-rw-r--r--patches.xen/xen3-patch-2.6.348
-rw-r--r--patches.xen/xen3-patch-2.6.3613
-rw-r--r--patches.xen/xen3-patch-2.6.3720
-rw-r--r--patches.xen/xen3-patch-2.6.3810
-rw-r--r--patches.xen/xen3-patch-2.6.3914
-rw-r--r--patches.xen/xen3-patch-3.128
-rw-r--r--patches.xen/xen3-patch-3.1012
-rw-r--r--patches.xen/xen3-patch-3.116
-rw-r--r--patches.xen/xen3-patch-3.126
-rw-r--r--patches.xen/xen3-patch-3.144
-rw-r--r--patches.xen/xen3-patch-3.158
-rw-r--r--patches.xen/xen3-patch-3.16-rc7 (renamed from patches.xen/xen3-patch-3.16-rc3)101
-rw-r--r--patches.xen/xen3-patch-3.718
-rw-r--r--patches.xen/xen3-patch-3.814
-rw-r--r--patches.xen/xen3-patch-3.916
-rw-r--r--patches.xen/xen3-stack-unwind4
-rw-r--r--series.conf3
54 files changed, 558 insertions, 342 deletions
diff --git a/patches.xen/pci-guestdev b/patches.xen/pci-guestdev
index 40440f8716..16cc1faade 100644
--- a/patches.xen/pci-guestdev
+++ b/patches.xen/pci-guestdev
@@ -10,7 +10,7 @@ Acked-by: jbeulich@novell.com
3.8/drivers/acpi/scan.c (pnp.unique_id handling now present)
---- head.orig/Documentation/kernel-parameters.txt 2014-06-26 11:21:31.000000000 +0200
+--- head.orig/Documentation/kernel-parameters.txt 2014-07-29 10:33:34.000000000 +0200
+++ head/Documentation/kernel-parameters.txt 2014-01-07 16:03:58.000000000 +0100
@@ -1140,6 +1140,24 @@ bytes respectively. Such letter suffixes
Format: <unsigned int> such that (rxsize & ~0x1fffc0) == 0.
@@ -37,7 +37,7 @@ Acked-by: jbeulich@novell.com
hashdist= [KNL,NUMA] Large hashes allocated during boot
are distributed across NUMA nodes. Defaults on
for 64-bit NUMA, off otherwise.
-@@ -2927,6 +2945,10 @@ bytes respectively. Such letter suffixes
+@@ -2933,6 +2951,10 @@ bytes respectively. Such letter suffixes
Run specified binary instead of /init from the ramdisk,
used for early userspace startup. See initrd.
@@ -2082,9 +2082,9 @@ 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.orig/drivers/pci/pci.c 2014-06-26 11:20:43.000000000 +0200
+--- head.orig/drivers/pci/pci.c 2014-07-29 10:32:47.000000000 +0200
+++ head/drivers/pci/pci.c 2014-01-07 16:03:38.000000000 +0100
-@@ -4299,7 +4299,7 @@ void pci_reassigndev_resource_alignment(
+@@ -4304,7 +4304,7 @@ void pci_reassigndev_resource_alignment(
/* check if specified PCI is target device to reassign */
align = pci_specified_resource_alignment(dev);
diff --git a/patches.xen/xen-netback-defer-netdev-destruction b/patches.xen/xen-netback-defer-netdev-destruction
new file mode 100644
index 0000000000..fe1aeb518a
--- /dev/null
+++ b/patches.xen/xen-netback-defer-netdev-destruction
@@ -0,0 +1,150 @@
+From: Olaf Hering <olaf@aepfle.de>
+Date: Thu, 10 Jul 2014 19:10:43 +0200
+Patch-mainline: submitted
+Subject: netbk: Don't destroy the netdev until the vif is shut down
+References: bnc#881008
+
+Without this patch, if a frontend cycles through states Closing
+and Closed (which Windows frontends need to do) then the netdev
+will be destroyed and requires re-invocation of hotplug scripts to
+restore state before the frontend can move to Connected. Thus when
+udev is not in use the backend gets stuck in InitWait.
+
+With this patch, the netdev is left alone whilst the backend is
+still online and is only de-registered and freed just prior to
+destroying the vif (which is also nicely symmetrical with the
+netdev allocation and registration being done during probe) so no
+re-invocation of hotplug scripts is required.
+
+Based on an upstream change from Paul Durrant <paul.durrant@citrix.com>
+
+Signed-off-by: Olaf Hering <olaf@aepfle.de>
+Acked-by: <ohering@suse.de>
+---
+ drivers/xen/netback/common.h | 1 +
+ drivers/xen/netback/interface.c | 16 +++++++++++-----
+ drivers/xen/netback/xenbus.c | 34 ++++++++++++++--------------------
+ 3 files changed, 26 insertions(+), 25 deletions(-)
+
+--- head.orig/drivers/xen/netback/common.h 2014-01-28 17:45:44.000000000 +0100
++++ head/drivers/xen/netback/common.h 2014-07-24 13:36:36.000000000 +0200
+@@ -179,6 +179,7 @@ void netif_accel_init(void);
+ #define NET_RX_RING_SIZE __CONST_RING_SIZE(netif_rx, PAGE_SIZE)
+
+ void netif_disconnect(struct backend_info *be);
++void netif_free(struct backend_info *be);
+
+ netif_t *netif_alloc(struct device *parent, domid_t domid, unsigned int handle);
+ int netif_map(struct backend_info *be, grant_ref_t tx_ring_ref,
+--- head.orig/drivers/xen/netback/interface.c 2014-01-28 17:28:51.000000000 +0100
++++ head/drivers/xen/netback/interface.c 2014-07-24 13:36:36.000000000 +0200
+@@ -301,6 +301,7 @@ int netif_map(struct backend_info *be, g
+ dev_set_mtu(netif->dev, ETH_DATA_LEN);
+ netdev_update_features(netif->dev);
+ netback_carrier_on(netif);
++ netif_carrier_on(netif->dev);
+ if (netif_running(netif->dev))
+ __netif_up(netif);
+ rtnl_unlock();
+@@ -327,21 +328,26 @@ void netif_disconnect(struct backend_inf
+ netif_put(netif);
+ }
+
+- atomic_dec(&netif->refcnt);
+- wait_event(netif->waiting_to_free, atomic_read(&netif->refcnt) == 0);
++ wait_event(netif->waiting_to_free, atomic_read(&netif->refcnt) == 1);
+
+ del_timer_sync(&netif->credit_timeout);
+ del_timer_sync(&netif->tx_queue_timeout);
+
+- if (netif->irq)
++ if (netif->irq) {
+ unbind_from_irqhandler(netif->irq, netif);
++ netif->irq = 0;
++ }
+
+- unregister_netdev(netif->dev);
+-
+ if (netif->tx.sring) {
+ xenbus_unmap_ring_vfree(be->dev, netif->tx_comms_area);
+ xenbus_unmap_ring_vfree(be->dev, netif->rx_comms_area);
+ }
++}
+
++void netif_free(struct backend_info *be)
++{
++ netif_t *netif = be->netif;
++
++ unregister_netdev(netif->dev);
+ free_netdev(netif->dev);
+ }
+--- head.orig/drivers/xen/netback/xenbus.c 2014-01-28 17:46:17.000000000 +0100
++++ head/drivers/xen/netback/xenbus.c 2014-07-24 13:36:38.000000000 +0200
+@@ -28,7 +28,6 @@ static int connect_rings(struct backend_
+ static void connect(struct backend_info *);
+ static void backend_create_netif(struct backend_info *be);
+ static void unregister_hotplug_status_watch(struct backend_info *be);
+-static void netback_disconnect(struct device *, bool);
+
+ static int netback_remove(struct xenbus_device *dev)
+ {
+@@ -36,29 +35,27 @@ static int netback_remove(struct xenbus_
+
+ netback_remove_accelerators(be, dev);
+
+- netback_disconnect(&dev->dev, true);
++ xenbus_switch_state(dev, XenbusStateClosed);
++ unregister_hotplug_status_watch(be);
++ kobject_uevent(&dev->dev.kobj, KOBJ_OFFLINE);
++ down_write(&teardown_sem);
++ if (be->netif) {
++ xenbus_rm(XBT_NIL, be->dev->nodename, "hotplug-status");
++ netif_free(be);
++ be->netif = NULL;
++ }
++ dev_set_drvdata(&dev->dev, NULL);
++ up_write(&teardown_sem);
+ kfree(be);
+ return 0;
+ }
+
+-static void netback_disconnect(struct device *xbdev_dev, bool clear)
++static void netback_disconnect(struct device *xbdev_dev)
+ {
+ struct backend_info *be = dev_get_drvdata(xbdev_dev);
+
+- unregister_hotplug_status_watch(be);
+- if (be->netif)
+- kobject_uevent(&xbdev_dev->kobj, KOBJ_OFFLINE);
+-
+- xenbus_rm(XBT_NIL, be->dev->nodename, "hotplug-status");
+-
+- down_write(&teardown_sem);
+- if (be->netif) {
++ if (be && be->netif)
+ netif_disconnect(be);
+- be->netif = NULL;
+- }
+- if (clear)
+- dev_set_drvdata(xbdev_dev, NULL);
+- up_write(&teardown_sem);
+ }
+
+ /**
+@@ -255,15 +252,12 @@ static void frontend_changed(struct xenb
+ case XenbusStateConnected:
+ if (dev->state == XenbusStateConnected)
+ break;
+-
+- /* backend_create_netif() is idempotent */
+- backend_create_netif(be);
+ if (be->netif)
+ connect(be);
+ break;
+
+ case XenbusStateClosing:
+- netback_disconnect(&dev->dev, false);
++ netback_disconnect(&dev->dev);
+ xenbus_switch_state(dev, XenbusStateClosing);
+ break;
+
diff --git a/patches.xen/xen-netback-generalize b/patches.xen/xen-netback-generalize
index a5bcc14d63..f521329901 100644
--- a/patches.xen/xen-netback-generalize
+++ b/patches.xen/xen-netback-generalize
@@ -13,7 +13,7 @@ Acked-by: jbeulich@novell.com
--- head.orig/drivers/xen/netback/common.h 2014-01-28 17:29:12.000000000 +0100
+++ head/drivers/xen/netback/common.h 2014-01-28 17:30:54.000000000 +0100
-@@ -221,4 +221,65 @@ static inline int netbk_can_sg(struct ne
+@@ -222,4 +222,65 @@ static inline int netbk_can_sg(struct ne
return netif->can_sg;
}
diff --git a/patches.xen/xen-netback-kernel-threads b/patches.xen/xen-netback-kernel-threads
index 54511ca4eb..a6cb6d8dfb 100644
--- a/patches.xen/xen-netback-kernel-threads
+++ b/patches.xen/xen-netback-kernel-threads
@@ -63,7 +63,7 @@ Acked-by: jbeulich@novell.com
new_page->index = page->index;
--- head.orig/drivers/xen/netback/common.h 2014-01-28 17:31:48.000000000 +0100
+++ head/drivers/xen/netback/common.h 2014-01-28 17:32:02.000000000 +0100
-@@ -272,6 +272,9 @@ struct xen_netbk {
+@@ -273,6 +273,9 @@ struct xen_netbk {
netif_tx_request_t slots[XEN_NETIF_NR_SLOTS_MIN];
} tx;
diff --git a/patches.xen/xen-netback-multiple-tasklets b/patches.xen/xen-netback-multiple-tasklets
index d6b42c3428..8a1ba09529 100644
--- a/patches.xen/xen-netback-multiple-tasklets
+++ b/patches.xen/xen-netback-multiple-tasklets
@@ -27,7 +27,7 @@ Acked-by: jbeulich@novell.com
unsigned int handle;
u8 fe_dev_addr[6];
-@@ -244,6 +245,8 @@ struct netbk_tx_pending_inuse {
+@@ -245,6 +246,8 @@ struct netbk_tx_pending_inuse {
#define MAX_MFN_ALLOC 64
struct xen_netbk {
@@ -36,7 +36,7 @@ Acked-by: jbeulich@novell.com
struct {
pending_ring_idx_t pending_prod, pending_cons;
pending_ring_idx_t dealloc_prod, dealloc_cons;
-@@ -282,4 +285,8 @@ struct xen_netbk {
+@@ -283,4 +286,8 @@ struct xen_netbk {
unsigned long mfn_list[MAX_MFN_ALLOC];
} rx;
};
@@ -45,7 +45,7 @@ Acked-by: jbeulich@novell.com
+extern unsigned int netbk_nr_groups;
+
#endif /* __NETIF__BACKEND__COMMON_H__ */
---- head.orig/drivers/xen/netback/interface.c 2014-01-28 17:28:51.000000000 +0100
+--- head.orig/drivers/xen/netback/interface.c 2014-07-24 13:36:36.000000000 +0200
+++ head/drivers/xen/netback/interface.c 2014-01-28 17:31:49.000000000 +0100
@@ -56,6 +56,23 @@ module_param_named(queue_length, netbk_q
diff --git a/patches.xen/xen-privcmd-hcall-preemption b/patches.xen/xen-privcmd-hcall-preemption
index 231e8b96b5..5528aae043 100644
--- a/patches.xen/xen-privcmd-hcall-preemption
+++ b/patches.xen/xen-privcmd-hcall-preemption
@@ -17,7 +17,7 @@ References: bnc#861093
#define is_running_on_xen() (!!hypercall_stubs)
--- head.orig/arch/x86/kernel/entry_32-xen.S 2014-06-27 16:51:37.000000000 +0200
+++ head/arch/x86/kernel/entry_32-xen.S 2014-01-16 09:58:54.000000000 +0100
-@@ -912,6 +912,17 @@ ENTRY(hypervisor_callback)
+@@ -913,6 +913,17 @@ ENTRY(hypervisor_callback)
call evtchn_do_upcall
add $4,%esp
CFI_ADJUST_CFA_OFFSET -4
diff --git a/patches.xen/xen-spinlock-poll-early b/patches.xen/xen-spinlock-poll-early
index d4e763e203..ab9dd53e3b 100644
--- a/patches.xen/xen-spinlock-poll-early
+++ b/patches.xen/xen-spinlock-poll-early
@@ -17,7 +17,7 @@ only gets introduced in the 2.6.32 merge.
### Arch settings
config X86
-@@ -381,6 +381,8 @@ config X86_64_XEN
+@@ -382,6 +382,8 @@ config X86_64_XEN
bool "Enable Xen compatible kernel"
depends on X86_64
select XEN
diff --git a/patches.xen/xen-unpriv-build b/patches.xen/xen-unpriv-build
index 48a0df979b..a160fe5f74 100644
--- a/patches.xen/xen-unpriv-build
+++ b/patches.xen/xen-unpriv-build
@@ -4,7 +4,7 @@ Patch-mainline: n/a
--- head.orig/arch/x86/Kconfig 2014-01-07 17:00:40.000000000 +0100
+++ head/arch/x86/Kconfig 2014-02-20 15:47:08.000000000 +0100
-@@ -716,6 +716,7 @@ config DMI
+@@ -717,6 +717,7 @@ config DMI
default y
select DMI_SCAN_MACHINE_NON_EFI_FALLBACK
bool "Enable DMI scanning" if EXPERT
@@ -12,7 +12,7 @@ Patch-mainline: n/a
---help---
Enabled scanning of DMI to identify machine quirks. Say Y
here unless you have verified that your setup is not
-@@ -775,6 +776,7 @@ config CALGARY_IOMMU_ENABLED_BY_DEFAULT
+@@ -776,6 +777,7 @@ config CALGARY_IOMMU_ENABLED_BY_DEFAULT
# need this always selected by IOMMU for the VIA workaround
config SWIOTLB
def_bool y if X86_64 || XEN
@@ -20,7 +20,7 @@ Patch-mainline: n/a
---help---
Support for software bounce buffers used on x86-64 systems
which don't have a hardware IOMMU. Using this PCI devices
-@@ -2137,13 +2139,15 @@ config PCI_GOBIOS
+@@ -2138,13 +2140,15 @@ config PCI_GOBIOS
config PCI_GOMMCONFIG
bool "MMConfig"
@@ -37,7 +37,7 @@ Patch-mainline: n/a
config PCI_GOXEN_FE
bool "Xen PCI Frontend"
-@@ -2154,6 +2158,7 @@ config PCI_GOXEN_FE
+@@ -2155,6 +2159,7 @@ config PCI_GOXEN_FE
config PCI_GOANY
bool "Any"
@@ -45,7 +45,7 @@ Patch-mainline: n/a
endchoice
-@@ -2354,7 +2359,7 @@ endif # X86_32
+@@ -2355,7 +2360,7 @@ endif # X86_32
config AMD_NB
def_bool y
diff --git a/patches.xen/xen-x86-EFI b/patches.xen/xen-x86-EFI
index 79c07e1fb9..248c4945e6 100644
--- a/patches.xen/xen-x86-EFI
+++ b/patches.xen/xen-x86-EFI
@@ -5,7 +5,7 @@ References: fate#311376, fate#311529, bnc#578927, bnc#628554
--- head.orig/arch/x86/Kconfig 2014-01-07 17:30:52.000000000 +0100
+++ head/arch/x86/Kconfig 2014-01-07 17:30:58.000000000 +0100
-@@ -1570,7 +1570,7 @@ config X86_SMAP
+@@ -1571,7 +1571,7 @@ config X86_SMAP
config EFI
bool "EFI runtime service support"
@@ -14,7 +14,7 @@ References: fate#311376, fate#311529, bnc#578927, bnc#628554
select UCS2_STRING
---help---
This enables the kernel to use EFI runtime services that are
-@@ -1585,7 +1585,7 @@ config EFI
+@@ -1586,7 +1586,7 @@ config EFI
config EFI_STUB
bool "EFI stub support"
@@ -705,7 +705,7 @@ References: fate#311376, fate#311529, bnc#578927, bnc#628554
+ return EFI_SUCCESS;
+}
+EXPORT_SYMBOL_GPL(efi_query_variable_store);
---- head.orig/drivers/firmware/efi/efi.c 2014-06-26 11:20:13.000000000 +0200
+--- head.orig/drivers/firmware/efi/efi.c 2014-07-29 10:32:22.000000000 +0200
+++ head/drivers/firmware/efi/efi.c 2014-05-02 16:30:39.000000000 +0200
@@ -202,6 +202,7 @@ subsys_initcall(efisubsys_init);
*/
diff --git a/patches.xen/xen-x86-bzImage b/patches.xen/xen-x86-bzImage
index 69a26cc9ab..2820a4c2d7 100644
--- a/patches.xen/xen-x86-bzImage
+++ b/patches.xen/xen-x86-bzImage
@@ -10,7 +10,7 @@ patch (but is probably better kept here).
--- head.orig/arch/x86/Kconfig 2014-01-07 17:30:58.000000000 +0100
+++ head/arch/x86/Kconfig 2014-01-07 17:31:03.000000000 +0100
-@@ -1585,7 +1585,7 @@ config EFI
+@@ -1586,7 +1586,7 @@ config EFI
config EFI_STUB
bool "EFI stub support"
@@ -19,7 +19,7 @@ patch (but is probably better kept here).
---help---
This kernel feature allows a bzImage to be loaded directly
by EFI firmware without the use of a bootloader.
-@@ -1808,6 +1808,34 @@ config PHYSICAL_ALIGN
+@@ -1809,6 +1809,34 @@ config PHYSICAL_ALIGN
Don't change this unless you know what you are doing.
@@ -123,9 +123,9 @@ patch (but is probably better kept here).
$(obj)/vmlinux: $(VMLINUX_OBJS) FORCE
$(call if_changed,ld)
---- head.orig/arch/x86/boot/header.S 2014-06-08 20:19:54.000000000 +0200
+--- head.orig/arch/x86/boot/header.S 2014-07-29 10:32:13.000000000 +0200
+++ head/arch/x86/boot/header.S 2013-03-25 16:37:43.000000000 +0100
-@@ -422,6 +422,9 @@ setup_data: .quad 0 # 64-bit physical
+@@ -440,6 +440,9 @@ setup_data: .quad 0 # 64-bit physical
pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr
@@ -135,7 +135,7 @@ patch (but is probably better kept here).
#define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
#define VO_INIT_SIZE (VO__end - VO__text)
#if ZO_INIT_SIZE > VO_INIT_SIZE
-@@ -436,6 +439,7 @@ handover_offset: .long 0 # Filled in b
+@@ -454,6 +457,7 @@ handover_offset: .long 0 # Filled in b
.section ".entrytext", "ax"
start_of_setup:
@@ -143,12 +143,12 @@ patch (but is probably better kept here).
# Force %es = %ds
movw %ds, %ax
movw %ax, %es
-@@ -508,3 +512,4 @@ die:
+@@ -526,3 +530,4 @@ die:
setup_corrupt:
.byte 7
.string "No setup signature found...\n"
+#endif /* CONFIG_XEN */
---- head.orig/arch/x86/boot/tools/build.c 2014-06-08 20:19:54.000000000 +0200
+--- head.orig/arch/x86/boot/tools/build.c 2014-07-29 10:32:13.000000000 +0200
+++ head/arch/x86/boot/tools/build.c 2013-12-11 11:57:53.000000000 +0100
@@ -43,8 +43,10 @@ typedef unsigned int u32;
#define DEFAULT_MINOR_ROOT 0
@@ -161,7 +161,7 @@ patch (but is probably better kept here).
#define SETUP_SECT_MAX 64
/* This must be large enough to hold the entire setup */
-@@ -336,8 +338,8 @@ int main(int argc, char ** argv)
+@@ -356,8 +358,8 @@ int main(int argc, char ** argv)
c = fread(buf, 1, sizeof(buf), file);
if (ferror(file))
die("read-error on `setup'");
@@ -172,7 +172,7 @@ patch (but is probably better kept here).
if (get_unaligned_le16(&buf[510]) != 0xAA55)
die("Boot block hasn't got boot flag (0xAA55)");
fclose(file);
-@@ -346,8 +348,10 @@ int main(int argc, char ** argv)
+@@ -366,8 +368,10 @@ int main(int argc, char ** argv)
/* Pad unused space with zeros */
setup_sectors = (c + 511) / 512;
diff --git a/patches.xen/xen-x86-pcpu b/patches.xen/xen-x86-pcpu
index a47095e8b9..8d08ce6b23 100644
--- a/patches.xen/xen-x86-pcpu
+++ b/patches.xen/xen-x86-pcpu
@@ -7,7 +7,7 @@ Patch-mainline: n/a
--- head.orig/arch/x86/Kconfig 2014-02-20 15:47:08.000000000 +0100
+++ head/arch/x86/Kconfig 2014-01-07 17:30:52.000000000 +0100
-@@ -1094,6 +1094,7 @@ config MICROCODE_EARLY
+@@ -1095,6 +1095,7 @@ config MICROCODE_EARLY
config X86_MSR
tristate "/dev/cpu/*/msr - Model-specific register support"
diff --git a/patches.xen/xen-x86-per-cpu-vcpu-info b/patches.xen/xen-x86-per-cpu-vcpu-info
index 7d2fa428f0..6fa4aaa51e 100644
--- a/patches.xen/xen-x86-per-cpu-vcpu-info
+++ b/patches.xen/xen-x86-per-cpu-vcpu-info
@@ -228,7 +228,7 @@ prerequisite for removing the limitation on 32 vCPU-s per guest.
TRACE_IRQS_ON
1: mov PT_FS(%esp), %fs
PTGS_TO_GS
-@@ -949,7 +952,9 @@ critical_region_fixup:
+@@ -950,7 +953,9 @@ critical_region_fixup:
.section .rodata,"a"
critical_fixup_table:
@@ -239,7 +239,7 @@ prerequisite for removing the limitation on 32 vCPU-s per guest.
.byte -1,-1 # jnz 14f
.byte 0 # pop %ebx
.byte 1 # pop %ecx
-@@ -968,7 +973,9 @@ critical_fixup_table:
+@@ -969,7 +974,9 @@ critical_fixup_table:
.byte 10,10,10 # add $8,%esp
#endif
.byte 12 # iret
diff --git a/patches.xen/xen-x86_64-vread-pvclock b/patches.xen/xen-x86_64-vread-pvclock
index c9491c06cc..20375fc167 100644
--- a/patches.xen/xen-x86_64-vread-pvclock
+++ b/patches.xen/xen-x86_64-vread-pvclock
@@ -7,7 +7,7 @@ the later xen-clockevents changes.
--- head.orig/arch/x86/Kconfig 2014-01-07 17:31:03.000000000 +0100
+++ head/arch/x86/Kconfig 2014-01-07 17:31:16.000000000 +0100
-@@ -381,6 +381,7 @@ config X86_64_XEN
+@@ -382,6 +382,7 @@ config X86_64_XEN
bool "Enable Xen compatible kernel"
depends on X86_64
select XEN
@@ -15,7 +15,7 @@ the later xen-clockevents changes.
select ARCH_USE_CMPXCHG_LOCKREF if XEN_SPINLOCK_ACQUIRE_NESTING = ""
# select ARCH_USE_CMPXCHG_LOCKREF if (XEN_SPINLOCK_ACQUIRE_NESTING + 1) * NR_CPUS < 256
help
-@@ -652,11 +653,11 @@ config PARAVIRT_TIME_ACCOUNTING
+@@ -653,11 +654,11 @@ config PARAVIRT_TIME_ACCOUNTING
If in doubt, say N here.
diff --git a/patches.xen/xen3-auto-arch-i386.diff b/patches.xen/xen3-auto-arch-i386.diff
index e01dce213f..f2cc896501 100644
--- a/patches.xen/xen3-auto-arch-i386.diff
+++ b/patches.xen/xen3-auto-arch-i386.diff
@@ -1,4 +1,4 @@
-From http://xenbits.xen.org/linux-2.6.18-xen.hg (tip 1261:19448506c371)
+From http://xenbits.xen.org/linux-2.6.18-xen.hg (tip 1263:52f54ddbf449)
Subject: xen3 arch-i386
From: xen-devel@lists.xen.org
Patch-mainline: n/a
@@ -22,7 +22,7 @@ Acked-by: jbeulich@suse.com
#if defined(CONFIG_LGUEST) || defined(CONFIG_LGUEST_GUEST) || defined(CONFIG_LGUEST_MODULE)
BLANK();
---- head.orig/arch/x86/kernel/entry_32.S 2014-07-03 10:48:01.000000000 +0200
+--- head.orig/arch/x86/kernel/entry_32.S 2014-07-29 10:33:36.000000000 +0200
+++ head/arch/x86/kernel/entry_32.S 2013-12-02 16:31:34.000000000 +0100
@@ -413,7 +413,7 @@ ENTRY(ia32_sysenter_target)
CFI_SIGNAL_FRAME
@@ -33,7 +33,7 @@ Acked-by: jbeulich@suse.com
sysenter_past_esp:
/*
* Interrupts are disabled here, but we can't trace it until
-@@ -1321,7 +1321,7 @@ END(page_fault)
+@@ -1322,7 +1322,7 @@ END(page_fault)
* that sets up the real kernel stack. Check here, since we can't
* allow the wrong stack to be used.
*
@@ -42,7 +42,7 @@ Acked-by: jbeulich@suse.com
* already pushed 3 words if it hits on the sysenter instruction:
* eflags, cs and eip.
*
-@@ -1333,7 +1333,7 @@ END(page_fault)
+@@ -1334,7 +1334,7 @@ END(page_fault)
cmpw $__KERNEL_CS, 4(%esp)
jne \ok
\label:
diff --git a/patches.xen/xen3-auto-arch-x86.diff b/patches.xen/xen3-auto-arch-x86.diff
index f75deb8ccf..d9030267de 100644
--- a/patches.xen/xen3-auto-arch-x86.diff
+++ b/patches.xen/xen3-auto-arch-x86.diff
@@ -1,4 +1,4 @@
-From http://xenbits.xen.org/linux-2.6.18-xen.hg (tip 1261:19448506c371)
+From http://xenbits.xen.org/linux-2.6.18-xen.hg (tip 1263:52f54ddbf449)
Subject: xen3 arch-x86
From: xen-devel@lists.xen.org
Patch-mainline: n/a
@@ -134,7 +134,7 @@ take the forward porting patches:
obj-$(CONFIG_X86_MCE_THRESHOLD) += threshold.o
obj-$(CONFIG_X86_MCE_INJECT) += mce-inject.o
---- head.orig/arch/x86/kernel/cpu/mcheck/mce.c 2014-06-26 11:20:06.000000000 +0200
+--- head.orig/arch/x86/kernel/cpu/mcheck/mce.c 2014-07-29 10:32:14.000000000 +0200
+++ head/arch/x86/kernel/cpu/mcheck/mce.c 2014-06-26 14:18:29.000000000 +0200
@@ -1262,8 +1262,15 @@ void mce_log_therm_throt_event(__u64 sta
* Periodic polling timer for "silent" machine check errors. If the
@@ -184,7 +184,7 @@ take the forward porting patches:
}
static void mce_start_timer(unsigned int cpu, struct timer_list *t)
-@@ -2466,6 +2477,16 @@ static __init int mcheck_init_device(voi
+@@ -2472,6 +2483,16 @@ static __init int mcheck_init_device(voi
if (err)
goto err_register;
@@ -367,7 +367,7 @@ take the forward porting patches:
# define ENABLE_TOPO_DEFINES
# endif
#endif
---- head.orig/arch/x86/vdso/Makefile 2014-06-26 11:20:08.000000000 +0200
+--- head.orig/arch/x86/vdso/Makefile 2014-07-03 10:47:19.000000000 +0200
+++ head/arch/x86/vdso/Makefile 2012-04-10 15:45:54.000000000 +0200
@@ -122,6 +122,8 @@ $(obj)/vdsox32.so.dbg: $(src)/vdsox32.ld
vdso32.so-$(VDSO32-y) += int80
diff --git a/patches.xen/xen3-auto-arch-x86_64.diff b/patches.xen/xen3-auto-arch-x86_64.diff
index 6a38b90060..ec88ead734 100644
--- a/patches.xen/xen3-auto-arch-x86_64.diff
+++ b/patches.xen/xen3-auto-arch-x86_64.diff
@@ -1,4 +1,4 @@
-From http://xenbits.xen.org/linux-2.6.18-xen.hg (tip 1261:19448506c371)
+From http://xenbits.xen.org/linux-2.6.18-xen.hg (tip 1263:52f54ddbf449)
Subject: xen3 arch-x86_64
From: xen-devel@lists.xen.org
Patch-mainline: n/a
diff --git a/patches.xen/xen3-auto-common.diff b/patches.xen/xen3-auto-common.diff
index 0cf037da4b..8442ed60bd 100644
--- a/patches.xen/xen3-auto-common.diff
+++ b/patches.xen/xen3-auto-common.diff
@@ -1,4 +1,4 @@
-From http://xenbits.xen.org/linux-2.6.18-xen.hg (tip 1261:19448506c371)
+From http://xenbits.xen.org/linux-2.6.18-xen.hg (tip 1263:52f54ddbf449)
Subject: xen3 common
From: xen-devel@lists.xen.org
Patch-mainline: n/a
@@ -2839,7 +2839,7 @@ take the forward porting patches:
oprofilefs_create_file(root, "buffer", &event_buffer_fops);
oprofilefs_create_ulong(root, "buffer_size", &oprofile_buffer_size);
oprofilefs_create_ulong(root, "buffer_watershed", &oprofile_buffer_watershed);
---- head.orig/fs/aio.c 2014-07-03 10:47:46.000000000 +0200
+--- head.orig/fs/aio.c 2014-07-29 10:33:10.000000000 +0200
+++ head/fs/aio.c 2014-06-26 14:14:07.000000000 +0200
@@ -44,6 +44,11 @@
#include <asm/kmap_types.h>
@@ -2881,7 +2881,7 @@ take the forward porting patches:
/*
* It'd be more correct to do this in free_ioctx(), after all
* the outstanding kiocbs have finished - but by then io_destroy
-@@ -1034,6 +1053,11 @@ void aio_complete(struct kiocb *iocb, lo
+@@ -1041,6 +1060,11 @@ void aio_complete(struct kiocb *iocb, lo
if (waitqueue_active(&ctx->wait))
wake_up(&ctx->wait);
@@ -2893,7 +2893,7 @@ take the forward porting patches:
percpu_ref_put(&ctx->reqs);
}
EXPORT_SYMBOL(aio_complete);
-@@ -1041,6 +1065,8 @@ EXPORT_SYMBOL(aio_complete);
+@@ -1048,6 +1072,8 @@ EXPORT_SYMBOL(aio_complete);
/* aio_read_events
* Pull an event off of the ioctx's event ring. Returns the number of
* events fetched
@@ -2902,7 +2902,7 @@ take the forward porting patches:
*/
static long aio_read_events_ring(struct kioctx *ctx,
struct io_event __user *event, long nr)
-@@ -1079,6 +1105,11 @@ static long aio_read_events_ring(struct
+@@ -1086,6 +1112,11 @@ static long aio_read_events_ring(struct
avail = min_t(long, avail, AIO_EVENTS_PER_PAGE -
((head + AIO_EVENTS_OFFSET) % AIO_EVENTS_PER_PAGE));
@@ -2914,7 +2914,7 @@ take the forward porting patches:
pos = head + AIO_EVENTS_OFFSET;
page = ctx->ring_pages[pos / AIO_EVENTS_PER_PAGE];
pos %= AIO_EVENTS_PER_PAGE;
-@@ -1166,6 +1197,67 @@ static long read_events(struct kioctx *c
+@@ -1173,6 +1204,67 @@ static long read_events(struct kioctx *c
return ret;
}
@@ -2982,7 +2982,7 @@ take the forward porting patches:
/* sys_io_setup:
* Create an aio_context capable of receiving at least nr_events.
* ctxp must not point to an aio_context that already exists, and
-@@ -1178,18 +1270,30 @@ static long read_events(struct kioctx *c
+@@ -1185,18 +1277,30 @@ static long read_events(struct kioctx *c
* resources are available. May fail with -EFAULT if an invalid
* pointer is passed for ctxp. Will fail with -ENOSYS if not
* implemented.
@@ -3013,7 +3013,7 @@ take the forward porting patches:
if (unlikely(ctx || nr_events == 0)) {
pr_debug("EINVAL: io_setup: ctx %lu nr_events %u\n",
ctx, nr_events);
-@@ -1200,7 +1304,11 @@ SYSCALL_DEFINE2(io_setup, unsigned, nr_e
+@@ -1207,7 +1311,11 @@ SYSCALL_DEFINE2(io_setup, unsigned, nr_e
ret = PTR_ERR(ioctx);
if (!IS_ERR(ioctx)) {
ret = put_user(ioctx->user_id, ctxp);
@@ -3786,7 +3786,7 @@ take the forward porting patches:
return i ? : -EFAULT;
if (is_vm_hugetlb_page(vma)) {
i = follow_hugetlb_page(mm, vma, pages, vmas,
---- head.orig/mm/memory.c 2014-06-26 11:21:17.000000000 +0200
+--- head.orig/mm/memory.c 2014-07-29 10:33:22.000000000 +0200
+++ head/mm/memory.c 2014-06-26 14:13:39.000000000 +0200
@@ -750,6 +750,12 @@ struct page *vm_normal_page(struct vm_ar
{
@@ -3873,7 +3873,7 @@ take the forward porting patches:
vma = mm->mmap;
if (!vma) /* Can happen if dup_mmap() received an OOM */
return;
---- head.orig/mm/page_alloc.c 2014-07-03 10:47:48.000000000 +0200
+--- head.orig/mm/page_alloc.c 2014-07-29 10:33:22.000000000 +0200
+++ head/mm/page_alloc.c 2013-09-26 11:25:08.000000000 +0200
@@ -745,6 +745,13 @@ static bool free_pages_prepare(struct pa
int i;
diff --git a/patches.xen/xen3-auto-include-xen-interface.diff b/patches.xen/xen3-auto-include-xen-interface.diff
index d1a32b7384..0fd25736a4 100644
--- a/patches.xen/xen3-auto-include-xen-interface.diff
+++ b/patches.xen/xen3-auto-include-xen-interface.diff
@@ -1,4 +1,4 @@
-From http://xenbits.xen.org/linux-2.6.18-xen.hg (tip 1261:19448506c371)
+From http://xenbits.xen.org/linux-2.6.18-xen.hg (tip 1263:52f54ddbf449)
Subject: xen3 include-xen-interface
From: xen-devel@lists.xen.org
Patch-mainline: n/a
diff --git a/patches.xen/xen3-auto-xen-arch.diff b/patches.xen/xen3-auto-xen-arch.diff
index b2f6562300..ca641b6c2f 100644
--- a/patches.xen/xen3-auto-xen-arch.diff
+++ b/patches.xen/xen3-auto-xen-arch.diff
@@ -1,4 +1,4 @@
-From http://xenbits.xen.org/linux-2.6.18-xen.hg (tip 1261:19448506c371)
+From http://xenbits.xen.org/linux-2.6.18-xen.hg (tip 1263:52f54ddbf449)
Subject: xen3 xen-arch
From: xen-devel@lists.xen.org
Patch-mainline: n/a
diff --git a/patches.xen/xen3-auto-xen-drivers.diff b/patches.xen/xen3-auto-xen-drivers.diff
index 7524e9df0e..0a53701109 100644
--- a/patches.xen/xen3-auto-xen-drivers.diff
+++ b/patches.xen/xen3-auto-xen-drivers.diff
@@ -1,4 +1,4 @@
-From http://xenbits.xen.org/linux-2.6.18-xen.hg (tip 1261:19448506c371)
+From http://xenbits.xen.org/linux-2.6.18-xen.hg (tip 1263:52f54ddbf449)
Subject: xen3 xen-drivers
From: xen-devel@lists.xen.org
Patch-mainline: n/a
@@ -26811,7 +26811,7 @@ and in case upstream wants to take the forward porting patches:
+xen-scsibk-y := interface.o scsiback.o xenbus.o translate.o emulate.o
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/scsiback/common.h 2013-06-20 14:41:30.000000000 +0200
++++ head/drivers/xen/scsiback/common.h 2014-07-29 10:43:04.000000000 +0200
@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) 2008, FUJITSU Limited
@@ -26978,19 +26978,19 @@ and in case upstream wants to take the forward porting patches:
+void scsiback_release_translation_entry(struct vscsibk_info *info);
+
+
-+void scsiback_cmd_exec(pending_req_t *pending_req);
++int scsiback_cmd_exec(pending_req_t *pending_req);
+void scsiback_do_resp_with_sense(char *sense_buffer, int32_t result,
+ uint32_t resid, pending_req_t *pending_req);
+void scsiback_fast_flush_area(pending_req_t *req);
+
+void scsiback_rsp_emulation(pending_req_t *pending_req);
-+void scsiback_req_emulation_or_cmdexec(pending_req_t *pending_req);
++int scsiback_req_emulation_or_cmdexec(pending_req_t *pending_req);
+void scsiback_emulation_init(void);
+
+
+#endif /* __SCSIIF__BACKEND__COMMON_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/scsiback/emulate.c 2014-07-03 11:24:08.000000000 +0200
++++ head/drivers/xen/scsiback/emulate.c 2014-07-29 10:43:04.000000000 +0200
@@ -0,0 +1,481 @@
+/*
+ * Xen SCSI backend driver
@@ -27339,16 +27339,16 @@ and in case upstream wants to take the forward porting patches:
+}
+
+
-+void scsiback_req_emulation_or_cmdexec(pending_req_t *pending_req)
++int scsiback_req_emulation_or_cmdexec(pending_req_t *pending_req)
+{
-+ if (__pre_do_emulation(pending_req, NULL)) {
-+ scsiback_cmd_exec(pending_req);
-+ }
-+ else {
-+ scsiback_fast_flush_area(pending_req);
-+ scsiback_do_resp_with_sense(pending_req->sense_buffer,
-+ pending_req->rslt, pending_req->resid, pending_req);
-+ }
++ if (__pre_do_emulation(pending_req, NULL))
++ return scsiback_cmd_exec(pending_req);
++
++ scsiback_fast_flush_area(pending_req);
++ scsiback_do_resp_with_sense(pending_req->sense_buffer,
++ pending_req->rslt, pending_req->resid,
++ pending_req);
++ return 0;
+}
+
+
@@ -27620,8 +27620,8 @@ and in case upstream wants to take the forward porting patches:
+ kmem_cache_destroy(scsiback_cachep);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/scsiback/scsiback.c 2014-07-03 11:24:08.000000000 +0200
-@@ -0,0 +1,764 @@
++++ head/drivers/xen/scsiback/scsiback.c 2014-07-29 10:43:04.000000000 +0200
+@@ -0,0 +1,777 @@
+/*
+ * Xen SCSI backend driver
+ *
@@ -28053,14 +28053,14 @@ and in case upstream wants to take the forward porting patches:
+}
+
+
-+void scsiback_cmd_exec(pending_req_t *pending_req)
++int scsiback_cmd_exec(pending_req_t *pending_req)
+{
+ int cmd_len = (int)pending_req->cmd_len;
+ int data_dir = (int)pending_req->sc_data_direction;
+ unsigned int nr_segments = (unsigned int)pending_req->nr_segments;
+ unsigned int timeout;
+ struct request *rq;
-+ int write;
++ int write, err;
+
+ DPRINTK("%s\n",__FUNCTION__);
+
@@ -28087,17 +28087,19 @@ and in case upstream wants to take the forward porting patches:
+ rq->end_io_data = pending_req;
+
+ if (nr_segments) {
-+
-+ if (request_map_sg(rq, pending_req, nr_segments)) {
-+ printk(KERN_ERR "scsiback: SG Request Map Error\n");
-+ return;
++ err = request_map_sg(rq, pending_req, nr_segments);
++ if (err) {
++ printk(KERN_ERR "scsiback: SG Request Map error %d\n",
++ err);
++ blk_put_request(rq);
++ return err;
+ }
+ }
+
+ scsiback_get(pending_req->info);
+ blk_execute_rq_nowait(rq->q, NULL, rq, 1, scsiback_cmd_done);
+
-+ return ;
++ return 0;
+}
+
+
@@ -28239,17 +28241,28 @@ and in case upstream wants to take the forward porting patches:
+ switch (err ?: pending_req->act) {
+ case VSCSIIF_ACT_SCSI_CDB:
+ /* The Host mode is through as for Emulation. */
-+ if (info->feature == VSCSI_TYPE_HOST)
-+ scsiback_cmd_exec(pending_req);
-+ else
-+ scsiback_req_emulation_or_cmdexec(pending_req);
++ if (info->feature == VSCSI_TYPE_HOST ?
++ scsiback_cmd_exec(pending_req) :
++ scsiback_req_emulation_or_cmdexec(pending_req)) {
++ scsiback_fast_flush_area(pending_req);
++ scsiback_do_resp_with_sense(NULL,
++ DRIVER_ERROR << 24,
++ 0, pending_req);
++ }
+ break;
+ case VSCSIIF_ACT_SCSI_RESET:
++ /* Just for pointlessly specified segments: */
++ scsiback_fast_flush_area(pending_req);
+ scsiback_device_reset_exec(pending_req);
+ break;
+ default:
-+ if(!err && printk_ratelimit())
-+ printk(KERN_ERR "scsiback: invalid request\n");
++ if(!err) {
++ scsiback_fast_flush_area(pending_req);
++ if (printk_ratelimit())
++ printk(KERN_ERR
++ "scsiback: invalid request %#x\n",
++ pending_req->act);
++ }
+ scsiback_do_resp_with_sense(NULL, DRIVER_ERROR << 24,
+ 0, pending_req);
+ break;
diff --git a/patches.xen/xen3-auto-xen-kconfig.diff b/patches.xen/xen3-auto-xen-kconfig.diff
index 4cf2fb0ecf..ea215d11cf 100644
--- a/patches.xen/xen3-auto-xen-kconfig.diff
+++ b/patches.xen/xen3-auto-xen-kconfig.diff
@@ -1,12 +1,12 @@
-From http://xenbits.xen.org/linux-2.6.18-xen.hg (tip 1261:19448506c371)
+From http://xenbits.xen.org/linux-2.6.18-xen.hg (tip 1263:52f54ddbf449)
Subject: xen3 xen-kconfig
From: xen-devel@lists.xen.org
Patch-mainline: n/a
Acked-by: jbeulich@suse.com
---- head.orig/arch/x86/Kconfig 2014-06-26 11:21:33.000000000 +0200
+--- head.orig/arch/x86/Kconfig 2014-07-29 10:33:36.000000000 +0200
+++ head/arch/x86/Kconfig 2014-06-26 13:51:07.000000000 +0200
-@@ -248,7 +248,17 @@ config X86_64_SMP
+@@ -249,7 +249,17 @@ config X86_64_SMP
config X86_HT
def_bool y
@@ -25,7 +25,7 @@ Acked-by: jbeulich@suse.com
config X86_32_LAZY_GS
def_bool y
-@@ -327,6 +337,15 @@ config X86_MPPARSE
+@@ -328,6 +338,15 @@ config X86_MPPARSE
For old smp systems that do not have proper acpi support. Newer systems
(esp with 64bit cpus) with acpi support, MADT and DSDT will override it
@@ -41,7 +41,7 @@ Acked-by: jbeulich@suse.com
config X86_BIGSMP
bool "Support for big SMP systems with more than 8 CPUs"
depends on X86_32 && SMP
-@@ -359,6 +378,13 @@ config X86_EXTENDED_PLATFORM
+@@ -360,6 +379,13 @@ config X86_EXTENDED_PLATFORM
generic distribution kernel, say Y here - otherwise say N.
endif
@@ -55,7 +55,7 @@ Acked-by: jbeulich@suse.com
if X86_64
config X86_EXTENDED_PLATFORM
bool "Support for extended (non-PC) x86 platforms"
-@@ -648,6 +674,7 @@ source "arch/x86/Kconfig.cpu"
+@@ -649,6 +675,7 @@ source "arch/x86/Kconfig.cpu"
config HPET_TIMER
def_bool X86_64
prompt "HPET Timer Support" if X86_32
@@ -63,7 +63,7 @@ Acked-by: jbeulich@suse.com
---help---
Use the IA-PC HPET (High Precision Event Timer) to manage
time in preference to the PIT and RTC, if a HPET is
-@@ -695,7 +722,7 @@ config DMI
+@@ -696,7 +723,7 @@ config DMI
config GART_IOMMU
bool "Old AMD GART IOMMU support"
select SWIOTLB
@@ -72,7 +72,7 @@ Acked-by: jbeulich@suse.com
---help---
Provides a driver for older AMD Athlon64/Opteron/Turion/Sempron
GART based hardware IOMMUs.
-@@ -716,7 +743,7 @@ config GART_IOMMU
+@@ -717,7 +744,7 @@ config GART_IOMMU
config CALGARY_IOMMU
bool "IBM Calgary IOMMU support"
select SWIOTLB
@@ -81,7 +81,7 @@ Acked-by: jbeulich@suse.com
---help---
Support for hardware IOMMUs in IBM's xSeries x366 and x460
systems. Needed to run systems with more than 3GB of memory
-@@ -772,6 +799,7 @@ config NR_CPUS
+@@ -773,6 +800,7 @@ config NR_CPUS
default "1" if !SMP
default "8192" if MAXSMP
default "32" if SMP && X86_BIGSMP
@@ -89,7 +89,7 @@ Acked-by: jbeulich@suse.com
default "8" if SMP
---help---
This allows you to specify the maximum number of CPUs which this
-@@ -804,7 +832,7 @@ source "kernel/Kconfig.preempt"
+@@ -805,7 +833,7 @@ source "kernel/Kconfig.preempt"
config X86_UP_APIC
bool "Local APIC support on uniprocessors"
@@ -98,7 +98,7 @@ Acked-by: jbeulich@suse.com
---help---
A local APIC (Advanced Programmable Interrupt Controller) is an
integrated interrupt controller in the CPU. If you have a single-CPU
-@@ -830,12 +858,19 @@ config X86_UP_IOAPIC
+@@ -831,12 +859,19 @@ config X86_UP_IOAPIC
config X86_LOCAL_APIC
def_bool y
depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_APIC || PCI_MSI
@@ -118,7 +118,7 @@ Acked-by: jbeulich@suse.com
config X86_REROUTE_FOR_BROKEN_BOOT_IRQS
bool "Reroute for broken boot IRQs"
depends on X86_IO_APIC
-@@ -862,6 +897,7 @@ config X86_REROUTE_FOR_BROKEN_BOOT_IRQS
+@@ -863,6 +898,7 @@ config X86_REROUTE_FOR_BROKEN_BOOT_IRQS
config X86_MCE
bool "Machine Check / overheating reporting"
default y
@@ -126,7 +126,7 @@ Acked-by: jbeulich@suse.com
---help---
Machine Check support allows the processor to notify the
kernel if it detects a problem (e.g. overheating, data corruption).
-@@ -871,7 +907,7 @@ config X86_MCE
+@@ -872,7 +908,7 @@ config X86_MCE
config X86_MCE_INTEL
def_bool y
prompt "Intel MCE features"
@@ -135,7 +135,7 @@ Acked-by: jbeulich@suse.com
---help---
Additional support for intel specific MCE features such as
the thermal monitor.
-@@ -879,7 +915,7 @@ config X86_MCE_INTEL
+@@ -880,7 +916,7 @@ config X86_MCE_INTEL
config X86_MCE_AMD
def_bool y
prompt "AMD MCE features"
@@ -144,7 +144,7 @@ Acked-by: jbeulich@suse.com
---help---
Additional support for AMD specific MCE features such as
the DRAM Error Threshold.
-@@ -904,6 +940,10 @@ config X86_MCE_INJECT
+@@ -905,6 +941,10 @@ config X86_MCE_INJECT
If you don't know what a machine check is and you don't do kernel
QA it is safe to say n.
@@ -155,7 +155,7 @@ Acked-by: jbeulich@suse.com
config X86_THERMAL_VECTOR
def_bool y
depends on X86_MCE_INTEL
-@@ -974,7 +1014,7 @@ config I8K
+@@ -975,7 +1015,7 @@ config I8K
config X86_REBOOTFIXUPS
bool "Enable X86 board specific fixups for reboot"
@@ -164,7 +164,7 @@ Acked-by: jbeulich@suse.com
---help---
This enables chipset and/or board specific fixups to be done
in order to get reboot to work correctly. This is only needed on
-@@ -992,6 +1032,7 @@ config X86_REBOOTFIXUPS
+@@ -993,6 +1033,7 @@ config X86_REBOOTFIXUPS
config MICROCODE
tristate "CPU microcode loading support"
depends on CPU_SUP_AMD || CPU_SUP_INTEL
@@ -172,7 +172,7 @@ Acked-by: jbeulich@suse.com
select FW_LOADER
---help---
-@@ -1201,7 +1242,7 @@ config DIRECT_GBPAGES
+@@ -1202,7 +1243,7 @@ config DIRECT_GBPAGES
# Common NUMA Features
config NUMA
bool "Numa Memory Allocation and Scheduler Support"
@@ -181,7 +181,7 @@ Acked-by: jbeulich@suse.com
depends on X86_64 || (X86_32 && HIGHMEM64G && X86_BIGSMP)
default y if X86_BIGSMP
---help---
-@@ -1289,6 +1330,7 @@ config ARCH_DISCONTIGMEM_DEFAULT
+@@ -1290,6 +1331,7 @@ config ARCH_DISCONTIGMEM_DEFAULT
config ARCH_SPARSEMEM_ENABLE
def_bool y
depends on X86_64 || NUMA || X86_32 || X86_32_NON_STANDARD
@@ -189,7 +189,7 @@ Acked-by: jbeulich@suse.com
select SPARSEMEM_STATIC if X86_32
select SPARSEMEM_VMEMMAP_ENABLE if X86_64
-@@ -1390,6 +1432,7 @@ config X86_RESERVE_LOW
+@@ -1391,6 +1433,7 @@ config X86_RESERVE_LOW
config MATH_EMULATION
bool
prompt "Math emulation" if X86_32
@@ -197,7 +197,7 @@ Acked-by: jbeulich@suse.com
---help---
Linux can emulate a math coprocessor (used for floating point
operations) if you don't have one. 486DX and Pentium processors have
-@@ -1416,6 +1459,7 @@ config MATH_EMULATION
+@@ -1417,6 +1460,7 @@ config MATH_EMULATION
config MTRR
def_bool y
prompt "MTRR (Memory Type Range Register) support" if EXPERT
@@ -205,7 +205,7 @@ Acked-by: jbeulich@suse.com
---help---
On Intel P6 family processors (Pentium Pro, Pentium II and later)
the Memory Type Range Registers (MTRRs) may be used to control
-@@ -1520,7 +1564,7 @@ config X86_SMAP
+@@ -1521,7 +1565,7 @@ config X86_SMAP
config EFI
bool "EFI runtime service support"
@@ -214,7 +214,7 @@ Acked-by: jbeulich@suse.com
select UCS2_STRING
---help---
This enables the kernel to use EFI runtime services that are
-@@ -1576,6 +1620,7 @@ source kernel/Kconfig.hz
+@@ -1577,6 +1621,7 @@ source kernel/Kconfig.hz
config KEXEC
bool "kexec system call"
@@ -222,7 +222,7 @@ Acked-by: jbeulich@suse.com
---help---
kexec is a system call that implements the ability to shutdown your
current kernel, and to start another kernel. It is like a reboot
-@@ -1593,6 +1638,7 @@ config KEXEC
+@@ -1594,6 +1639,7 @@ config KEXEC
config CRASH_DUMP
bool "kernel crash dumps"
depends on X86_64 || (X86_32 && HIGHMEM)
@@ -230,7 +230,7 @@ Acked-by: jbeulich@suse.com
---help---
Generate crash dump after being started by kexec.
This should be normally only set in special crash dump kernels
-@@ -1809,6 +1855,7 @@ config COMPAT_VDSO
+@@ -1810,6 +1856,7 @@ config COMPAT_VDSO
def_bool n
prompt "Disable the 32-bit vDSO (needed for glibc 2.3.3)"
depends on X86_32 || IA32_EMULATION
@@ -238,7 +238,7 @@ Acked-by: jbeulich@suse.com
---help---
Certain buggy versions of glibc will crash if they are
presented with a 32-bit vDSO that is not mapped at the address
-@@ -1896,6 +1943,7 @@ config ARCH_ENABLE_HUGEPAGE_MIGRATION
+@@ -1897,6 +1944,7 @@ config ARCH_ENABLE_HUGEPAGE_MIGRATION
depends on X86_64 && HUGETLB_PAGE && MIGRATION
menu "Power management and ACPI options"
@@ -246,7 +246,7 @@ Acked-by: jbeulich@suse.com
config ARCH_HIBERNATION_HEADER
def_bool y
-@@ -1913,7 +1961,7 @@ config X86_APM_BOOT
+@@ -1914,7 +1962,7 @@ config X86_APM_BOOT
menuconfig APM
tristate "APM (Advanced Power Management) BIOS support"
@@ -255,7 +255,7 @@ Acked-by: jbeulich@suse.com
---help---
APM is a BIOS specification for saving power using several different
techniques. This is mostly useful for battery powered laptops with
-@@ -2074,6 +2122,7 @@ choice
+@@ -2075,6 +2123,7 @@ choice
config PCI_GOBIOS
bool "BIOS"
@@ -263,7 +263,7 @@ Acked-by: jbeulich@suse.com
config PCI_GOMMCONFIG
bool "MMConfig"
-@@ -2085,6 +2134,13 @@ config PCI_GOOLPC
+@@ -2086,6 +2135,13 @@ config PCI_GOOLPC
bool "OLPC XO-1"
depends on OLPC
@@ -277,7 +277,7 @@ Acked-by: jbeulich@suse.com
config PCI_GOANY
bool "Any"
-@@ -2092,7 +2148,7 @@ endchoice
+@@ -2093,7 +2149,7 @@ endchoice
config PCI_BIOS
def_bool y
@@ -286,7 +286,7 @@ Acked-by: jbeulich@suse.com
# x86-64 doesn't support PCI BIOS access from long mode so always go direct.
config PCI_DIRECT
-@@ -2133,6 +2189,22 @@ config PCI_CNB20LE_QUIRK
+@@ -2134,6 +2190,22 @@ config PCI_CNB20LE_QUIRK
You should say N unless you know you need this.
@@ -309,7 +309,7 @@ Acked-by: jbeulich@suse.com
source "drivers/pci/pcie/Kconfig"
source "drivers/pci/Kconfig"
-@@ -2149,6 +2221,7 @@ if X86_32
+@@ -2150,6 +2222,7 @@ if X86_32
config ISA
bool "ISA support"
@@ -317,7 +317,7 @@ Acked-by: jbeulich@suse.com
---help---
Find out whether you have ISA slots on your motherboard. ISA is the
name of a bus system, i.e. the way the CPU talks to the other stuff
-@@ -2407,7 +2480,9 @@ source "net/Kconfig"
+@@ -2408,7 +2481,9 @@ source "net/Kconfig"
source "drivers/Kconfig"
@@ -327,7 +327,7 @@ Acked-by: jbeulich@suse.com
source "fs/Kconfig"
-@@ -2419,4 +2494,6 @@ source "crypto/Kconfig"
+@@ -2420,4 +2495,6 @@ source "crypto/Kconfig"
source "arch/x86/kvm/Kconfig"
diff --git a/patches.xen/xen3-fixup-arch-x86 b/patches.xen/xen3-fixup-arch-x86
index 4d77f3ae9f..f3531fbade 100644
--- a/patches.xen/xen3-fixup-arch-x86
+++ b/patches.xen/xen3-fixup-arch-x86
@@ -2,9 +2,9 @@ Subject: xen3 x86 build fixes.
From: jbeulich@novell.com
Patch-mainline: n/a
---- head.orig/arch/x86/kernel/cpu/intel_cacheinfo.c 2013-08-09 10:35:48.000000000 +0200
+--- head.orig/arch/x86/kernel/cpu/intel_cacheinfo.c 2014-07-29 10:32:14.000000000 +0200
+++ head/arch/x86/kernel/cpu/intel_cacheinfo.c 2013-08-09 12:10:50.000000000 +0200
-@@ -741,7 +741,7 @@ unsigned int init_intel_cacheinfo(struct
+@@ -753,7 +753,7 @@ unsigned int init_intel_cacheinfo(struct
static DEFINE_PER_CPU(struct _cpuid4_info *, ici_cpuid4_info);
#define CPUID4_INFO_IDX(x, y) (&((per_cpu(ici_cpuid4_info, x))[y]))
diff --git a/patches.xen/xen3-fixup-kconfig b/patches.xen/xen3-fixup-kconfig
index 0713f4362a..59f2bbb91f 100644
--- a/patches.xen/xen3-fixup-kconfig
+++ b/patches.xen/xen3-fixup-kconfig
@@ -4,7 +4,7 @@ Patch-mainline: n/a
--- head.orig/arch/x86/Kconfig 2014-06-26 13:51:07.000000000 +0200
+++ head/arch/x86/Kconfig 2014-01-07 16:12:57.000000000 +0100
-@@ -210,6 +210,7 @@ config NEED_PER_CPU_PAGE_FIRST_CHUNK
+@@ -211,6 +211,7 @@ config NEED_PER_CPU_PAGE_FIRST_CHUNK
config ARCH_HIBERNATION_POSSIBLE
def_bool y
diff --git a/patches.xen/xen3-fixup-xen b/patches.xen/xen3-fixup-xen
index 9c8286f6e9..d0853fe7ea 100644
--- a/patches.xen/xen3-fixup-xen
+++ b/patches.xen/xen3-fixup-xen
@@ -1,4 +1,4 @@
-From http://xenbits.xen.org/linux-2.6.18-xen.hg (tip 1261:19448506c371)
+From http://xenbits.xen.org/linux-2.6.18-xen.hg (tip 1263:52f54ddbf449)
Subject: Fix Xen build wrt. Xen files coming from mainline.
From: xen-devel@lists.xen.org
Patch-mainline: n/a
diff --git a/patches.xen/xen3-patch-2.6.18 b/patches.xen/xen3-patch-2.6.18
index 0baf39777c..78203fb856 100644
--- a/patches.xen/xen3-patch-2.6.18
+++ b/patches.xen/xen3-patch-2.6.18
@@ -9,7 +9,7 @@ Acked-by: jbeulich@novell.com
--- head.orig/arch/x86/Kconfig 2014-01-07 16:12:57.000000000 +0100
+++ head/arch/x86/Kconfig 2014-01-07 16:13:22.000000000 +0100
-@@ -1659,7 +1659,7 @@ config KEXEC_JUMP
+@@ -1660,7 +1660,7 @@ config KEXEC_JUMP
code in physical address mode via KEXEC
config PHYSICAL_START
@@ -27,7 +27,7 @@ Acked-by: jbeulich@novell.com
-disabled-obj-$(CONFIG_XEN) := i8237.o i8259_$(BITS).o reboot.o smpboot_$(BITS).o
+disabled-obj-$(CONFIG_XEN) := i8237.o 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.orig/arch/x86/kernel/quirks.c 2014-06-30 08:45:15.000000000 +0200
+--- head.orig/arch/x86/kernel/quirks.c 2014-03-31 05:40:15.000000000 +0200
+++ head/arch/x86/kernel/quirks.c 2013-01-14 13:48:49.000000000 +0100
@@ -6,7 +6,7 @@
@@ -316,7 +316,7 @@ Acked-by: jbeulich@novell.com
vxtime.mode = VXTIME_TSC;
vxtime.quot = (1000000L << 32) / vxtime_hz;
vxtime.tsc_quot = (1000L << 32) / cpu_khz;
---- head.orig/arch/x86/pci/irq.c 2014-06-30 08:45:15.000000000 +0200
+--- head.orig/arch/x86/pci/irq.c 2014-06-08 20:19:54.000000000 +0200
+++ head/arch/x86/pci/irq.c 2011-08-09 10:33:29.000000000 +0200
@@ -94,13 +94,18 @@ static struct irq_routing_table * __init
u8 *addr;
@@ -376,7 +376,7 @@ Acked-by: jbeulich@novell.com
+#endif
+
+#include_next <asm/time.h>
---- head.orig/arch/x86/include/asm/thread_info.h 2014-06-30 08:45:15.000000000 +0200
+--- head.orig/arch/x86/include/asm/thread_info.h 2014-06-26 11:20:06.000000000 +0200
+++ head/arch/x86/include/asm/thread_info.h 2014-04-30 10:03:45.000000000 +0200
@@ -144,11 +144,15 @@ struct thread_info {
_TIF_USER_RETURN_NOTIFY)
@@ -394,7 +394,7 @@ Acked-by: jbeulich@novell.com
#define STACK_WARN (THREAD_SIZE/8)
#define KERNEL_STACK_OFFSET (5*(BITS_PER_LONG/8))
---- head.orig/kernel/time/timekeeping.c 2014-06-30 08:45:15.000000000 +0200
+--- head.orig/kernel/time/timekeeping.c 2014-06-26 11:21:16.000000000 +0200
+++ head/kernel/time/timekeeping.c 2014-04-30 10:03:44.000000000 +0200
@@ -23,6 +23,9 @@
#include <linux/stop_machine.h>
diff --git a/patches.xen/xen3-patch-2.6.19 b/patches.xen/xen3-patch-2.6.19
index f2afbecec8..c021171b65 100644
--- a/patches.xen/xen3-patch-2.6.19
+++ b/patches.xen/xen3-patch-2.6.19
@@ -10,7 +10,7 @@ Acked-by: jbeulich@novell.com
--- head.orig/arch/x86/Kconfig 2014-01-07 16:13:22.000000000 +0100
+++ head/arch/x86/Kconfig 2014-01-07 16:22:04.000000000 +0100
-@@ -575,6 +575,7 @@ config SCHED_OMIT_FRAME_POINTER
+@@ -576,6 +576,7 @@ config SCHED_OMIT_FRAME_POINTER
menuconfig HYPERVISOR_GUEST
bool "Linux guest support"
@@ -7619,7 +7619,7 @@ Acked-by: jbeulich@novell.com
vma->vm_ops = &privcmd_vm_ops;
vma->vm_private_data = NULL;
---- head.orig/drivers/xen/scsiback/common.h 2013-06-20 14:41:30.000000000 +0200
+--- head.orig/drivers/xen/scsiback/common.h 2014-07-29 10:43:04.000000000 +0200
+++ head/drivers/xen/scsiback/common.h 2013-06-20 15:17:08.000000000 +0200
@@ -138,7 +138,7 @@ typedef struct {
@@ -7630,9 +7630,9 @@ Acked-by: jbeulich@novell.com
int scsiback_init_sring(struct vscsibk_info *, grant_ref_t, evtchn_port_t);
int scsiback_schedule(void *data);
---- head.orig/drivers/xen/scsiback/scsiback.c 2014-07-03 11:24:08.000000000 +0200
+--- head.orig/drivers/xen/scsiback/scsiback.c 2014-07-29 10:43:04.000000000 +0200
+++ head/drivers/xen/scsiback/scsiback.c 2013-01-30 10:35:34.000000000 +0100
-@@ -449,7 +449,7 @@ void scsiback_cmd_exec(pending_req_t *pe
+@@ -449,7 +449,7 @@ int scsiback_cmd_exec(pending_req_t *pen
write = (data_dir == DMA_TO_DEVICE);
rq = blk_get_request(pending_req->sdev->request_queue, write, GFP_KERNEL);
@@ -7641,7 +7641,7 @@ Acked-by: jbeulich@novell.com
rq->cmd_len = cmd_len;
memcpy(rq->cmd, pending_req->cmnd, cmd_len);
-@@ -493,7 +493,7 @@ static void scsiback_device_reset_exec(p
+@@ -495,7 +495,7 @@ static void scsiback_device_reset_exec(p
}
@@ -9202,7 +9202,7 @@ Acked-by: jbeulich@novell.com
+#endif /* __XEN_NETUTIL_H__ */
--- head.orig/mm/page_alloc.c 2013-09-26 11:25:08.000000000 +0200
+++ head/mm/page_alloc.c 2014-01-22 14:03:14.000000000 +0100
-@@ -5697,6 +5697,23 @@ static void __setup_per_zone_wmarks(void
+@@ -5709,6 +5709,23 @@ static 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 2997eb5028..6b9d282947 100644
--- a/patches.xen/xen3-patch-2.6.20
+++ b/patches.xen/xen3-patch-2.6.20
@@ -7,7 +7,7 @@ Acked-by: jbeulich@novell.com
--- head.orig/arch/x86/Kconfig 2014-01-07 16:22:04.000000000 +0100
+++ head/arch/x86/Kconfig 2014-02-18 17:12:21.000000000 +0100
-@@ -1702,6 +1702,7 @@ config PHYSICAL_START
+@@ -1703,6 +1703,7 @@ config PHYSICAL_START
config RELOCATABLE
bool "Build a relocatable kernel"
@@ -15,7 +15,7 @@ Acked-by: jbeulich@novell.com
default y
---help---
This builds a kernel image that retains relocation information
-@@ -1773,7 +1774,8 @@ config X86_NEED_RELOCS
+@@ -1774,7 +1775,8 @@ config X86_NEED_RELOCS
depends on RANDOMIZE_BASE || (X86_32 && RELOCATABLE)
config PHYSICAL_ALIGN
diff --git a/patches.xen/xen3-patch-2.6.22 b/patches.xen/xen3-patch-2.6.22
index 686a8c143e..ab01133856 100644
--- a/patches.xen/xen3-patch-2.6.22
+++ b/patches.xen/xen3-patch-2.6.22
@@ -7,7 +7,7 @@ Acked-by: jbeulich@novell.com
--- head.orig/arch/x86/Kconfig 2014-06-26 14:28:22.000000000 +0200
+++ head/arch/x86/Kconfig 2014-04-30 10:14:22.000000000 +0200
-@@ -1859,7 +1859,6 @@ config COMPAT_VDSO
+@@ -1860,7 +1860,6 @@ config COMPAT_VDSO
def_bool n
prompt "Disable the 32-bit vDSO (needed for glibc 2.3.3)"
depends on X86_32 || IA32_EMULATION
@@ -4499,7 +4499,7 @@ Acked-by: jbeulich@novell.com
"pcifront", pdev);
if (err < 0) {
xenbus_dev_fatal(pdev->xdev, err,
---- head.orig/drivers/xen/scsiback/emulate.c 2014-07-03 11:24:08.000000000 +0200
+--- head.orig/drivers/xen/scsiback/emulate.c 2014-07-29 10:43:04.000000000 +0200
+++ head/drivers/xen/scsiback/emulate.c 2012-01-09 11:04:26.000000000 +0100
@@ -153,8 +153,9 @@ static int __copy_to_sg(struct scatterli
return -ENOMEM;
@@ -4720,7 +4720,7 @@ Acked-by: jbeulich@novell.com
#endif
#include "internal.h"
-@@ -1237,7 +1237,7 @@ static const struct file_operations aioq
+@@ -1244,7 +1244,7 @@ static const struct file_operations aioq
/* make_aio_fd:
* Create a file descriptor that can be used to poll the event queue.
@@ -4729,7 +4729,7 @@ Acked-by: jbeulich@novell.com
*/
static int make_aio_fd(struct kioctx *ioctx)
-@@ -1246,7 +1246,8 @@ static int make_aio_fd(struct kioctx *io
+@@ -1253,7 +1253,8 @@ static int make_aio_fd(struct kioctx *io
struct inode *inode;
struct file *file;
diff --git a/patches.xen/xen3-patch-2.6.23 b/patches.xen/xen3-patch-2.6.23
index 669d31575d..297cfbda96 100644
--- a/patches.xen/xen3-patch-2.6.23
+++ b/patches.xen/xen3-patch-2.6.23
@@ -76,7 +76,7 @@ Acked-by: jbeulich@novell.com
--- head.orig/arch/x86/kernel/entry_32.S 2013-12-02 16:31:34.000000000 +0100
+++ head/arch/x86/kernel/entry_32.S 2014-06-26 14:32:12.000000000 +0200
-@@ -986,7 +986,7 @@ ENTRY(spurious_interrupt_bug)
+@@ -987,7 +987,7 @@ ENTRY(spurious_interrupt_bug)
CFI_ENDPROC
END(spurious_interrupt_bug)
@@ -85,7 +85,7 @@ Acked-by: jbeulich@novell.com
/* Xen doesn't set %esp to be precisely what the normal sysenter
entrypoint expects, so fix it up before using the normal path. */
ENTRY(xen_sysenter_target)
-@@ -1076,7 +1076,7 @@ ENDPROC(xen_failsafe_callback)
+@@ -1077,7 +1077,7 @@ ENDPROC(xen_failsafe_callback)
BUILD_INTERRUPT3(xen_hvm_callback_vector, HYPERVISOR_CALLBACK_VECTOR,
xen_evtchn_do_upcall)
diff --git a/patches.xen/xen3-patch-2.6.24 b/patches.xen/xen3-patch-2.6.24
index 4a80552e15..f35cf12694 100644
--- a/patches.xen/xen3-patch-2.6.24
+++ b/patches.xen/xen3-patch-2.6.24
@@ -23,7 +23,7 @@ Acked-by: jbeulich@novell.com
select GENERIC_TIME_VSYSCALL
select KTIME_SCALAR if X86_32
select GENERIC_STRNCPY_FROM_USER
-@@ -253,12 +253,12 @@ config X86_HT
+@@ -254,12 +254,12 @@ config X86_HT
config X86_NO_TSS
bool
@@ -38,7 +38,7 @@ Acked-by: jbeulich@novell.com
default y
config X86_32_LAZY_GS
-@@ -340,6 +340,7 @@ config X86_MPPARSE
+@@ -341,6 +341,7 @@ config X86_MPPARSE
config X86_XEN
bool "Xen-compatible"
@@ -46,7 +46,7 @@ Acked-by: jbeulich@novell.com
select XEN
select X86_PAE
select SWIOTLB
-@@ -381,6 +382,7 @@ endif
+@@ -382,6 +383,7 @@ endif
config X86_64_XEN
bool "Enable Xen compatible kernel"
@@ -54,7 +54,7 @@ Acked-by: jbeulich@novell.com
select XEN
select SWIOTLB
help
-@@ -676,7 +678,7 @@ source "arch/x86/Kconfig.cpu"
+@@ -677,7 +679,7 @@ source "arch/x86/Kconfig.cpu"
config HPET_TIMER
def_bool X86_64
prompt "HPET Timer Support" if X86_32
@@ -63,7 +63,7 @@ Acked-by: jbeulich@novell.com
---help---
Use the IA-PC HPET (High Precision Event Timer) to manage
time in preference to the PIT and RTC, if a HPET is
-@@ -1016,7 +1018,7 @@ config I8K
+@@ -1017,7 +1019,7 @@ config I8K
config X86_REBOOTFIXUPS
bool "Enable X86 board specific fixups for reboot"
@@ -72,7 +72,7 @@ Acked-by: jbeulich@novell.com
---help---
This enables chipset and/or board specific fixups to be done
in order to get reboot to work correctly. This is only needed on
-@@ -1434,7 +1436,7 @@ config X86_RESERVE_LOW
+@@ -1435,7 +1437,7 @@ config X86_RESERVE_LOW
config MATH_EMULATION
bool
prompt "Math emulation" if X86_32
@@ -81,7 +81,7 @@ Acked-by: jbeulich@novell.com
---help---
Linux can emulate a math coprocessor (used for floating point
operations) if you don't have one. 486DX and Pentium processors have
-@@ -1928,6 +1930,7 @@ endmenu
+@@ -1929,6 +1931,7 @@ endmenu
config ARCH_ENABLE_MEMORY_HOTPLUG
def_bool y
depends on X86_64 || (X86_32 && HIGHMEM)
@@ -89,7 +89,7 @@ Acked-by: jbeulich@novell.com
config ARCH_ENABLE_MEMORY_HOTREMOVE
def_bool y
-@@ -2125,7 +2128,7 @@ choice
+@@ -2126,7 +2129,7 @@ choice
config PCI_GOBIOS
bool "BIOS"
@@ -98,7 +98,7 @@ Acked-by: jbeulich@novell.com
config PCI_GOMMCONFIG
bool "MMConfig"
-@@ -2194,7 +2197,7 @@ config PCI_CNB20LE_QUIRK
+@@ -2195,7 +2198,7 @@ config PCI_CNB20LE_QUIRK
config XEN_PCIDEV_FRONTEND
bool "Xen PCI Frontend" if X86_64
@@ -239,8 +239,8 @@ Acked-by: jbeulich@novell.com
c->x86_clflush_size = 32;
memset(&c->x86_capability, 0, sizeof c->x86_capability);
---- head.orig/arch/x86/kernel/cpu/intel.c 2014-06-08 20:19:54.000000000 +0200
-+++ head/arch/x86/kernel/cpu/intel.c 2014-01-07 16:24:58.000000000 +0100
+--- head.orig/arch/x86/kernel/cpu/intel.c 2014-07-29 10:32:14.000000000 +0200
++++ head/arch/x86/kernel/cpu/intel.c 2014-07-29 11:03:48.000000000 +0200
@@ -299,6 +299,7 @@ static void srat_detect_node(struct cpui
#endif
}
@@ -257,7 +257,7 @@ Acked-by: jbeulich@novell.com
static void detect_vmx_virtcap(struct cpuinfo_x86 *c)
{
-@@ -438,6 +440,7 @@ static void init_intel(struct cpuinfo_x8
+@@ -370,6 +372,7 @@ static void init_intel(struct cpuinfo_x8
*/
detect_extended_topology(c);
@@ -265,7 +265,7 @@ Acked-by: jbeulich@novell.com
if (!cpu_has(c, X86_FEATURE_XTOPOLOGY)) {
/*
* let's use the legacy cpuid vector 0x1 and 0x4 for topology
-@@ -448,6 +451,7 @@ static void init_intel(struct cpuinfo_x8
+@@ -380,6 +383,7 @@ static void init_intel(struct cpuinfo_x8
detect_ht(c);
#endif
}
@@ -4797,7 +4797,7 @@ Acked-by: jbeulich@novell.com
}
--- head.orig/drivers/xen/scsiback/scsiback.c 2013-01-30 10:35:56.000000000 +0100
-+++ head/drivers/xen/scsiback/scsiback.c 2013-06-20 15:20:55.000000000 +0200
++++ head/drivers/xen/scsiback/scsiback.c 2014-07-24 12:28:55.000000000 +0200
@@ -194,14 +194,10 @@ static void scsiback_print_status(char *
{
struct scsi_device *sdev = pending_req->sdev;
@@ -4946,16 +4946,17 @@ Acked-by: jbeulich@novell.com
}
return err;
-@@ -463,7 +449,7 @@ void scsiback_cmd_exec(pending_req_t *pe
+@@ -463,8 +449,7 @@ int scsiback_cmd_exec(pending_req_t *pen
if (nr_segments) {
-
- if (request_map_sg(rq, pending_req, nr_segments)) {
-- printk(KERN_ERR "scsiback: SG Request Map Error\n");
-+ pr_err("scsiback: SG Request Map Error\n");
- return;
+ err = request_map_sg(rq, pending_req, nr_segments);
+ if (err) {
+- printk(KERN_ERR "scsiback: SG Request Map error %d\n",
+- err);
++ pr_err("scsiback: SG Request Map Error %d\n", err);
+ blk_put_request(rq);
+ return err;
}
- }
-@@ -589,10 +575,10 @@ static int _scsiback_do_cmd_fn(struct vs
+@@ -591,10 +576,10 @@ static int _scsiback_do_cmd_fn(struct vs
if (RING_REQUEST_PROD_OVERFLOW(ring, rp)) {
rc = ring->rsp_prod_pvt;
@@ -4970,16 +4971,17 @@ Acked-by: jbeulich@novell.com
return -EACCES;
}
-@@ -623,7 +609,7 @@ static int _scsiback_do_cmd_fn(struct vs
- break;
- default:
- if(!err && printk_ratelimit())
-- printk(KERN_ERR "scsiback: invalid request\n");
-+ pr_err("scsiback: invalid request\n");
+@@ -633,8 +618,7 @@ static int _scsiback_do_cmd_fn(struct vs
+ if(!err) {
+ scsiback_fast_flush_area(pending_req);
+ if (printk_ratelimit())
+- printk(KERN_ERR
+- "scsiback: invalid request %#x\n",
++ pr_err("scsiback: invalid request %#x\n",
+ pending_req->act);
+ }
scsiback_do_resp_with_sense(NULL, DRIVER_ERROR << 24,
- 0, pending_req);
- break;
-@@ -736,7 +722,7 @@ out_of_memory:
+@@ -749,7 +733,7 @@ out_of_memory:
kfree(pending_reqs);
kfree(pending_grant_handles);
free_empty_pages_and_pagevec(pending_pages, mmap_pages);
diff --git a/patches.xen/xen3-patch-2.6.25 b/patches.xen/xen3-patch-2.6.25
index a76f936527..7063e04b34 100644
--- a/patches.xen/xen3-patch-2.6.25
+++ b/patches.xen/xen3-patch-2.6.25
@@ -19,7 +19,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
select HAVE_ARCH_KGDB
select HAVE_ARCH_TRACEHOOK
select HAVE_GENERIC_DMA_COHERENT if X86_32
-@@ -252,14 +252,12 @@ config X86_HT
+@@ -253,14 +253,12 @@ config X86_HT
depends on SMP && !XEN
config X86_NO_TSS
@@ -36,7 +36,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
config X86_32_LAZY_GS
def_bool y
-@@ -871,9 +869,8 @@ config X86_IO_APIC
+@@ -872,9 +870,8 @@ config X86_IO_APIC
select GENERIC_IRQ_LEGACY_ALLOC_HWIRQ
config X86_XEN_GENAPIC
@@ -47,7 +47,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
config X86_REROUTE_FOR_BROKEN_BOOT_IRQS
bool "Reroute for broken boot IRQs"
-@@ -1340,7 +1337,7 @@ config ARCH_SPARSEMEM_ENABLE
+@@ -1341,7 +1338,7 @@ config ARCH_SPARSEMEM_ENABLE
config ARCH_SPARSEMEM_DEFAULT
def_bool y
@@ -56,7 +56,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
config ARCH_SELECT_MEMORY_MODEL
def_bool y
-@@ -2196,10 +2193,10 @@ config PCI_CNB20LE_QUIRK
+@@ -2197,10 +2194,10 @@ config PCI_CNB20LE_QUIRK
You should say N unless you know you need this.
config XEN_PCIDEV_FRONTEND
@@ -69,7 +69,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
help
The PCI device frontend driver allows the kernel to import arbitrary
PCI devices from a PCI backend to support PCI driver domains.
-@@ -2207,7 +2204,6 @@ config XEN_PCIDEV_FRONTEND
+@@ -2208,7 +2205,6 @@ config XEN_PCIDEV_FRONTEND
config XEN_PCIDEV_FE_DEBUG
bool "Xen PCI Frontend Debugging"
depends on XEN_PCIDEV_FRONTEND
@@ -21270,7 +21270,7 @@ 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.orig/arch/x86/include/asm/ptrace.h 2014-03-31 05:40:15.000000000 +0200
+--- head.orig/arch/x86/include/asm/ptrace.h 2014-07-29 10:32:14.000000000 +0200
+++ head/arch/x86/include/asm/ptrace.h 2013-01-08 11:47:39.000000000 +0100
@@ -223,7 +223,9 @@ static inline unsigned long regs_get_ker
}
diff --git a/patches.xen/xen3-patch-2.6.26 b/patches.xen/xen3-patch-2.6.26
index 7089618a80..af77494d93 100644
--- a/patches.xen/xen3-patch-2.6.26
+++ b/patches.xen/xen3-patch-2.6.26
@@ -19,7 +19,7 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
select HAVE_ARCH_TRACEHOOK
select HAVE_GENERIC_DMA_COHERENT if X86_32
select HAVE_EFFICIENT_UNALIGNED_ACCESS
-@@ -662,6 +662,7 @@ config NO_BOOTMEM
+@@ -663,6 +663,7 @@ config NO_BOOTMEM
config MEMTEST
bool "Memtest"
@@ -27,7 +27,7 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
---help---
This option adds a kernel parameter 'memtest', which allows memtest
to be set.
-@@ -1234,7 +1235,7 @@ config ARCH_DMA_ADDR_T_64BIT
+@@ -1235,7 +1236,7 @@ config ARCH_DMA_ADDR_T_64BIT
config DIRECT_GBPAGES
bool "Enable 1GB pages for kernel pagetables" if EXPERT
default y
@@ -36,7 +36,7 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
---help---
Allow the kernel linear mapping to use 1GB pages on CPUs that
support it. This can improve the kernel's performance a tiny bit by
-@@ -2496,6 +2497,4 @@ source "crypto/Kconfig"
+@@ -2497,6 +2498,4 @@ source "crypto/Kconfig"
source "arch/x86/kvm/Kconfig"
@@ -12043,7 +12043,7 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
ctx->file->private_data = 0;
ctx->file = 0;
}
-@@ -1207,6 +1208,7 @@ static int aio_queue_fd_close(struct ino
+@@ -1214,6 +1215,7 @@ static int aio_queue_fd_close(struct ino
spin_lock_irq(&ioctx->ctx_lock);
ioctx->file = 0;
spin_unlock_irq(&ioctx->ctx_lock);
@@ -12051,7 +12051,7 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
}
return 0;
}
-@@ -1242,16 +1244,17 @@ static const struct file_operations aioq
+@@ -1249,16 +1251,17 @@ static const struct file_operations aioq
static int make_aio_fd(struct kioctx *ioctx)
{
diff --git a/patches.xen/xen3-patch-2.6.27 b/patches.xen/xen3-patch-2.6.27
index c795e9f999..e117c7d8b5 100644
--- a/patches.xen/xen3-patch-2.6.27
+++ b/patches.xen/xen3-patch-2.6.27
@@ -16,7 +16,7 @@ have been needed - see SLE11 SPn).
--- head.orig/arch/x86/Kconfig 2014-01-07 16:26:38.000000000 +0100
+++ head/arch/x86/Kconfig 2014-01-07 16:26:51.000000000 +0100
-@@ -1497,7 +1497,7 @@ config MTRR
+@@ -1498,7 +1498,7 @@ config MTRR
config MTRR_SANITIZER
def_bool y
prompt "MTRR cleanup support"
@@ -14787,7 +14787,7 @@ have been needed - see SLE11 SPn).
static int xenwatch_handle_callback(void *data)
--- head.orig/fs/aio.c 2014-06-26 14:42:22.000000000 +0200
+++ head/fs/aio.c 2014-01-07 16:26:44.000000000 +0100
-@@ -1247,7 +1247,7 @@ static int make_aio_fd(struct kioctx *io
+@@ -1254,7 +1254,7 @@ static int make_aio_fd(struct kioctx *io
int fd;
struct file *file;
diff --git a/patches.xen/xen3-patch-2.6.28 b/patches.xen/xen3-patch-2.6.28
index f5bb225bec..e51009acd5 100644
--- a/patches.xen/xen3-patch-2.6.28
+++ b/patches.xen/xen3-patch-2.6.28
@@ -19,7 +19,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
--- head.orig/arch/x86/Kconfig 2014-01-07 16:26:51.000000000 +0100
+++ head/arch/x86/Kconfig 2014-01-07 16:27:33.000000000 +0100
-@@ -1053,7 +1053,7 @@ config MICROCODE
+@@ -1054,7 +1054,7 @@ config MICROCODE
config MICROCODE_INTEL
bool "Intel microcode loading support"
@@ -28,7 +28,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
default MICROCODE
select FW_LOADER
---help---
-@@ -1066,7 +1066,7 @@ config MICROCODE_INTEL
+@@ -1067,7 +1067,7 @@ config MICROCODE_INTEL
config MICROCODE_AMD
bool "AMD microcode loading support"
@@ -37,7 +37,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
select FW_LOADER
---help---
If you select this option, microcode patch loading support for AMD
-@@ -1374,6 +1374,7 @@ config HIGHPTE
+@@ -1375,6 +1375,7 @@ config HIGHPTE
config X86_CHECK_BIOS_CORRUPTION
bool "Check for low memory corruption"
@@ -45,7 +45,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
---help---
Periodically check for memory corruption in low memory, which
is suspected to be caused by BIOS. Even when enabled in the
-@@ -1404,6 +1405,7 @@ config X86_BOOTPARAM_MEMORY_CORRUPTION_C
+@@ -1405,6 +1406,7 @@ config X86_BOOTPARAM_MEMORY_CORRUPTION_C
config X86_RESERVE_LOW
int "Amount of low memory, in kilobytes, to reserve for the BIOS"
@@ -53,7 +53,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
default 64
range 4 640
---help---
-@@ -1527,8 +1529,8 @@ config MTRR_SANITIZER_SPARE_REG_NR_DEFAU
+@@ -1528,8 +1530,8 @@ config MTRR_SANITIZER_SPARE_REG_NR_DEFAU
config X86_PAT
def_bool y
diff --git a/patches.xen/xen3-patch-2.6.29 b/patches.xen/xen3-patch-2.6.29
index 6b868cbff6..6419384010 100644
--- a/patches.xen/xen3-patch-2.6.29
+++ b/patches.xen/xen3-patch-2.6.29
@@ -11,7 +11,7 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
--- head.orig/arch/x86/Kconfig 2014-01-07 16:27:33.000000000 +0100
+++ head/arch/x86/Kconfig 2014-01-07 16:32:49.000000000 +0100
-@@ -341,7 +341,6 @@ config X86_XEN
+@@ -342,7 +342,6 @@ config X86_XEN
depends on X86_32
select XEN
select X86_PAE
@@ -19,7 +19,7 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
help
Choose this option if you plan to run this kernel on top of the
Xen Hypervisor.
-@@ -382,7 +381,6 @@ config X86_64_XEN
+@@ -383,7 +382,6 @@ config X86_64_XEN
bool "Enable Xen compatible kernel"
depends on X86_64
select XEN
@@ -27,7 +27,7 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
help
This option will compile a kernel compatible with Xen hypervisor
-@@ -774,7 +772,7 @@ config CALGARY_IOMMU_ENABLED_BY_DEFAULT
+@@ -775,7 +773,7 @@ config CALGARY_IOMMU_ENABLED_BY_DEFAULT
# need this always selected by IOMMU for the VIA workaround
config SWIOTLB
@@ -36,7 +36,7 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
---help---
Support for software bounce buffers used on x86-64 systems
which don't have a hardware IOMMU. Using this PCI devices
-@@ -875,7 +873,7 @@ config X86_XEN_GENAPIC
+@@ -876,7 +874,7 @@ config X86_XEN_GENAPIC
config X86_REROUTE_FOR_BROKEN_BOOT_IRQS
bool "Reroute for broken boot IRQs"
@@ -8814,9 +8814,9 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
.poll = drm_poll,
.read = drm_read,
#ifdef CONFIG_COMPAT
---- head.orig/drivers/gpu/drm/i915/i915_drv.h 2014-07-03 10:47:21.000000000 +0200
+--- head.orig/drivers/gpu/drm/i915/i915_drv.h 2014-07-29 10:32:23.000000000 +0200
+++ head/drivers/gpu/drm/i915/i915_drv.h 2014-06-26 14:57:02.000000000 +0200
-@@ -2280,6 +2280,11 @@ int __i915_add_request(struct intel_engi
+@@ -2281,6 +2281,11 @@ int __i915_add_request(struct intel_engi
__i915_add_request(ring, NULL, NULL, seqno)
int __must_check i915_wait_seqno(struct intel_engine_cs *ring,
uint32_t seqno);
@@ -8828,7 +8828,7 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf);
int __must_check
i915_gem_object_set_to_gtt_domain(struct drm_i915_gem_object *obj,
---- head.orig/drivers/gpu/drm/i915/i915_gem.c 2014-06-26 11:20:14.000000000 +0200
+--- head.orig/drivers/gpu/drm/i915/i915_gem.c 2014-07-29 10:32:23.000000000 +0200
+++ head/drivers/gpu/drm/i915/i915_gem.c 2013-12-02 17:42:01.000000000 +0100
@@ -1495,6 +1495,17 @@ i915_gem_mmap_ioctl(struct drm_device *d
return 0;
diff --git a/patches.xen/xen3-patch-2.6.30 b/patches.xen/xen3-patch-2.6.30
index a0fd695afc..1ed7dea154 100644
--- a/patches.xen/xen3-patch-2.6.30
+++ b/patches.xen/xen3-patch-2.6.30
@@ -24,7 +24,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
select HAVE_KERNEL_XZ
select HAVE_KERNEL_LZO
select HAVE_KERNEL_LZ4
-@@ -347,7 +347,7 @@ config X86_XEN
+@@ -348,7 +348,7 @@ config X86_XEN
config X86_BIGSMP
bool "Support for big SMP systems with more than 8 CPUs"
@@ -33,7 +33,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
---help---
This option is needed for the systems that have more than 8 CPUs
-@@ -355,7 +355,7 @@ config GOLDFISH
+@@ -356,7 +356,7 @@ config GOLDFISH
def_bool y
depends on X86_GOLDFISH
@@ -42,7 +42,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
config X86_EXTENDED_PLATFORM
bool "Support for extended (non-PC) x86 platforms"
default y
-@@ -384,7 +384,7 @@ config X86_64_XEN
+@@ -385,7 +385,7 @@ config X86_64_XEN
help
This option will compile a kernel compatible with Xen hypervisor
@@ -51,7 +51,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
config X86_EXTENDED_PLATFORM
bool "Support for extended (non-PC) x86 platforms"
default y
-@@ -794,7 +794,7 @@ config MAXSMP
+@@ -795,7 +795,7 @@ config MAXSMP
config NR_CPUS
int "Maximum number of CPUs" if SMP && !MAXSMP
@@ -60,7 +60,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
range 2 512 if SMP && !MAXSMP && !CPUMASK_OFFSTACK
range 2 8192 if SMP && !MAXSMP && CPUMASK_OFFSTACK && X86_64
default "1" if !SMP
-@@ -867,10 +867,6 @@ config X86_IO_APIC
+@@ -868,10 +868,6 @@ config X86_IO_APIC
depends on !XEN_UNPRIVILEGED_GUEST
select GENERIC_IRQ_LEGACY_ALLOC_HWIRQ
@@ -17781,7 +17781,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
},
};
---- head.orig/kernel/locking/mutex.c 2014-06-08 20:19:54.000000000 +0200
+--- head.orig/kernel/locking/mutex.c 2014-07-29 10:33:21.000000000 +0200
+++ head/kernel/locking/mutex.c 2013-08-09 14:49:59.000000000 +0200
@@ -123,6 +123,9 @@ EXPORT_SYMBOL(mutex_lock);
/*
@@ -17990,7 +17990,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
}
--- head.orig/mm/page_alloc.c 2014-01-22 14:03:14.000000000 +0100
+++ head/mm/page_alloc.c 2014-01-22 14:06:01.000000000 +0100
-@@ -5698,11 +5698,9 @@ static void __setup_per_zone_wmarks(void
+@@ -5710,11 +5710,9 @@ static void __setup_per_zone_wmarks(void
}
#ifdef CONFIG_XEN
diff --git a/patches.xen/xen3-patch-2.6.31 b/patches.xen/xen3-patch-2.6.31
index a98becd8d9..aebe46b94d 100644
--- a/patches.xen/xen3-patch-2.6.31
+++ b/patches.xen/xen3-patch-2.6.31
@@ -21,7 +21,7 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
select HAVE_IOREMAP_PROT
select HAVE_KPROBES
select HAVE_MEMBLOCK
-@@ -893,7 +893,7 @@ config X86_REROUTE_FOR_BROKEN_BOOT_IRQS
+@@ -894,7 +894,7 @@ config X86_REROUTE_FOR_BROKEN_BOOT_IRQS
config X86_MCE
bool "Machine Check / overheating reporting"
default y
@@ -30,7 +30,7 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
---help---
Machine Check support allows the processor to notify the
kernel if it detects a problem (e.g. overheating, data corruption).
-@@ -918,7 +918,7 @@ config X86_MCE_AMD
+@@ -919,7 +919,7 @@ config X86_MCE_AMD
config X86_ANCIENT_MCE
bool "Support for old Pentium 5 / WinChip machine checks"
@@ -39,7 +39,7 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
---help---
Include support for machine check handling on old Pentium 5 or WinChip
systems. These typically need to be enabled explicitly on the command
-@@ -1657,6 +1657,7 @@ config KEXEC_JUMP
+@@ -1658,6 +1658,7 @@ config KEXEC_JUMP
config PHYSICAL_START
hex "Physical address where the kernel is loaded" if (EXPERT || CRASH_DUMP || XEN)
@@ -2517,7 +2517,7 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
rdmsrl(MSR_IA32_MCG_CAP, m->mcgcap);
}
-@@ -2480,7 +2482,7 @@ static __init int mcheck_init_device(voi
+@@ -2486,7 +2488,7 @@ static __init int mcheck_init_device(voi
#ifdef CONFIG_X86_XEN_MCE
if (is_initial_xendomain()) {
/* Register vIRQ handler for MCE LOG processing */
@@ -6585,8 +6585,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
return 0;
}
---- head.orig/drivers/xen/scsiback/scsiback.c 2013-06-20 15:20:55.000000000 +0200
-+++ head/drivers/xen/scsiback/scsiback.c 2013-01-30 10:43:03.000000000 +0100
+--- head.orig/drivers/xen/scsiback/scsiback.c 2014-07-24 12:28:55.000000000 +0200
++++ head/drivers/xen/scsiback/scsiback.c 2014-07-24 14:23:30.000000000 +0200
@@ -212,7 +212,7 @@ static void scsiback_cmd_done(struct req
int errors;
@@ -6713,7 +6713,7 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
}
-@@ -417,8 +397,8 @@ void scsiback_cmd_exec(pending_req_t *pe
+@@ -417,10 +397,10 @@ int scsiback_cmd_exec(pending_req_t *pen
{
int cmd_len = (int)pending_req->cmd_len;
int data_dir = (int)pending_req->sc_data_direction;
@@ -6721,9 +6721,12 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
unsigned int timeout;
+ struct bio *bio;
struct request *rq;
- int write;
+- int write, err;
++ int write;
-@@ -431,7 +411,34 @@ void scsiback_cmd_exec(pending_req_t *pe
+ DPRINTK("%s\n",__FUNCTION__);
+
+@@ -431,7 +411,40 @@ int scsiback_cmd_exec(pending_req_t *pen
timeout = VSCSIIF_TIMEOUT;
write = (data_dir == DMA_TO_DEVICE);
@@ -6733,7 +6736,7 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
+ if (IS_ERR(bio)) {
+ pr_err("scsiback: SG Request Map Error %ld\n",
+ PTR_ERR(bio));
-+ return;
++ return PTR_ERR(bio);
+ }
+ } else
+ bio = NULL;
@@ -6742,9 +6745,15 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
+ rq = blk_make_request(pending_req->sdev->request_queue, bio,
+ GFP_KERNEL);
+ if (IS_ERR(rq)) {
++ do {
++ struct bio *b = bio->bi_next;
++
++ bio_put(bio);
++ bio = b;
++ } while (bio);
+ pr_err("scsiback: Make Request Error %ld\n",
+ PTR_ERR(rq));
-+ return;
++ return PTR_ERR(rq);
+ }
+
+ rq->buffer = NULL;
@@ -6753,21 +6762,22 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
+ GFP_KERNEL);
+ if (unlikely(!rq)) {
+ pr_err("scsiback: Get Request Error\n");
-+ return;
++ return -ENOMEM;
+ }
+ }
rq->cmd_type = REQ_TYPE_BLOCK_PC;
rq->cmd_len = cmd_len;
-@@ -446,14 +453,6 @@ void scsiback_cmd_exec(pending_req_t *pe
+@@ -446,15 +459,6 @@ int scsiback_cmd_exec(pending_req_t *pen
rq->timeout = timeout;
rq->end_io_data = pending_req;
- if (nr_segments) {
--
-- if (request_map_sg(rq, pending_req, nr_segments)) {
-- pr_err("scsiback: SG Request Map Error\n");
-- return;
+- err = request_map_sg(rq, pending_req, nr_segments);
+- if (err) {
+- pr_err("scsiback: SG Request Map Error %d\n", err);
+- blk_put_request(rq);
+- return err;
- }
- }
-
diff --git a/patches.xen/xen3-patch-2.6.34 b/patches.xen/xen3-patch-2.6.34
index c0daf01d2a..02f7d7ca22 100644
--- a/patches.xen/xen3-patch-2.6.34
+++ b/patches.xen/xen3-patch-2.6.34
@@ -11,7 +11,7 @@ Automatically created from "patches.kernel.org/patch-2.6.34" by xen-port-patches
--- head.orig/arch/x86/Kconfig 2014-01-07 16:34:25.000000000 +0100
+++ head/arch/x86/Kconfig 2014-01-07 16:34:44.000000000 +0100
-@@ -163,7 +163,7 @@ config SBUS
+@@ -164,7 +164,7 @@ config SBUS
config NEED_DMA_MAP_STATE
def_bool y
@@ -1409,7 +1409,7 @@ Automatically created from "patches.kernel.org/patch-2.6.34" by xen-port-patches
+ setup_IO_APIC_irq(0, 0, 0, desc, 0, 0);
+}
+#endif
---- head.orig/arch/x86/kernel/cpu/intel.c 2014-01-07 16:24:58.000000000 +0100
+--- head.orig/arch/x86/kernel/cpu/intel.c 2014-07-29 11:03:48.000000000 +0200
+++ head/arch/x86/kernel/cpu/intel.c 2013-03-21 15:18:17.000000000 +0100
@@ -59,6 +59,9 @@ static void early_init_intel(struct cpui
* need the microcode to have already been loaded... so if it is
@@ -4008,7 +4008,7 @@ Automatically created from "patches.kernel.org/patch-2.6.34" by xen-port-patches
#include <asm/dma.h>
--- head.orig/mm/page_alloc.c 2014-01-22 14:06:01.000000000 +0100
+++ head/mm/page_alloc.c 2014-01-22 14:07:52.000000000 +0100
-@@ -5707,7 +5707,8 @@ static void __setup_per_zone_wmarks(void
+@@ -5719,7 +5719,8 @@ static void __setup_per_zone_wmarks(void
high = percpu_pagelist_fraction
? zone->present_pages / percpu_pagelist_fraction
: 5 * zone_batchsize(zone);
@@ -4018,7 +4018,7 @@ Automatically created from "patches.kernel.org/patch-2.6.34" by xen-port-patches
}
}
#endif
-@@ -6594,6 +6595,11 @@ static const struct trace_print_flags pa
+@@ -6606,6 +6607,11 @@ static const struct trace_print_flags pa
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
{1UL << PG_compound_lock, "compound_lock" },
#endif
diff --git a/patches.xen/xen3-patch-2.6.36 b/patches.xen/xen3-patch-2.6.36
index 43d2eb85cb..53f37e0402 100644
--- a/patches.xen/xen3-patch-2.6.36
+++ b/patches.xen/xen3-patch-2.6.36
@@ -18,7 +18,7 @@ Automatically created from "patches.kernel.org/patch-2.6.36" by xen-port-patches
select HAVE_PERF_REGS
select HAVE_PERF_USER_STACK_DUMP
select HAVE_DEBUG_KMEMLEAK
-@@ -1107,6 +1107,7 @@ config X86_CPUID
+@@ -1108,6 +1108,7 @@ config X86_CPUID
choice
prompt "High Memory Support"
@@ -26,7 +26,7 @@ Automatically created from "patches.kernel.org/patch-2.6.36" by xen-port-patches
default HIGHMEM4G
depends on X86_32
-@@ -1148,6 +1149,7 @@ config NOHIGHMEM
+@@ -1149,6 +1150,7 @@ config NOHIGHMEM
config HIGHMEM4G
bool "4GB"
@@ -369,7 +369,7 @@ Automatically created from "patches.kernel.org/patch-2.6.36" by xen-port-patches
}
#endif
--- head.orig/arch/x86/kernel/cpu/intel.c 2013-03-21 15:18:17.000000000 +0100
-+++ head/arch/x86/kernel/cpu/intel.c 2014-01-07 16:34:59.000000000 +0100
++++ head/arch/x86/kernel/cpu/intel.c 2014-07-29 11:13:22.000000000 +0200
@@ -285,6 +285,7 @@ static void intel_workarounds(struct cpu
}
#endif
@@ -402,12 +402,11 @@ Automatically created from "patches.kernel.org/patch-2.6.36" by xen-port-patches
static void init_intel(struct cpuinfo_x86 *c)
{
-@@ -454,12 +454,14 @@ static void init_intel(struct cpuinfo_x8
- if (c->x86 == 6)
+@@ -456,11 +456,13 @@ static void init_intel(struct cpuinfo_x8
set_cpu_cap(c, X86_FEATURE_P3);
#endif
-+#ifndef CONFIG_XEN
++#ifndef CONFIG_XEN
/* Work around errata */
srat_detect_node(c);
@@ -1630,7 +1629,7 @@ Automatically created from "patches.kernel.org/patch-2.6.36" by xen-port-patches
xenbus_unregister_driver(&netfront_driver);
netif_exit_accel();
---- head.orig/drivers/xen/scsiback/scsiback.c 2013-01-30 10:43:03.000000000 +0100
+--- head.orig/drivers/xen/scsiback/scsiback.c 2014-07-24 14:23:30.000000000 +0200
+++ head/drivers/xen/scsiback/scsiback.c 2013-01-30 11:51:46.000000000 +0100
@@ -371,7 +371,7 @@ static struct bio *request_map_sg(pendin
if (bio->bi_vcnt >= nr_vecs) {
diff --git a/patches.xen/xen3-patch-2.6.37 b/patches.xen/xen3-patch-2.6.37
index 895eb51802..3215aa5b82 100644
--- a/patches.xen/xen3-patch-2.6.37
+++ b/patches.xen/xen3-patch-2.6.37
@@ -9,7 +9,7 @@ Automatically created from "patches.kernel.org/patch-2.6.37" by xen-port-patches
--- head.orig/arch/x86/Kconfig 2014-04-30 10:47:53.000000000 +0200
+++ head/arch/x86/Kconfig 2014-06-26 15:01:39.000000000 +0200
-@@ -1946,7 +1946,6 @@ config ARCH_ENABLE_HUGEPAGE_MIGRATION
+@@ -1947,7 +1947,6 @@ config ARCH_ENABLE_HUGEPAGE_MIGRATION
depends on X86_64 && HUGETLB_PAGE && MIGRATION
menu "Power management and ACPI options"
@@ -17,7 +17,7 @@ Automatically created from "patches.kernel.org/patch-2.6.37" by xen-port-patches
config ARCH_HIBERNATION_HEADER
def_bool y
-@@ -1954,6 +1953,8 @@ config ARCH_HIBERNATION_HEADER
+@@ -1955,6 +1954,8 @@ config ARCH_HIBERNATION_HEADER
source "kernel/power/Kconfig"
@@ -26,7 +26,7 @@ Automatically created from "patches.kernel.org/patch-2.6.37" by xen-port-patches
source "drivers/acpi/Kconfig"
source "drivers/sfi/Kconfig"
-@@ -2090,6 +2091,8 @@ source "drivers/cpuidle/Kconfig"
+@@ -2091,6 +2092,8 @@ source "drivers/cpuidle/Kconfig"
source "drivers/idle/Kconfig"
@@ -35,7 +35,7 @@ Automatically created from "patches.kernel.org/patch-2.6.37" by xen-port-patches
endmenu
-@@ -2168,7 +2171,7 @@ config PCI_OLPC
+@@ -2169,7 +2172,7 @@ config PCI_OLPC
config PCI_XEN
def_bool y
@@ -44,7 +44,7 @@ Automatically created from "patches.kernel.org/patch-2.6.37" by xen-port-patches
select SWIOTLB_XEN
config PCI_DOMAINS
-@@ -2192,21 +2195,6 @@ config PCI_CNB20LE_QUIRK
+@@ -2193,21 +2196,6 @@ config PCI_CNB20LE_QUIRK
You should say N unless you know you need this.
@@ -76,7 +76,7 @@ Automatically created from "patches.kernel.org/patch-2.6.37" by xen-port-patches
#endif
#endif
---- head.orig/arch/x86/include/asm/io.h 2014-06-30 10:27:44.000000000 +0200
+--- head.orig/arch/x86/include/asm/io.h 2014-06-08 20:19:54.000000000 +0200
+++ head/arch/x86/include/asm/io.h 2014-04-30 10:50:21.000000000 +0200
@@ -319,7 +319,7 @@ extern void __iomem *ioremap_wc(resource
@@ -3937,7 +3937,7 @@ Automatically created from "patches.kernel.org/patch-2.6.37" by xen-port-patches
return 0;
}
---- head.orig/arch/x86/kernel/resource.c 2014-06-30 10:27:44.000000000 +0200
+--- head.orig/arch/x86/kernel/resource.c 2011-01-05 01:50:19.000000000 +0100
+++ head/arch/x86/kernel/resource.c 2011-09-23 14:48:43.000000000 +0200
@@ -1,3 +1,7 @@
+#ifdef CONFIG_XEN
@@ -7371,7 +7371,7 @@ Automatically created from "patches.kernel.org/patch-2.6.37" by xen-port-patches
/* Allocate space for the per-instance private data. */
private_data = kmalloc(sizeof(*private_data), GFP_KERNEL);
if (!private_data)
---- head.orig/drivers/xen/pci.c 2014-06-30 10:27:44.000000000 +0200
+--- head.orig/drivers/xen/pci.c 2014-03-31 05:40:15.000000000 +0200
+++ head/drivers/xen/pci.c 2014-02-18 17:29:14.000000000 +0100
@@ -23,14 +23,23 @@
#include <xen/interface/physdev.h>
@@ -7625,7 +7625,7 @@ Automatically created from "patches.kernel.org/patch-2.6.37" by xen-port-patches
typedef struct xen_memory_map xen_memory_map_t;
DEFINE_XEN_GUEST_HANDLE(xen_memory_map_t);
---- head.orig/include/uapi/xen/privcmd.h 2014-06-30 10:27:44.000000000 +0200
+--- head.orig/include/uapi/xen/privcmd.h 2012-12-11 04:30:57.000000000 +0100
+++ head/include/uapi/xen/privcmd.h 2012-10-23 15:44:46.000000000 +0200
@@ -1,98 +1,3 @@
-/******************************************************************************
@@ -7739,7 +7739,7 @@ Automatically created from "patches.kernel.org/patch-2.6.37" by xen-port-patches
typedef struct privcmd_hypercall
{
---- head.orig/kernel/power/Kconfig 2014-06-30 10:27:44.000000000 +0200
+--- head.orig/kernel/power/Kconfig 2014-06-26 11:21:16.000000000 +0200
+++ head/kernel/power/Kconfig 2013-12-02 17:57:40.000000000 +0100
@@ -165,7 +165,7 @@ config PM_ADVANCED_DEBUG
diff --git a/patches.xen/xen3-patch-2.6.38 b/patches.xen/xen3-patch-2.6.38
index b30b726b17..9f1f554a69 100644
--- a/patches.xen/xen3-patch-2.6.38
+++ b/patches.xen/xen3-patch-2.6.38
@@ -18,7 +18,7 @@ Automatically created from "patches.kernel.org/patch-2.6.38" by xen-port-patches
select HAVE_KERNEL_LZO if !XEN
select HAVE_KERNEL_LZ4
select HAVE_HW_BREAKPOINT
-@@ -548,7 +548,7 @@ config STA2X11
+@@ -549,7 +549,7 @@ config STA2X11
config X86_32_IRIS
tristate "Eurobraille/Iris poweroff module"
@@ -27,7 +27,7 @@ Automatically created from "patches.kernel.org/patch-2.6.38" by xen-port-patches
---help---
The Iris machines from EuroBraille do not have APM or ACPI support
to shut themselves down properly. A special I/O sequence is
-@@ -1773,7 +1773,7 @@ config X86_NEED_RELOCS
+@@ -1774,7 +1774,7 @@ config X86_NEED_RELOCS
depends on RANDOMIZE_BASE || (X86_32 && RELOCATABLE)
config PHYSICAL_ALIGN
@@ -855,7 +855,7 @@ Automatically created from "patches.kernel.org/patch-2.6.38" by xen-port-patches
#ifdef CONFIG_XEN
--- head.orig/arch/x86/kernel/cpu/intel_cacheinfo.c 2013-02-20 11:32:38.000000000 +0100
+++ head/arch/x86/kernel/cpu/intel_cacheinfo.c 2013-08-09 15:11:39.000000000 +0200
-@@ -1018,7 +1018,7 @@ static struct attribute *default_attrs[]
+@@ -1030,7 +1030,7 @@ static struct attribute *default_attrs[]
NULL
};
@@ -864,7 +864,7 @@ Automatically created from "patches.kernel.org/patch-2.6.38" by xen-port-patches
static struct attribute **amd_l3_attrs(void)
{
static struct attribute **attrs;
-@@ -1164,7 +1164,7 @@ static int cache_add_dev(struct device *
+@@ -1176,7 +1176,7 @@ static int cache_add_dev(struct device *
this_leaf = CPUID4_INFO_IDX(cpu, i);
ktype_cache.default_attrs = default_attrs;
@@ -2489,7 +2489,7 @@ Automatically created from "patches.kernel.org/patch-2.6.38" by xen-port-patches
return -ENOENT;
}
---- head.orig/drivers/xen/core/evtchn.c 2014-04-04 15:13:22.000000000 +0200
+--- head.orig/drivers/xen/core/evtchn.c 2014-06-30 10:29:57.000000000 +0200
+++ head/drivers/xen/core/evtchn.c 2013-01-30 11:53:55.000000000 +0100
@@ -301,7 +301,11 @@ void force_evtchn_callback(void)
/* Not a GPL symbol: used in ubiquitous macros, so too restrictive. */
diff --git a/patches.xen/xen3-patch-2.6.39 b/patches.xen/xen3-patch-2.6.39
index 9b62b83700..24c446ea24 100644
--- a/patches.xen/xen3-patch-2.6.39
+++ b/patches.xen/xen3-patch-2.6.39
@@ -11,7 +11,7 @@ Acked-by: jbeulich@novell.com
--- head.orig/arch/x86/Kconfig 2014-01-07 16:35:35.000000000 +0100
+++ head/arch/x86/Kconfig 2014-01-07 16:35:42.000000000 +0100
-@@ -1226,7 +1226,7 @@ config ARCH_PHYS_ADDR_T_64BIT
+@@ -1227,7 +1227,7 @@ config ARCH_PHYS_ADDR_T_64BIT
config ARCH_DMA_ADDR_T_64BIT
def_bool y
@@ -20,7 +20,7 @@ Acked-by: jbeulich@novell.com
config DIRECT_GBPAGES
bool "Enable 1GB pages for kernel pagetables" if EXPERT
-@@ -2201,7 +2201,7 @@ source "drivers/pci/Kconfig"
+@@ -2202,7 +2202,7 @@ source "drivers/pci/Kconfig"
# x86_64 have no ISA slots, but can have ISA-style DMA.
config ISA_DMA_API
@@ -29,7 +29,7 @@ Acked-by: jbeulich@novell.com
default y
help
Enables ISA-style DMA support for devices requiring such controllers.
-@@ -2260,7 +2260,7 @@ config SCx200HR_TIMER
+@@ -2261,7 +2261,7 @@ config SCx200HR_TIMER
config OLPC
bool "One Laptop Per Child support"
@@ -2574,14 +2574,14 @@ Acked-by: jbeulich@novell.com
obj-$(CONFIG_USB_CATC) += usb/
obj-$(CONFIG_USB_KAWETH) += usb/
---- head.orig/drivers/net/xen-netback/Makefile 2014-06-30 10:33:23.000000000 +0200
+--- head.orig/drivers/net/xen-netback/Makefile 2011-05-19 06:06:34.000000000 +0200
+++ head/drivers/net/xen-netback/Makefile 2011-04-13 14:42:19.000000000 +0200
@@ -1,3 +1,3 @@
-obj-$(CONFIG_XEN_NETDEV_BACKEND) := xen-netback.o
+obj-$(CONFIG_PARAVIRT_XEN_NETDEV_BACKEND) := xen-netback.o
xen-netback-y := netback.o xenbus.o interface.o
---- head.orig/drivers/scsi/scsi_error.c 2014-06-30 10:33:23.000000000 +0200
+--- head.orig/drivers/scsi/scsi_error.c 2014-07-29 10:33:36.000000000 +0200
+++ head/drivers/scsi/scsi_error.c 2013-12-02 17:58:14.000000000 +0100
@@ -1925,6 +1925,31 @@ int scsi_decide_disposition(struct scsi_
}
@@ -2615,7 +2615,7 @@ Acked-by: jbeulich@novell.com
default:
return FAILED;
}
---- head.orig/drivers/watchdog/Kconfig 2014-06-30 10:33:23.000000000 +0200
+--- head.orig/drivers/watchdog/Kconfig 2014-06-26 11:21:03.000000000 +0200
+++ head/drivers/watchdog/Kconfig 2013-12-02 17:58:19.000000000 +0100
@@ -1347,7 +1347,7 @@ config WATCHDOG_RIO
@@ -2626,7 +2626,7 @@ Acked-by: jbeulich@novell.com
help
Say Y here to support the hypervisor watchdog capability provided
by Xen 4.0 and newer. The watchdog timeout period is normally one
---- head.orig/drivers/watchdog/xen_wdt.c 2014-06-30 10:33:23.000000000 +0200
+--- head.orig/drivers/watchdog/xen_wdt.c 2014-01-20 03:40:07.000000000 +0100
+++ head/drivers/watchdog/xen_wdt.c 2012-04-10 17:11:39.000000000 +0200
@@ -1,7 +1,8 @@
/*
diff --git a/patches.xen/xen3-patch-3.1 b/patches.xen/xen3-patch-3.1
index d59b103d81..204cf183b6 100644
--- a/patches.xen/xen3-patch-3.1
+++ b/patches.xen/xen3-patch-3.1
@@ -1253,9 +1253,9 @@ Acked-by: jbeulich@suse.com
pte = pfn_pte(phys >> PAGE_SHIFT, flags);
set_pte_vaddr_pud(level3_user_pgt, address, pte);
break;
---- head.orig/drivers/gpu/drm/i915/intel_pm.c 2014-06-26 11:20:14.000000000 +0200
+--- head.orig/drivers/gpu/drm/i915/intel_pm.c 2014-07-29 10:32:23.000000000 +0200
+++ head/drivers/gpu/drm/i915/intel_pm.c 2014-01-07 16:36:12.000000000 +0100
-@@ -3657,7 +3657,11 @@ static void __gen6_update_ring_freq(stru
+@@ -3665,7 +3665,11 @@ static void __gen6_update_ring_freq(stru
* Default to measured freq if none found, PCU will ensure we
* don't go over
*/
@@ -2034,7 +2034,7 @@ Acked-by: jbeulich@suse.com
MODULE_LICENSE("Dual BSD/GPL");
/* MODULE_ALIAS("devname:" BLKTAP2_DEV_DIR "control"); */
+MODULE_ALIAS("xen-backend:tap2");
---- head.orig/drivers/xen/core/evtchn.c 2014-04-04 15:16:37.000000000 +0200
+--- head.orig/drivers/xen/core/evtchn.c 2014-06-30 10:35:58.000000000 +0200
+++ head/drivers/xen/core/evtchn.c 2012-01-26 13:48:33.000000000 +0100
@@ -38,7 +38,7 @@
#include <linux/kernel_stat.h>
@@ -2314,7 +2314,7 @@ Acked-by: jbeulich@suse.com
struct pci_bus_entry {
--- head.orig/drivers/xen/scsiback/scsiback.c 2013-01-30 11:51:46.000000000 +0100
+++ head/drivers/xen/scsiback/scsiback.c 2013-06-20 15:27:44.000000000 +0200
-@@ -745,3 +745,4 @@ module_exit(scsiback_exit);
+@@ -761,3 +761,4 @@ module_exit(scsiback_exit);
MODULE_DESCRIPTION("Xen SCSI backend driver");
MODULE_LICENSE("Dual BSD/GPL");
@@ -3197,7 +3197,7 @@ Acked-by: jbeulich@suse.com
+ .get = _xen_pcibk_get_pci_dev,
+};
--- head.orig/drivers/xen/xen-pciback/xenbus.c 2014-06-26 11:21:03.000000000 +0200
-+++ head/drivers/xen/xen-pciback/xenbus.c 2014-06-26 15:03:24.000000000 +0200
++++ head/drivers/xen/xen-pciback/xenbus.c 2014-07-29 11:14:52.000000000 +0200
@@ -9,30 +9,77 @@
#include <linux/module.h>
#include <linux/init.h>
@@ -3349,7 +3349,17 @@ Acked-by: jbeulich@suse.com
err = bind_interdomain_evtchn_to_irqhandler(
pdev->xdev->otherend_id, remote_evtchn, xen_pcibk_handle_event,
-@@ -246,6 +315,7 @@ static int xen_pcibk_export_device(struc
+@@ -170,7 +239,8 @@ static int xen_pcibk_attach(struct xen_p
+ }
+
+ if (magic == NULL || strcmp(magic, XEN_PCI_MAGIC) != 0) {
+- xenbus_dev_fatal(pdev->xdev, -EFAULT,
++ err = magic ? -EILSEQ : -ENODATA;
++ xenbus_dev_fatal(pdev->xdev, err,
+ "version mismatch (%s/%s) with pcifront - "
+ "halting " DRV_NAME,
+ magic, XEN_PCI_MAGIC);
+@@ -246,6 +316,7 @@ static int xen_pcibk_export_device(struc
if (err)
goto out;
@@ -3357,7 +3367,7 @@ Acked-by: jbeulich@suse.com
dev_dbg(&dev->dev, "registering for %d\n", pdev->xdev->otherend_id);
if (xen_register_device_domain_owner(dev,
pdev->xdev->otherend_id) != 0) {
-@@ -254,6 +324,7 @@ static int xen_pcibk_export_device(struc
+@@ -254,6 +325,7 @@ static int xen_pcibk_export_device(struc
xen_unregister_device_domain_owner(dev);
xen_register_device_domain_owner(dev, pdev->xdev->otherend_id);
}
@@ -3365,7 +3375,7 @@ Acked-by: jbeulich@suse.com
/* TODO: It'd be nice to export a bridge and have all of its children
* get exported with it. This may be best done in xend (which will
-@@ -285,8 +356,10 @@ static int xen_pcibk_remove_device(struc
+@@ -285,8 +357,10 @@ static int xen_pcibk_remove_device(struc
goto out;
}
@@ -3376,7 +3386,7 @@ Acked-by: jbeulich@suse.com
/* N.B. This ends up calling pcistub_put_pci_dev which ends up
* doing the FLR. */
-@@ -725,17 +798,30 @@ static DEFINE_XENBUS_DRIVER(xen_pcibk, D
+@@ -725,17 +799,30 @@ static DEFINE_XENBUS_DRIVER(xen_pcibk, D
);
const struct xen_pcibk_backend *__read_mostly xen_pcibk_backend;
diff --git a/patches.xen/xen3-patch-3.10 b/patches.xen/xen3-patch-3.10
index ff4a2fec11..d457544ebe 100644
--- a/patches.xen/xen3-patch-3.10
+++ b/patches.xen/xen3-patch-3.10
@@ -1121,9 +1121,9 @@ Acked-by: jbeulich@suse.com
continue;
per_cpu(xen_vcpu, cpu) = &HYPERVISOR_shared_info->vcpu_info[cpu];
}
---- head.orig/drivers/gpu/drm/i915/intel_display.c 2014-07-03 10:47:21.000000000 +0200
+--- head.orig/drivers/gpu/drm/i915/intel_display.c 2014-07-29 10:32:23.000000000 +0200
+++ head/drivers/gpu/drm/i915/intel_display.c 2014-06-23 12:23:13.000000000 +0200
-@@ -2139,7 +2139,7 @@ static void intel_disable_primary_hw_pla
+@@ -2148,7 +2148,7 @@ static void intel_disable_primary_hw_pla
static bool need_vtd_wa(struct drm_device *dev)
{
@@ -2050,7 +2050,7 @@ Acked-by: jbeulich@suse.com
extern int xenbus_match(struct device *_dev, struct device_driver *_drv);
--- head.orig/fs/aio.c 2014-01-07 16:26:44.000000000 +0100
+++ head/fs/aio.c 2014-01-07 16:37:43.000000000 +0100
-@@ -1066,8 +1066,8 @@ EXPORT_SYMBOL(aio_complete);
+@@ -1073,8 +1073,8 @@ EXPORT_SYMBOL(aio_complete);
/* aio_read_events
* Pull an event off of the ioctx's event ring. Returns the number of
* events fetched
@@ -2061,7 +2061,7 @@ Acked-by: jbeulich@suse.com
*/
static long aio_read_events_ring(struct kioctx *ctx,
struct io_event __user *event, long nr)
-@@ -1106,10 +1106,12 @@ static long aio_read_events_ring(struct
+@@ -1113,10 +1113,12 @@ static long aio_read_events_ring(struct
avail = min_t(long, avail, AIO_EVENTS_PER_PAGE -
((head + AIO_EVENTS_OFFSET) % AIO_EVENTS_PER_PAGE));
@@ -2074,7 +2074,7 @@ Acked-by: jbeulich@suse.com
pos = head + AIO_EVENTS_OFFSET;
page = ctx->ring_pages[pos / AIO_EVENTS_PER_PAGE];
-@@ -1166,6 +1168,11 @@ static long read_events(struct kioctx *c
+@@ -1173,6 +1175,11 @@ static long read_events(struct kioctx *c
ktime_t until = { .tv64 = KTIME_MAX };
long ret = 0;
@@ -2086,7 +2086,7 @@ Acked-by: jbeulich@suse.com
if (timeout) {
struct timespec ts;
-@@ -1218,15 +1225,14 @@ static unsigned int aio_queue_fd_poll(st
+@@ -1225,15 +1232,14 @@ static unsigned int aio_queue_fd_poll(st
struct kioctx *ioctx = file->private_data;
if (ioctx) {
diff --git a/patches.xen/xen3-patch-3.11 b/patches.xen/xen3-patch-3.11
index eb91b61b00..e0d060af58 100644
--- a/patches.xen/xen3-patch-3.11
+++ b/patches.xen/xen3-patch-3.11
@@ -7,9 +7,9 @@ Patch-mainline: 3.11
Automatically created from "patch-3.11" by xen-port-patches.py
Acked-by: jbeulich@suse.com
---- head.orig/arch/arm64/Kconfig 2014-06-26 11:19:51.000000000 +0200
+--- head.orig/arch/arm64/Kconfig 2014-07-29 10:32:02.000000000 +0200
+++ head/arch/arm64/Kconfig 2014-01-07 16:38:06.000000000 +0100
-@@ -259,9 +259,9 @@ source "mm/Kconfig"
+@@ -260,9 +260,9 @@ source "mm/Kconfig"
config XEN_DOM0
def_bool y
@@ -2572,7 +2572,7 @@ Acked-by: jbeulich@suse.com
#endif
--- head.orig/mm/page_alloc.c 2013-09-26 12:59:30.000000000 +0200
+++ head/mm/page_alloc.c 2014-01-22 14:19:44.000000000 +0100
-@@ -5707,8 +5707,8 @@ static void __setup_per_zone_wmarks(void
+@@ -5719,8 +5719,8 @@ static void __setup_per_zone_wmarks(void
high = percpu_pagelist_fraction
? zone->present_pages / percpu_pagelist_fraction
: 5 * zone_batchsize(zone);
diff --git a/patches.xen/xen3-patch-3.12 b/patches.xen/xen3-patch-3.12
index 62a374d3c8..44de8c7c49 100644
--- a/patches.xen/xen3-patch-3.12
+++ b/patches.xen/xen3-patch-3.12
@@ -9,7 +9,7 @@ Acked-by: jbeulich@suse.com
--- head.orig/arch/x86/Kconfig 2014-06-26 15:14:59.000000000 +0200
+++ head/arch/x86/Kconfig 2014-06-10 12:32:25.000000000 +0200
-@@ -1777,7 +1777,7 @@ config PHYSICAL_ALIGN
+@@ -1778,7 +1778,7 @@ config PHYSICAL_ALIGN
hex "Alignment value to which kernel should be aligned" if !XEN || EXPERT
default 0x2000 if XEN
default "0x200000"
@@ -18,7 +18,7 @@ Acked-by: jbeulich@suse.com
range 0x200000 0x1000000 if X86_64
---help---
This value puts the alignment restrictions on physical address
-@@ -2368,6 +2368,7 @@ source "drivers/rapidio/Kconfig"
+@@ -2369,6 +2369,7 @@ source "drivers/rapidio/Kconfig"
config X86_SYSFB
bool "Mark VGA/VBE/EFI FB as generic system framebuffer"
@@ -1070,7 +1070,7 @@ Acked-by: jbeulich@suse.com
-obj-$(CONFIG_TCG_XEN) += tpm_xenu.o
+obj-$(CONFIG_TCG_XEN_V1) += tpm_xenu.o
tpm_xenu-y = tpm_xen.o tpm_vtpm.o
---- head.orig/drivers/char/tpm/xen-tpmfront.c 2014-06-30 08:57:51.000000000 +0200
+--- head.orig/drivers/char/tpm/xen-tpmfront.c 2014-03-31 05:40:15.000000000 +0200
+++ head/drivers/char/tpm/xen-tpmfront.c 2014-02-18 17:52:31.000000000 +0100
@@ -11,19 +11,26 @@
#include <linux/err.h>
diff --git a/patches.xen/xen3-patch-3.14 b/patches.xen/xen3-patch-3.14
index 84e7ee3740..e2639fbcd9 100644
--- a/patches.xen/xen3-patch-3.14
+++ b/patches.xen/xen3-patch-3.14
@@ -1637,9 +1637,9 @@ Acked-by: jbeulich@suse.com
default y
help
Export efi runtime memory maps to /sys/firmware/efi/runtime-map.
---- head.orig/drivers/gpu/drm/i915/i915_gem_stolen.c 2014-06-08 20:19:54.000000000 +0200
+--- head.orig/drivers/gpu/drm/i915/i915_gem_stolen.c 2014-07-29 10:32:23.000000000 +0200
+++ head/drivers/gpu/drm/i915/i915_gem_stolen.c 2014-04-30 11:34:23.000000000 +0200
-@@ -214,7 +214,7 @@ int i915_gem_init_stolen(struct drm_devi
+@@ -258,7 +258,7 @@ int i915_gem_init_stolen(struct drm_devi
struct drm_i915_private *dev_priv = dev->dev_private;
int bios_reserved = 0;
diff --git a/patches.xen/xen3-patch-3.15 b/patches.xen/xen3-patch-3.15
index b78aafff71..7c342763e1 100644
--- a/patches.xen/xen3-patch-3.15
+++ b/patches.xen/xen3-patch-3.15
@@ -9,7 +9,7 @@ Acked-by: jbeulich@suse.com
--- head.orig/arch/x86/Kconfig 2014-06-10 12:32:25.000000000 +0200
+++ head/arch/x86/Kconfig 2014-06-10 12:26:03.000000000 +0200
-@@ -1589,7 +1589,7 @@ config EFI_STUB
+@@ -1590,7 +1590,7 @@ config EFI_STUB
config EFI_MIXED
bool "EFI mixed-mode support"
@@ -18,7 +18,7 @@ Acked-by: jbeulich@suse.com
---help---
Enabling this feature allows a 64-bit kernel to be booted
on a 32-bit firmware, provided that your CPU supports 64-bit
-@@ -1775,9 +1775,11 @@ config X86_NEED_RELOCS
+@@ -1776,9 +1776,11 @@ config X86_NEED_RELOCS
config PHYSICAL_ALIGN
hex "Alignment value to which kernel should be aligned" if !XEN || EXPERT
@@ -2242,7 +2242,7 @@ Acked-by: jbeulich@suse.com
while (count > 0) {
sz = size_inside_page(p, count);
---- head.orig/drivers/xen/core/evtchn.c 2014-04-04 15:24:45.000000000 +0200
+--- head.orig/drivers/xen/core/evtchn.c 2014-06-30 10:32:01.000000000 +0200
+++ head/drivers/xen/core/evtchn.c 2014-05-13 10:03:39.000000000 +0200
@@ -309,7 +309,7 @@ static DEFINE_PER_CPU(unsigned int, curr
static DEFINE_PER_CPU(unsigned int, current_l2i);
@@ -2468,7 +2468,7 @@ Acked-by: jbeulich@suse.com
}
#else /* CONFIG_MMU */
---- head.orig/sound/pci/hda/hda_controller.c 2014-06-08 20:19:54.000000000 +0200
+--- head.orig/sound/pci/hda/hda_controller.c 2014-07-29 10:33:29.000000000 +0200
+++ head/sound/pci/hda/hda_controller.c 2014-05-14 11:08:30.000000000 +0200
@@ -23,6 +23,7 @@
#include <linux/clocksource.h>
diff --git a/patches.xen/xen3-patch-3.16-rc3 b/patches.xen/xen3-patch-3.16-rc7
index 18678278d4..14c7ab6f96 100644
--- a/patches.xen/xen3-patch-3.16-rc3
+++ b/patches.xen/xen3-patch-3.16-rc7
@@ -1,15 +1,15 @@
From: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
-Subject: Linux: 3.16-rc3
-Patch-mainline: 3.16-rc3
+Subject: Linux: 3.16-rc7
+Patch-mainline: 3.16-rc7
- This patch contains the differences between 3.15 and 3.16-rc3.
+ This patch contains the differences between 3.15 and 3.16-rc7.
-Automatically created from "patch-3.16-rc3" by xen-port-patches.py
+Automatically created from "patch-3.16-rc7" by xen-port-patches.py
Acked-by: jbeulich@suse.com
--- head.orig/arch/x86/Kconfig 2014-06-10 12:26:03.000000000 +0200
+++ head/arch/x86/Kconfig 2014-06-30 10:41:25.000000000 +0200
-@@ -865,7 +865,7 @@ config X86_IO_APIC
+@@ -866,7 +866,7 @@ config X86_IO_APIC
def_bool y
depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_IOAPIC || PCI_MSI
depends on !XEN_UNPRIVILEGED_GUEST
@@ -18,7 +18,7 @@ Acked-by: jbeulich@suse.com
config X86_REROUTE_FOR_BROKEN_BOOT_IRQS
bool "Reroute for broken boot IRQs"
-@@ -965,11 +965,11 @@ config X86_16BIT
+@@ -966,11 +966,11 @@ config X86_16BIT
config X86_ESPFIX32
def_bool y
@@ -735,7 +735,7 @@ Acked-by: jbeulich@suse.com
snprintf(buf, sizeof(buf), "intel-ucode/%02x-%02x-%02x",
c->x86, c->x86_model, c->x86_mask);
--- head.orig/arch/x86/kernel/entry_32-xen.S 2014-01-22 14:23:28.000000000 +0100
-+++ head/arch/x86/kernel/entry_32-xen.S 2014-07-03 11:52:42.000000000 +0200
++++ head/arch/x86/kernel/entry_32-xen.S 2014-07-29 11:21:59.000000000 +0200
@@ -319,10 +319,6 @@ ENTRY(ret_from_kernel_thread)
ENDPROC(ret_from_kernel_thread)
@@ -758,18 +758,17 @@ Acked-by: jbeulich@suse.com
/* SYSENTER_RETURN points to after the "sysenter" instruction in
the vsyscall page. See vsyscall-sysentry.S, which defines the symbol. */
-@@ -435,9 +427,10 @@ sysenter_past_esp:
+@@ -435,8 +427,9 @@ sysenter_past_esp:
jnz sysenter_audit
sysenter_do_call:
cmpl $(NR_syscalls), %eax
- jae syscall_badsys
+ jae sysenter_badsys
call *sys_call_table(,%eax,4)
- movl %eax,PT_EAX(%esp)
+sysenter_after_call:
+ movl %eax,PT_EAX(%esp)
LOCKDEP_SYS_EXIT
DISABLE_INTERRUPTS(CLBR_ANY)
- TRACE_IRQS_OFF
@@ -524,10 +517,6 @@ ENTRY(ia32pv_sysenter_target)
CFI_ENDPROC
ENDPROC(ia32pv_sysenter_target)
@@ -781,7 +780,15 @@ Acked-by: jbeulich@suse.com
# system call handler stub
ENTRY(system_call)
RING0_INT_FRAME # can't unwind into user space anyway
-@@ -556,7 +545,7 @@ syscall_exit:
+@@ -542,6 +531,7 @@ ENTRY(system_call)
+ jae syscall_badsys
+ syscall_call:
+ call *sys_call_table(,%eax,4)
++syscall_after_call:
+ movl %eax,PT_EAX(%esp) # store the return value
+ syscall_exit:
+ LOCKDEP_SYS_EXIT
+@@ -556,7 +546,7 @@ syscall_exit:
restore_all:
TRACE_IRQS_IRET
restore_all_notrace:
@@ -790,7 +797,7 @@ Acked-by: jbeulich@suse.com
movl PT_EFLAGS(%esp), %eax # mix EFLAGS, SS and CS
# Warning: PT_OLDSS(%esp) contains the wrong/random values if we
# are returning to the kernel.
-@@ -567,9 +556,9 @@ restore_all_notrace:
+@@ -567,9 +557,9 @@ restore_all_notrace:
cmpl $((SEGMENT_LDT << 8) | USER_RPL), %eax
CFI_REMEMBER_STATE
je ldt_ss # returning to user-space with LDT SS
@@ -802,7 +809,7 @@ Acked-by: jbeulich@suse.com
movl PT_EFLAGS(%esp), %eax
testl $(X86_EFLAGS_VM|NMI_MASK), %eax
CFI_REMEMBER_STATE
-@@ -593,13 +582,8 @@ ENTRY(iret_exc)
+@@ -593,13 +583,8 @@ ENTRY(iret_exc)
_ASM_EXTABLE(irq_return,iret_exc)
CFI_RESTORE_STATE
@@ -817,7 +824,7 @@ Acked-by: jbeulich@suse.com
#ifdef CONFIG_PARAVIRT
/*
* The kernel can't run on a non-flat stack if paravirt mode
-@@ -641,7 +625,8 @@ ldt_ss:
+@@ -641,7 +626,8 @@ ldt_ss:
lss (%esp), %esp /* switch to espfix segment */
CFI_ADJUST_CFA_OFFSET -8
jmp restore_nocheck
@@ -827,16 +834,18 @@ Acked-by: jbeulich@suse.com
ALIGN
restore_all_enable_events:
TRACE_IRQS_ON
-@@ -754,13 +739,14 @@ END(syscall_fault)
+@@ -753,14 +739,15 @@ syscall_fault:
+ END(syscall_fault)
syscall_badsys:
- movl $-ENOSYS,PT_EAX(%esp)
+- movl $-ENOSYS,PT_EAX(%esp)
- jmp resume_userspace
-+ jmp syscall_exit
++ movl $-ENOSYS,%eax
++ jmp syscall_after_call
END(syscall_badsys)
+
+sysenter_badsys:
-+ movl $-ENOSYS,PT_EAX(%esp)
++ movl $-ENOSYS,%eax
+ jmp sysenter_after_call
+END(sysenter_badsys)
CFI_ENDPROC
@@ -847,7 +856,7 @@ Acked-by: jbeulich@suse.com
#ifndef CONFIG_XEN
.macro FIXUP_ESPFIX_STACK
-@@ -771,6 +757,7 @@ END(syscall_badsys)
+@@ -771,6 +758,7 @@ END(syscall_badsys)
* the high word of the segment base from the GDT and swiches to the
* normal stack and adjusts ESP with the matching offset.
*/
@@ -855,7 +864,7 @@ Acked-by: jbeulich@suse.com
/* fixup the stack */
mov GDT_ESPFIX_SS + 4, %al /* bits 16..23 */
mov GDT_ESPFIX_SS + 7, %ah /* bits 24..31 */
-@@ -780,8 +767,10 @@ END(syscall_badsys)
+@@ -780,8 +768,10 @@ END(syscall_badsys)
pushl_cfi %eax
lss (%esp), %esp /* switch to the normal stack segment */
CFI_ADJUST_CFA_OFFSET -8
@@ -866,7 +875,7 @@ Acked-by: jbeulich@suse.com
movl %ss, %eax
/* see if on espfix stack */
cmpw $__ESPFIX_SS, %ax
-@@ -792,6 +781,7 @@ END(syscall_badsys)
+@@ -792,6 +782,7 @@ END(syscall_badsys)
/* switch to normal stack */
FIXUP_ESPFIX_STACK
27:
@@ -874,7 +883,7 @@ Acked-by: jbeulich@suse.com
.endm
/*
-@@ -848,10 +838,6 @@ common_interrupt:
+@@ -848,10 +839,6 @@ common_interrupt:
ENDPROC(common_interrupt)
CFI_ENDPROC
@@ -885,7 +894,7 @@ Acked-by: jbeulich@suse.com
#define BUILD_INTERRUPT3(name, nr, fn) \
ENTRY(name) \
RING0_INT_FRAME; \
-@@ -883,8 +869,6 @@ ENDPROC(name)
+@@ -883,8 +870,6 @@ ENDPROC(name)
#else
#define UNWIND_ESPFIX_STACK
@@ -894,7 +903,7 @@ Acked-by: jbeulich@suse.com
# A note on the "critical region" in our callback handler.
# We want to avoid stacking callback handlers due to events occurring
# during handling of the last event. To do this, we keep events disabled
-@@ -1180,10 +1164,6 @@ ENTRY(fixup_4gb_segment)
+@@ -1180,10 +1165,6 @@ ENTRY(fixup_4gb_segment)
jmp error_code
CFI_ENDPROC
END(fixup_4gb_segment)
@@ -905,15 +914,37 @@ Acked-by: jbeulich@suse.com
#ifdef CONFIG_FUNCTION_TRACER
#ifdef CONFIG_DYNAMIC_FTRACE
-@@ -1436,17 +1416,16 @@ cstar_trace_entry:
+@@ -1390,6 +1371,7 @@ ENTRY(ia32pv_cstar_target)
+ btl %eax,cstar_special
+ jc .Lcstar_special
+ call *cstar_call_table(,%eax,4)
++.Lcstar_after_call:
+ movl %eax,PT_EAX(%esp) # store the return value
+ .Lcstar_exit:
+ movl PT_ECX(%esp),%ecx
+@@ -1405,10 +1387,9 @@ GLOBAL(cstar_set_tif)
+ orl $_TIF_CSTAR,TI_flags(%ebp)
+ jmp *sys_call_table(,%eax,4)
+ cstar_clear_tif:
+- movl %eax,PT_EAX(%esp) # store the return value
+ LOCK_PREFIX
+ andl $~_TIF_CSTAR,TI_flags(%ebp)
+- jmp .Lcstar_exit
++ jmp .Lcstar_after_call
+ cstar_trace_entry:
+ movl $-ENOSYS,PT_EAX(%esp)
+ cmpl $NR_syscalls,%eax
+@@ -1435,18 +1416,17 @@ cstar_trace_entry:
+ jb syscall_call
jmp syscall_exit
cstar_badsys:
- movl $-ENOSYS,PT_EAX(%esp)
+- movl $-ENOSYS,PT_EAX(%esp)
-.Lcstar_resume:
- movl PT_ECX(%esp),%ecx
- movl %ecx,PT_EBP(%esp) # put user EBP back in place
- jmp resume_userspace
-+ jmp .Lcstar_exit
++ movl $-ENOSYS,%eax
++ jmp .Lcstar_after_call
CFI_RESTORE_STATE
cstar_fault:
ASM_CLAC
@@ -927,7 +958,7 @@ Acked-by: jbeulich@suse.com
CFI_ENDPROC
ENDPROC(ia32pv_cstar_target)
-@@ -1482,11 +1461,6 @@ mask=0
+@@ -1482,11 +1462,6 @@ mask=0
.popsection
#endif /* TIF_CSTAR */
@@ -939,7 +970,7 @@ Acked-by: jbeulich@suse.com
#ifdef CONFIG_TRACING
ENTRY(trace_page_fault)
RING0_EC_FRAME
-@@ -1602,12 +1576,14 @@ END(debug)
+@@ -1602,12 +1577,14 @@ END(debug)
ENTRY(nmi)
RING0_INT_FRAME
ASM_CLAC
@@ -955,7 +986,7 @@ Acked-by: jbeulich@suse.com
cmpl $ia32_sysenter_target,(%esp)
je nmi_stack_fixup
pushl_cfi %eax
-@@ -1647,6 +1623,7 @@ nmi_debug_stack_check:
+@@ -1647,6 +1624,7 @@ nmi_debug_stack_check:
FIX_STACK 24, nmi_stack_correct, 1
jmp nmi_stack_correct
@@ -963,7 +994,7 @@ Acked-by: jbeulich@suse.com
nmi_espfix_stack:
/* We have a RING0_INT_FRAME here.
*
-@@ -1668,7 +1645,9 @@ nmi_espfix_stack:
+@@ -1668,7 +1646,9 @@ nmi_espfix_stack:
lss 12+4(%esp), %esp # back to espfix stack
CFI_ADJUST_CFA_OFFSET -24
jmp irq_return
@@ -974,7 +1005,7 @@ Acked-by: jbeulich@suse.com
SAVE_ALL
xorl %edx,%edx # zero error code
movl %esp,%eax # pt_regs pointer
-@@ -1709,7 +1688,3 @@ ENTRY(async_page_fault)
+@@ -1709,7 +1689,3 @@ ENTRY(async_page_fault)
END(async_page_fault)
#endif
@@ -2967,10 +2998,10 @@ Acked-by: jbeulich@suse.com
schedule_pcifront_aer_op(pdev);
--- head.orig/drivers/xen/scsiback/scsiback.c 2013-01-25 15:10:30.000000000 +0100
-+++ head/drivers/xen/scsiback/scsiback.c 2014-06-30 12:19:25.000000000 +0200
-@@ -429,8 +429,6 @@ void scsiback_cmd_exec(pending_req_t *pe
++++ head/drivers/xen/scsiback/scsiback.c 2014-07-29 11:16:52.000000000 +0200
+@@ -435,8 +435,6 @@ int scsiback_cmd_exec(pending_req_t *pen
PTR_ERR(rq));
- return;
+ return PTR_ERR(rq);
}
-
- rq->buffer = NULL;
diff --git a/patches.xen/xen3-patch-3.7 b/patches.xen/xen3-patch-3.7
index b94dc7e9cc..5a89a235e8 100644
--- a/patches.xen/xen3-patch-3.7
+++ b/patches.xen/xen3-patch-3.7
@@ -7,9 +7,9 @@ Patch-mainline: 3.7
Automatically created from "patch-3.7" by xen-port-patches.py
Acked-by: jbeulich@suse.com
---- head.orig/arch/arm/Kconfig 2014-06-30 08:57:53.000000000 +0200
+--- head.orig/arch/arm/Kconfig 2014-07-29 10:31:56.000000000 +0200
+++ head/arch/arm/Kconfig 2013-12-03 08:30:32.000000000 +0100
-@@ -1822,9 +1822,9 @@ config IOMMU_HELPER
+@@ -1823,9 +1823,9 @@ config IOMMU_HELPER
config XEN_DOM0
def_bool y
@@ -21,7 +21,7 @@ Acked-by: jbeulich@suse.com
bool "Xen guest support on ARM (EXPERIMENTAL)"
depends on ARM && AEABI && OF
depends on CPU_V7 && !CPU_V6
---- head.orig/arch/arm/Makefile 2014-06-30 08:57:53.000000000 +0200
+--- head.orig/arch/arm/Makefile 2014-06-26 11:19:44.000000000 +0200
+++ head/arch/arm/Makefile 2013-09-26 13:20:15.000000000 +0200
@@ -261,7 +261,7 @@ endif
core-$(CONFIG_FPE_NWFPE) += arch/arm/nwfpe/
@@ -32,7 +32,7 @@ Acked-by: jbeulich@suse.com
core-$(CONFIG_KVM_ARM_HOST) += arch/arm/kvm/
# If we have a machine-specific directory, then include it in the build.
---- head.orig/arch/arm/include/asm/xen/interface.h 2014-06-30 08:57:53.000000000 +0200
+--- head.orig/arch/arm/include/asm/xen/interface.h 2014-06-26 11:21:31.000000000 +0200
+++ head/arch/arm/include/asm/xen/interface.h 2014-06-26 15:12:45.000000000 +0200
@@ -11,14 +11,14 @@
@@ -81,7 +81,7 @@ Acked-by: jbeulich@suse.com
select CLKEVT_I8253 if !XEN
select ARCH_HAVE_NMI_SAFE_CMPXCHG
select GENERIC_IOMAP
-@@ -1554,6 +1554,7 @@ config ARCH_RANDOM
+@@ -1555,6 +1555,7 @@ config ARCH_RANDOM
config X86_SMAP
def_bool y
prompt "Supervisor Mode Access Prevention" if EXPERT
@@ -2676,7 +2676,7 @@ Acked-by: jbeulich@suse.com
};
static int adjust_tjmax(struct platform_data *c, u32 id, struct device *dev)
---- head.orig/drivers/remoteproc/Kconfig 2014-06-30 08:57:53.000000000 +0200
+--- head.orig/drivers/remoteproc/Kconfig 2014-06-26 11:20:44.000000000 +0200
+++ head/drivers/remoteproc/Kconfig 2012-11-02 12:55:30.000000000 +0100
@@ -1,4 +1,5 @@
menu "Remoteproc drivers"
@@ -2956,7 +2956,7 @@ Acked-by: jbeulich@suse.com
return rc;
}
---- head.orig/drivers/xen/events/events_2l.c 2014-06-30 08:57:53.000000000 +0200
+--- head.orig/drivers/xen/events/events_2l.c 2014-06-08 20:19:54.000000000 +0200
+++ head/drivers/xen/events/events_2l.c 2014-04-02 12:38:04.000000000 +0200
@@ -280,7 +280,11 @@ irqreturn_t xen_debug_interrupt(int irq,
v = per_cpu(xen_vcpu, i);
@@ -2970,7 +2970,7 @@ Acked-by: jbeulich@suse.com
printk("%d: masked=%d pending=%d event_sel %0*"PRI_xen_ulong"\n ", i,
pending, v->evtchn_upcall_pending,
(int)(sizeof(v->evtchn_pending_sel)*2),
---- head.orig/drivers/xen/fallback.c 2014-06-30 08:57:53.000000000 +0200
+--- head.orig/drivers/xen/fallback.c 2013-04-29 02:36:01.000000000 +0200
+++ head/drivers/xen/fallback.c 2013-04-03 10:48:55.000000000 +0200
@@ -3,7 +3,16 @@
#include <linux/bug.h>
@@ -3869,7 +3869,7 @@ Acked-by: jbeulich@suse.com
err = xenbus_scanf(XBT_NIL, "control",
"platform-feature-xs_reset_watches", "%d",
&supported);
---- head.orig/include/uapi/xen/evtchn.h 2014-06-30 08:57:53.000000000 +0200
+--- head.orig/include/uapi/xen/evtchn.h 2012-12-11 04:30:57.000000000 +0100
+++ head/include/uapi/xen/evtchn.h 2012-10-31 16:44:01.000000000 +0100
@@ -1,88 +1 @@
-/******************************************************************************
diff --git a/patches.xen/xen3-patch-3.8 b/patches.xen/xen3-patch-3.8
index 3487851e81..f355f8900d 100644
--- a/patches.xen/xen3-patch-3.8
+++ b/patches.xen/xen3-patch-3.8
@@ -7,7 +7,7 @@ Patch-mainline: 3.8
Automatically created from "patch-3.8" by xen-port-patches.py
Acked-by: jbeulich@suse.com
---- head.orig/Documentation/filesystems/proc.txt 2014-06-30 08:57:52.000000000 +0200
+--- head.orig/Documentation/filesystems/proc.txt 2014-06-26 11:19:42.000000000 +0200
+++ head/Documentation/filesystems/proc.txt 2013-12-03 08:31:16.000000000 +0100
@@ -464,6 +464,7 @@ manner. The codes are the following:
mm - mixed map area
@@ -19,7 +19,7 @@ Acked-by: jbeulich@suse.com
Note that there is no guarantee that every flag and associated mnemonic will
--- head.orig/arch/x86/Kconfig 2014-01-07 16:37:08.000000000 +0100
+++ head/arch/x86/Kconfig 2014-01-07 16:37:13.000000000 +0100
-@@ -1814,7 +1814,7 @@ config HOTPLUG_CPU
+@@ -1815,7 +1815,7 @@ config HOTPLUG_CPU
config BOOTPARAM_HOTPLUG_CPU0
bool "Set default setting of cpu0_hotpluggable"
default n
@@ -28,7 +28,7 @@ Acked-by: jbeulich@suse.com
---help---
Set whether default state of cpu0_hotpluggable is on or off.
-@@ -1843,7 +1843,7 @@ config BOOTPARAM_HOTPLUG_CPU0
+@@ -1844,7 +1844,7 @@ config BOOTPARAM_HOTPLUG_CPU0
config DEBUG_HOTPLUG_CPU0
def_bool n
prompt "Debug CPU0 hotplug"
@@ -811,7 +811,7 @@ Acked-by: jbeulich@suse.com
}
#endif
}
---- head.orig/arch/x86/kernel/topology.c 2014-06-30 08:57:52.000000000 +0200
+--- head.orig/arch/x86/kernel/topology.c 2014-01-20 03:40:07.000000000 +0100
+++ head/arch/x86/kernel/topology.c 2013-12-03 08:31:51.000000000 +0100
@@ -37,7 +37,9 @@ static DEFINE_PER_CPU(struct x86_cpu, cp
@@ -1189,7 +1189,7 @@ Acked-by: jbeulich@suse.com
}
}
---- head.orig/arch/x86/pci/common.c 2014-06-30 08:57:52.000000000 +0200
+--- head.orig/arch/x86/pci/common.c 2014-06-08 20:19:54.000000000 +0200
+++ head/arch/x86/pci/common.c 2013-06-20 15:31:28.000000000 +0200
@@ -625,6 +625,7 @@ unsigned int pcibios_assign_all_busses(v
@@ -1643,7 +1643,7 @@ Acked-by: jbeulich@suse.com
#endif
xenbus_init(void)
{
---- head.orig/fs/proc/task_mmu.c 2014-06-30 08:57:52.000000000 +0200
+--- head.orig/fs/proc/task_mmu.c 2014-06-26 11:21:32.000000000 +0200
+++ head/fs/proc/task_mmu.c 2013-12-03 08:33:41.000000000 +0100
@@ -574,8 +574,12 @@ static void show_smap_vma_flags(struct s
[ilog2(VM_SOFTDIRTY)] = "sd",
@@ -1658,7 +1658,7 @@ Acked-by: jbeulich@suse.com
[ilog2(VM_MERGEABLE)] = "mg",
};
size_t i;
---- head.orig/include/linux/clocksource.h 2014-06-30 08:57:52.000000000 +0200
+--- head.orig/include/linux/clocksource.h 2014-06-26 11:21:10.000000000 +0200
+++ head/include/linux/clocksource.h 2013-05-14 08:46:48.000000000 +0200
@@ -16,7 +16,9 @@
#include <linux/timer.h>
diff --git a/patches.xen/xen3-patch-3.9 b/patches.xen/xen3-patch-3.9
index c560422561..443e19f605 100644
--- a/patches.xen/xen3-patch-3.9
+++ b/patches.xen/xen3-patch-3.9
@@ -11,7 +11,7 @@ Acked-by: jbeulich@suse.com
--- head.orig/arch/x86/Kconfig 2014-01-07 16:37:13.000000000 +0100
+++ head/arch/x86/Kconfig 2014-03-12 12:06:18.000000000 +0100
-@@ -1078,7 +1078,7 @@ config MICROCODE_AMD_EARLY
+@@ -1079,7 +1079,7 @@ config MICROCODE_AMD_EARLY
config MICROCODE_EARLY
bool "Early load microcode"
@@ -46,7 +46,7 @@ Acked-by: jbeulich@suse.com
ALIGN
GLOBAL(stub32_clone)
---- head.orig/arch/x86/include/asm/efi.h 2014-06-30 11:53:11.000000000 +0200
+--- head.orig/arch/x86/include/asm/efi.h 2014-06-26 11:20:05.000000000 +0200
+++ head/arch/x86/include/asm/efi.h 2014-04-30 11:28:12.000000000 +0200
@@ -119,7 +119,11 @@ extern u64 efi_setup;
@@ -77,7 +77,7 @@ Acked-by: jbeulich@suse.com
static inline unsigned long __phys_addr_nodebug(unsigned long x)
{
---- head.orig/arch/x86/include/asm/processor.h 2014-06-30 11:53:11.000000000 +0200
+--- head.orig/arch/x86/include/asm/processor.h 2014-06-08 20:19:54.000000000 +0200
+++ head/arch/x86/include/asm/processor.h 2013-12-03 08:34:25.000000000 +0100
@@ -973,7 +973,7 @@ extern unsigned long arch_align_stack(un
extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
@@ -1642,7 +1642,7 @@ Acked-by: jbeulich@suse.com
-
start_kernel();
}
---- head.orig/arch/x86/kernel/head_64.S 2014-06-30 11:53:11.000000000 +0200
+--- head.orig/arch/x86/kernel/head_64.S 2014-03-11 09:58:27.000000000 +0100
+++ head/arch/x86/kernel/head_64.S 2013-06-04 13:59:45.000000000 +0200
@@ -469,7 +469,7 @@ NEXT_PAGE(early_dynamic_pgts)
@@ -1692,7 +1692,7 @@ Acked-by: jbeulich@suse.com
{
struct thread_struct *t = &current->thread;
unsigned int old = t->iopl >> 12;
---- head.orig/arch/x86/kernel/process.c 2014-06-30 11:53:11.000000000 +0200
+--- head.orig/arch/x86/kernel/process.c 2014-06-08 20:19:54.000000000 +0200
+++ head/arch/x86/kernel/process.c 2013-07-02 09:49:24.000000000 +0200
@@ -314,7 +314,7 @@ void default_idle(void)
EXPORT_SYMBOL(default_idle);
@@ -4572,7 +4572,7 @@ Acked-by: jbeulich@suse.com
void __init early_iounmap(void __iomem *addr, unsigned long size)
{
unsigned long virt_addr;
---- head.orig/arch/x86/mm/mm_internal.h 2014-06-30 11:53:11.000000000 +0200
+--- head.orig/arch/x86/mm/mm_internal.h 2013-04-29 02:36:01.000000000 +0200
+++ head/arch/x86/mm/mm_internal.h 2014-02-28 15:02:10.000000000 +0100
@@ -12,8 +12,15 @@ void early_ioremap_page_table_range_init
unsigned long kernel_physical_mapping_init(unsigned long start,
@@ -5045,7 +5045,7 @@ Acked-by: jbeulich@suse.com
{ 0x36, ANY, 100000 }, /* Atom Cedar Trail/Cedarview (N2xxx, D2xxx) */
};
---- head.orig/drivers/misc/vmw_vmci/Kconfig 2014-06-30 11:53:11.000000000 +0200
+--- head.orig/drivers/misc/vmw_vmci/Kconfig 2013-07-01 00:13:29.000000000 +0200
+++ head/drivers/misc/vmw_vmci/Kconfig 2013-06-04 13:59:32.000000000 +0200
@@ -4,7 +4,7 @@
@@ -5326,7 +5326,7 @@ Acked-by: jbeulich@suse.com
}
/**
---- head.orig/drivers/thermal/Kconfig 2014-06-30 11:53:11.000000000 +0200
+--- head.orig/drivers/thermal/Kconfig 2014-06-26 11:21:01.000000000 +0200
+++ head/drivers/thermal/Kconfig 2013-09-26 13:24:10.000000000 +0200
@@ -189,7 +189,7 @@ config DB8500_CPUFREQ_COOLING
config INTEL_POWERCLAMP
diff --git a/patches.xen/xen3-stack-unwind b/patches.xen/xen3-stack-unwind
index 56ebdf687e..7ae701a72a 100644
--- a/patches.xen/xen3-stack-unwind
+++ b/patches.xen/xen3-stack-unwind
@@ -16,9 +16,9 @@ Update Aug 01 2012 jbeulich:
Automatically created from "patches.suse/stack-unwind" by xen-port-patches.py
---- head.orig/arch/x86/kernel/entry_32-xen.S 2014-07-03 11:52:42.000000000 +0200
+--- head.orig/arch/x86/kernel/entry_32-xen.S 2014-07-29 11:21:59.000000000 +0200
+++ head/arch/x86/kernel/entry_32-xen.S 2014-06-27 16:51:37.000000000 +0200
-@@ -1165,6 +1165,41 @@ ENTRY(fixup_4gb_segment)
+@@ -1166,6 +1166,41 @@ ENTRY(fixup_4gb_segment)
CFI_ENDPROC
END(fixup_4gb_segment)
diff --git a/series.conf b/series.conf
index db9b840223..0f4475db0f 100644
--- a/series.conf
+++ b/series.conf
@@ -595,7 +595,7 @@
patches.xen/xen3-patch-3.13
patches.xen/xen3-patch-3.14
patches.xen/xen3-patch-3.15
- patches.xen/xen3-patch-3.16-rc3
+ patches.xen/xen3-patch-3.16-rc7
# ports of other patches
patches.xen/xen3-stack-unwind
@@ -631,6 +631,7 @@
patches.xen/xen-blktap-modular
patches.xen/xen-blktap-write-barriers
patches.xen/xen-blktap2-configurable-nr-devs
+ patches.xen/xen-netback-defer-netdev-destruction
patches.xen/xen-netback-notify-multi
patches.xen/xen-netback-generalize
patches.xen/xen-netback-multiple-tasklets