Home Home > GIT Browse > SLE15-SP1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@suse.com>2013-02-05 14:35:19 +0100
committerJan Beulich <jbeulich@suse.com>2013-02-05 14:35:19 +0100
commitffecceb3b8f76a7ea44c3439f0a082c0dc3946a7 (patch)
tree0914622fe00e657c5f6ef5555d9adfa0c7c5401a
parent8f91af5a91869644a4bd27c2b9c5e5fde5205ad2 (diff)
- Update Xen patches to 3.7.6 and c/s 1222.
- xen-pciback: rate limit error messages from xen_pcibk_enable_msi{,x}() (CVE-2013-0231 XSA-43 bnc#801178).
-rw-r--r--patches.xen/pci-guestdev56
-rw-r--r--patches.xen/xen-blkback-multi-page-ring26
-rw-r--r--patches.xen/xen-blkif-op-packet46
-rw-r--r--patches.xen/xen-configurable-guest-devices18
-rw-r--r--patches.xen/xen-netback-generalize58
-rw-r--r--patches.xen/xen-netback-kernel-threads89
-rw-r--r--patches.xen/xen-netback-multiple-tasklets20
-rw-r--r--patches.xen/xen-pciback-ratelimit51
-rw-r--r--patches.xen/xen-pcpu-hotplug28
-rw-r--r--patches.xen/xen-sections14
-rw-r--r--patches.xen/xen-virq-per-cpu-irq28
-rw-r--r--patches.xen/xen-x86-EFI79
-rw-r--r--patches.xen/xen-x86-bigmem20
-rw-r--r--patches.xen/xen-x86-panic-no-reboot6
-rw-r--r--patches.xen/xen-x86-pcpu7
-rw-r--r--patches.xen/xen-x86_64-note-init-p2m40
-rw-r--r--patches.xen/xen3-003-acpi_initrd_override_tables.patch6
-rw-r--r--patches.xen/xen3-007-acpi_initrd_override_tables.patch6
-rw-r--r--patches.xen/xen3-010-acpi_initrd_override_tables.patch6
-rw-r--r--patches.xen/xen3-auto-arch-i386.diff22
-rw-r--r--patches.xen/xen3-auto-arch-x86.diff2
-rw-r--r--patches.xen/xen3-auto-arch-x86_64.diff2
-rw-r--r--patches.xen/xen3-auto-common.diff230
-rw-r--r--patches.xen/xen3-auto-include-xen-interface.diff2
-rw-r--r--patches.xen/xen3-auto-xen-arch.diff213
-rw-r--r--patches.xen/xen3-auto-xen-drivers.diff547
-rw-r--r--patches.xen/xen3-auto-xen-kconfig.diff2
-rw-r--r--patches.xen/xen3-fixup-xen2
-rw-r--r--patches.xen/xen3-patch-2.6.1846
-rw-r--r--patches.xen/xen3-patch-2.6.19492
-rw-r--r--patches.xen/xen3-patch-2.6.20327
-rw-r--r--patches.xen/xen3-patch-2.6.21256
-rw-r--r--patches.xen/xen3-patch-2.6.22402
-rw-r--r--patches.xen/xen3-patch-2.6.23474
-rw-r--r--patches.xen/xen3-patch-2.6.24710
-rw-r--r--patches.xen/xen3-patch-2.6.25456
-rw-r--r--patches.xen/xen3-patch-2.6.26418
-rw-r--r--patches.xen/xen3-patch-2.6.27550
-rw-r--r--patches.xen/xen3-patch-2.6.28448
-rw-r--r--patches.xen/xen3-patch-2.6.29394
-rw-r--r--patches.xen/xen3-patch-2.6.30426
-rw-r--r--patches.xen/xen3-patch-2.6.31492
-rw-r--r--patches.xen/xen3-patch-2.6.32436
-rw-r--r--patches.xen/xen3-patch-2.6.33278
-rw-r--r--patches.xen/xen3-patch-2.6.34342
-rw-r--r--patches.xen/xen3-patch-2.6.35194
-rw-r--r--patches.xen/xen3-patch-2.6.36232
-rw-r--r--patches.xen/xen3-patch-2.6.37373
-rw-r--r--patches.xen/xen3-patch-2.6.38262
-rw-r--r--patches.xen/xen3-patch-2.6.39256
-rw-r--r--patches.xen/xen3-patch-3.1290
-rw-r--r--patches.xen/xen3-patch-3.2358
-rw-r--r--patches.xen/xen3-patch-3.3392
-rw-r--r--patches.xen/xen3-patch-3.4234
-rw-r--r--patches.xen/xen3-patch-3.5216
-rw-r--r--patches.xen/xen3-patch-3.6231
-rw-r--r--patches.xen/xen3-patch-3.7437
-rw-r--r--patches.xen/xen3-patch-3.7.2-340
-rw-r--r--patches.xen/xen3-patch-3.7.3-4108
-rw-r--r--patches.xen/xen3-patch-3.7.5-695
-rw-r--r--patches.xen/xen3-stack-unwind10
-rw-r--r--series.conf4
62 files changed, 6413 insertions, 5892 deletions
diff --git a/patches.xen/pci-guestdev b/patches.xen/pci-guestdev
index 84a12f013d..92e556975a 100644
--- a/patches.xen/pci-guestdev
+++ b/patches.xen/pci-guestdev
@@ -8,8 +8,8 @@ jb: Added support for guestiomuldev=all.
jb: split /dev/xen/pci_iomul driver to be separate (so it can be a module)
Acked-by: jbeulich@novell.com
---- head.orig/Documentation/kernel-parameters.txt 2012-11-14 12:05:16.000000000 +0100
-+++ head/Documentation/kernel-parameters.txt 2012-10-22 16:26:12.000000000 +0200
+--- 12.3.orig/Documentation/kernel-parameters.txt 2013-01-25 13:57:40.000000000 +0100
++++ 12.3/Documentation/kernel-parameters.txt 2012-10-22 16:26:12.000000000 +0200
@@ -907,6 +907,24 @@ bytes respectively. Such letter suffixes
gpt [EFI] Forces disk with valid GPT signature but
invalid Protective MBR to be treated as GPT.
@@ -46,8 +46,8 @@ Acked-by: jbeulich@novell.com
reboot= [BUGS=X86-32,BUGS=ARM,BUGS=IA-64] Rebooting mode
Format: <reboot_mode>[,<reboot_mode2>[,...]]
See arch/*/kernel/reboot.c or arch/*/kernel/process.c
---- head.orig/drivers/acpi/pci_root.c 2012-11-14 12:05:16.000000000 +0100
-+++ head/drivers/acpi/pci_root.c 2012-10-22 16:26:20.000000000 +0200
+--- 12.3.orig/drivers/acpi/pci_root.c 2013-01-25 13:57:40.000000000 +0100
++++ 12.3/drivers/acpi/pci_root.c 2012-10-22 16:26:20.000000000 +0200
@@ -445,6 +445,41 @@ out:
}
EXPORT_SYMBOL(acpi_pci_osc_control_set);
@@ -136,8 +136,8 @@ Acked-by: jbeulich@novell.com
+ return FALSE;
+}
+#endif
---- head.orig/drivers/acpi/scan.c 2012-11-14 12:05:16.000000000 +0100
-+++ head/drivers/acpi/scan.c 2012-10-22 16:26:25.000000000 +0200
+--- 12.3.orig/drivers/acpi/scan.c 2013-01-25 13:57:40.000000000 +0100
++++ 12.3/drivers/acpi/scan.c 2013-01-25 14:01:42.000000000 +0100
@@ -216,6 +216,16 @@ acpi_device_hid_show(struct device *dev,
}
static DEVICE_ATTR(hid, 0444, acpi_device_hid_show, NULL);
@@ -179,7 +179,7 @@ Acked-by: jbeulich@novell.com
}
static void acpi_device_release(struct device *dev)
-@@ -1208,6 +1228,11 @@ static void acpi_device_set_id(struct ac
+@@ -1213,6 +1233,11 @@ static void acpi_device_set_id(struct ac
for (i = 0; i < cid_list->count; i++)
acpi_add_id(device, cid_list->ids[i].string);
}
@@ -191,8 +191,8 @@ Acked-by: jbeulich@novell.com
if (info->valid & ACPI_VALID_ADR) {
device->pnp.bus_address = info->address;
device->flags.bus_address = 1;
---- head.orig/drivers/pci/Kconfig 2012-11-14 12:05:16.000000000 +0100
-+++ head/drivers/pci/Kconfig 2012-10-22 16:26:32.000000000 +0200
+--- 12.3.orig/drivers/pci/Kconfig 2013-01-25 13:57:40.000000000 +0100
++++ 12.3/drivers/pci/Kconfig 2012-10-22 16:26:32.000000000 +0200
@@ -43,6 +43,20 @@ config PCI_REALLOC_ENABLE_AUTO
When in doubt, say N.
@@ -214,8 +214,8 @@ Acked-by: jbeulich@novell.com
config PCI_STUB
tristate "PCI Stub driver"
depends on PCI
---- head.orig/drivers/pci/Makefile 2012-11-14 12:05:16.000000000 +0100
-+++ head/drivers/pci/Makefile 2011-01-31 14:31:28.000000000 +0100
+--- 12.3.orig/drivers/pci/Makefile 2013-01-25 13:57:40.000000000 +0100
++++ 12.3/drivers/pci/Makefile 2011-01-31 14:31:28.000000000 +0100
@@ -7,6 +7,10 @@ obj-y += access.o bus.o probe.o host-br
irq.o vpd.o
obj-$(CONFIG_PROC_FS) += proc.o
@@ -228,7 +228,7 @@ Acked-by: jbeulich@novell.com
obj-$(CONFIG_PCI_QUIRKS) += quirks.o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/pci/guestdev.c 2012-06-08 11:09:16.000000000 +0200
++++ 12.3/drivers/pci/guestdev.c 2012-06-08 11:09:16.000000000 +0200
@@ -0,0 +1,882 @@
+/*
+ * Copyright (c) 2008, 2009 NEC Corporation.
@@ -1113,7 +1113,7 @@ Acked-by: jbeulich@novell.com
+fs_initcall(pci_check_guestdev_exists);
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/pci/iomulti.c 2012-06-08 11:09:31.000000000 +0200
++++ 12.3/drivers/pci/iomulti.c 2012-06-08 11:09:31.000000000 +0200
@@ -0,0 +1,905 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
@@ -2021,7 +2021,7 @@ Acked-by: jbeulich@novell.com
+late_initcall(pci_iomul_hotplug_init);
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/pci/iomulti.h 2011-01-31 14:31:28.000000000 +0100
++++ 12.3/drivers/pci/iomulti.h 2011-01-31 14:31:28.000000000 +0100
@@ -0,0 +1,122 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
@@ -2145,9 +2145,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 2012-11-14 12:05:16.000000000 +0100
-+++ head/drivers/pci/pci.c 2012-11-14 12:06:10.000000000 +0100
-@@ -3750,6 +3750,13 @@ resource_size_t pci_specified_resource_a
+--- 12.3.orig/drivers/pci/pci.c 2013-01-25 13:57:40.000000000 +0100
++++ 12.3/drivers/pci/pci.c 2013-01-25 14:01:49.000000000 +0100
+@@ -3752,6 +3752,13 @@ resource_size_t pci_specified_resource_a
*/
int pci_is_reassigndev(struct pci_dev *dev)
{
@@ -2161,8 +2161,8 @@ Acked-by: jbeulich@novell.com
return (pci_specified_resource_alignment(dev) != 0);
}
---- head.orig/drivers/pci/pci.h 2012-11-14 12:05:16.000000000 +0100
-+++ head/drivers/pci/pci.h 2012-11-14 12:06:11.000000000 +0100
+--- 12.3.orig/drivers/pci/pci.h 2013-01-25 13:57:40.000000000 +0100
++++ 12.3/drivers/pci/pci.h 2012-11-14 12:06:11.000000000 +0100
@@ -323,4 +323,11 @@ static inline int pci_dev_specific_reset
}
#endif
@@ -2176,7 +2176,7 @@ Acked-by: jbeulich@novell.com
+
#endif /* DRIVERS_PCI_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/pci/pci-iomul.c 2011-09-09 14:16:22.000000000 +0200
++++ 12.3/drivers/pci/pci-iomul.c 2011-09-09 14:16:22.000000000 +0200
@@ -0,0 +1,440 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
@@ -2618,8 +2618,8 @@ Acked-by: jbeulich@novell.com
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Isaku Yamahata <yamahata@valinux.co.jp>");
+MODULE_DESCRIPTION("PCI IO space multiplexing driver");
---- head.orig/include/linux/acpi.h 2012-11-14 12:05:16.000000000 +0100
-+++ head/include/linux/acpi.h 2012-10-22 16:26:01.000000000 +0200
+--- 12.3.orig/include/linux/acpi.h 2013-01-25 13:57:40.000000000 +0100
++++ 12.3/include/linux/acpi.h 2012-10-22 16:26:01.000000000 +0200
@@ -257,6 +257,8 @@ int acpi_check_region(resource_size_t st
int acpi_resources_are_enforced(void);
@@ -2629,8 +2629,8 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_PM_SLEEP
void __init acpi_no_s4_hw_signature(void);
void __init acpi_old_suspend_ordering(void);
---- head.orig/include/linux/pci.h 2012-11-14 12:05:16.000000000 +0100
-+++ head/include/linux/pci.h 2012-10-22 16:25:34.000000000 +0200
+--- 12.3.orig/include/linux/pci.h 2013-01-25 13:57:40.000000000 +0100
++++ 12.3/include/linux/pci.h 2012-10-22 16:25:34.000000000 +0200
@@ -1809,4 +1809,10 @@ static inline struct eeh_dev *pci_dev_to
*/
struct pci_dev *pci_find_upstream_pcie_bridge(struct pci_dev *pdev);
@@ -2642,19 +2642,19 @@ Acked-by: jbeulich@novell.com
+#endif
+
#endif /* LINUX_PCI_H */
---- head.orig/include/uapi/xen/Kbuild 2012-11-14 12:05:16.000000000 +0100
-+++ head/include/uapi/xen/Kbuild 2012-10-22 16:25:23.000000000 +0200
+--- 12.3.orig/include/uapi/xen/Kbuild 2013-01-25 13:57:40.000000000 +0100
++++ 12.3/include/uapi/xen/Kbuild 2012-10-22 16:25:23.000000000 +0200
@@ -1,3 +1,4 @@
# UAPI Header export list
header-y += evtchn.h
header-y += privcmd.h
+header-y += public/
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/include/uapi/xen/public/Kbuild 2011-01-31 14:31:28.000000000 +0100
++++ 12.3/include/uapi/xen/public/Kbuild 2011-01-31 14:31:28.000000000 +0100
@@ -0,0 +1 @@
+header-y += iomulti.h
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/include/uapi/xen/public/iomulti.h 2011-01-31 14:31:28.000000000 +0100
++++ 12.3/include/uapi/xen/public/iomulti.h 2011-01-31 14:31:28.000000000 +0100
@@ -0,0 +1,50 @@
+#ifndef __LINUX_PUBLIC_IOMULTI_H__
+#define __LINUX_PUBLIC_IOMULTI_H__
diff --git a/patches.xen/xen-blkback-multi-page-ring b/patches.xen/xen-blkback-multi-page-ring
index d63cc84013..89d9ec8b41 100644
--- a/patches.xen/xen-blkback-multi-page-ring
+++ b/patches.xen/xen-blkback-multi-page-ring
@@ -7,8 +7,8 @@ Patch-mainline: n/a
[jb: only map as many ring pages as are actually going to be used]
Acked-by: jbeulich@suse.com
---- head.orig/drivers/xen/blkback/blkback.c 2012-03-26 13:37:56.000000000 +0200
-+++ head/drivers/xen/blkback/blkback.c 2012-03-26 13:29:28.000000000 +0200
+--- 12.3.orig/drivers/xen/blkback/blkback.c 2012-03-26 13:37:56.000000000 +0200
++++ 12.3/drivers/xen/blkback/blkback.c 2013-01-08 17:24:19.000000000 +0100
@@ -40,6 +40,7 @@
#include <linux/freezer.h>
#include <linux/list.h>
@@ -23,16 +23,16 @@ Acked-by: jbeulich@suse.com
* 64 should be enough to keep us competitive with Linux.
+ * 128 is required to make blkif_max_ring_page_order = 2 a useful default.
*/
--static int blkif_reqs = 64;
--module_param_named(reqs, blkif_reqs, int, 0);
+-static unsigned int blkif_reqs = 64;
+-module_param_named(reqs, blkif_reqs, uint, 0);
+static unsigned int blkif_reqs = 4 * BITS_PER_LONG;
+module_param_named(reqs, blkif_reqs, uint, 0444);
MODULE_PARM_DESC(reqs, "Number of blkback requests to allocate");
/* Run-time switchable: /sys/module/blkback/parameters/ */
-@@ -67,6 +69,33 @@ static unsigned int debug_lvl = 0;
- module_param(log_stats, int, 0644);
- module_param(debug_lvl, int, 0644);
+@@ -67,6 +69,33 @@ static unsigned int debug_lvl;
+ module_param(log_stats, bool, 0644);
+ module_param(debug_lvl, uint, 0644);
+/* Order of maximum shared ring size advertised to the front end. */
+unsigned int blkif_max_ring_page_order/* XXX = sizeof(long) / 4*/;
@@ -64,8 +64,8 @@ Acked-by: jbeulich@suse.com
/*
* Each outstanding request that we've passed to the lower device layers has a
* 'pending_req' allocated to it. Each buffer_head that completes decrements
---- head.orig/drivers/xen/blkback/common.h 2012-06-08 10:38:21.000000000 +0200
-+++ head/drivers/xen/blkback/common.h 2012-10-31 12:20:58.000000000 +0100
+--- 12.3.orig/drivers/xen/blkback/common.h 2012-06-08 10:38:21.000000000 +0200
++++ 12.3/drivers/xen/blkback/common.h 2012-10-31 12:20:58.000000000 +0100
@@ -54,7 +54,9 @@ struct vbd {
sector_t size; /* Cached size parameter */
};
@@ -93,8 +93,8 @@ Acked-by: jbeulich@suse.com
void vbd_resize(blkif_t *blkif);
#define blkif_get(_b) (atomic_inc(&(_b)->refcnt))
---- head.orig/drivers/xen/blkback/interface.c 2011-11-10 08:52:02.000000000 +0100
-+++ head/drivers/xen/blkback/interface.c 2012-03-23 15:02:42.000000000 +0100
+--- 12.3.orig/drivers/xen/blkback/interface.c 2011-11-10 08:52:02.000000000 +0100
++++ 12.3/drivers/xen/blkback/interface.c 2012-03-23 15:02:42.000000000 +0100
@@ -57,8 +57,30 @@ blkif_t *blkif_alloc(domid_t domid)
return blkif;
}
@@ -145,8 +145,8 @@ Acked-by: jbeulich@suse.com
})
case BLKIF_PROTOCOL_NATIVE:
BLKBK_RING_INIT(native);
---- head.orig/drivers/xen/blkback/xenbus.c 2012-12-18 12:11:42.000000000 +0100
-+++ head/drivers/xen/blkback/xenbus.c 2012-12-18 12:22:08.000000000 +0100
+--- 12.3.orig/drivers/xen/blkback/xenbus.c 2012-12-18 12:11:42.000000000 +0100
++++ 12.3/drivers/xen/blkback/xenbus.c 2012-12-18 12:22:08.000000000 +0100
@@ -298,6 +298,11 @@ static int blkback_probe(struct xenbus_d
if (err)
goto fail;
diff --git a/patches.xen/xen-blkif-op-packet b/patches.xen/xen-blkif-op-packet
index b9a4fed39d..a657139444 100644
--- a/patches.xen/xen-blkif-op-packet
+++ b/patches.xen/xen-blkif-op-packet
@@ -3,8 +3,8 @@ Subject: add support for new operation type BLKIF_OP_PACKET
Patch-mainline: n/a
References: fate#300964
---- head.orig/drivers/xen/blkback/blkback.c 2012-03-26 13:29:28.000000000 +0200
-+++ head/drivers/xen/blkback/blkback.c 2012-10-31 12:26:14.000000000 +0100
+--- 12.3.orig/drivers/xen/blkback/blkback.c 2013-01-08 17:24:19.000000000 +0100
++++ 12.3/drivers/xen/blkback/blkback.c 2012-10-31 12:26:14.000000000 +0100
@@ -225,10 +225,11 @@ static void fast_flush_area(pending_req_
static void print_stats(blkif_t *blkif)
{
@@ -42,8 +42,8 @@ References: fate#300964
default:
/* A good sign something is wrong: sleep for a while to
* avoid excessive CPU consumption by a bad guest. */
---- head.orig/drivers/xen/blkback/common.h 2012-10-31 12:21:14.000000000 +0100
-+++ head/drivers/xen/blkback/common.h 2012-10-31 12:26:16.000000000 +0100
+--- 12.3.orig/drivers/xen/blkback/common.h 2012-10-31 12:21:14.000000000 +0100
++++ 12.3/drivers/xen/blkback/common.h 2012-10-31 12:26:16.000000000 +0100
@@ -92,6 +92,7 @@ typedef struct blkif_st {
int st_br_req;
int st_fl_req;
@@ -52,8 +52,8 @@ References: fate#300964
int st_rd_sect;
int st_wr_sect;
---- head.orig/drivers/xen/blkfront/blkfront.c 2012-10-31 12:24:32.000000000 +0100
-+++ head/drivers/xen/blkfront/blkfront.c 2012-10-31 12:26:25.000000000 +0100
+--- 12.3.orig/drivers/xen/blkfront/blkfront.c 2012-10-31 12:24:32.000000000 +0100
++++ 12.3/drivers/xen/blkfront/blkfront.c 2012-10-31 12:26:25.000000000 +0100
@@ -704,6 +704,7 @@ static const char *op_name(unsigned int
[BLKIF_OP_WRITE] = "write",
[BLKIF_OP_WRITE_BARRIER] = "barrier",
@@ -89,8 +89,8 @@ References: fate#300964
if (unlikely(bret->status != BLKIF_RSP_OKAY))
DPRINTK("Bad return from blkdev %s request: %d\n",
op_name(bret->operation),
---- head.orig/drivers/xen/blktap/blktap.c 2012-10-30 14:54:13.000000000 +0100
-+++ head/drivers/xen/blktap/blktap.c 2012-05-23 13:47:55.000000000 +0200
+--- 12.3.orig/drivers/xen/blktap/blktap.c 2012-10-30 14:54:13.000000000 +0100
++++ 12.3/drivers/xen/blktap/blktap.c 2012-05-23 13:47:55.000000000 +0200
@@ -1142,13 +1142,14 @@ static void fast_flush_area(pending_req_
static void print_stats(blkif_t *blkif)
@@ -120,9 +120,9 @@ References: fate#300964
default:
/* A good sign something is wrong: sleep for a while to
* avoid excessive CPU consumption by a bad guest. */
---- head.orig/drivers/xen/blktap/common.h 2011-11-18 15:35:50.000000000 +0100
-+++ head/drivers/xen/blktap/common.h 2012-06-08 10:40:16.000000000 +0200
-@@ -69,6 +69,7 @@ typedef struct blkif_st {
+--- 12.3.orig/drivers/xen/blktap/common.h 2011-11-18 15:35:50.000000000 +0100
++++ 12.3/drivers/xen/blktap/common.h 2013-02-05 11:29:34.000000000 +0100
+@@ -70,6 +70,7 @@ typedef struct blkif_st {
int st_rd_req;
int st_wr_req;
int st_oo_req;
@@ -130,8 +130,8 @@ References: fate#300964
int st_rd_sect;
int st_wr_sect;
---- head.orig/drivers/xen/blktap2/blktap.h 2011-02-01 15:03:03.000000000 +0100
-+++ head/drivers/xen/blktap2/blktap.h 2012-06-08 10:40:23.000000000 +0200
+--- 12.3.orig/drivers/xen/blktap2/blktap.h 2011-02-01 15:03:03.000000000 +0100
++++ 12.3/drivers/xen/blktap2/blktap.h 2012-06-08 10:40:23.000000000 +0200
@@ -141,6 +141,7 @@ struct blktap_statistics {
int st_rd_req;
int st_wr_req;
@@ -140,8 +140,8 @@ References: fate#300964
int st_rd_sect;
int st_wr_sect;
s64 st_rd_cnt;
---- head.orig/drivers/xen/blktap2/device.c 2012-02-17 11:29:27.000000000 +0100
-+++ head/drivers/xen/blktap2/device.c 2012-02-16 14:43:12.000000000 +0100
+--- 12.3.orig/drivers/xen/blktap2/device.c 2012-02-17 11:29:27.000000000 +0100
++++ 12.3/drivers/xen/blktap2/device.c 2012-02-16 14:43:12.000000000 +0100
@@ -344,7 +344,8 @@ blktap_device_fail_pending_requests(stru
BTERR("%u:%u: failing pending %s of %d pages\n",
@@ -180,8 +180,8 @@ References: fate#300964
tap->stats.st_wr_sect += nr_sects;
tap->stats.st_wr_req++;
} else {
---- head.orig/drivers/xen/blktap2-new/blktap.h 2011-02-24 15:00:29.000000000 +0100
-+++ head/drivers/xen/blktap2-new/blktap.h 2012-06-08 10:40:25.000000000 +0200
+--- 12.3.orig/drivers/xen/blktap2-new/blktap.h 2011-02-24 15:00:29.000000000 +0100
++++ 12.3/drivers/xen/blktap2-new/blktap.h 2012-06-08 10:40:25.000000000 +0200
@@ -114,6 +114,7 @@ struct blktap_statistics {
int st_rd_req;
int st_wr_req;
@@ -190,8 +190,8 @@ References: fate#300964
int st_rd_sect;
int st_wr_sect;
s64 st_rd_cnt;
---- head.orig/drivers/xen/blktap2-new/device.c 2012-02-17 11:29:41.000000000 +0100
-+++ head/drivers/xen/blktap2-new/device.c 2011-11-21 15:55:46.000000000 +0100
+--- 12.3.orig/drivers/xen/blktap2-new/device.c 2012-02-17 11:29:41.000000000 +0100
++++ 12.3/drivers/xen/blktap2-new/device.c 2011-11-21 15:55:46.000000000 +0100
@@ -190,6 +190,8 @@ blktap_device_make_request(struct blktap
request->rq = rq;
@@ -201,8 +201,8 @@ References: fate#300964
err = blktap_request_get_pages(tap, request, nsegs);
if (err)
---- head.orig/drivers/xen/blktap2-new/ring.c 2012-10-30 14:55:51.000000000 +0100
-+++ head/drivers/xen/blktap2-new/ring.c 2012-10-31 12:26:30.000000000 +0100
+--- 12.3.orig/drivers/xen/blktap2-new/ring.c 2012-10-30 14:55:51.000000000 +0100
++++ 12.3/drivers/xen/blktap2-new/ring.c 2012-10-31 12:26:30.000000000 +0100
@@ -153,11 +153,11 @@ blktap_ring_map_request(struct blktap *t
int seg, err = 0;
int write;
@@ -283,8 +283,8 @@ References: fate#300964
time->tv_sec, time->tv_usec);
}
---- head.orig/include/xen/interface/io/blkif.h 2012-12-18 12:12:00.000000000 +0100
-+++ head/include/xen/interface/io/blkif.h 2012-12-18 12:28:55.000000000 +0100
+--- 12.3.orig/include/xen/interface/io/blkif.h 2012-12-18 12:12:00.000000000 +0100
++++ 12.3/include/xen/interface/io/blkif.h 2012-12-18 12:28:55.000000000 +0100
@@ -436,10 +436,9 @@
*/
#define BLKIF_OP_FLUSH_DISKCACHE 3
diff --git a/patches.xen/xen-configurable-guest-devices b/patches.xen/xen-configurable-guest-devices
index 0ac9051951..f5f8aee47d 100644
--- a/patches.xen/xen-configurable-guest-devices
+++ b/patches.xen/xen-configurable-guest-devices
@@ -7,8 +7,8 @@ value).
Similarly, allow the number of simultaneous transmits in netback to be
configurable.
---- head.orig/arch/x86/include/mach-xen/asm/irq_vectors.h 2011-11-17 16:00:04.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/irq_vectors.h 2011-11-18 16:44:59.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/irq_vectors.h 2011-11-17 16:00:04.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/irq_vectors.h 2011-11-18 16:44:59.000000000 +0100
@@ -88,9 +88,9 @@ extern int nr_pirqs;
#define DYNIRQ_BASE (PIRQ_BASE + nr_pirqs)
@@ -21,8 +21,8 @@ configurable.
#endif
#define NR_IRQS (NR_PIRQS + NR_DYNIRQS)
---- head.orig/drivers/xen/Kconfig 2012-10-04 13:48:11.000000000 +0200
-+++ head/drivers/xen/Kconfig 2012-02-17 14:38:14.000000000 +0100
+--- 12.3.orig/drivers/xen/Kconfig 2012-10-04 13:48:11.000000000 +0200
++++ 12.3/drivers/xen/Kconfig 2012-02-17 14:38:14.000000000 +0100
@@ -96,6 +96,15 @@ config XEN_NETDEV_BACKEND
network devices to other guests via a high-performance shared-memory
interface.
@@ -56,8 +56,8 @@ configurable.
choice
prompt "Xen version compatibility"
default XEN_COMPAT_030002_AND_LATER
---- head.orig/drivers/xen/core/evtchn.c 2012-10-04 13:48:08.000000000 +0200
-+++ head/drivers/xen/core/evtchn.c 2012-10-04 13:48:31.000000000 +0200
+--- 12.3.orig/drivers/xen/core/evtchn.c 2012-10-04 13:48:08.000000000 +0200
++++ 12.3/drivers/xen/core/evtchn.c 2012-10-04 13:48:31.000000000 +0200
@@ -1775,7 +1775,7 @@ EXPORT_SYMBOL_GPL(nr_pirqs);
int __init arch_probe_nr_irqs(void)
@@ -67,8 +67,8 @@ configurable.
if (is_initial_xendomain()) {
nr_irqs_gsi = NR_IRQS_LEGACY;
---- head.orig/drivers/xen/netback/netback.c 2012-11-29 14:26:16.000000000 +0100
-+++ head/drivers/xen/netback/netback.c 2012-11-29 14:26:31.000000000 +0100
+--- 12.3.orig/drivers/xen/netback/netback.c 2013-01-25 14:26:38.000000000 +0100
++++ 12.3/drivers/xen/netback/netback.c 2013-01-25 14:26:47.000000000 +0100
@@ -78,7 +78,7 @@ static DECLARE_TASKLET(net_rx_tasklet, n
static struct timer_list net_timer;
static struct timer_list netbk_tx_pending_timer;
@@ -78,7 +78,7 @@ configurable.
/* Discriminate from any valid pending_idx value. */
#define INVALID_PENDING_IDX 0xffff
-@@ -1305,6 +1305,7 @@ static void net_tx_action(unsigned long
+@@ -1329,6 +1329,7 @@ static void net_tx_action(unsigned long
net_tx_action_dealloc();
mop = tx_map_ops;
diff --git a/patches.xen/xen-netback-generalize b/patches.xen/xen-netback-generalize
index a193ae5c56..37a686e16f 100644
--- a/patches.xen/xen-netback-generalize
+++ b/patches.xen/xen-netback-generalize
@@ -11,9 +11,9 @@ Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
jb: various cleanups
Acked-by: jbeulich@novell.com
---- head.orig/drivers/xen/netback/common.h 2012-06-08 10:36:38.000000000 +0200
-+++ head/drivers/xen/netback/common.h 2012-11-29 14:35:32.000000000 +0100
-@@ -211,4 +211,75 @@ static inline int netbk_can_sg(struct ne
+--- 12.3.orig/drivers/xen/netback/common.h 2012-06-08 10:36:38.000000000 +0200
++++ 12.3/drivers/xen/netback/common.h 2013-01-25 14:29:27.000000000 +0100
+@@ -214,4 +214,75 @@ static inline int netbk_can_sg(struct ne
return netif->can_sg;
}
@@ -89,8 +89,8 @@ Acked-by: jbeulich@novell.com
+ unsigned long mfn_list[MAX_MFN_ALLOC];
+};
#endif /* __NETIF__BACKEND__COMMON_H__ */
---- head.orig/drivers/xen/netback/netback.c 2012-11-29 14:27:27.000000000 +0100
-+++ head/drivers/xen/netback/netback.c 2012-11-29 14:35:30.000000000 +0100
+--- 12.3.orig/drivers/xen/netback/netback.c 2012-11-29 14:27:27.000000000 +0100
++++ 12.3/drivers/xen/netback/netback.c 2013-01-25 14:29:23.000000000 +0100
@@ -37,6 +37,7 @@
#include "common.h"
#include <linux/if_vlan.h>
@@ -811,7 +811,7 @@ Acked-by: jbeulich@novell.com
netif_put(netif);
-@@ -1140,9 +1137,14 @@ static gnttab_map_grant_ref_t *netbk_get
+@@ -1155,9 +1152,14 @@ static gnttab_map_grant_ref_t *netbk_get
start = (frag_get_pending_idx(frags) == pending_idx);
for (i = start; i < shinfo->nr_frags; i++, txp++) {
@@ -828,7 +828,7 @@ Acked-by: jbeulich@novell.com
GNTMAP_host_map | GNTMAP_readonly,
txp->gref, netif->domid);
-@@ -1155,11 +1157,12 @@ static gnttab_map_grant_ref_t *netbk_get
+@@ -1170,11 +1172,12 @@ static gnttab_map_grant_ref_t *netbk_get
return mop;
}
@@ -843,7 +843,7 @@ Acked-by: jbeulich@novell.com
netif_t *netif = pending_tx_info[pending_idx].netif;
netif_tx_request_t *txp;
struct skb_shared_info *shinfo = skb_shinfo(skb);
-@@ -1169,14 +1172,16 @@ static int netbk_tx_check_mop(struct sk_
+@@ -1184,14 +1187,16 @@ static int netbk_tx_check_mop(struct sk_
/* Check status of header. */
err = mop->status;
if (unlikely(err != GNTST_okay)) {
@@ -863,7 +863,7 @@ Acked-by: jbeulich@novell.com
}
/* Skip first skb fragment if it is on same page as header fragment. */
-@@ -1184,25 +1189,27 @@ static int netbk_tx_check_mop(struct sk_
+@@ -1199,25 +1204,27 @@ static int netbk_tx_check_mop(struct sk_
for (i = start; i < nr_frags; i++) {
int j, newerr;
@@ -895,7 +895,7 @@ Acked-by: jbeulich@novell.com
netif_put(netif);
/* Not the first error? Preceding frags already invalidated. */
-@@ -1211,10 +1218,10 @@ static int netbk_tx_check_mop(struct sk_
+@@ -1226,10 +1233,10 @@ static int netbk_tx_check_mop(struct sk_
/* First error: invalidate header and preceding fragments. */
pending_idx = *((u16 *)skb->data);
@@ -908,7 +908,7 @@ Acked-by: jbeulich@novell.com
}
/* Remember the error: invalidate all subsequent fragments. */
-@@ -1225,7 +1232,7 @@ static int netbk_tx_check_mop(struct sk_
+@@ -1240,7 +1247,7 @@ static int netbk_tx_check_mop(struct sk_
return err;
}
@@ -917,7 +917,7 @@ Acked-by: jbeulich@novell.com
{
struct skb_shared_info *shinfo = skb_shinfo(skb);
int nr_frags = shinfo->nr_frags;
-@@ -1235,12 +1242,12 @@ static void netbk_fill_frags(struct sk_b
+@@ -1250,12 +1257,12 @@ static void netbk_fill_frags(struct sk_b
netif_tx_request_t *txp;
u16 pending_idx = frag_get_pending_idx(shinfo->frags + i);
@@ -935,7 +935,7 @@ Acked-by: jbeulich@novell.com
txp->offset, txp->size);
skb->len += txp->size;
-@@ -1301,8 +1308,9 @@ static int netbk_set_skb_gso(struct sk_b
+@@ -1325,8 +1332,9 @@ static int netbk_set_skb_gso(netif_t *ne
}
/* Called after netfront has transmitted */
@@ -946,7 +946,7 @@ Acked-by: jbeulich@novell.com
struct sk_buff *skb;
netif_t *netif;
netif_tx_request_t txreq;
-@@ -1314,14 +1322,14 @@ static void net_tx_action(unsigned long
+@@ -1338,14 +1346,14 @@ static void net_tx_action(unsigned long
unsigned int data_len;
int ret, work_to_do;
@@ -963,10 +963,10 @@ Acked-by: jbeulich@novell.com
/* Get a netif from the list with work to do. */
- netif = poll_net_schedule_list();
+ netif = poll_net_schedule_list(netbk);
- if (!netif)
- continue;
-
-@@ -1403,7 +1411,7 @@ static void net_tx_action(unsigned long
+ /*
+ * This can sometimes happen because the test of
+ * list_empty(net_schedule_list) at the top of the
+@@ -1440,7 +1448,7 @@ static void net_tx_action(unsigned long
continue;
}
@@ -975,7 +975,7 @@ Acked-by: jbeulich@novell.com
data_len = (txreq.size > PKT_PROT_LEN &&
ret < MAX_SKB_FRAGS) ?
-@@ -1431,14 +1439,14 @@ static void net_tx_action(unsigned long
+@@ -1468,14 +1476,14 @@ static void net_tx_action(unsigned long
}
}
@@ -993,7 +993,7 @@ Acked-by: jbeulich@novell.com
*((u16 *)skb->data) = pending_idx;
__skb_put(skb, data_len);
-@@ -1450,20 +1458,20 @@ static void net_tx_action(unsigned long
+@@ -1487,20 +1495,20 @@ static void net_tx_action(unsigned long
pending_idx = INVALID_PENDING_IDX;
frag_set_pending_idx(skb_shinfo(skb)->frags, pending_idx);
@@ -1018,7 +1018,7 @@ Acked-by: jbeulich@novell.com
goto out;
/* NOTE: some maps may fail with GNTST_eagain, which could be successfully
-@@ -1471,22 +1479,23 @@ static void net_tx_action(unsigned long
+@@ -1508,22 +1516,23 @@ static void net_tx_action(unsigned long
* req and let the frontend resend the relevant packet again. This is fine
* because it is unlikely that a network buffer will be paged out or shared,
* and therefore it is unlikely to fail with GNTST_eagain. */
@@ -1049,7 +1049,7 @@ Acked-by: jbeulich@novell.com
DPRINTK("netback grant failed.\n");
skb_shinfo(skb)->nr_frags = 0;
kfree_skb(skb);
-@@ -1496,7 +1505,7 @@ static void net_tx_action(unsigned long
+@@ -1533,7 +1542,7 @@ static void net_tx_action(unsigned long
data_len = skb->len;
memcpy(skb->data,
@@ -1058,7 +1058,7 @@ Acked-by: jbeulich@novell.com
data_len);
if (data_len < txp->size) {
/* Append the packet payload as a fragment. */
-@@ -1504,7 +1513,7 @@ static void net_tx_action(unsigned long
+@@ -1541,7 +1550,7 @@ static void net_tx_action(unsigned long
txp->size -= data_len;
} else {
/* Schedule a response immediately. */
@@ -1067,7 +1067,7 @@ Acked-by: jbeulich@novell.com
}
if (txp->flags & XEN_NETTXF_csum_blank)
-@@ -1514,7 +1523,7 @@ static void net_tx_action(unsigned long
+@@ -1551,7 +1560,7 @@ static void net_tx_action(unsigned long
else
skb->ip_summed = CHECKSUM_NONE;
@@ -1076,7 +1076,7 @@ Acked-by: jbeulich@novell.com
/*
* If the initial fragment was < PKT_PROT_LEN then
-@@ -1550,36 +1559,39 @@ static void net_tx_action(unsigned long
+@@ -1587,36 +1596,39 @@ static void net_tx_action(unsigned long
out:
if (netbk_copy_skb_mode == NETBK_DELAYED_COPY_SKB &&
@@ -1129,7 +1129,7 @@ Acked-by: jbeulich@novell.com
}
irqreturn_t netif_be_int(int irq, void *dev_id)
-@@ -1587,7 +1599,7 @@ irqreturn_t netif_be_int(int irq, void *
+@@ -1624,7 +1636,7 @@ irqreturn_t netif_be_int(int irq, void *
netif_t *netif = dev_id;
add_to_net_schedule_list_tail(netif);
@@ -1138,7 +1138,7 @@ Acked-by: jbeulich@novell.com
if (netif_schedulable(netif) && !netbk_queue_full(netif))
netif_wake_queue(netif->dev);
-@@ -1651,33 +1663,38 @@ static netif_rx_response_t *make_rx_resp
+@@ -1688,33 +1700,38 @@ static netif_rx_response_t *make_rx_resp
#ifdef NETBE_DEBUG_INTERRUPT
static irqreturn_t netif_be_dbg(int irq, void *dev_id)
{
@@ -1198,7 +1198,7 @@ Acked-by: jbeulich@novell.com
pr_alert(" ** End of netif_schedule_list **\n");
return IRQ_HANDLED;
-@@ -1692,46 +1709,62 @@ static struct irqaction netif_be_dbg_act
+@@ -1729,46 +1746,62 @@ static struct irqaction netif_be_dbg_act
static int __init netback_init(void)
{
@@ -1290,7 +1290,7 @@ Acked-by: jbeulich@novell.com
netbk_copy_skb_mode = NETBK_DONT_COPY_SKB;
if (MODPARM_copy_skb) {
-@@ -1753,6 +1786,19 @@ static int __init netback_init(void)
+@@ -1790,6 +1823,19 @@ static int __init netback_init(void)
#endif
return 0;
diff --git a/patches.xen/xen-netback-kernel-threads b/patches.xen/xen-netback-kernel-threads
index 3ad25983eb..de1189b23d 100644
--- a/patches.xen/xen-netback-kernel-threads
+++ b/patches.xen/xen-netback-kernel-threads
@@ -33,8 +33,8 @@ jb: changed write_seq{,un}lock_irq() to write_seq{,un}lock_bh(), and
made the use of kernel threads optional (but default)
Acked-by: jbeulich@novell.com
---- head.orig/drivers/xen/core/gnttab.c 2012-03-12 14:04:06.000000000 +0100
-+++ head/drivers/xen/core/gnttab.c 2012-10-31 12:27:55.000000000 +0100
+--- 12.3.orig/drivers/xen/core/gnttab.c 2012-03-12 14:04:06.000000000 +0100
++++ 12.3/drivers/xen/core/gnttab.c 2012-10-31 12:27:55.000000000 +0100
@@ -659,14 +659,14 @@ int gnttab_copy_grant_page(grant_ref_t r
pfn = page_to_pfn(page);
new_mfn = virt_to_mfn(new_addr);
@@ -61,9 +61,9 @@ Acked-by: jbeulich@novell.com
new_page->mapping = page->mapping;
new_page->index = page->index;
---- head.orig/drivers/xen/netback/common.h 2012-11-29 14:35:46.000000000 +0100
-+++ head/drivers/xen/netback/common.h 2012-11-29 14:36:32.000000000 +0100
-@@ -234,8 +234,16 @@ struct netbk_tx_pending_inuse {
+--- 12.3.orig/drivers/xen/netback/common.h 2013-01-25 14:29:30.000000000 +0100
++++ 12.3/drivers/xen/netback/common.h 2013-01-25 14:29:34.000000000 +0100
+@@ -237,8 +237,16 @@ struct netbk_tx_pending_inuse {
#define MAX_MFN_ALLOC 64
struct xen_netbk {
@@ -82,8 +82,8 @@ Acked-by: jbeulich@novell.com
struct sk_buff_head rx_queue;
struct sk_buff_head tx_queue;
---- head.orig/drivers/xen/netback/netback.c 2012-11-29 14:35:45.000000000 +0100
-+++ head/drivers/xen/netback/netback.c 2012-11-29 14:36:34.000000000 +0100
+--- 12.3.orig/drivers/xen/netback/netback.c 2013-01-25 14:29:30.000000000 +0100
++++ 12.3/drivers/xen/netback/netback.c 2013-01-25 17:14:56.000000000 +0100
@@ -36,6 +36,7 @@
#include "common.h"
@@ -114,70 +114,72 @@ Acked-by: jbeulich@novell.com
int netbk_copy_skb_mode;
-@@ -184,6 +191,19 @@ static int check_mfn(struct xen_netbk *n
+@@ -184,6 +191,22 @@ static int check_mfn(struct xen_netbk *n
return netbk->alloc_index >= nr ? 0 : -ENOMEM;
}
-+static void netbk_schedule(struct xen_netbk *netbk)
++static void netbk_rx_schedule(struct xen_netbk *netbk)
+{
+ if (use_kthreads)
+ wake_up(&netbk->netbk_action_wq);
+ else
-+ tasklet_schedule(&netbk->net_tx_tasklet);
++ tasklet_schedule(&netbk->net_rx_tasklet);
+}
+
-+static void netbk_schedule_group(unsigned long group)
++static void netbk_tx_schedule(struct xen_netbk *netbk)
+{
-+ netbk_schedule(&xen_netbk[group]);
++ if (use_kthreads)
++ wake_up(&netbk->netbk_action_wq);
++ else
++ tasklet_schedule(&netbk->net_tx_tasklet);
+}
+
static inline void maybe_schedule_tx_action(unsigned int group)
{
struct xen_netbk *netbk = &xen_netbk[group];
-@@ -191,7 +211,7 @@ static inline void maybe_schedule_tx_act
+@@ -191,7 +214,7 @@ static inline void maybe_schedule_tx_act
smp_mb();
if ((nr_pending_reqs(netbk) < (MAX_PENDING_REQS/2)) &&
!list_empty(&netbk->schedule_list))
- tasklet_schedule(&netbk->net_tx_tasklet);
-+ netbk_schedule(netbk);
++ netbk_tx_schedule(netbk);
}
static struct sk_buff *netbk_copy_skb(struct sk_buff *skb)
-@@ -371,7 +391,7 @@ int netif_be_start_xmit(struct sk_buff *
+@@ -371,7 +394,7 @@ int netif_be_start_xmit(struct sk_buff *
netbk = &xen_netbk[group];
skb_queue_tail(&netbk->rx_queue, skb);
- tasklet_schedule(&netbk->net_rx_tasklet);
-+ netbk_schedule(netbk);
++ netbk_rx_schedule(netbk);
return NETDEV_TX_OK;
-@@ -824,23 +844,13 @@ static void net_rx_action(unsigned long
+@@ -824,7 +847,7 @@ static void net_rx_action(unsigned long
/* More work to do? */
if (!skb_queue_empty(&netbk->rx_queue) &&
!timer_pending(&netbk->net_timer))
- tasklet_schedule(&netbk->net_rx_tasklet);
-+ netbk_schedule(netbk);
++ netbk_rx_schedule(netbk);
#if 0
else
xen_network_done_notify();
- #endif
- }
+@@ -833,12 +856,12 @@ static void net_rx_action(unsigned long
--static void net_alarm(unsigned long group)
--{
+ static void net_alarm(unsigned long group)
+ {
- tasklet_schedule(&xen_netbk[group].net_rx_tasklet);
--}
--
--static void netbk_tx_pending_timeout(unsigned long group)
--{
++ netbk_rx_schedule(&xen_netbk[group]);
+ }
+
+ static void netbk_tx_pending_timeout(unsigned long group)
+ {
- tasklet_schedule(&xen_netbk[group].net_tx_tasklet);
--}
--
++ netbk_tx_schedule(&xen_netbk[group]);
+ }
+
static int __on_net_schedule_list(netif_t *netif)
- {
- return netif->list.next != NULL;
-@@ -1564,7 +1574,10 @@ static void net_tx_action(unsigned long
+@@ -1601,7 +1624,10 @@ static void net_tx_action(unsigned long
dev->stats.rx_bytes += skb->len;
dev->stats.rx_packets++;
@@ -189,16 +191,16 @@ Acked-by: jbeulich@novell.com
}
out:
-@@ -1589,7 +1602,7 @@ static void netif_idx_release(struct xen
+@@ -1626,7 +1652,7 @@ static void netif_idx_release(struct xen
netbk->dealloc_prod++;
spin_unlock_irqrestore(&netbk->release_lock, flags);
- tasklet_schedule(&netbk->net_tx_tasklet);
-+ netbk_schedule(netbk);
++ netbk_tx_schedule(netbk);
}
static void netif_page_release(struct page *page, unsigned int order)
-@@ -1728,6 +1741,50 @@ static struct irqaction netif_be_dbg_act
+@@ -1765,6 +1791,50 @@ static struct irqaction netif_be_dbg_act
};
#endif
@@ -249,7 +251,7 @@ Acked-by: jbeulich@novell.com
static int __init netback_init(void)
{
unsigned int i, group;
-@@ -1758,20 +1815,16 @@ static int __init netback_init(void)
+@@ -1795,9 +1865,6 @@ static int __init netback_init(void)
for (group = 0; group < netbk_nr_groups; group++) {
struct xen_netbk *netbk = &xen_netbk[group];
@@ -259,20 +261,7 @@ Acked-by: jbeulich@novell.com
skb_queue_head_init(&netbk->rx_queue);
skb_queue_head_init(&netbk->tx_queue);
- init_timer(&netbk->net_timer);
- netbk->net_timer.data = group;
-- netbk->net_timer.function = net_alarm;
-+ netbk->net_timer.function = netbk_schedule_group;
-
- init_timer(&netbk->tx_pending_timer);
- netbk->tx_pending_timer.data = group;
-- netbk->tx_pending_timer.function =
-- netbk_tx_pending_timeout;
-+ netbk->tx_pending_timer.function = netbk_schedule_group;
-
- netbk->pending_prod = MAX_PENDING_REQS;
-
-@@ -1796,6 +1849,26 @@ static int __init netback_init(void)
+@@ -1833,6 +1900,26 @@ static int __init netback_init(void)
netbk->pending_ring[i] = i;
INIT_LIST_HEAD(&netbk->pending_inuse[i].list);
}
@@ -299,7 +288,7 @@ Acked-by: jbeulich@novell.com
}
netbk_copy_skb_mode = NETBK_DONT_COPY_SKB;
-@@ -1820,12 +1893,15 @@ static int __init netback_init(void)
+@@ -1857,12 +1944,15 @@ static int __init netback_init(void)
return 0;
failed_init:
diff --git a/patches.xen/xen-netback-multiple-tasklets b/patches.xen/xen-netback-multiple-tasklets
index 8a23a3a579..f319b13448 100644
--- a/patches.xen/xen-netback-multiple-tasklets
+++ b/patches.xen/xen-netback-multiple-tasklets
@@ -17,8 +17,8 @@ Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
jb: some cleanups
Acked-by: jbeulich@novell.com
---- head.orig/drivers/xen/netback/common.h 2012-11-29 14:35:32.000000000 +0100
-+++ head/drivers/xen/netback/common.h 2012-11-29 14:35:46.000000000 +0100
+--- 12.3.orig/drivers/xen/netback/common.h 2013-01-25 14:29:27.000000000 +0100
++++ 12.3/drivers/xen/netback/common.h 2013-01-25 14:29:30.000000000 +0100
@@ -51,6 +51,7 @@
typedef struct netif_st {
/* Unique identifier for this interface. */
@@ -27,7 +27,7 @@ Acked-by: jbeulich@novell.com
unsigned int handle;
u8 fe_dev_addr[6];
-@@ -255,6 +256,7 @@ struct xen_netbk {
+@@ -258,6 +259,7 @@ struct xen_netbk {
struct page **mmap_pages;
@@ -35,7 +35,7 @@ Acked-by: jbeulich@novell.com
unsigned int alloc_index;
struct pending_tx_info pending_tx_info[MAX_PENDING_REQS];
-@@ -282,4 +284,8 @@ struct xen_netbk {
+@@ -285,4 +287,8 @@ struct xen_netbk {
unsigned long mfn_list[MAX_MFN_ALLOC];
};
@@ -44,8 +44,8 @@ Acked-by: jbeulich@novell.com
+extern unsigned int netbk_nr_groups;
+
#endif /* __NETIF__BACKEND__COMMON_H__ */
---- head.orig/drivers/xen/netback/interface.c 2012-02-10 13:34:52.000000000 +0100
-+++ head/drivers/xen/netback/interface.c 2012-02-10 13:35:28.000000000 +0100
+--- 12.3.orig/drivers/xen/netback/interface.c 2012-02-10 13:34:52.000000000 +0100
++++ 12.3/drivers/xen/netback/interface.c 2012-02-10 13:35:28.000000000 +0100
@@ -56,14 +56,36 @@ module_param_named(queue_length, netbk_q
static void __netif_up(netif_t *netif)
@@ -91,8 +91,8 @@ Acked-by: jbeulich@novell.com
netif->handle = handle;
netif->can_sg = 1;
netif->csum = 1;
---- head.orig/drivers/xen/netback/netback.c 2012-11-29 14:35:30.000000000 +0100
-+++ head/drivers/xen/netback/netback.c 2012-11-29 14:35:45.000000000 +0100
+--- 12.3.orig/drivers/xen/netback/netback.c 2013-01-25 14:29:23.000000000 +0100
++++ 12.3/drivers/xen/netback/netback.c 2013-01-25 14:29:30.000000000 +0100
@@ -47,10 +47,10 @@
/*define NETBE_DEBUG_INTERRUPT*/
@@ -166,7 +166,7 @@ Acked-by: jbeulich@novell.com
permute_dealloc_ring(netbk->dealloc_ring, dc, dp);
while (dc != dp) {
-@@ -1597,9 +1607,20 @@ static void netif_page_release(struct pa
+@@ -1634,9 +1644,20 @@ static void netif_page_release(struct pa
irqreturn_t netif_be_int(int irq, void *dev_id)
{
netif_t *netif = dev_id;
@@ -188,7 +188,7 @@ Acked-by: jbeulich@novell.com
if (netif_schedulable(netif) && !netbk_queue_full(netif))
netif_wake_queue(netif->dev);
-@@ -1716,9 +1737,20 @@ static int __init netback_init(void)
+@@ -1753,9 +1774,20 @@ static int __init netback_init(void)
if (!is_running_on_xen())
return -ENODEV;
diff --git a/patches.xen/xen-pciback-ratelimit b/patches.xen/xen-pciback-ratelimit
new file mode 100644
index 0000000000..e05deb8a35
--- /dev/null
+++ b/patches.xen/xen-pciback-ratelimit
@@ -0,0 +1,51 @@
+From: jbeulich@suse.com
+Subject: xen-pciback: rate limit error messages from xen_pcibk_enable_msi{,x}()
+References: CVE-2013-0231 XSA-43 bnc#801178
+Patch-mainline: n/a
+
+... as being guest triggerable (e.g. by invoking
+XEN_PCI_OP_enable_msi{,x} on a device not being MSI/MSI-X capable).
+
+This is CVE-2013-0231 / XSA-43.
+
+Also make the two messages uniform in both their wording and severity.
+
+Signed-off-by: Jan Beulich <jbeulich@suse.com>
+
+--- head.orig/drivers/xen/xen-pciback/pciback_ops.c 2012-04-10 17:21:35.000000000 +0200
++++ head/drivers/xen/xen-pciback/pciback_ops.c 2013-01-28 16:17:29.000000000 +0100
+@@ -148,7 +148,6 @@ int xen_pcibk_enable_msi(struct xen_pcib
+ #ifndef CONFIG_XEN
+ struct xen_pcibk_dev_data *dev_data;
+ #endif
+- int otherend = pdev->xdev->otherend_id;
+ int status;
+
+ if (unlikely(verbose_request))
+@@ -157,8 +156,9 @@ int xen_pcibk_enable_msi(struct xen_pcib
+ status = pci_enable_msi(dev);
+
+ if (status) {
+- printk(KERN_ERR "error enable msi for guest %x status %x\n",
+- otherend, status);
++ pr_warn_ratelimited(DRV_NAME ": %s: error enabling MSI for guest %u: err %d\n",
++ pci_name(dev), pdev->xdev->otherend_id,
++ status);
+ op->value = 0;
+ return XEN_PCI_ERR_op_failed;
+ }
+@@ -256,10 +256,10 @@ int xen_pcibk_enable_msix(struct xen_pci
+ pci_name(dev), i,
+ op->msix_entries[i].vector);
+ }
+- } else {
+- printk(KERN_WARNING DRV_NAME ": %s: failed to enable MSI-X: err %d!\n",
+- pci_name(dev), result);
+- }
++ } else
++ pr_warn_ratelimited(DRV_NAME ": %s: error enabling MSI-X for guest %u: err %d!\n",
++ pci_name(dev), pdev->xdev->otherend_id,
++ result);
+ kfree(entries);
+
+ op->value = result;
diff --git a/patches.xen/xen-pcpu-hotplug b/patches.xen/xen-pcpu-hotplug
index 28cc374b1e..e230343b14 100644
--- a/patches.xen/xen-pcpu-hotplug
+++ b/patches.xen/xen-pcpu-hotplug
@@ -29,8 +29,8 @@ jb: ported over glue logic; retry loops around XENPF_get_cpuinfo;
improve error handling; cleanup.
Acked-by: jbeulich@novell.com
---- head.orig/arch/x86/kernel/acpi/processor_extcntl_xen.c 2012-10-31 08:25:00.000000000 +0100
-+++ head/arch/x86/kernel/acpi/processor_extcntl_xen.c 2012-04-11 17:03:00.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/acpi/processor_extcntl_xen.c 2012-10-31 08:25:00.000000000 +0100
++++ 12.3/arch/x86/kernel/acpi/processor_extcntl_xen.c 2012-04-11 17:03:00.000000000 +0200
@@ -181,9 +181,65 @@ static int xen_tx_notifier(struct acpi_p
{
return -EINVAL;
@@ -109,9 +109,9 @@ Acked-by: jbeulich@novell.com
if (pmbits & XEN_PROCESSOR_PM_CX)
xen_extcntl_ops.pm_ops[PM_TYPE_IDLE] = xen_cx_notifier;
if (pmbits & XEN_PROCESSOR_PM_PX)
---- head.orig/drivers/acpi/processor_driver.c 2012-10-31 11:22:06.000000000 +0100
-+++ head/drivers/acpi/processor_driver.c 2012-10-31 12:16:40.000000000 +0100
-@@ -917,10 +917,21 @@ static acpi_status acpi_processor_hotadd
+--- 12.3.orig/drivers/acpi/processor_driver.c 2013-02-05 10:56:34.000000000 +0100
++++ 12.3/drivers/acpi/processor_driver.c 2013-02-05 11:29:16.000000000 +0100
+@@ -920,10 +920,21 @@ static acpi_status acpi_processor_hotadd
{
acpi_handle handle = pr->handle;
@@ -133,7 +133,7 @@ Acked-by: jbeulich@novell.com
if (acpi_map_lsapic(handle, &pr->id))
return AE_ERROR;
-@@ -945,10 +956,11 @@ static acpi_status acpi_processor_hotadd
+@@ -948,10 +959,11 @@ static acpi_status acpi_processor_hotadd
static int acpi_processor_handle_eject(struct acpi_processor *pr)
{
@@ -148,8 +148,8 @@ Acked-by: jbeulich@novell.com
if (cpu_online(pr->id))
cpu_down(pr->id);
---- head.orig/drivers/acpi/processor_extcntl.c 2011-02-01 15:03:03.000000000 +0100
-+++ head/drivers/acpi/processor_extcntl.c 2011-02-02 15:09:57.000000000 +0100
+--- 12.3.orig/drivers/acpi/processor_extcntl.c 2011-02-01 15:03:03.000000000 +0100
++++ 12.3/drivers/acpi/processor_extcntl.c 2011-02-02 15:09:57.000000000 +0100
@@ -83,10 +83,13 @@ int processor_notify_external(struct acp
ret = processor_extcntl_ops->pm_ops[type](pr, event);
@@ -164,8 +164,8 @@ Acked-by: jbeulich@novell.com
default:
pr_err("Unsupported processor event %d.\n", event);
break;
---- head.orig/drivers/xen/core/Makefile 2012-02-17 14:37:13.000000000 +0100
-+++ head/drivers/xen/core/Makefile 2012-02-17 14:37:35.000000000 +0100
+--- 12.3.orig/drivers/xen/core/Makefile 2012-02-17 14:37:13.000000000 +0100
++++ 12.3/drivers/xen/core/Makefile 2012-02-17 14:37:35.000000000 +0100
@@ -5,6 +5,7 @@
obj-y := evtchn.o gnttab.o reboot.o machine_reboot.o
@@ -175,7 +175,7 @@ Acked-by: jbeulich@novell.com
obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o
obj-$(CONFIG_XEN_SMPBOOT) += smpboot.o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/core/pcpu.c 2012-02-10 13:22:33.000000000 +0100
++++ 12.3/drivers/xen/core/pcpu.c 2012-02-10 13:22:33.000000000 +0100
@@ -0,0 +1,401 @@
+/*
+ * pcpu.c - management physical cpu in dom0 environment
@@ -578,9 +578,9 @@ Acked-by: jbeulich@novell.com
+ return err;
+}
+subsys_initcall(xen_pcpu_init);
---- head.orig/include/acpi/processor.h 2012-10-23 15:36:37.000000000 +0200
-+++ head/include/acpi/processor.h 2012-10-31 12:16:44.000000000 +0100
-@@ -483,6 +483,8 @@ static inline void xen_convert_psd_pack(
+--- 12.3.orig/include/acpi/processor.h 2012-10-23 15:36:37.000000000 +0200
++++ 12.3/include/acpi/processor.h 2013-02-05 11:29:08.000000000 +0100
+@@ -484,6 +484,8 @@ static inline void xen_convert_psd_pack(
xpsd->num_processors = apsd->num_processors;
}
diff --git a/patches.xen/xen-sections b/patches.xen/xen-sections
index 5a7a91395d..bc5cda8ecd 100644
--- a/patches.xen/xen-sections
+++ b/patches.xen/xen-sections
@@ -2,8 +2,8 @@ From: jbeulich@novell.com
Subject: fix placement of some routines/data
Patch-mainline: obsolete
---- head.orig/drivers/xen/core/cpu_hotplug.c 2012-02-10 09:47:12.000000000 +0100
-+++ head/drivers/xen/core/cpu_hotplug.c 2012-02-10 11:56:16.000000000 +0100
+--- 12.3.orig/drivers/xen/core/cpu_hotplug.c 2013-01-25 14:16:14.000000000 +0100
++++ 12.3/drivers/xen/core/cpu_hotplug.c 2013-01-25 14:26:56.000000000 +0100
@@ -25,7 +25,7 @@ static int local_cpu_hotplug_request(voi
return (current->mm != NULL);
}
@@ -12,7 +12,7 @@ Patch-mainline: obsolete
+static void __cpuinit vcpu_hotplug(unsigned int cpu, struct device *dev)
{
int err;
- char dir[32], state[32];
+ char dir[16], state[16];
@@ -54,7 +54,7 @@ static void vcpu_hotplug(unsigned int cp
}
}
@@ -65,8 +65,8 @@ Patch-mainline: obsolete
{
unsigned int cpu;
---- head.orig/drivers/xen/core/gnttab.c 2012-11-14 13:33:44.000000000 +0100
-+++ head/drivers/xen/core/gnttab.c 2012-11-14 13:33:56.000000000 +0100
+--- 12.3.orig/drivers/xen/core/gnttab.c 2012-11-14 13:33:44.000000000 +0100
++++ 12.3/drivers/xen/core/gnttab.c 2012-11-14 13:33:56.000000000 +0100
@@ -896,7 +896,12 @@ static int gnttab_expand(unsigned int re
return rc;
}
@@ -81,8 +81,8 @@ Patch-mainline: obsolete
{
int i, ret;
unsigned int max_nr_glist_frames, nr_glist_frames;
---- head.orig/drivers/xen/pcifront/pci_op.c 2012-04-13 16:45:40.000000000 +0200
-+++ head/drivers/xen/pcifront/pci_op.c 2012-04-04 13:33:29.000000000 +0200
+--- 12.3.orig/drivers/xen/pcifront/pci_op.c 2012-04-13 16:45:40.000000000 +0200
++++ 12.3/drivers/xen/pcifront/pci_op.c 2012-04-04 13:33:29.000000000 +0200
@@ -407,7 +407,7 @@ void pci_frontend_disable_msi(struct pci
#endif /* CONFIG_PCI_MSI */
diff --git a/patches.xen/xen-virq-per-cpu-irq b/patches.xen/xen-virq-per-cpu-irq
index c788e26227..8ab7b5197f 100644
--- a/patches.xen/xen-virq-per-cpu-irq
+++ b/patches.xen/xen-virq-per-cpu-irq
@@ -2,8 +2,8 @@ From: jbeulich@novell.com
Subject: fold per-CPU VIRQs onto a single IRQ each
Patch-mainline: n/a
---- head.orig/arch/x86/kernel/time-xen.c 2012-04-11 16:59:35.000000000 +0200
-+++ head/arch/x86/kernel/time-xen.c 2012-04-11 17:01:05.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/time-xen.c 2012-04-11 16:59:35.000000000 +0200
++++ 12.3/arch/x86/kernel/time-xen.c 2012-04-11 17:01:05.000000000 +0200
@@ -674,19 +674,17 @@ struct vcpu_runstate_info *setup_runstat
}
@@ -69,8 +69,8 @@ Patch-mainline: n/a
}
#endif
---- head.orig/drivers/xen/core/evtchn.c 2012-10-04 13:39:08.000000000 +0200
-+++ head/drivers/xen/core/evtchn.c 2012-10-04 13:48:00.000000000 +0200
+--- 12.3.orig/drivers/xen/core/evtchn.c 2012-10-04 13:39:08.000000000 +0200
++++ 12.3/drivers/xen/core/evtchn.c 2012-10-04 13:48:00.000000000 +0200
@@ -57,6 +57,23 @@ static DEFINE_SPINLOCK(irq_mapping_updat
static int evtchn_to_irq[NR_EVENT_CHANNELS] = {
[0 ... NR_EVENT_CHANNELS-1] = -1 };
@@ -533,8 +533,8 @@ Patch-mainline: n/a
init_evtchn_cpu_bindings();
#ifdef CONFIG_SPARSE_IRQ
---- head.orig/drivers/xen/core/smpboot.c 2012-03-22 16:23:49.000000000 +0100
-+++ head/drivers/xen/core/smpboot.c 2012-03-22 16:23:53.000000000 +0100
+--- 12.3.orig/drivers/xen/core/smpboot.c 2012-03-22 16:23:49.000000000 +0100
++++ 12.3/drivers/xen/core/smpboot.c 2012-03-22 16:23:53.000000000 +0100
@@ -123,7 +123,7 @@ static int __cpuinit xen_smp_intr_init(u
fail:
xen_spinlock_cleanup(cpu);
@@ -553,9 +553,9 @@ Patch-mainline: n/a
xen_spinlock_cleanup(cpu);
}
---- head.orig/drivers/xen/netback/netback.c 2012-11-29 14:10:18.000000000 +0100
-+++ head/drivers/xen/netback/netback.c 2012-11-29 14:26:16.000000000 +0100
-@@ -1669,6 +1669,12 @@ static irqreturn_t netif_be_dbg(int irq,
+--- 12.3.orig/drivers/xen/netback/netback.c 2012-11-29 14:10:18.000000000 +0100
++++ 12.3/drivers/xen/netback/netback.c 2013-01-25 14:26:38.000000000 +0100
+@@ -1706,6 +1706,12 @@ static irqreturn_t netif_be_dbg(int irq,
return IRQ_HANDLED;
}
@@ -568,7 +568,7 @@ Patch-mainline: n/a
#endif
static int __init netback_init(void)
-@@ -1728,12 +1734,9 @@ static int __init netback_init(void)
+@@ -1765,12 +1771,9 @@ static int __init netback_init(void)
netif_xenbus_init();
#ifdef NETBE_DEBUG_INTERRUPT
@@ -584,8 +584,8 @@ Patch-mainline: n/a
#endif
return 0;
---- head.orig/drivers/xen/xenoprof/xenoprofile.c 2011-04-15 12:46:57.000000000 +0200
-+++ head/drivers/xen/xenoprof/xenoprofile.c 2012-02-16 14:39:52.000000000 +0100
+--- 12.3.orig/drivers/xen/xenoprof/xenoprofile.c 2011-04-15 12:46:57.000000000 +0200
++++ 12.3/drivers/xen/xenoprof/xenoprofile.c 2012-02-16 14:39:52.000000000 +0100
@@ -53,8 +53,9 @@ extern unsigned long oprofile_backtrace_
/* Number of buffers in shared area (one per VCPU) */
@@ -688,8 +688,8 @@ Patch-mainline: n/a
+
+ free_cpumask_var(ovf_irq_mapped);
}
---- head.orig/include/xen/evtchn.h 2012-04-03 08:29:39.000000000 +0200
-+++ head/include/xen/evtchn.h 2012-02-10 11:32:59.000000000 +0100
+--- 12.3.orig/include/xen/evtchn.h 2012-04-03 08:29:39.000000000 +0200
++++ 12.3/include/xen/evtchn.h 2012-02-10 11:32:59.000000000 +0100
@@ -95,6 +95,17 @@ int bind_virq_to_irqhandler(
unsigned long irqflags,
const char *devname,
diff --git a/patches.xen/xen-x86-EFI b/patches.xen/xen-x86-EFI
index 1e0ce79393..bf1aa61ce7 100644
--- a/patches.xen/xen-x86-EFI
+++ b/patches.xen/xen-x86-EFI
@@ -3,8 +3,8 @@ From: jbeulich@novell.com
Patch-mainline: n/a
References: fate#311376, fate#311529, bnc#578927, bnc#628554
---- head.orig/arch/x86/Kconfig 2012-10-31 12:30:45.000000000 +0100
-+++ head/arch/x86/Kconfig 2012-10-31 12:30:58.000000000 +0100
+--- 12.3.orig/arch/x86/Kconfig 2012-10-31 12:30:45.000000000 +0100
++++ 12.3/arch/x86/Kconfig 2012-10-31 12:30:58.000000000 +0100
@@ -1555,7 +1555,7 @@ config X86_SMAP
config EFI
@@ -23,8 +23,8 @@ References: fate#311376, fate#311529, bnc#578927, bnc#628554
---help---
This kernel feature allows a bzImage to be loaded directly
by EFI firmware without the use of a bootloader.
---- head.orig/arch/x86/include/mach-xen/asm/setup.h 2011-02-01 14:54:13.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/setup.h 2011-07-04 12:32:43.000000000 +0200
+--- 12.3.orig/arch/x86/include/mach-xen/asm/setup.h 2011-02-01 14:54:13.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/setup.h 2011-07-04 12:32:43.000000000 +0200
@@ -3,6 +3,12 @@
void xen_start_kernel(void);
void xen_arch_setup(void);
@@ -38,9 +38,9 @@ References: fate#311376, fate#311529, bnc#578927, bnc#628554
#endif
#include_next <asm/setup.h>
---- head.orig/arch/x86/kernel/setup-xen.c 2012-10-31 12:28:43.000000000 +0100
-+++ head/arch/x86/kernel/setup-xen.c 2012-10-31 12:31:22.000000000 +0100
-@@ -908,6 +908,8 @@ void __init setup_arch(char **cmdline_p)
+--- 12.3.orig/arch/x86/kernel/setup-xen.c 2013-01-25 14:29:56.000000000 +0100
++++ 12.3/arch/x86/kernel/setup-xen.c 2013-01-25 14:30:04.000000000 +0100
+@@ -986,6 +986,8 @@ void __init setup_arch(char **cmdline_p)
xen_start_info->console.dom0.info_size);
xen_start_info->console.domU.mfn = 0;
xen_start_info->console.domU.evtchn = 0;
@@ -49,15 +49,15 @@ References: fate#311376, fate#311529, bnc#578927, bnc#628554
} else
screen_info.orig_video_isVGA = 0;
copy_edid();
---- head.orig/arch/x86/platform/efi/Makefile 2012-10-22 15:52:11.000000000 +0200
-+++ head/arch/x86/platform/efi/Makefile 2012-10-31 12:31:50.000000000 +0100
+--- 12.3.orig/arch/x86/platform/efi/Makefile 2013-01-25 13:57:38.000000000 +0100
++++ 12.3/arch/x86/platform/efi/Makefile 2012-10-31 12:31:50.000000000 +0100
@@ -1,2 +1,3 @@
obj-$(CONFIG_EFI) += efi.o efi_$(BITS).o efi_stub_$(BITS).o
obj-$(CONFIG_ACPI_BGRT) += efi-bgrt.o
+disabled-obj-$(CONFIG_XEN) := efi_%$(BITS).o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/platform/efi/efi-xen.c 2012-12-05 10:47:30.000000000 +0100
-@@ -0,0 +1,531 @@
++++ 12.3/arch/x86/platform/efi/efi-xen.c 2013-02-05 11:21:21.000000000 +0100
+@@ -0,0 +1,548 @@
+/*
+ * Common EFI (Extensible Firmware Interface) support functions
+ * Based on Extensible Firmware Interface Specification version 1.0
@@ -108,9 +108,24 @@ References: fate#311376, fate#311529, bnc#578927, bnc#628554
+
+#define EFI_DEBUG 1
+
-+int __read_mostly efi_enabled;
++unsigned long x86_efi_facility;
++
++/*
++ * Returns 1 if 'facility' is enabled, 0 otherwise.
++ */
++int efi_enabled(int facility)
++{
++ return test_bit(facility, &x86_efi_facility) != 0;
++}
+EXPORT_SYMBOL(efi_enabled);
+
++static int __init setup_noefi(char *arg)
++{
++ clear_bit(EFI_BOOT, &x86_efi_facility);
++ return 0;
++}
++early_param("noefi", setup_noefi);
++
+#define call op.u.efi_runtime_call
+#define DECLARE_CALL(what) \
+ struct xen_platform_op op; \
@@ -366,13 +381,6 @@ References: fate#311376, fate#311529, bnc#578927, bnc#628554
+};
+EXPORT_SYMBOL(efi);
+
-+static int __init setup_noefi(char *arg)
-+{
-+ efi_enabled = 0;
-+ return 0;
-+}
-+early_param("noefi", setup_noefi);
-+
+
+int efi_set_rtc_mmss(unsigned long nowtime)
+{
@@ -429,8 +437,13 @@ References: fate#311376, fate#311529, bnc#578927, bnc#628554
+ }
+ };
+
-+ if (HYPERVISOR_platform_op(&op) == 0)
-+ efi_enabled = 1;
++ if (HYPERVISOR_platform_op(&op) == 0) {
++ __set_bit(EFI_BOOT, &x86_efi_facility);
++ __set_bit(EFI_64BIT, &x86_efi_facility);
++ __set_bit(EFI_SYSTEM_TABLES, &x86_efi_facility);
++ __set_bit(EFI_RUNTIME_SERVICES, &x86_efi_facility);
++ __set_bit(EFI_MEMMAP, &x86_efi_facility);
++ }
+}
+
+void __init efi_reserve_boot_services(void) { }
@@ -528,10 +541,10 @@ References: fate#311376, fate#311529, bnc#578927, bnc#628554
+ op.u.firmware_info.index = XEN_FW_EFI_CONFIG_TABLE;
+ if (HYPERVISOR_platform_op(&op))
+ BUG();
-+ if (efi_config_init(info->cfg.addr, info->cfg.nent)) {
-+ efi_enabled = 0;
++ if (efi_config_init(info->cfg.addr, info->cfg.nent))
+ return;
-+ }
++
++ set_bit(EFI_CONFIG_TABLES, &x86_efi_facility);
+
+ x86_platform.get_wallclock = efi_get_time;
+ x86_platform.set_wallclock = efi_set_rtc_mmss;
@@ -553,7 +566,8 @@ References: fate#311376, fate#311529, bnc#578927, bnc#628554
+
+static int __init rtc_init(void)
+{
-+ if (efi_enabled && platform_device_register(&rtc_efi_dev) < 0)
++ if (efi_enabled(EFI_RUNTIME_SERVICES)
++ && platform_device_register(&rtc_efi_dev) < 0)
+ pr_err("unable to register rtc device...\n");
+
+ /* not necessarily an error */
@@ -569,6 +583,9 @@ References: fate#311376, fate#311529, bnc#578927, bnc#628554
+ struct xen_platform_op op;
+ union xenpf_efi_info *info = &op.u.firmware_info.u.efi_info;
+
++ if (!efi_enabled(EFI_MEMMAP))
++ return 0;
++
+ op.cmd = XENPF_firmware_info;
+ op.u.firmware_info.type = XEN_FW_EFI_INFO;
+ op.u.firmware_info.index = XEN_FW_EFI_MEM_INFO;
@@ -589,8 +606,8 @@ References: fate#311376, fate#311529, bnc#578927, bnc#628554
+ info->mem.size = 0;
+ return HYPERVISOR_platform_op(&op) ? 0 : info->mem.attr;
+}
---- head.orig/drivers/rtc/Kconfig 2012-10-22 15:52:53.000000000 +0200
-+++ head/drivers/rtc/Kconfig 2012-10-31 12:31:03.000000000 +0100
+--- 12.3.orig/drivers/rtc/Kconfig 2013-01-25 13:57:38.000000000 +0100
++++ 12.3/drivers/rtc/Kconfig 2012-10-31 12:31:03.000000000 +0100
@@ -602,7 +602,7 @@ config RTC_DRV_DA9052
config RTC_DRV_EFI
@@ -600,8 +617,8 @@ References: fate#311376, fate#311529, bnc#578927, bnc#628554
help
If you say yes here you will get support for the EFI
Real Time Clock.
---- head.orig/drivers/xen/console/console.c 2012-03-22 14:31:13.000000000 +0100
-+++ head/drivers/xen/console/console.c 2012-03-22 15:29:12.000000000 +0100
+--- 12.3.orig/drivers/xen/console/console.c 2012-03-22 14:31:13.000000000 +0100
++++ 12.3/drivers/xen/console/console.c 2012-03-22 15:29:12.000000000 +0100
@@ -307,6 +307,7 @@ void __init dom0_init_screen_info(const
break;
@@ -621,8 +638,8 @@ References: fate#311376, fate#311529, bnc#578927, bnc#628554
if (size >= offsetof(struct dom0_vga_console_info,
u.vesa_lfb.gbl_caps)
+ sizeof(info->u.vesa_lfb.gbl_caps))
---- head.orig/include/linux/efi.h 2012-10-22 15:53:29.000000000 +0200
-+++ head/include/linux/efi.h 2012-04-11 17:14:58.000000000 +0200
+--- 12.3.orig/include/linux/efi.h 2013-01-25 13:57:38.000000000 +0100
++++ 12.3/include/linux/efi.h 2012-04-11 17:14:58.000000000 +0200
@@ -451,7 +451,9 @@ typedef struct {
* All runtime access to EFI goes through this structure:
*/
diff --git a/patches.xen/xen-x86-bigmem b/patches.xen/xen-x86-bigmem
index 29fa79bb11..07197623ba 100644
--- a/patches.xen/xen-x86-bigmem
+++ b/patches.xen/xen-x86-bigmem
@@ -3,8 +3,8 @@ Subject: fix issues with the assignment of huge amounts of memory
Patch-mainline: obsolete
References: bnc#482614, bnc#537435, bnc#700856
---- head.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2012-05-31 14:50:05.000000000 +0200
-+++ head/arch/x86/include/mach-xen/asm/hypervisor.h 2012-05-11 16:46:55.000000000 +0200
+--- 12.3.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2012-05-31 14:50:05.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/hypervisor.h 2012-05-11 16:46:55.000000000 +0200
@@ -103,6 +103,10 @@ void xen_pgd_pin(unsigned long ptr);
void xen_pgd_unpin(unsigned long ptr);
@@ -16,8 +16,8 @@ References: bnc#482614, bnc#537435, bnc#700856
void xen_set_ldt(const void *ptr, unsigned int ents);
---- head.orig/arch/x86/kernel/e820-xen.c 2012-10-31 11:57:31.000000000 +0100
-+++ head/arch/x86/kernel/e820-xen.c 2012-07-05 14:18:06.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/e820-xen.c 2012-10-31 11:57:31.000000000 +0100
++++ 12.3/arch/x86/kernel/e820-xen.c 2012-07-05 14:18:06.000000000 +0200
@@ -926,6 +926,26 @@ static int __init parse_memopt(char *p)
/* don't remove all of memory when handling "mem={invalid}" param */
if (mem_size == 0)
@@ -83,8 +83,8 @@ References: bnc#482614, bnc#537435, bnc#700856
if (is_initial_xendomain()) {
memmap.nr_entries = E820MAX;
set_xen_guest_handle(memmap.buffer, machine_e820.map);
---- head.orig/arch/x86/kernel/setup-xen.c 2012-10-31 12:28:05.000000000 +0100
-+++ head/arch/x86/kernel/setup-xen.c 2012-10-31 12:28:43.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/setup-xen.c 2013-01-25 14:29:49.000000000 +0100
++++ 12.3/arch/x86/kernel/setup-xen.c 2013-01-25 14:29:56.000000000 +0100
@@ -132,12 +132,7 @@ static struct notifier_block xen_panic_b
unsigned long *phys_to_machine_mapping;
EXPORT_SYMBOL(phys_to_machine_mapping);
@@ -162,7 +162,7 @@ References: bnc#482614, bnc#537435, bnc#700856
#endif
/*
-@@ -1140,6 +1191,9 @@ void __init setup_arch(char **cmdline_p)
+@@ -1220,6 +1271,9 @@ void __init setup_arch(char **cmdline_p)
#ifdef CONFIG_XEN
#ifdef CONFIG_KEXEC
xen_machine_kexec_setup_resources();
@@ -172,7 +172,7 @@ References: bnc#482614, bnc#537435, bnc#700856
#endif
p2m_pages = max_pfn;
if (xen_start_info->nr_pages > max_pfn) {
-@@ -1165,45 +1219,20 @@ void __init setup_arch(char **cmdline_p)
+@@ -1245,45 +1299,20 @@ void __init setup_arch(char **cmdline_p)
p2m_pages = xen_start_info->nr_pages;
if (!xen_feature(XENFEAT_auto_translated_physmap)) {
@@ -222,8 +222,8 @@ References: bnc#482614, bnc#537435, bnc#700856
}
#ifdef CONFIG_ISA_DMA_API
---- head.orig/drivers/xen/core/machine_reboot.c 2011-11-18 16:11:15.000000000 +0100
-+++ head/drivers/xen/core/machine_reboot.c 2011-11-18 17:16:21.000000000 +0100
+--- 12.3.orig/drivers/xen/core/machine_reboot.c 2011-11-18 16:11:15.000000000 +0100
++++ 12.3/drivers/xen/core/machine_reboot.c 2011-11-18 17:16:21.000000000 +0100
@@ -71,11 +71,7 @@ static void pre_suspend(void)
static void post_suspend(int suspend_cancelled)
diff --git a/patches.xen/xen-x86-panic-no-reboot b/patches.xen/xen-x86-panic-no-reboot
index f29eda7d97..6b155ed9a8 100644
--- a/patches.xen/xen-x86-panic-no-reboot
+++ b/patches.xen/xen-x86-panic-no-reboot
@@ -4,9 +4,9 @@ Patch-mainline: obsolete
$subject says it all.
---- head.orig/arch/x86/kernel/setup-xen.c 2012-10-31 12:08:31.000000000 +0100
-+++ head/arch/x86/kernel/setup-xen.c 2012-10-31 12:28:05.000000000 +0100
-@@ -751,15 +751,17 @@ void __init setup_arch(char **cmdline_p)
+--- 12.3.orig/arch/x86/kernel/setup-xen.c 2013-01-25 14:25:59.000000000 +0100
++++ 12.3/arch/x86/kernel/setup-xen.c 2013-01-25 14:29:49.000000000 +0100
+@@ -829,15 +829,17 @@ void __init setup_arch(char **cmdline_p)
unsigned long p2m_pages;
struct physdev_set_iopl set_iopl;
diff --git a/patches.xen/xen-x86-pcpu b/patches.xen/xen-x86-pcpu
index a3f0022d40..f3c82e3431 100644
--- a/patches.xen/xen-x86-pcpu
+++ b/patches.xen/xen-x86-pcpu
@@ -119,8 +119,8 @@ Patch-mainline: n/a
platform_device_unregister(microcode_pdev);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/kernel/msr-xen.c 2011-08-10 12:21:39.000000000 +0200
-@@ -0,0 +1,337 @@
++++ head/arch/x86/kernel/msr-xen.c 2013-02-05 11:00:19.000000000 +0100
+@@ -0,0 +1,340 @@
+#ifndef CONFIG_XEN_PRIVILEGED_GUEST
+#include "msr.c"
+#else
@@ -279,6 +279,9 @@ Patch-mainline: n/a
+{
+ unsigned int cpu;
+
++ if (!capable(CAP_SYS_RAWIO))
++ return -EPERM;
++
+ cpu = pmsr_minor(file->f_path.dentry->d_inode);
+ if (cpu >= nr_xen_cpu_ids || !test_bit(cpu, xen_cpu_online_map))
+ return -ENXIO; /* No such CPU */
diff --git a/patches.xen/xen-x86_64-note-init-p2m b/patches.xen/xen-x86_64-note-init-p2m
index 8fb51c1af4..69c55bd4ac 100644
--- a/patches.xen/xen-x86_64-note-init-p2m
+++ b/patches.xen/xen-x86_64-note-init-p2m
@@ -18,8 +18,8 @@ shouldn't be as expensive (and hence can be viewed as an optimization
avoiding the spurious page fault on the local CPU), but is required
when the functions are used before the page fault handler gets set up.
---- head.orig/arch/x86/kernel/head64-xen.c 2012-06-14 11:23:26.000000000 +0200
-+++ head/arch/x86/kernel/head64-xen.c 2012-06-14 14:10:22.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/head64-xen.c 2012-06-14 11:23:26.000000000 +0200
++++ 12.3/arch/x86/kernel/head64-xen.c 2012-06-14 14:10:22.000000000 +0200
@@ -119,6 +119,12 @@ void __init x86_64_start_reservations(ch
memblock_reserve(__pa_symbol(&_text),
__pa_symbol(&__bss_stop) - __pa_symbol(&_text));
@@ -33,8 +33,8 @@ when the functions are used before the page fault handler gets set up.
/*
* At this point everything still needed from the boot loader
* or BIOS or kernel text should be early reserved or marked not
---- head.orig/arch/x86/kernel/head_64-xen.S 2012-12-06 16:28:14.000000000 +0100
-+++ head/arch/x86/kernel/head_64-xen.S 2012-12-06 16:28:24.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/head_64-xen.S 2012-12-06 16:28:14.000000000 +0100
++++ 12.3/arch/x86/kernel/head_64-xen.S 2012-12-06 16:28:24.000000000 +0100
@@ -17,6 +17,7 @@
#include <linux/elfnote.h>
#include <asm/segment.h>
@@ -51,9 +51,9 @@ when the functions are used before the page fault handler gets set up.
ELFNOTE(Xen, XEN_ELFNOTE_FEATURES, .ascii "writable_page_tables";
.ascii "|writable_descriptor_tables";
.ascii "|auto_translated_physmap";
---- head.orig/arch/x86/kernel/setup-xen.c 2012-10-31 12:31:22.000000000 +0100
-+++ head/arch/x86/kernel/setup-xen.c 2012-10-31 12:34:00.000000000 +0100
-@@ -1098,6 +1098,54 @@ void __init setup_arch(char **cmdline_p)
+--- 12.3.orig/arch/x86/kernel/setup-xen.c 2013-01-25 14:30:04.000000000 +0100
++++ 12.3/arch/x86/kernel/setup-xen.c 2013-01-25 14:30:10.000000000 +0100
+@@ -1178,6 +1178,54 @@ void __init setup_arch(char **cmdline_p)
init_gbpages();
/* max_pfn_mapped is updated here */
@@ -108,7 +108,7 @@ when the functions are used before the page fault handler gets set up.
max_low_pfn_mapped = init_memory_mapping(0, max_low_pfn<<PAGE_SHIFT);
max_pfn_mapped = max_low_pfn_mapped;
-@@ -1119,6 +1167,7 @@ void __init setup_arch(char **cmdline_p)
+@@ -1199,6 +1247,7 @@ void __init setup_arch(char **cmdline_p)
max((1UL<<32), start), end);
}
@@ -116,7 +116,7 @@ when the functions are used before the page fault handler gets set up.
/* can we preseve max_low_pfn ?*/
max_low_pfn = max_pfn;
}
-@@ -1212,7 +1261,7 @@ void __init setup_arch(char **cmdline_p)
+@@ -1292,7 +1341,7 @@ void __init setup_arch(char **cmdline_p)
difference = xen_start_info->nr_pages - max_pfn;
set_xen_guest_handle(reservation.extent_start,
@@ -125,7 +125,7 @@ when the functions are used before the page fault handler gets set up.
reservation.nr_extents = difference;
ret = HYPERVISOR_memory_op(XENMEM_decrease_reservation,
&reservation);
-@@ -1225,13 +1274,83 @@ void __init setup_arch(char **cmdline_p)
+@@ -1305,13 +1354,83 @@ void __init setup_arch(char **cmdline_p)
phys_to_machine_mapping = alloc_bootmem_pages(
max_pfn * sizeof(unsigned long));
memcpy(phys_to_machine_mapping,
@@ -213,8 +213,8 @@ when the functions are used before the page fault handler gets set up.
if (!is_initial_xendomain() || kexec_enabled())
setup_pfn_to_mfn_frame_list(__alloc_bootmem);
---- head.orig/arch/x86/mm/init-xen.c 2012-10-31 12:28:31.000000000 +0100
-+++ head/arch/x86/mm/init-xen.c 2012-10-31 12:33:55.000000000 +0100
+--- 12.3.orig/arch/x86/mm/init-xen.c 2012-10-31 12:28:31.000000000 +0100
++++ 12.3/arch/x86/mm/init-xen.c 2012-10-31 12:33:55.000000000 +0100
@@ -361,9 +361,20 @@ unsigned long __init_refok init_memory_m
* RO all the pagetable pages, including the ones that are beyond
* pgt_buf_end at that time.
@@ -237,8 +237,8 @@ when the functions are used before the page fault handler gets set up.
if (!after_bootmem)
early_memtest(start, end);
---- head.orig/arch/x86/mm/init_64-xen.c 2012-10-31 12:32:15.000000000 +0100
-+++ head/arch/x86/mm/init_64-xen.c 2012-10-31 12:33:49.000000000 +0100
+--- 12.3.orig/arch/x86/mm/init_64-xen.c 2012-10-31 12:32:15.000000000 +0100
++++ 12.3/arch/x86/mm/init_64-xen.c 2012-10-31 12:33:49.000000000 +0100
@@ -220,6 +220,17 @@ void sync_global_pgds(unsigned long star
}
}
@@ -355,8 +355,8 @@ when the functions are used before the page fault handler gets set up.
/* Destroy the Xen-created mappings beyond the kernel image. */
start = PAGE_ALIGN(_brk_end);
end = __START_KERNEL_map + (pgt_buf_start << PAGE_SHIFT);
---- head.orig/arch/x86/mm/pageattr-xen.c 2012-06-19 12:14:10.000000000 +0200
-+++ head/arch/x86/mm/pageattr-xen.c 2012-09-05 15:52:53.000000000 +0200
+--- 12.3.orig/arch/x86/mm/pageattr-xen.c 2012-06-19 12:14:10.000000000 +0200
++++ 12.3/arch/x86/mm/pageattr-xen.c 2012-09-05 15:52:53.000000000 +0200
@@ -1490,7 +1490,7 @@ static void __make_page_writable(unsigne
pte = lookup_address(va, &level);
@@ -366,8 +366,8 @@ when the functions are used before the page fault handler gets set up.
BUG();
if (in_secondary_range(va)) {
unsigned long pfn = pte_pfn(*pte);
---- head.orig/arch/x86/mm/pgtable-xen.c 2011-04-11 16:14:31.000000000 +0200
-+++ head/arch/x86/mm/pgtable-xen.c 2011-02-03 14:42:41.000000000 +0100
+--- 12.3.orig/arch/x86/mm/pgtable-xen.c 2011-04-11 16:14:31.000000000 +0200
++++ 12.3/arch/x86/mm/pgtable-xen.c 2011-02-03 14:42:41.000000000 +0100
@@ -344,7 +344,7 @@ void __init xen_init_pgd_pin(void)
if (PTRS_PER_PUD > 1) /* not folded */
SetPagePinned(virt_to_page(pud));
@@ -386,8 +386,8 @@ when the functions are used before the page fault handler gets set up.
continue;
SetPagePinned(pmd_page(*pmd));
}
---- head.orig/arch/x86/mm/pgtable_32-xen.c 2012-04-11 13:26:23.000000000 +0200
-+++ head/arch/x86/mm/pgtable_32-xen.c 2011-02-03 14:42:41.000000000 +0100
+--- 12.3.orig/arch/x86/mm/pgtable_32-xen.c 2012-04-11 13:26:23.000000000 +0200
++++ 12.3/arch/x86/mm/pgtable_32-xen.c 2011-02-03 14:42:41.000000000 +0100
@@ -173,6 +173,6 @@ void make_lowmem_page_writable(void *va,
pte = lookup_address((unsigned long)va, &level);
BUG_ON(!pte || level != PG_LEVEL_4K || !pte_present(*pte));
diff --git a/patches.xen/xen3-003-acpi_initrd_override_tables.patch b/patches.xen/xen3-003-acpi_initrd_override_tables.patch
index c7b71c07ed..304610fcb3 100644
--- a/patches.xen/xen3-003-acpi_initrd_override_tables.patch
+++ b/patches.xen/xen3-003-acpi_initrd_override_tables.patch
@@ -20,9 +20,9 @@ Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Automatically created from "patches.arch/003-acpi_initrd_override_tables.patch" by xen-port-patches.py
---- head.orig/arch/x86/kernel/setup-xen.c 2012-10-31 11:57:31.000000000 +0100
-+++ head/arch/x86/kernel/setup-xen.c 2012-10-31 12:08:09.000000000 +0100
-@@ -1082,6 +1082,8 @@ void __init setup_arch(char **cmdline_p)
+--- 12.3.orig/arch/x86/kernel/setup-xen.c 2013-01-25 14:25:15.000000000 +0100
++++ 12.3/arch/x86/kernel/setup-xen.c 2013-01-25 14:25:50.000000000 +0100
+@@ -1162,6 +1162,8 @@ void __init setup_arch(char **cmdline_p)
reserve_initrd();
diff --git a/patches.xen/xen3-007-acpi_initrd_override_tables.patch b/patches.xen/xen3-007-acpi_initrd_override_tables.patch
index 4ea17399db..366fbd2635 100644
--- a/patches.xen/xen3-007-acpi_initrd_override_tables.patch
+++ b/patches.xen/xen3-007-acpi_initrd_override_tables.patch
@@ -35,9 +35,9 @@ Cc: Len Brown <lenb@kernel.org>
Automatically created from "patches.arch/007-acpi_initrd_override_tables.patch" by xen-port-patches.py
---- head.orig/arch/x86/kernel/setup-xen.c 2012-10-31 12:08:09.000000000 +0100
-+++ head/arch/x86/kernel/setup-xen.c 2012-10-31 12:08:29.000000000 +0100
-@@ -1082,7 +1082,9 @@ void __init setup_arch(char **cmdline_p)
+--- 12.3.orig/arch/x86/kernel/setup-xen.c 2013-01-25 14:25:50.000000000 +0100
++++ 12.3/arch/x86/kernel/setup-xen.c 2013-01-25 14:25:56.000000000 +0100
+@@ -1162,7 +1162,9 @@ void __init setup_arch(char **cmdline_p)
reserve_initrd();
diff --git a/patches.xen/xen3-010-acpi_initrd_override_tables.patch b/patches.xen/xen3-010-acpi_initrd_override_tables.patch
index 539e0eea3c..95042b618d 100644
--- a/patches.xen/xen3-010-acpi_initrd_override_tables.patch
+++ b/patches.xen/xen3-010-acpi_initrd_override_tables.patch
@@ -16,8 +16,8 @@ Cleanup only, no functional change.
Signed-off-by: Thomas Renninger <trenn@suse.de>
Automatically created from "patches.arch/010-acpi_initrd_override_tables.patch" by xen-port-patches.py
---- head.orig/arch/x86/kernel/setup-xen.c 2012-10-31 12:08:29.000000000 +0100
-+++ head/arch/x86/kernel/setup-xen.c 2012-10-31 12:08:31.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/setup-xen.c 2013-01-25 14:25:56.000000000 +0100
++++ 12.3/arch/x86/kernel/setup-xen.c 2013-01-25 14:25:59.000000000 +0100
@@ -466,6 +466,8 @@ static void __init reserve_initrd(void)
relocate_initrd();
@@ -27,7 +27,7 @@ Automatically created from "patches.arch/010-acpi_initrd_override_tables.patch"
}
#else
static void __init reserve_initrd(void)
-@@ -1082,10 +1084,6 @@ void __init setup_arch(char **cmdline_p)
+@@ -1162,10 +1164,6 @@ void __init setup_arch(char **cmdline_p)
reserve_initrd();
diff --git a/patches.xen/xen3-auto-arch-i386.diff b/patches.xen/xen3-auto-arch-i386.diff
index 26f82c86a7..f89602591d 100644
--- a/patches.xen/xen3-auto-arch-i386.diff
+++ b/patches.xen/xen3-auto-arch-i386.diff
@@ -1,11 +1,11 @@
-From http://xenbits.xen.org/linux-2.6.18-xen.hg (tip 1213:302f7c9423c9)
+From http://xenbits.xen.org/linux-2.6.18-xen.hg (tip 1222:d732224ce60e)
Subject: xen3 arch-i386
From: xen-devel@lists.xen.org
Patch-mainline: n/a
Acked-by: jbeulich@suse.com
---- head.orig/arch/x86/kernel/asm-offsets_32.c 2012-03-19 00:15:34.000000000 +0100
-+++ head/arch/x86/kernel/asm-offsets_32.c 2012-02-08 10:56:16.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/asm-offsets_32.c 2013-01-25 13:57:40.000000000 +0100
++++ 12.3/arch/x86/kernel/asm-offsets_32.c 2012-02-08 10:56:16.000000000 +0100
@@ -60,9 +60,14 @@ void foo(void)
OFFSET(IA32_RT_SIGFRAME_sigcontext, rt_sigframe, uc.uc_mcontext);
BLANK();
@@ -22,8 +22,8 @@ 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 2012-10-31 10:19:10.000000000 +0100
-+++ head/arch/x86/kernel/entry_32.S 2012-10-31 10:44:17.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/entry_32.S 2013-01-25 13:57:40.000000000 +0100
++++ 12.3/arch/x86/kernel/entry_32.S 2013-01-25 14:04:15.000000000 +0100
@@ -424,7 +424,7 @@ ENTRY(ia32_sysenter_target)
CFI_SIGNAL_FRAME
CFI_DEF_CFA esp, 0
@@ -33,7 +33,7 @@ Acked-by: jbeulich@suse.com
sysenter_past_esp:
/*
* Interrupts are disabled here, but we can't trace it until
-@@ -1379,7 +1379,7 @@ END(page_fault)
+@@ -1378,7 +1378,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.
*
-@@ -1391,7 +1391,7 @@ END(page_fault)
+@@ -1390,7 +1390,7 @@ END(page_fault)
cmpw $__KERNEL_CS, 4(%esp)
jne \ok
\label:
@@ -51,8 +51,8 @@ Acked-by: jbeulich@suse.com
CFI_DEF_CFA esp, 0
CFI_UNDEFINED eip
pushfl_cfi
---- head.orig/arch/x86/kernel/machine_kexec_32.c 2012-04-10 14:50:08.000000000 +0200
-+++ head/arch/x86/kernel/machine_kexec_32.c 2012-04-10 15:46:03.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/machine_kexec_32.c 2012-04-10 14:50:08.000000000 +0200
++++ 12.3/arch/x86/kernel/machine_kexec_32.c 2012-04-10 15:46:03.000000000 +0200
@@ -26,6 +26,10 @@
#include <asm/cacheflush.h>
#include <asm/debugreg.h>
@@ -136,8 +136,8 @@ Acked-by: jbeulich@suse.com
void arch_crash_save_vmcoreinfo(void)
{
---- head.orig/arch/x86/kernel/vm86_32.c 2012-10-22 15:52:10.000000000 +0200
-+++ head/arch/x86/kernel/vm86_32.c 2012-08-20 10:19:03.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/vm86_32.c 2013-01-25 13:57:40.000000000 +0100
++++ 12.3/arch/x86/kernel/vm86_32.c 2012-08-20 10:19:03.000000000 +0200
@@ -127,7 +127,9 @@ static int copy_vm86_regs_from_user(stru
struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
diff --git a/patches.xen/xen3-auto-arch-x86.diff b/patches.xen/xen3-auto-arch-x86.diff
index 1e5c6d7fa9..ab73971bf0 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 1213:302f7c9423c9)
+From http://xenbits.xen.org/linux-2.6.18-xen.hg (tip 1222:d732224ce60e)
Subject: xen3 arch-x86
From: xen-devel@lists.xen.org
Patch-mainline: n/a
diff --git a/patches.xen/xen3-auto-arch-x86_64.diff b/patches.xen/xen3-auto-arch-x86_64.diff
index e2724a451c..8b575bd4e8 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 1213:302f7c9423c9)
+From http://xenbits.xen.org/linux-2.6.18-xen.hg (tip 1222:d732224ce60e)
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 47fd4edb9e..270f384dbf 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 1213:302f7c9423c9)
+From http://xenbits.xen.org/linux-2.6.18-xen.hg (tip 1222:d732224ce60e)
Subject: xen3 common
From: xen-devel@lists.xen.org
Patch-mainline: n/a
@@ -22,8 +22,8 @@ take the forward porting patches:
2.6.35/kernel/time.c
3.4/drivers/acpi/acpica/hwsleep.c
---- head.orig/drivers/Makefile 2012-12-18 11:38:26.000000000 +0100
-+++ head/drivers/Makefile 2012-10-22 17:22:16.000000000 +0200
+--- 12.3.orig/drivers/Makefile 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/drivers/Makefile 2012-10-22 17:22:16.000000000 +0200
@@ -55,6 +55,7 @@ obj-$(CONFIG_PARPORT) += parport/
obj-y += base/ block/ misc/ mfd/ nfc/
obj-$(CONFIG_NUBUS) += nubus/
@@ -32,8 +32,8 @@ take the forward porting patches:
obj-$(CONFIG_IDE) += ide/
obj-$(CONFIG_SCSI) += scsi/
obj-$(CONFIG_ATA) += ata/
---- head.orig/drivers/acpi/Makefile 2012-12-18 11:38:26.000000000 +0100
-+++ head/drivers/acpi/Makefile 2012-10-22 17:22:12.000000000 +0200
+--- 12.3.orig/drivers/acpi/Makefile 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/drivers/acpi/Makefile 2012-10-22 17:22:12.000000000 +0200
@@ -72,6 +72,9 @@ obj-$(CONFIG_ACPI_BGRT) += bgrt.o
processor-y := processor_driver.o processor_throttling.o
processor-y += processor_idle.o processor_thermal.o
@@ -44,8 +44,8 @@ take the forward porting patches:
obj-$(CONFIG_ACPI_PROCESSOR_AGGREGATOR) += acpi_pad.o
---- head.orig/drivers/acpi/processor_driver.c 2012-12-18 11:38:26.000000000 +0100
-+++ head/drivers/acpi/processor_driver.c 2012-10-31 10:43:58.000000000 +0100
+--- 12.3.orig/drivers/acpi/processor_driver.c 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/drivers/acpi/processor_driver.c 2013-01-30 10:34:03.000000000 +0100
@@ -326,7 +326,8 @@ static int acpi_processor_get_info(struc
* they are physically not present.
*/
@@ -105,7 +105,7 @@ take the forward porting patches:
pr->cdev = thermal_cooling_device_register("Processor", device,
&processor_cooling_ops);
if (IS_ERR(pr->cdev)) {
-@@ -540,8 +560,11 @@ static int __cpuinit acpi_processor_add(
+@@ -541,8 +563,11 @@ static int __cpuinit acpi_processor_add(
strcpy(acpi_device_class(device), ACPI_PROCESSOR_CLASS);
device->driver_data = pr;
@@ -118,7 +118,7 @@ take the forward porting patches:
/* Processor is physically not present */
return 0;
}
-@@ -551,22 +574,43 @@ static int __cpuinit acpi_processor_add(
+@@ -552,22 +577,43 @@ static int __cpuinit acpi_processor_add(
return 0;
#endif
@@ -164,7 +164,7 @@ take the forward porting patches:
per_cpu(processors, pr->id) = pr;
dev = get_cpu_device(pr->id);
-@@ -596,6 +640,14 @@ err_clear_processor:
+@@ -597,6 +643,14 @@ err_clear_processor:
*/
per_cpu(processors, pr->id) = NULL;
err_free_cpumask:
@@ -179,7 +179,7 @@ take the forward porting patches:
free_cpumask_var(pr->throttling.shared_cpu_map);
err_free_pr:
kfree(pr);
-@@ -612,7 +664,7 @@ static int acpi_processor_remove(struct
+@@ -613,7 +667,7 @@ static int acpi_processor_remove(struct
pr = acpi_driver_data(device);
@@ -188,7 +188,7 @@ take the forward porting patches:
goto free;
if (type == ACPI_BUS_REMOVAL_EJECT) {
-@@ -631,8 +683,16 @@ static int acpi_processor_remove(struct
+@@ -632,8 +686,16 @@ static int acpi_processor_remove(struct
pr->cdev = NULL;
}
@@ -205,7 +205,7 @@ take the forward porting patches:
free:
free_cpumask_var(pr->throttling.shared_cpu_map);
-@@ -688,6 +748,10 @@ int acpi_processor_device_add(acpi_handl
+@@ -689,6 +751,10 @@ int acpi_processor_device_add(acpi_handl
return -ENODEV;
}
@@ -216,7 +216,7 @@ take the forward porting patches:
return 0;
}
-@@ -719,6 +783,11 @@ static void acpi_processor_hotplug_notif
+@@ -720,6 +786,11 @@ static void acpi_processor_hotplug_notif
break;
}
@@ -228,7 +228,7 @@ take the forward porting patches:
ost_code = ACPI_OST_SC_SUCCESS;
break;
-@@ -738,6 +807,10 @@ static void acpi_processor_hotplug_notif
+@@ -739,6 +810,10 @@ static void acpi_processor_hotplug_notif
break;
}
@@ -239,7 +239,7 @@ take the forward porting patches:
/* REVISIT: update when eject is supported */
ost_code = ACPI_OST_SC_EJECT_NOT_SUPPORTED;
break;
-@@ -848,6 +921,11 @@ static acpi_status acpi_processor_hotadd
+@@ -849,6 +924,11 @@ static acpi_status acpi_processor_hotadd
static int acpi_processor_handle_eject(struct acpi_processor *pr)
{
@@ -251,7 +251,7 @@ take the forward porting patches:
if (cpu_online(pr->id))
cpu_down(pr->id);
-@@ -933,6 +1011,30 @@ static void __exit acpi_processor_exit(v
+@@ -934,6 +1014,30 @@ static void __exit acpi_processor_exit(v
acpi_bus_unregister_driver(&acpi_processor_driver);
@@ -283,7 +283,7 @@ take the forward porting patches:
}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/acpi/processor_extcntl.c 2011-01-31 14:53:38.000000000 +0100
++++ 12.3/drivers/acpi/processor_extcntl.c 2011-01-31 14:53:38.000000000 +0100
@@ -0,0 +1,241 @@
+/*
+ * processor_extcntl.c - channel to external control logic
@@ -526,8 +526,8 @@ take the forward porting patches:
+ kfree(perf);
+ return ret;
+}
---- head.orig/drivers/acpi/processor_idle.c 2012-12-18 11:38:26.000000000 +0100
-+++ head/drivers/acpi/processor_idle.c 2012-10-22 17:22:04.000000000 +0200
+--- 12.3.orig/drivers/acpi/processor_idle.c 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/drivers/acpi/processor_idle.c 2013-02-05 10:45:47.000000000 +0100
@@ -448,7 +448,8 @@ static int acpi_processor_get_power_info
*/
cx.entry_method = ACPI_CSTATE_HALT;
@@ -560,7 +560,7 @@ take the forward porting patches:
status = -EFAULT;
end:
-@@ -1292,6 +1299,11 @@ int __cpuinit acpi_processor_power_init(
+@@ -1296,6 +1303,11 @@ int __cpuinit acpi_processor_power_init(
}
acpi_processor_registered++;
}
@@ -572,8 +572,8 @@ take the forward porting patches:
return 0;
}
---- head.orig/drivers/acpi/processor_perflib.c 2012-12-18 11:38:26.000000000 +0100
-+++ head/drivers/acpi/processor_perflib.c 2012-10-22 17:22:06.000000000 +0200
+--- 12.3.orig/drivers/acpi/processor_perflib.c 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/drivers/acpi/processor_perflib.c 2013-02-05 10:45:48.000000000 +0100
@@ -75,6 +75,7 @@ MODULE_PARM_DESC(ignore_ppc, "If the fre
static int acpi_processor_ppc_status;
@@ -619,7 +619,7 @@ take the forward porting patches:
/*
* Do a quick check if the systems looks like it should use ACPI
-@@ -458,7 +467,10 @@ static int acpi_processor_get_performanc
+@@ -465,7 +474,10 @@ static int acpi_processor_get_performanc
return result;
}
@@ -631,7 +631,7 @@ take the forward porting patches:
{
int result = 0;
acpi_status status = AE_OK;
-@@ -503,6 +515,7 @@ static int acpi_processor_get_performanc
+@@ -510,6 +522,7 @@ static int acpi_processor_get_performanc
return result;
}
@@ -639,7 +639,7 @@ take the forward porting patches:
int acpi_processor_notify_smm(struct module *calling_module)
{
acpi_status status;
-@@ -563,8 +576,12 @@ int acpi_processor_notify_smm(struct mod
+@@ -570,8 +583,12 @@ int acpi_processor_notify_smm(struct mod
}
EXPORT_SYMBOL(acpi_processor_notify_smm);
@@ -653,8 +653,8 @@ take the forward porting patches:
{
int result = 0;
acpi_status status = AE_OK;
---- head.orig/drivers/acpi/sleep.c 2012-12-18 11:38:26.000000000 +0100
-+++ head/drivers/acpi/sleep.c 2012-08-20 10:16:59.000000000 +0200
+--- 12.3.orig/drivers/acpi/sleep.c 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/drivers/acpi/sleep.c 2012-08-20 10:16:59.000000000 +0200
@@ -63,6 +63,7 @@ static struct notifier_block tts_notifie
static int acpi_sleep_prepare(u32 acpi_state)
{
@@ -671,8 +671,8 @@ take the forward porting patches:
ACPI_FLUSH_CPU_CACHE();
#endif
printk(KERN_INFO PREFIX "Preparing to enter system sleep state S%d\n",
---- head.orig/drivers/block/floppy.c 2012-12-18 11:38:26.000000000 +0100
-+++ head/drivers/block/floppy.c 2012-04-10 15:43:06.000000000 +0200
+--- 12.3.orig/drivers/block/floppy.c 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/drivers/block/floppy.c 2012-04-10 15:43:06.000000000 +0200
@@ -146,7 +146,9 @@
#undef FLOPPY_SILENT_DCL_CLEAR
@@ -683,8 +683,8 @@ take the forward porting patches:
#define DEBUGT 2
---- head.orig/drivers/char/agp/intel-gtt.c 2012-12-18 11:38:26.000000000 +0100
-+++ head/drivers/char/agp/intel-gtt.c 2012-10-22 17:21:51.000000000 +0200
+--- 12.3.orig/drivers/char/agp/intel-gtt.c 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/drivers/char/agp/intel-gtt.c 2012-10-22 17:21:51.000000000 +0200
@@ -138,8 +138,19 @@ static struct page *i8xx_alloc_pages(voi
if (page == NULL)
return NULL;
@@ -715,8 +715,8 @@ take the forward porting patches:
put_page(page);
__free_pages(page, 2);
atomic_dec(&agp_bridge->current_memory_agp);
---- head.orig/drivers/char/mem.c 2012-12-18 11:38:26.000000000 +0100
-+++ head/drivers/char/mem.c 2012-08-20 10:17:14.000000000 +0200
+--- 12.3.orig/drivers/char/mem.c 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/drivers/char/mem.c 2012-08-20 10:17:14.000000000 +0200
@@ -89,6 +89,7 @@ void __weak unxlate_dev_mem_ptr(unsigned
{
}
@@ -775,16 +775,16 @@ take the forward porting patches:
#ifdef CONFIG_DEVKMEM
static const struct file_operations kmem_fops = {
---- head.orig/drivers/char/tpm/Makefile 2012-12-18 11:38:26.000000000 +0100
-+++ head/drivers/char/tpm/Makefile 2012-10-22 17:21:06.000000000 +0200
+--- 12.3.orig/drivers/char/tpm/Makefile 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/drivers/char/tpm/Makefile 2012-10-22 17:21:06.000000000 +0200
@@ -17,3 +17,5 @@ obj-$(CONFIG_TCG_NSC) += tpm_nsc.o
obj-$(CONFIG_TCG_ATMEL) += tpm_atmel.o
obj-$(CONFIG_TCG_INFINEON) += tpm_infineon.o
obj-$(CONFIG_TCG_IBMVTPM) += tpm_ibmvtpm.o
+obj-$(CONFIG_TCG_XEN) += tpm_xenu.o
+tpm_xenu-y = tpm_xen.o tpm_vtpm.o
---- head.orig/drivers/char/tpm/tpm.h 2012-12-18 11:38:26.000000000 +0100
-+++ head/drivers/char/tpm/tpm.h 2012-10-22 17:20:59.000000000 +0200
+--- 12.3.orig/drivers/char/tpm/tpm.h 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/drivers/char/tpm/tpm.h 2012-10-22 17:20:59.000000000 +0200
@@ -129,6 +129,9 @@ struct tpm_chip {
struct dentry **bios_dir;
@@ -815,7 +815,7 @@ take the forward porting patches:
extern void tpm_gen_interrupt(struct tpm_chip *);
extern int tpm_do_selftest(struct tpm_chip *);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/char/tpm/tpm_vtpm.c 2011-01-31 14:53:38.000000000 +0100
++++ 12.3/drivers/char/tpm/tpm_vtpm.c 2011-01-31 14:53:38.000000000 +0100
@@ -0,0 +1,542 @@
+/*
+ * Copyright (C) 2006 IBM Corporation
@@ -1360,7 +1360,7 @@ take the forward porting patches:
+ kfree(vtpms);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/char/tpm/tpm_vtpm.h 2011-01-31 14:53:38.000000000 +0100
++++ 12.3/drivers/char/tpm/tpm_vtpm.h 2011-01-31 14:53:38.000000000 +0100
@@ -0,0 +1,55 @@
+#ifndef TPM_VTPM_H
+#define TPM_VTPM_H
@@ -1418,7 +1418,7 @@ take the forward porting patches:
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/char/tpm/tpm_xen.c 2012-03-12 12:51:05.000000000 +0100
++++ 12.3/drivers/char/tpm/tpm_xen.c 2012-03-12 12:51:05.000000000 +0100
@@ -0,0 +1,718 @@
+/*
+ * Copyright (c) 2005, IBM Corporation
@@ -2138,8 +2138,8 @@ take the forward porting patches:
+module_init(tpmif_init);
+
+MODULE_LICENSE("Dual BSD/GPL");
---- head.orig/drivers/tty/tty_io.c 2012-12-18 11:38:26.000000000 +0100
-+++ head/drivers/tty/tty_io.c 2012-10-22 17:20:47.000000000 +0200
+--- 12.3.orig/drivers/tty/tty_io.c 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/drivers/tty/tty_io.c 2012-10-22 17:20:47.000000000 +0200
@@ -137,6 +137,8 @@ EXPORT_SYMBOL(tty_mutex);
/* Spinlock to protect the tty->tty_files list */
DEFINE_SPINLOCK(tty_files_lock);
@@ -2170,8 +2170,8 @@ take the forward porting patches:
#endif
return 0;
}
---- head.orig/drivers/edac/edac_mc.c 2012-12-18 11:38:26.000000000 +0100
-+++ head/drivers/edac/edac_mc.c 2012-12-06 16:04:05.000000000 +0100
+--- 12.3.orig/drivers/edac/edac_mc.c 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/drivers/edac/edac_mc.c 2012-12-06 16:04:05.000000000 +0100
@@ -838,6 +838,10 @@ static void edac_mc_scrub_block(unsigned
edac_dbg(3, "\n");
@@ -2183,8 +2183,8 @@ take the forward porting patches:
/* ECC error page was not in our memory. Ignore it. */
if (!pfn_valid(page))
return;
---- head.orig/drivers/firmware/dell_rbu.c 2012-12-18 11:38:26.000000000 +0100
-+++ head/drivers/firmware/dell_rbu.c 2011-04-13 11:25:29.000000000 +0200
+--- 12.3.orig/drivers/firmware/dell_rbu.c 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/drivers/firmware/dell_rbu.c 2011-04-13 11:25:29.000000000 +0200
@@ -170,9 +170,28 @@ static int create_packet(void *data, siz
spin_lock(&rbu_data.lock);
goto out_alloc_packet_array;
@@ -2291,8 +2291,8 @@ take the forward porting patches:
spin_lock_init(&rbu_data.lock);
init_packet_head();
---- head.orig/drivers/ide/ide-lib.c 2012-12-18 11:38:26.000000000 +0100
-+++ head/drivers/ide/ide-lib.c 2011-11-16 17:01:48.000000000 +0100
+--- 12.3.orig/drivers/ide/ide-lib.c 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/drivers/ide/ide-lib.c 2011-11-16 17:01:48.000000000 +0100
@@ -19,12 +19,12 @@ void ide_toggle_bounce(ide_drive_t *driv
{
u64 addr = BLK_BOUNCE_HIGH; /* dma64_addr_t */
@@ -2310,8 +2310,8 @@ take the forward porting patches:
addr = *dev->dma_mask;
}
---- head.orig/drivers/oprofile/buffer_sync.c 2012-12-18 11:38:26.000000000 +0100
-+++ head/drivers/oprofile/buffer_sync.c 2012-10-22 17:20:27.000000000 +0200
+--- 12.3.orig/drivers/oprofile/buffer_sync.c 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/drivers/oprofile/buffer_sync.c 2012-10-22 17:20:27.000000000 +0200
@@ -8,6 +8,10 @@
* @author Barry Kasindorf
* @author Robert Richter <robert.richter@amd.com>
@@ -2505,8 +2505,8 @@ take the forward porting patches:
mark_done(cpu);
mutex_unlock(&buffer_mutex);
---- head.orig/drivers/oprofile/cpu_buffer.c 2012-12-18 11:38:26.000000000 +0100
-+++ head/drivers/oprofile/cpu_buffer.c 2011-04-13 12:22:07.000000000 +0200
+--- 12.3.orig/drivers/oprofile/cpu_buffer.c 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/drivers/oprofile/cpu_buffer.c 2011-04-13 12:22:07.000000000 +0200
@@ -8,6 +8,10 @@
* @author Barry Kasindorf <barry.kasindorf@amd.com>
* @author Robert Richter <robert.richter@amd.com>
@@ -2628,8 +2628,8 @@ take the forward porting patches:
/*
* This serves to avoid cpu buffer overflow, and makes sure
* the task mortuary progresses
---- head.orig/drivers/oprofile/cpu_buffer.h 2012-12-18 11:38:26.000000000 +0100
-+++ head/drivers/oprofile/cpu_buffer.h 2011-04-13 11:25:29.000000000 +0200
+--- 12.3.orig/drivers/oprofile/cpu_buffer.h 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/drivers/oprofile/cpu_buffer.h 2011-04-13 11:25:29.000000000 +0200
@@ -41,7 +41,7 @@ struct op_entry;
struct oprofile_cpu_buffer {
unsigned long buffer_size;
@@ -2664,8 +2664,8 @@ take the forward porting patches:
+#define DOMAIN_SWITCH (1UL << 5)
#endif /* OPROFILE_CPU_BUFFER_H */
---- head.orig/drivers/oprofile/event_buffer.h 2012-12-18 11:38:26.000000000 +0100
-+++ head/drivers/oprofile/event_buffer.h 2011-04-13 11:25:29.000000000 +0200
+--- 12.3.orig/drivers/oprofile/event_buffer.h 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/drivers/oprofile/event_buffer.h 2011-04-13 11:25:29.000000000 +0200
@@ -30,6 +30,9 @@ void wake_up_buffer_waiter(void);
#define INVALID_COOKIE ~0UL
#define NO_COOKIE 0UL
@@ -2676,8 +2676,8 @@ take the forward porting patches:
extern const struct file_operations event_buffer_fops;
/* mutex between sync_cpu_buffers() and the
---- head.orig/drivers/oprofile/oprof.c 2012-12-18 11:38:26.000000000 +0100
-+++ head/drivers/oprofile/oprof.c 2011-01-31 17:01:49.000000000 +0100
+--- 12.3.orig/drivers/oprofile/oprof.c 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/drivers/oprofile/oprof.c 2011-01-31 17:01:49.000000000 +0100
@@ -5,6 +5,10 @@
* @remark Read the file COPYING
*
@@ -2724,8 +2724,8 @@ take the forward porting patches:
int oprofile_setup(void)
{
int err;
---- head.orig/drivers/oprofile/oprof.h 2012-12-18 11:38:26.000000000 +0100
-+++ head/drivers/oprofile/oprof.h 2012-02-08 10:51:51.000000000 +0100
+--- 12.3.orig/drivers/oprofile/oprof.h 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/drivers/oprofile/oprof.h 2012-02-08 10:51:51.000000000 +0100
@@ -48,4 +48,7 @@ static inline int op_nmi_timer_init(stru
int oprofile_set_ulong(unsigned long *addr, unsigned long val);
int oprofile_set_timeout(unsigned long time);
@@ -2734,8 +2734,8 @@ take the forward porting patches:
+int oprofile_set_passive(int passive_domains[], unsigned int pdomains);
+
#endif /* OPROF_H */
---- head.orig/drivers/oprofile/oprofile_files.c 2012-12-18 11:38:26.000000000 +0100
-+++ head/drivers/oprofile/oprofile_files.c 2012-02-16 11:09:01.000000000 +0100
+--- 12.3.orig/drivers/oprofile/oprofile_files.c 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/drivers/oprofile/oprofile_files.c 2012-02-16 11:09:01.000000000 +0100
@@ -5,11 +5,17 @@
* @remark Read the file COPYING
*
@@ -2904,8 +2904,8 @@ take the forward porting patches:
oprofilefs_create_file(sb, root, "buffer", &event_buffer_fops);
oprofilefs_create_ulong(sb, root, "buffer_size", &oprofile_buffer_size);
oprofilefs_create_ulong(sb, root, "buffer_watershed", &oprofile_buffer_watershed);
---- head.orig/fs/aio.c 2012-12-18 11:38:26.000000000 +0100
-+++ head/fs/aio.c 2012-08-20 10:17:31.000000000 +0200
+--- 12.3.orig/fs/aio.c 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/fs/aio.c 2012-08-20 10:17:31.000000000 +0200
@@ -39,6 +39,11 @@
#include <asm/kmap_types.h>
#include <asm/uaccess.h>
@@ -3091,8 +3091,8 @@ take the forward porting patches:
io_destroy(ioctx);
put_ioctx(ioctx);
}
---- head.orig/fs/compat_ioctl.c 2012-12-18 11:38:26.000000000 +0100
-+++ head/fs/compat_ioctl.c 2012-10-31 10:43:47.000000000 +0100
+--- 12.3.orig/fs/compat_ioctl.c 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/fs/compat_ioctl.c 2012-10-31 10:43:47.000000000 +0100
@@ -116,6 +116,13 @@
#include <asm/fbio.h>
#endif
@@ -3127,8 +3127,8 @@ take the forward porting patches:
};
/*
---- head.orig/include/acpi/processor.h 2012-12-18 11:38:26.000000000 +0100
-+++ head/include/acpi/processor.h 2012-10-22 17:19:29.000000000 +0200
+--- 12.3.orig/include/acpi/processor.h 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/include/acpi/processor.h 2013-02-05 10:45:55.000000000 +0100
@@ -41,6 +41,17 @@
struct acpi_processor_cx;
@@ -3160,7 +3160,7 @@ take the forward porting patches:
char desc[ACPI_CX_DESC_LEN];
};
-@@ -283,6 +300,9 @@ static inline void acpi_processor_ppc_ex
+@@ -284,6 +301,9 @@ static inline void acpi_processor_ppc_ex
{
return;
}
@@ -3170,7 +3170,7 @@ take the forward porting patches:
static inline int acpi_processor_ppc_has_changed(struct acpi_processor *pr,
int event_flag)
{
-@@ -296,6 +316,7 @@ static inline int acpi_processor_ppc_has
+@@ -297,6 +317,7 @@ static inline int acpi_processor_ppc_has
}
return 0;
}
@@ -3178,7 +3178,7 @@ take the forward porting patches:
static inline int acpi_processor_get_bios_limit(int cpu, unsigned int *limit)
{
return -ENODEV;
-@@ -346,4 +367,120 @@ static inline void acpi_thermal_cpufreq_
+@@ -347,4 +368,120 @@ static inline void acpi_thermal_cpufreq_
}
#endif
@@ -3299,8 +3299,8 @@ take the forward porting patches:
+#endif /* CONFIG_XEN */
+
#endif
---- head.orig/include/linux/aio.h 2012-12-18 11:38:26.000000000 +0100
-+++ head/include/linux/aio.h 2012-08-20 10:17:46.000000000 +0200
+--- 12.3.orig/include/linux/aio.h 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/include/linux/aio.h 2012-08-20 10:17:46.000000000 +0200
@@ -203,6 +203,12 @@ struct kioctx {
struct delayed_work wq;
@@ -3314,8 +3314,8 @@ take the forward porting patches:
struct rcu_head rcu_head;
};
---- head.orig/include/linux/highmem.h 2012-12-18 11:38:26.000000000 +0100
-+++ head/include/linux/highmem.h 2012-08-20 10:17:53.000000000 +0200
+--- 12.3.orig/include/linux/highmem.h 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/include/linux/highmem.h 2012-08-20 10:17:53.000000000 +0200
@@ -182,12 +182,14 @@ alloc_zeroed_user_highpage_movable(struc
return __alloc_zeroed_user_highpage(__GFP_MOVABLE, vma, vaddr);
}
@@ -3347,8 +3347,8 @@ take the forward porting patches:
+#endif
+
#endif /* _LINUX_HIGHMEM_H */
---- head.orig/include/linux/interrupt.h 2012-12-18 11:38:26.000000000 +0100
-+++ head/include/linux/interrupt.h 2012-08-20 10:17:58.000000000 +0200
+--- 12.3.orig/include/linux/interrupt.h 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/include/linux/interrupt.h 2012-08-20 10:17:58.000000000 +0200
@@ -386,6 +386,11 @@ static inline int disable_irq_wake(unsig
}
#endif /* CONFIG_GENERIC_HARDIRQS */
@@ -3361,8 +3361,8 @@ take the forward porting patches:
#ifdef CONFIG_IRQ_FORCED_THREADING
extern bool force_irqthreads;
---- head.orig/include/linux/kexec.h 2012-12-18 11:38:26.000000000 +0100
-+++ head/include/linux/kexec.h 2012-10-22 17:19:14.000000000 +0200
+--- 12.3.orig/include/linux/kexec.h 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/include/linux/kexec.h 2012-10-22 17:19:14.000000000 +0200
@@ -57,6 +57,13 @@
KEXEC_CORE_NOTE_DESC_BYTES )
#endif
@@ -3390,8 +3390,8 @@ take the forward porting patches:
extern asmlinkage long sys_kexec_load(unsigned long entry,
unsigned long nr_segments,
struct kexec_segment __user *segments,
---- head.orig/include/linux/mm.h 2012-12-18 11:38:26.000000000 +0100
-+++ head/include/linux/mm.h 2012-10-22 17:19:04.000000000 +0200
+--- 12.3.orig/include/linux/mm.h 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/include/linux/mm.h 2012-10-22 17:19:04.000000000 +0200
@@ -104,8 +104,14 @@ extern unsigned int kobjsize(const void
#define VM_DONTDUMP 0x04000000 /* Do not include in the core dump */
@@ -3436,8 +3436,8 @@ take the forward porting patches:
#ifdef CONFIG_NUMA
/*
* set_policy() op must add a reference to any non-NULL @new mempolicy
---- head.orig/include/linux/oprofile.h 2012-12-18 11:38:26.000000000 +0100
-+++ head/include/linux/oprofile.h 2011-09-07 15:19:35.000000000 +0200
+--- 12.3.orig/include/linux/oprofile.h 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/include/linux/oprofile.h 2011-09-07 15:19:35.000000000 +0200
@@ -19,6 +19,9 @@
#include <linux/errno.h>
#include <linux/printk.h>
@@ -3491,8 +3491,8 @@ take the forward porting patches:
/**
* Create a file of the given name as a child of the given root, with
---- head.orig/include/linux/page-flags.h 2012-12-18 11:38:26.000000000 +0100
-+++ head/include/linux/page-flags.h 2012-08-20 10:18:05.000000000 +0200
+--- 12.3.orig/include/linux/page-flags.h 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/include/linux/page-flags.h 2013-01-25 14:03:48.000000000 +0100
@@ -109,6 +109,11 @@ enum pageflags {
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
PG_compound_lock,
@@ -3533,7 +3533,7 @@ take the forward porting patches:
extern void cancel_dirty_page(struct page *page, unsigned int account_size);
int test_clear_page_writeback(struct page *page);
-@@ -494,6 +520,14 @@ static inline void ClearPageSlabPfmemall
+@@ -500,6 +526,14 @@ static inline void ClearPageSlabPfmemall
#define __PG_COMPOUND_LOCK 0
#endif
@@ -3548,7 +3548,7 @@ take the forward porting patches:
/*
* Flags checked when a page is freed. Pages being freed should not have
* these flags set. It they are, there is a problem.
-@@ -504,7 +538,7 @@ static inline void ClearPageSlabPfmemall
+@@ -510,7 +544,7 @@ static inline void ClearPageSlabPfmemall
1 << PG_writeback | 1 << PG_reserved | \
1 << PG_slab | 1 << PG_swapcache | 1 << PG_active | \
1 << PG_unevictable | __PG_MLOCKED | __PG_HWPOISON | \
@@ -3557,8 +3557,8 @@ take the forward porting patches:
/*
* Flags checked when a page is prepped for return by the page allocator.
---- head.orig/include/linux/pci.h 2012-10-22 16:25:34.000000000 +0200
-+++ head/include/linux/pci.h 2012-10-22 17:19:10.000000000 +0200
+--- 12.3.orig/include/linux/pci.h 2012-10-22 16:25:34.000000000 +0200
++++ 12.3/include/linux/pci.h 2012-10-22 17:19:10.000000000 +0200
@@ -1121,6 +1121,10 @@ extern void pci_disable_msix(struct pci_
extern void msi_remove_pci_irq_vectors(struct pci_dev *dev);
extern void pci_restore_msi_state(struct pci_dev *dev);
@@ -3570,8 +3570,8 @@ take the forward porting patches:
#endif
#ifdef CONFIG_PCIEPORTBUS
---- head.orig/include/linux/vermagic.h 2012-12-18 11:38:26.000000000 +0100
-+++ head/include/linux/vermagic.h 2011-11-16 17:02:46.000000000 +0100
+--- 12.3.orig/include/linux/vermagic.h 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/include/linux/vermagic.h 2011-11-16 17:02:46.000000000 +0100
@@ -21,6 +21,11 @@
#else
#define MODULE_VERMAGIC_MODVERSIONS ""
@@ -3591,8 +3591,8 @@ take the forward porting patches:
- MODULE_ARCH_VERMAGIC
+ MODULE_VERMAGIC_XEN MODULE_ARCH_VERMAGIC
---- head.orig/kernel/irq/spurious.c 2012-12-18 11:38:26.000000000 +0100
-+++ head/kernel/irq/spurious.c 2011-12-21 10:08:43.000000000 +0100
+--- 12.3.orig/kernel/irq/spurious.c 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/kernel/irq/spurious.c 2011-12-21 10:08:43.000000000 +0100
@@ -290,7 +290,7 @@ void note_interrupt(unsigned int irq, st
*/
if (time_after(jiffies, desc->last_unhandled + HZ/10))
@@ -3602,8 +3602,8 @@ take the forward porting patches:
desc->irqs_unhandled++;
desc->last_unhandled = jiffies;
}
---- head.orig/kernel/kexec.c 2012-12-18 11:38:26.000000000 +0100
-+++ head/kernel/kexec.c 2012-10-22 17:19:41.000000000 +0200
+--- 12.3.orig/kernel/kexec.c 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/kernel/kexec.c 2012-10-22 17:19:41.000000000 +0200
@@ -354,13 +354,26 @@ static int kimage_is_destination_range(s
return 0;
}
@@ -3804,8 +3804,8 @@ take the forward porting patches:
/* Install the new kernel, and Uninstall the old */
image = xchg(dest_image, image);
---- head.orig/kernel/sysctl.c 2012-12-18 11:38:26.000000000 +0100
-+++ head/kernel/sysctl.c 2012-10-22 17:19:44.000000000 +0200
+--- 12.3.orig/kernel/sysctl.c 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/kernel/sysctl.c 2012-10-22 17:19:44.000000000 +0200
@@ -877,7 +877,7 @@ static struct ctl_table kern_table[] = {
.proc_handler = proc_dointvec,
},
@@ -3815,9 +3815,9 @@ take the forward porting patches:
{
.procname = "acpi_video_flags",
.data = &acpi_realmode_flags,
---- head.orig/mm/memory.c 2012-12-18 11:38:26.000000000 +0100
-+++ head/mm/memory.c 2012-10-22 17:19:52.000000000 +0200
-@@ -783,6 +783,12 @@ struct page *vm_normal_page(struct vm_ar
+--- 12.3.orig/mm/memory.c 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/mm/memory.c 2013-01-25 14:03:53.000000000 +0100
+@@ -788,6 +788,12 @@ struct page *vm_normal_page(struct vm_ar
{
unsigned long pfn = pte_pfn(pte);
@@ -3830,7 +3830,7 @@ take the forward porting patches:
if (HAVE_PTE_SPECIAL) {
if (likely(!pte_special(pte)))
goto check_pfn;
-@@ -814,6 +820,9 @@ struct page *vm_normal_page(struct vm_ar
+@@ -819,6 +825,9 @@ struct page *vm_normal_page(struct vm_ar
return NULL;
check_pfn:
if (unlikely(pfn > highest_memmap_pfn)) {
@@ -3840,7 +3840,7 @@ take the forward porting patches:
print_bad_pte(vma, addr, pte, NULL);
return NULL;
}
-@@ -1146,8 +1155,14 @@ again:
+@@ -1151,8 +1160,14 @@ again:
page->index > details->last_index))
continue;
}
@@ -3857,7 +3857,7 @@ take the forward porting patches:
tlb_remove_tlb_entry(tlb, pte, addr);
if (unlikely(!page))
continue;
-@@ -1415,6 +1430,7 @@ void zap_page_range(struct vm_area_struc
+@@ -1420,6 +1435,7 @@ void zap_page_range(struct vm_area_struc
mmu_notifier_invalidate_range_end(mm, start, end);
tlb_finish_mmu(&tlb, start, end);
}
@@ -3865,7 +3865,7 @@ take the forward porting patches:
/**
* zap_page_range_single - remove user pages in a given range
-@@ -1750,6 +1766,28 @@ int __get_user_pages(struct task_struct
+@@ -1755,6 +1771,28 @@ int __get_user_pages(struct task_struct
goto next_page;
}
@@ -3894,8 +3894,8 @@ take the forward porting patches:
if (!vma ||
(vma->vm_flags & (VM_IO | VM_PFNMAP)) ||
!(vm_flags & vma->vm_flags))
---- head.orig/mm/mmap.c 2012-12-18 11:38:26.000000000 +0100
-+++ head/mm/mmap.c 2012-12-18 11:40:21.000000000 +0100
+--- 12.3.orig/mm/mmap.c 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/mm/mmap.c 2012-12-18 11:40:21.000000000 +0100
@@ -1959,6 +1959,14 @@ static void unmap_region(struct mm_struc
tlb_finish_mmu(&tlb, start, end);
}
@@ -3931,8 +3931,8 @@ take the forward porting patches:
vma = mm->mmap;
if (!vma) /* Can happen if dup_mmap() received an OOM */
return;
---- head.orig/mm/mprotect.c 2012-12-18 11:38:26.000000000 +0100
-+++ head/mm/mprotect.c 2011-06-30 15:38:52.000000000 +0200
+--- 12.3.orig/mm/mprotect.c 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/mm/mprotect.c 2011-06-30 15:38:52.000000000 +0200
@@ -97,6 +97,8 @@ static inline void change_pmd_range(stru
}
if (pmd_none_or_clear_bad(pmd))
@@ -3942,8 +3942,8 @@ take the forward porting patches:
change_pte_range(vma->vm_mm, pmd, addr, next, newprot,
dirty_accountable);
} while (pmd++, addr = next, addr != end);
---- head.orig/mm/page_alloc.c 2012-12-18 11:38:26.000000000 +0100
-+++ head/mm/page_alloc.c 2012-10-22 17:20:00.000000000 +0200
+--- 12.3.orig/mm/page_alloc.c 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/mm/page_alloc.c 2012-10-22 17:20:00.000000000 +0200
@@ -693,6 +693,13 @@ static bool free_pages_prepare(struct pa
int i;
int bad = 0;
@@ -3958,8 +3958,8 @@ take the forward porting patches:
trace_mm_page_free(page, order);
kmemcheck_free_shadow(page, order);
---- head.orig/scripts/Makefile.build 2012-12-18 11:38:26.000000000 +0100
-+++ head/scripts/Makefile.build 2011-06-30 15:39:08.000000000 +0200
+--- 12.3.orig/scripts/Makefile.build 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/scripts/Makefile.build 2011-06-30 15:39:08.000000000 +0200
@@ -128,6 +128,21 @@ ifndef obj
$(warning kbuild: Makefile.build is included improperly)
endif
@@ -3982,8 +3982,8 @@ take the forward porting patches:
# ===========================================================================
ifneq ($(strip $(lib-y) $(lib-m) $(lib-n) $(lib-)),)
---- head.orig/scripts/Makefile.lib 2012-12-18 11:38:26.000000000 +0100
-+++ head/scripts/Makefile.lib 2012-04-10 15:40:06.000000000 +0200
+--- 12.3.orig/scripts/Makefile.lib 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/scripts/Makefile.lib 2012-04-10 15:40:06.000000000 +0200
@@ -22,6 +22,12 @@ obj-m := $(filter-out $(obj-y),$(obj-m))
lib-y := $(filter-out $(obj-y), $(sort $(lib-y) $(lib-m)))
diff --git a/patches.xen/xen3-auto-include-xen-interface.diff b/patches.xen/xen3-auto-include-xen-interface.diff
index 7938d9c692..aecbb51165 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 1213:302f7c9423c9)
+From http://xenbits.xen.org/linux-2.6.18-xen.hg (tip 1222:d732224ce60e)
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 f33173bce2..6ce79ef841 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 1213:302f7c9423c9)
+From http://xenbits.xen.org/linux-2.6.18-xen.hg (tip 1222:d732224ce60e)
Subject: xen3 xen-arch
From: xen-devel@lists.xen.org
Patch-mainline: n/a
@@ -147,7 +147,7 @@ pick them up (for reference, prefixed with the version the removal occured):
3.7/arch/x86/include/mach-xen/asm/cmpxchg.h (added in 2.6.24)
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/kernel/acpi/processor_extcntl_xen.c 2010-03-22 12:00:53.000000000 +0100
++++ 12.3/arch/x86/kernel/acpi/processor_extcntl_xen.c 2010-03-22 12:00:53.000000000 +0100
@@ -0,0 +1,208 @@
+/*
+ * processor_extcntl_xen.c - interface to notify Xen
@@ -358,7 +358,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+}
+EXPORT_SYMBOL(arch_acpi_processor_init_extcntl);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/kernel/apic/apic-xen.c 2007-06-12 13:12:48.000000000 +0200
++++ 12.3/arch/x86/kernel/apic/apic-xen.c 2007-06-12 13:12:48.000000000 +0200
@@ -0,0 +1,155 @@
+/*
+ * Local APIC handling, local APIC timers
@@ -516,7 +516,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+ return 0;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/kernel/cpu/common-xen.c 2012-07-05 09:59:30.000000000 +0200
++++ 12.3/arch/x86/kernel/cpu/common-xen.c 2012-07-05 09:59:30.000000000 +0200
@@ -0,0 +1,752 @@
+#include <linux/init.h>
+#include <linux/string.h>
@@ -1271,7 +1271,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+}
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/kernel/cpu/mcheck/mce_dom0.c 2011-10-17 10:45:09.000000000 +0200
++++ 12.3/arch/x86/kernel/cpu/mcheck/mce_dom0.c 2011-10-17 10:45:09.000000000 +0200
@@ -0,0 +1,133 @@
+#include <linux/init.h>
+#include <linux/types.h>
@@ -1407,7 +1407,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+}
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/kernel/cpu/mtrr/main-xen.c 2008-01-28 12:24:18.000000000 +0100
++++ 12.3/arch/x86/kernel/cpu/mtrr/main-xen.c 2008-01-28 12:24:18.000000000 +0100
@@ -0,0 +1,198 @@
+#include <linux/init.h>
+#include <linux/proc_fs.h>
@@ -1608,8 +1608,8 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+subsys_initcall(mtrr_init);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/kernel/entry_32-xen.S 2012-10-31 10:29:18.000000000 +0100
-@@ -0,0 +1,1242 @@
++++ 12.3/arch/x86/kernel/entry_32-xen.S 2013-01-25 13:04:32.000000000 +0100
+@@ -0,0 +1,1241 @@
+/*
+ * linux/arch/i386/entry.S
+ *
@@ -2484,12 +2484,11 @@ pick them up (for reference, prefixed with the version the removal occured):
+4: mov 16(%esp),%gs
+ testl %eax,%eax
+ popl %eax
-+ jz 5f
-+ addl $16,%esp # EAX != 0 => Category 2 (Bad IRET)
-+ jmp iret_exc
-+5: addl $16,%esp # EAX == 0 => Category 1 (Bad segment)
++ leal 16(%esp),%esp
+ RING0_INT_FRAME
-+ pushl $-1
++ jnz iret_exc # EAX != 0 => Category 2 (Bad IRET)
++ pushl $-1 # EAX == 0 => Category 1 (Bad segment)
++ CFI_ADJUST_CFA_OFFSET 4
+ SAVE_ALL
+ jmp ret_from_exception
+.section .fixup,"ax"; \
@@ -2853,7 +2852,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+syscall_table_size=(.-sys_call_table)
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/kernel/fixup.c 2008-01-28 12:24:18.000000000 +0100
++++ 12.3/arch/x86/kernel/fixup.c 2008-01-28 12:24:18.000000000 +0100
@@ -0,0 +1,88 @@
+/******************************************************************************
+ * fixup.c
@@ -2944,7 +2943,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+}
+__initcall(fixup_init);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/kernel/head_32-xen.S 2012-12-06 15:59:02.000000000 +0100
++++ 12.3/arch/x86/kernel/head_32-xen.S 2012-12-06 15:59:02.000000000 +0100
@@ -0,0 +1,237 @@
+
+
@@ -3184,7 +3183,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+ ELFNOTE(Xen, XEN_ELFNOTE_LOADER, .asciz, "generic")
+ ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long, 1)
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/kernel/io_apic_32-xen.c 2009-03-18 10:39:31.000000000 +0100
++++ 12.3/arch/x86/kernel/io_apic_32-xen.c 2009-03-18 10:39:31.000000000 +0100
@@ -0,0 +1,2786 @@
+/*
+ * Intel IO-APIC support for multi-Pentium hosts.
@@ -5973,7 +5972,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif /* CONFIG_ACPI */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/kernel/microcode_core-xen.c 2011-12-21 10:11:41.000000000 +0100
++++ 12.3/arch/x86/kernel/microcode_core-xen.c 2011-12-21 10:11:41.000000000 +0100
@@ -0,0 +1,147 @@
+/*
+ * Intel CPU Microcode Update Driver for Linux
@@ -6123,7 +6122,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+module_exit(microcode_exit)
+MODULE_ALIAS_MISCDEV(MICROCODE_MINOR);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/kernel/mpparse-xen.c 2007-06-12 13:12:48.000000000 +0200
++++ 12.3/arch/x86/kernel/mpparse-xen.c 2007-06-12 13:12:48.000000000 +0200
@@ -0,0 +1,1185 @@
+/*
+ * Intel Multiprocessor Specification 1.1 and 1.4
@@ -7311,7 +7310,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+#endif /* CONFIG_X86_IO_APIC */
+#endif /* CONFIG_ACPI */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/kernel/pci-dma-xen.c 2012-11-14 12:23:04.000000000 +0100
++++ 12.3/arch/x86/kernel/pci-dma-xen.c 2012-11-14 12:23:04.000000000 +0100
@@ -0,0 +1,406 @@
+/*
+ * Dynamic DMA mapping support.
@@ -7720,7 +7719,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+}
+EXPORT_SYMBOL(dma_sync_single_for_device);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/kernel/process_32-xen.c 2012-08-10 08:16:46.000000000 +0200
++++ 12.3/arch/x86/kernel/process_32-xen.c 2012-08-10 08:16:46.000000000 +0200
@@ -0,0 +1,883 @@
+/*
+ * linux/arch/i386/kernel/process.c
@@ -8606,7 +8605,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+ return sp & ~0xf;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/kernel/setup_32-xen.c 2012-06-06 13:16:59.000000000 +0200
++++ 12.3/arch/x86/kernel/setup_32-xen.c 2012-06-06 13:16:59.000000000 +0200
@@ -0,0 +1,1917 @@
+/*
+ * linux/arch/i386/kernel/setup.c
@@ -10526,7 +10525,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/kernel/smp_32-xen.c 2007-12-10 08:47:31.000000000 +0100
++++ 12.3/arch/x86/kernel/smp_32-xen.c 2007-12-10 08:47:31.000000000 +0100
@@ -0,0 +1,605 @@
+/*
+ * Intel SMP support routines.
@@ -11134,7 +11133,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+}
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/kernel/time-xen.c 2010-08-31 09:24:21.000000000 +0200
++++ 12.3/arch/x86/kernel/time-xen.c 2010-08-31 09:24:21.000000000 +0200
@@ -0,0 +1,1242 @@
+/*
+ * linux/arch/i386/kernel/time.c
@@ -12379,7 +12378,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+}
+__initcall(xen_sysctl_init);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/kernel/traps_32-xen.c 2012-07-05 09:59:30.000000000 +0200
++++ 12.3/arch/x86/kernel/traps_32-xen.c 2012-07-05 09:59:30.000000000 +0200
@@ -0,0 +1,1191 @@
+/*
+ * linux/arch/i386/traps.c
@@ -13573,7 +13572,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+__setup("call_trace=", call_trace_setup);
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/mach-xen/Makefile 2007-06-12 13:12:48.000000000 +0200
++++ 12.3/arch/x86/mach-xen/Makefile 2007-06-12 13:12:48.000000000 +0200
@@ -0,0 +1,5 @@
+#
+# Makefile for the linux kernel.
@@ -13581,7 +13580,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+obj-y := setup.o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/mach-xen/setup.c 2011-09-07 14:16:54.000000000 +0200
++++ 12.3/arch/x86/mach-xen/setup.c 2011-09-07 14:16:54.000000000 +0200
@@ -0,0 +1,158 @@
+/*
+ * Machine specific setup for generic
@@ -13742,7 +13741,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+#endif
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/lib/scrub.c 2008-02-08 12:30:51.000000000 +0100
++++ 12.3/arch/x86/lib/scrub.c 2008-02-08 12:30:51.000000000 +0100
@@ -0,0 +1,21 @@
+#include <asm/cpufeature.h>
+#include <asm/page.h>
@@ -13766,7 +13765,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+ clear_page(v);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/mm/fault_32-xen.c 2010-09-23 15:39:04.000000000 +0200
++++ 12.3/arch/x86/mm/fault_32-xen.c 2010-09-23 15:39:04.000000000 +0200
@@ -0,0 +1,792 @@
+/*
+ * linux/arch/i386/mm/fault.c
@@ -14561,7 +14560,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+}
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/mm/highmem_32-xen.c 2008-10-29 09:55:56.000000000 +0100
++++ 12.3/arch/x86/mm/highmem_32-xen.c 2008-10-29 09:55:56.000000000 +0100
@@ -0,0 +1,183 @@
+#include <linux/highmem.h>
+#include <linux/module.h>
@@ -14747,7 +14746,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+EXPORT_SYMBOL(clear_highpage);
+EXPORT_SYMBOL(copy_highpage);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/mm/hypervisor.c 2012-06-06 13:16:59.000000000 +0200
++++ 12.3/arch/x86/mm/hypervisor.c 2012-06-06 13:16:59.000000000 +0200
@@ -0,0 +1,652 @@
+/******************************************************************************
+ * mm/hypervisor.c
@@ -15402,7 +15401,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+ return !rc;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/mm/init_32-xen.c 2011-10-17 10:45:09.000000000 +0200
++++ 12.3/arch/x86/mm/init_32-xen.c 2011-10-17 10:45:09.000000000 +0200
@@ -0,0 +1,840 @@
+/*
+ * linux/arch/i386/mm/init.c
@@ -16245,7 +16244,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+#endif
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/mm/ioremap-xen.c 2011-04-11 13:43:15.000000000 +0200
++++ 12.3/arch/x86/mm/ioremap-xen.c 2011-04-11 13:43:15.000000000 +0200
@@ -0,0 +1,424 @@
+/*
+ * arch/i386/mm/ioremap.c
@@ -16672,7 +16671,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+ }
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/mm/pgtable_32-xen.c 2010-09-23 15:39:04.000000000 +0200
++++ 12.3/arch/x86/mm/pgtable_32-xen.c 2010-09-23 15:39:04.000000000 +0200
@@ -0,0 +1,738 @@
+/*
+ * linux/arch/i386/mm/pgtable.c
@@ -17413,7 +17412,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+ mm_unpin(mm);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/oprofile/xenoprof.c 2008-01-28 12:24:19.000000000 +0100
++++ 12.3/arch/x86/oprofile/xenoprof.c 2008-01-28 12:24:19.000000000 +0100
@@ -0,0 +1,179 @@
+/**
+ * @file xenoprof.c
@@ -17595,7 +17594,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+ xenoprofile_exit();
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/pci/pcifront.c 2009-03-18 10:39:31.000000000 +0100
++++ 12.3/arch/x86/pci/pcifront.c 2009-03-18 10:39:31.000000000 +0100
@@ -0,0 +1,57 @@
+/*
+ * PCI Frontend Stub - puts some "dummy" functions in to the Linux x86 PCI core
@@ -17655,7 +17654,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+arch_initcall(pcifront_x86_stub_init);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/ia32/ia32entry-xen.S 2008-04-02 12:34:02.000000000 +0200
++++ 12.3/arch/x86/ia32/ia32entry-xen.S 2008-04-02 12:34:02.000000000 +0200
@@ -0,0 +1,666 @@
+/*
+ * Compatibility mode system call entry point for x86-64.
@@ -18324,7 +18323,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+ .quad compat_sys_move_pages
+ia32_syscall_end:
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/kernel/e820_64-xen.c 2009-12-04 08:45:56.000000000 +0100
++++ 12.3/arch/x86/kernel/e820_64-xen.c 2009-12-04 08:45:56.000000000 +0100
@@ -0,0 +1,800 @@
+/*
+ * Handle the memory map.
@@ -19127,7 +19126,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+ pci_mem_start, gapstart, gapsize);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/kernel/early_printk-xen.c 2007-06-12 13:13:01.000000000 +0200
++++ 12.3/arch/x86/kernel/early_printk-xen.c 2007-06-12 13:13:01.000000000 +0200
@@ -0,0 +1,302 @@
+#include <linux/console.h>
+#include <linux/kernel.h>
@@ -19432,7 +19431,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+__setup("earlyprintk=", setup_early_printk);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/kernel/entry_64-xen.S 2012-10-31 10:29:18.000000000 +0100
++++ 12.3/arch/x86/kernel/entry_64-xen.S 2012-10-31 10:29:18.000000000 +0100
@@ -0,0 +1,1320 @@
+/*
+ * linux/arch/x86_64/entry.S
@@ -20755,7 +20754,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+ENDPROC(arch_unwind_init_running)
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/kernel/head_64-xen.S 2012-12-06 15:59:02.000000000 +0100
++++ 12.3/arch/x86/kernel/head_64-xen.S 2012-12-06 15:59:02.000000000 +0100
@@ -0,0 +1,245 @@
+/*
+ * linux/arch/x86_64/kernel/head.S -- start in 32bit and switch to 64bit
@@ -21003,7 +21002,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+ ELFNOTE(Xen, XEN_ELFNOTE_LOADER, .asciz, "generic")
+ ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long, 1)
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/kernel/head64-xen.c 2011-08-08 12:54:10.000000000 +0200
++++ 12.3/arch/x86/kernel/head64-xen.c 2011-08-08 12:54:10.000000000 +0200
@@ -0,0 +1,159 @@
+/*
+ * linux/arch/x86_64/kernel/head64.c -- prepare to run common code
@@ -21165,7 +21164,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+ start_kernel();
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/kernel/io_apic_64-xen.c 2009-03-18 10:39:31.000000000 +0100
++++ 12.3/arch/x86/kernel/io_apic_64-xen.c 2009-03-18 10:39:31.000000000 +0100
@@ -0,0 +1,2270 @@
+/*
+ * Intel IO-APIC support for multi-Pentium hosts.
@@ -23438,7 +23437,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+#endif
+#endif /* !CONFIG_XEN */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/kernel/ioport-xen.c 2008-01-28 12:24:19.000000000 +0100
++++ 12.3/arch/x86/kernel/ioport-xen.c 2008-01-28 12:24:19.000000000 +0100
@@ -0,0 +1,100 @@
+/*
+ * linux/arch/x86_64/kernel/ioport.c
@@ -23541,7 +23540,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+ return 0;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/kernel/ldt-xen.c 2007-06-12 13:13:01.000000000 +0200
++++ 12.3/arch/x86/kernel/ldt-xen.c 2007-06-12 13:13:01.000000000 +0200
@@ -0,0 +1,282 @@
+/*
+ * linux/arch/x86_64/kernel/ldt.c
@@ -23826,7 +23825,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+ return ret;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/kernel/process_64-xen.c 2012-08-10 08:16:46.000000000 +0200
++++ 12.3/arch/x86/kernel/process_64-xen.c 2012-08-10 08:16:46.000000000 +0200
@@ -0,0 +1,856 @@
+/*
+ * linux/arch/x86-64/kernel/process.c
@@ -24685,7 +24684,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+ return sp & ~0xf;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/kernel/setup_64-xen.c 2012-06-06 13:16:59.000000000 +0200
++++ 12.3/arch/x86/kernel/setup_64-xen.c 2012-06-06 13:16:59.000000000 +0200
@@ -0,0 +1,1654 @@
+/*
+ * linux/arch/x86-64/kernel/setup.c
@@ -26342,7 +26341,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+device_initcall(add_pcspkr);
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/kernel/smp_64-xen.c 2008-04-02 12:34:02.000000000 +0200
++++ 12.3/arch/x86/kernel/smp_64-xen.c 2008-04-02 12:34:02.000000000 +0200
@@ -0,0 +1,575 @@
+/*
+ * Intel SMP support routines.
@@ -26920,7 +26919,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+#endif
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/kernel/traps_64-xen.c 2012-07-05 09:59:30.000000000 +0200
++++ 12.3/arch/x86/kernel/traps_64-xen.c 2012-07-05 09:59:30.000000000 +0200
@@ -0,0 +1,1174 @@
+/*
+ * linux/arch/x86-64/traps.c
@@ -28097,7 +28096,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+__setup("call_trace=", call_trace_setup);
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/kernel/vsyscall_64-xen.c 2007-06-18 08:38:13.000000000 +0200
++++ 12.3/arch/x86/kernel/vsyscall_64-xen.c 2007-06-18 08:38:13.000000000 +0200
@@ -0,0 +1,227 @@
+/*
+ * linux/arch/x86_64/kernel/vsyscall.c
@@ -28327,7 +28326,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+__initcall(vsyscall_init);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/mm/fault_64-xen.c 2011-10-07 10:44:29.000000000 +0200
++++ 12.3/arch/x86/mm/fault_64-xen.c 2011-10-07 10:44:29.000000000 +0200
@@ -0,0 +1,731 @@
+/*
+ * linux/arch/x86-64/mm/fault.c
@@ -29061,7 +29060,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+}
+__setup("pagefaulttrace", enable_pagefaulttrace);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/mm/init_64-xen.c 2011-10-17 10:45:09.000000000 +0200
++++ 12.3/arch/x86/mm/init_64-xen.c 2011-10-17 10:45:09.000000000 +0200
@@ -0,0 +1,1244 @@
+/*
+ * linux/arch/x86_64/mm/init.c
@@ -30308,7 +30307,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+ return (addr >= VSYSCALL_START) && (addr < VSYSCALL_END);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/mm/pageattr_64-xen.c 2009-03-18 10:39:31.000000000 +0100
++++ 12.3/arch/x86/mm/pageattr_64-xen.c 2009-03-18 10:39:31.000000000 +0100
@@ -0,0 +1,508 @@
+/*
+ * Copyright 2002 Andi Kleen, SuSE Labs.
@@ -30819,7 +30818,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+EXPORT_SYMBOL(change_page_attr);
+EXPORT_SYMBOL(global_flush_tlb);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/pci/msi-xen.c 2012-10-31 10:29:18.000000000 +0100
++++ 12.3/drivers/pci/msi-xen.c 2012-10-31 10:29:18.000000000 +0100
@@ -0,0 +1,935 @@
+/*
+ * File: msi.c
@@ -31757,7 +31756,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+#endif
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/agp.h 2007-06-22 09:08:06.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/agp.h 2007-06-22 09:08:06.000000000 +0200
@@ -0,0 +1,44 @@
+#ifndef AGP_H
+#define AGP_H 1
@@ -31804,7 +31803,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/desc_32.h 2008-01-28 12:24:19.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/desc_32.h 2008-01-28 12:24:19.000000000 +0100
@@ -0,0 +1,166 @@
+#ifndef __ARCH_DESC_H
+#define __ARCH_DESC_H
@@ -31973,7 +31972,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/fixmap_32.h 2007-06-12 13:14:02.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/fixmap_32.h 2007-06-12 13:14:02.000000000 +0200
@@ -0,0 +1,155 @@
+/*
+ * fixmap.h: compile-time virtual memory allocation
@@ -32131,7 +32130,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+#endif /* !__ASSEMBLY__ */
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/gnttab_dma.h 2012-11-14 12:23:04.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/gnttab_dma.h 2012-11-14 12:23:04.000000000 +0100
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2007 Herbert Xu <herbert@gondor.apana.org.au>
@@ -32183,7 +32182,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif /* _ASM_I386_GNTTAB_DMA_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/highmem.h 2008-10-29 09:55:56.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/highmem.h 2008-10-29 09:55:56.000000000 +0100
@@ -0,0 +1,97 @@
+/*
+ * highmem.h: virtual kernel memory mappings for high memory
@@ -32283,7 +32282,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif /* _ASM_HIGHMEM_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/hypercall_32.h 2012-10-31 10:29:18.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/hypercall_32.h 2012-10-31 10:29:18.000000000 +0100
@@ -0,0 +1,409 @@
+/******************************************************************************
+ * hypercall.h
@@ -32695,7 +32694,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif /* __HYPERCALL_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/hypervisor.h 2012-10-31 10:29:18.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/hypervisor.h 2012-10-31 10:29:18.000000000 +0100
@@ -0,0 +1,288 @@
+/******************************************************************************
+ * hypervisor.h
@@ -32986,7 +32985,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif /* __HYPERVISOR_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/irqflags_32.h 2007-06-12 13:14:02.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/irqflags_32.h 2007-06-12 13:14:02.000000000 +0200
@@ -0,0 +1,127 @@
+/*
+ * include/asm-i386/irqflags.h
@@ -33116,7 +33115,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/maddr_32.h 2011-08-08 12:54:10.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/maddr_32.h 2011-08-08 12:54:10.000000000 +0200
@@ -0,0 +1,193 @@
+#ifndef _I386_MADDR_H
+#define _I386_MADDR_H
@@ -33312,7 +33311,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif /* _I386_MADDR_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/mmu_context_32.h 2007-06-12 13:14:02.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/mmu_context_32.h 2007-06-12 13:14:02.000000000 +0200
@@ -0,0 +1,108 @@
+#ifndef __I386_SCHED_H
+#define __I386_SCHED_H
@@ -33423,7 +33422,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/pgalloc_32.h 2008-07-21 11:00:33.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/pgalloc_32.h 2008-07-21 11:00:33.000000000 +0200
@@ -0,0 +1,59 @@
+#ifndef _I386_PGALLOC_H
+#define _I386_PGALLOC_H
@@ -33485,7 +33484,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif /* _I386_PGALLOC_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/pgtable-3level-defs.h 2007-06-12 13:14:02.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/pgtable-3level-defs.h 2007-06-12 13:14:02.000000000 +0200
@@ -0,0 +1,24 @@
+#ifndef _I386_PGTABLE_3LEVEL_DEFS_H
+#define _I386_PGTABLE_3LEVEL_DEFS_H
@@ -33512,7 +33511,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif /* _I386_PGTABLE_3LEVEL_DEFS_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/pgtable-3level.h 2008-04-02 12:34:02.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/pgtable-3level.h 2008-04-02 12:34:02.000000000 +0200
@@ -0,0 +1,211 @@
+#ifndef _I386_PGTABLE_3LEVEL_H
+#define _I386_PGTABLE_3LEVEL_H
@@ -33726,7 +33725,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif /* _I386_PGTABLE_3LEVEL_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-04-11 13:43:15.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-04-11 13:43:15.000000000 +0200
@@ -0,0 +1,547 @@
+#ifndef _I386_PGTABLE_H
+#define _I386_PGTABLE_H
@@ -34276,7 +34275,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif /* _I386_PGTABLE_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/processor_32.h 2008-01-28 12:24:19.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/processor_32.h 2008-01-28 12:24:19.000000000 +0100
@@ -0,0 +1,743 @@
+/*
+ * include/asm-i386/processor.h
@@ -35022,7 +35021,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif /* __ASM_I386_PROCESSOR_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/smp_32.h 2007-06-12 13:14:02.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/smp_32.h 2007-06-12 13:14:02.000000000 +0200
@@ -0,0 +1,103 @@
+#ifndef __ASM_SMP_H
+#define __ASM_SMP_H
@@ -35128,7 +35127,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+#endif
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/tlbflush_32.h 2007-11-26 16:59:25.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/tlbflush_32.h 2007-11-26 16:59:25.000000000 +0100
@@ -0,0 +1,101 @@
+#ifndef _I386_TLBFLUSH_H
+#define _I386_TLBFLUSH_H
@@ -35232,7 +35231,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif /* _I386_TLBFLUSH_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/vga.h 2007-06-12 13:14:02.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/vga.h 2007-06-12 13:14:02.000000000 +0200
@@ -0,0 +1,20 @@
+/*
+ * Access to VGA videoram
@@ -35255,7 +35254,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/xenoprof.h 2007-06-12 13:14:02.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/xenoprof.h 2007-06-12 13:14:02.000000000 +0200
@@ -0,0 +1,48 @@
+/******************************************************************************
+ * asm-i386/mach-xen/asm/xenoprof.h
@@ -35306,7 +35305,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+#endif /* CONFIG_XEN */
+#endif /* __ASM_XENOPROF_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/irq_vectors.h 2008-09-25 13:55:32.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/irq_vectors.h 2008-09-25 13:55:32.000000000 +0200
@@ -0,0 +1,125 @@
+/*
+ * This file should contain #defines for all of the interrupt vector
@@ -35434,7 +35433,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif /* _ASM_IRQ_VECTORS_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/mach_traps.h 2007-06-12 13:14:02.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/mach_traps.h 2007-06-12 13:14:02.000000000 +0200
@@ -0,0 +1,33 @@
+/*
+ * include/asm-xen/asm-i386/mach-xen/mach_traps.h
@@ -35470,7 +35469,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif /* !_MACH_TRAPS_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/desc_64.h 2008-01-28 12:24:19.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/desc_64.h 2008-01-28 12:24:19.000000000 +0100
@@ -0,0 +1,265 @@
+/* Written 2000 by Andi Kleen */
+#ifndef __ARCH_DESC_H
@@ -35738,7 +35737,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/fixmap_64.h 2007-06-12 13:14:13.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/fixmap_64.h 2007-06-12 13:14:13.000000000 +0200
@@ -0,0 +1,112 @@
+/*
+ * fixmap.h: compile-time virtual memory allocation
@@ -35853,7 +35852,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/hypercall_64.h 2012-10-31 10:29:18.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/hypercall_64.h 2012-10-31 10:29:18.000000000 +0100
@@ -0,0 +1,416 @@
+/******************************************************************************
+ * hypercall.h
@@ -36272,7 +36271,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif /* __HYPERCALL_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/irqflags_64.h 2007-06-12 13:14:13.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/irqflags_64.h 2007-06-12 13:14:13.000000000 +0200
@@ -0,0 +1,139 @@
+/*
+ * include/asm-x86_64/irqflags.h
@@ -36414,7 +36413,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/maddr_64.h 2011-08-08 12:54:10.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/maddr_64.h 2011-08-08 12:54:10.000000000 +0200
@@ -0,0 +1,161 @@
+#ifndef _X86_64_MADDR_H
+#define _X86_64_MADDR_H
@@ -36578,7 +36577,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+#endif /* _X86_64_MADDR_H */
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/mmu_context_64.h 2007-06-12 13:14:13.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/mmu_context_64.h 2007-06-12 13:14:13.000000000 +0200
@@ -0,0 +1,136 @@
+#ifndef __X86_64_MMU_CONTEXT_H
+#define __X86_64_MMU_CONTEXT_H
@@ -36717,7 +36716,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/pgalloc_64.h 2010-09-23 15:39:04.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/pgalloc_64.h 2010-09-23 15:39:04.000000000 +0200
@@ -0,0 +1,210 @@
+#ifndef _X86_64_PGALLOC_H
+#define _X86_64_PGALLOC_H
@@ -36930,7 +36929,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif /* _X86_64_PGALLOC_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-04-11 13:43:15.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-04-11 13:43:15.000000000 +0200
@@ -0,0 +1,580 @@
+#ifndef _X86_64_PGTABLE_H
+#define _X86_64_PGTABLE_H
@@ -37513,7 +37512,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif /* _X86_64_PGTABLE_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/processor_64.h 2008-03-06 08:54:32.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/processor_64.h 2008-03-06 08:54:32.000000000 +0100
@@ -0,0 +1,502 @@
+/*
+ * include/asm-x86_64/processor.h
@@ -38018,7 +38017,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif /* __ASM_X86_64_PROCESSOR_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/smp_64.h 2007-06-12 13:14:13.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/smp_64.h 2007-06-12 13:14:13.000000000 +0200
@@ -0,0 +1,150 @@
+#ifndef __ASM_SMP_H
+#define __ASM_SMP_H
@@ -38171,7 +38170,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+#endif
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/tlbflush_64.h 2007-11-26 16:59:25.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/tlbflush_64.h 2007-11-26 16:59:25.000000000 +0100
@@ -0,0 +1,103 @@
+#ifndef _X8664_TLBFLUSH_H
+#define _X8664_TLBFLUSH_H
@@ -38277,7 +38276,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif /* _X8664_TLBFLUSH_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/setup_arch_post.h 2007-06-12 13:14:13.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/setup_arch_post.h 2007-06-12 13:14:13.000000000 +0200
@@ -0,0 +1,63 @@
+/**
+ * machine_specific_* - Hooks for machine specific setup.
@@ -38343,7 +38342,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+#endif
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/setup_arch_pre.h 2007-06-12 13:14:13.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/setup_arch_pre.h 2007-06-12 13:14:13.000000000 +0200
@@ -0,0 +1,5 @@
+/* Hook to call BIOS initialisation function */
+
@@ -38351,7 +38350,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+static void __init machine_specific_arch_setup(void);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/include/xen/barrier.h 2012-06-06 13:16:59.000000000 +0200
++++ 12.3/include/xen/barrier.h 2012-06-06 13:16:59.000000000 +0200
@@ -0,0 +1,10 @@
+#ifndef __XEN_BARRIER_H__
+#define __XEN_BARRIER_H__
@@ -38364,7 +38363,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif /* __XEN_BARRIER_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/include/xen/blkif.h 2012-04-04 08:57:09.000000000 +0200
++++ 12.3/include/xen/blkif.h 2012-04-04 08:57:09.000000000 +0200
@@ -0,0 +1,124 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -38491,7 +38490,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif /* __XEN_BLKIF_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/include/xen/compat_ioctl.h 2010-01-18 15:23:12.000000000 +0100
++++ 12.3/include/xen/compat_ioctl.h 2010-01-18 15:23:12.000000000 +0100
@@ -0,0 +1,75 @@
+/*
+ * This program is free software; you can redistribute it and/or
@@ -38569,7 +38568,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif /* __LINUX_XEN_COMPAT_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/include/xen/cpu_hotplug.h 2007-08-16 18:07:01.000000000 +0200
++++ 12.3/include/xen/cpu_hotplug.h 2007-08-16 18:07:01.000000000 +0200
@@ -0,0 +1,41 @@
+#ifndef __XEN_CPU_HOTPLUG_H__
+#define __XEN_CPU_HOTPLUG_H__
@@ -38613,7 +38612,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif /* __XEN_CPU_HOTPLUG_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/include/xen/driver_util.h 2007-06-12 13:14:19.000000000 +0200
++++ 12.3/include/xen/driver_util.h 2007-06-12 13:14:19.000000000 +0200
@@ -0,0 +1,14 @@
+
+#ifndef __ASM_XEN_DRIVER_UTIL_H__
@@ -38630,7 +38629,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif /* __ASM_XEN_DRIVER_UTIL_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/include/xen/evtchn.h 2009-03-19 11:35:59.000000000 +0100
++++ 12.3/include/xen/evtchn.h 2009-03-19 11:35:59.000000000 +0100
@@ -0,0 +1,146 @@
+/******************************************************************************
+ * evtchn.h
@@ -38779,7 +38778,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif /* __ASM_EVTCHN_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/include/xen/firmware.h 2011-10-17 10:45:09.000000000 +0200
++++ 12.3/include/xen/firmware.h 2011-10-17 10:45:09.000000000 +0200
@@ -0,0 +1,14 @@
+#ifndef __XEN_FIRMWARE_H__
+#define __XEN_FIRMWARE_H__
@@ -38796,7 +38795,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif /* __XEN_FIRMWARE_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/include/xen/gnttab.h 2012-03-12 12:51:05.000000000 +0100
++++ 12.3/include/xen/gnttab.h 2012-03-12 12:51:05.000000000 +0100
@@ -0,0 +1,204 @@
+/******************************************************************************
+ * gnttab.h
@@ -39003,7 +39002,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif /* __ASM_GNTTAB_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/include/xen/hypercall.h 2008-01-28 12:24:19.000000000 +0100
++++ 12.3/include/xen/hypercall.h 2008-01-28 12:24:19.000000000 +0100
@@ -0,0 +1,30 @@
+#ifndef __XEN_HYPERCALL_H__
+#define __XEN_HYPERCALL_H__
@@ -39036,7 +39035,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif /* __XEN_HYPERCALL_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/include/xen/pcifront.h 2012-04-04 08:57:09.000000000 +0200
++++ 12.3/include/xen/pcifront.h 2012-04-04 08:57:09.000000000 +0200
@@ -0,0 +1,75 @@
+/*
+ * PCI Frontend - arch-dependendent declarations
@@ -39114,7 +39113,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif /* __XEN_ASM_PCIFRONT_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/include/uapi/xen/public/evtchn.h 2007-06-12 13:14:19.000000000 +0200
++++ 12.3/include/uapi/xen/public/evtchn.h 2007-06-12 13:14:19.000000000 +0200
@@ -0,0 +1,88 @@
+/******************************************************************************
+ * evtchn.h
@@ -39205,7 +39204,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif /* __LINUX_PUBLIC_EVTCHN_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/include/uapi/xen/public/gntdev.h 2008-04-02 12:34:02.000000000 +0200
++++ 12.3/include/uapi/xen/public/gntdev.h 2008-04-02 12:34:02.000000000 +0200
@@ -0,0 +1,119 @@
+/******************************************************************************
+ * gntdev.h
@@ -39327,7 +39326,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif /* __LINUX_PUBLIC_GNTDEV_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/include/uapi/xen/public/privcmd.h 2010-01-18 15:23:12.000000000 +0100
++++ 12.3/include/uapi/xen/public/privcmd.h 2010-01-18 15:23:12.000000000 +0100
@@ -0,0 +1,89 @@
+/******************************************************************************
+ * privcmd.h
@@ -39419,7 +39418,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif /* __LINUX_PUBLIC_PRIVCMD_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/include/uapi/xen/public/xenbus.h 2009-05-29 10:25:53.000000000 +0200
++++ 12.3/include/uapi/xen/public/xenbus.h 2009-05-29 10:25:53.000000000 +0200
@@ -0,0 +1,56 @@
+/******************************************************************************
+ * xenbus.h
@@ -39478,7 +39477,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif /* __LINUX_PUBLIC_XENBUS_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/include/xen/xen_proc.h 2007-06-12 13:14:19.000000000 +0200
++++ 12.3/include/xen/xen_proc.h 2007-06-12 13:14:19.000000000 +0200
@@ -0,0 +1,12 @@
+
+#ifndef __ASM_XEN_PROC_H__
@@ -39493,7 +39492,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif /* __ASM_XEN_PROC_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/include/xen/xencons.h 2012-03-22 13:27:48.000000000 +0100
++++ 12.3/include/xen/xencons.h 2012-03-22 13:27:48.000000000 +0100
@@ -0,0 +1,12 @@
+#ifndef __ASM_XENCONS_H__
+#define __ASM_XENCONS_H__
@@ -39508,7 +39507,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+
+#endif /* __ASM_XENCONS_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/include/xen/xenoprof.h 2007-06-12 13:14:19.000000000 +0200
++++ 12.3/include/xen/xenoprof.h 2007-06-12 13:14:19.000000000 +0200
@@ -0,0 +1,42 @@
+/******************************************************************************
+ * xen/xenoprof.h
@@ -39553,7 +39552,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+#endif /* CONFIG_XEN */
+#endif /* __XEN_XENOPROF_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/lib/swiotlb-xen.c 2012-11-14 12:23:04.000000000 +0100
++++ 12.3/lib/swiotlb-xen.c 2012-11-14 12:23:04.000000000 +0100
@@ -0,0 +1,765 @@
+/*
+ * Dynamic DMA mapping support.
@@ -40321,7 +40320,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+EXPORT_SYMBOL(swiotlb_dma_mapping_error);
+EXPORT_SYMBOL(swiotlb_dma_supported);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/mm/tmem-xen.c 2011-05-23 10:40:00.000000000 +0200
++++ 12.3/mm/tmem-xen.c 2011-05-23 10:40:00.000000000 +0200
@@ -0,0 +1,42 @@
+/*
+ * Xen implementation for transcendent memory (tmem)
@@ -40366,7 +40365,7 @@ pick them up (for reference, prefixed with the version the removal occured):
+ return rc;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/scripts/Makefile.xen.awk 2007-08-06 15:10:49.000000000 +0200
++++ 12.3/scripts/Makefile.xen.awk 2007-08-06 15:10:49.000000000 +0200
@@ -0,0 +1,34 @@
+BEGIN {
+ is_rule = 0
diff --git a/patches.xen/xen3-auto-xen-drivers.diff b/patches.xen/xen3-auto-xen-drivers.diff
index 98cf74b63c..de232abc4f 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 1213:302f7c9423c9)
+From http://xenbits.xen.org/linux-2.6.18-xen.hg (tip 1222:d732224ce60e)
Subject: xen3 xen-drivers
From: xen-devel@lists.xen.org
Patch-mainline: n/a
@@ -34,12 +34,12 @@ and in case upstream wants to take the forward porting patches:
3.7/drivers/xen/core/fallback.c
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/balloon/Makefile 2007-06-12 13:13:44.000000000 +0200
++++ 12.3/drivers/xen/balloon/Makefile 2007-06-12 13:13:44.000000000 +0200
@@ -0,0 +1,2 @@
+
+obj-y := balloon.o sysfs.o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/balloon/balloon.c 2012-06-06 13:16:59.000000000 +0200
++++ 12.3/drivers/xen/balloon/balloon.c 2012-06-06 13:16:59.000000000 +0200
@@ -0,0 +1,744 @@
+/******************************************************************************
+ * balloon.c
@@ -786,7 +786,7 @@ and in case upstream wants to take the forward porting patches:
+
+MODULE_LICENSE("Dual BSD/GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/balloon/common.h 2009-06-09 15:01:37.000000000 +0200
++++ 12.3/drivers/xen/balloon/common.h 2009-06-09 15:01:37.000000000 +0200
@@ -0,0 +1,56 @@
+/******************************************************************************
+ * balloon/common.h
@@ -845,7 +845,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* __XEN_BALLOON_COMMON_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/balloon/sysfs.c 2012-02-29 10:23:59.000000000 +0100
++++ 12.3/drivers/xen/balloon/sysfs.c 2012-02-29 10:23:59.000000000 +0100
@@ -0,0 +1,167 @@
+/******************************************************************************
+ * balloon/sysfs.c
@@ -1015,15 +1015,15 @@ and in case upstream wants to take the forward porting patches:
+ unregister_balloon(&balloon_sysdev);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/blkback/Makefile 2009-06-09 15:01:37.000000000 +0200
++++ 12.3/drivers/xen/blkback/Makefile 2009-06-09 15:01:37.000000000 +0200
@@ -0,0 +1,4 @@
+obj-$(CONFIG_XEN_BLKDEV_BACKEND) := blkbk.o
+obj-$(CONFIG_XEN_BLKBACK_PAGEMAP) += blkback-pagemap.o
+
+blkbk-y := blkback.o xenbus.o interface.o vbd.o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/blkback/blkback.c 2012-04-04 08:57:09.000000000 +0200
-@@ -0,0 +1,672 @@
++++ 12.3/drivers/xen/blkback/blkback.c 2013-02-05 10:28:44.000000000 +0100
+@@ -0,0 +1,671 @@
+/******************************************************************************
+ * arch/xen/drivers/blkif/backend/main.c
+ *
@@ -1081,15 +1081,15 @@ and in case upstream wants to take the forward porting patches:
+ * This will increase the chances of being able to write whole tracks.
+ * 64 should be enough to keep us competitive with Linux.
+ */
-+static int blkif_reqs = 64;
-+module_param_named(reqs, blkif_reqs, int, 0);
++static unsigned int blkif_reqs = 64;
++module_param_named(reqs, blkif_reqs, uint, 0);
+MODULE_PARM_DESC(reqs, "Number of blkback requests to allocate");
+
+/* Run-time switchable: /sys/module/blkback/parameters/ */
-+static unsigned int log_stats = 0;
-+static unsigned int debug_lvl = 0;
-+module_param(log_stats, int, 0644);
-+module_param(debug_lvl, int, 0644);
++static int log_stats;
++static unsigned int debug_lvl;
++module_param(log_stats, bool, 0644);
++module_param(debug_lvl, uint, 0644);
+
+/*
+ * Each outstanding request that we've passed to the lower device layers has a
@@ -1466,7 +1466,6 @@ and in case upstream wants to take the forward porting patches:
+ goto fail_response;
+ }
+
-+ preq.dev = req->handle;
+ preq.sector_number = req->sector_number;
+ preq.nr_sects = 0;
+
@@ -1697,7 +1696,7 @@ and in case upstream wants to take the forward porting patches:
+
+MODULE_LICENSE("Dual BSD/GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/blkback/blkback-pagemap.c 2009-06-09 15:01:37.000000000 +0200
++++ 12.3/drivers/xen/blkback/blkback-pagemap.c 2009-06-09 15:01:37.000000000 +0200
@@ -0,0 +1,96 @@
+#include <linux/module.h>
+#include "blkback-pagemap.h"
@@ -1796,7 +1795,7 @@ and in case upstream wants to take the forward porting patches:
+
+MODULE_LICENSE("Dual BSD/GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/blkback/blkback-pagemap.h 2009-06-09 15:01:37.000000000 +0200
++++ 12.3/drivers/xen/blkback/blkback-pagemap.h 2009-06-09 15:01:37.000000000 +0200
@@ -0,0 +1,37 @@
+#ifndef _BLKBACK_PAGEMAP_H_
+#define _BLKBACK_PAGEMAP_H_
@@ -1836,7 +1835,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/blkback/common.h 2012-06-06 13:16:59.000000000 +0200
++++ 12.3/drivers/xen/blkback/common.h 2012-06-06 13:16:59.000000000 +0200
@@ -0,0 +1,145 @@
+/*
+ * This program is free software; you can redistribute it and/or
@@ -1984,7 +1983,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* __BLKIF__BACKEND__COMMON_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/blkback/interface.c 2012-04-04 08:57:09.000000000 +0200
++++ 12.3/drivers/xen/blkback/interface.c 2012-04-04 08:57:09.000000000 +0200
@@ -0,0 +1,137 @@
+/******************************************************************************
+ * arch/xen/drivers/blkif/backend/interface.c
@@ -2124,7 +2123,7 @@ and in case upstream wants to take the forward porting patches:
+ 0, 0, NULL, NULL);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/blkback/vbd.c 2011-06-30 15:37:44.000000000 +0200
++++ 12.3/drivers/xen/blkback/vbd.c 2011-06-30 15:37:44.000000000 +0200
@@ -0,0 +1,169 @@
+/******************************************************************************
+ * blkback/vbd.c
@@ -2296,7 +2295,7 @@ and in case upstream wants to take the forward porting patches:
+ xenbus_transaction_end(xbt, 1);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/blkback/xenbus.c 2012-12-18 10:47:37.000000000 +0100
++++ 12.3/drivers/xen/blkback/xenbus.c 2012-12-18 10:47:37.000000000 +0100
@@ -0,0 +1,550 @@
+/* Xenbus code for blkif backend
+ Copyright (C) 2005 Rusty Russell <rusty@rustcorp.com.au>
@@ -2849,7 +2848,7 @@ and in case upstream wants to take the forward porting patches:
+ WARN_ON(xenbus_register_backend(&blkback_driver));
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/blkfront/Makefile 2007-06-12 13:13:44.000000000 +0200
++++ 12.3/drivers/xen/blkfront/Makefile 2007-06-12 13:13:44.000000000 +0200
@@ -0,0 +1,5 @@
+
+obj-$(CONFIG_XEN_BLKDEV_FRONTEND) := xenblk.o
@@ -2857,7 +2856,7 @@ and in case upstream wants to take the forward porting patches:
+xenblk-objs := blkfront.o vbd.o
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/blkfront/blkfront.c 2012-10-04 11:18:40.000000000 +0200
++++ 12.3/drivers/xen/blkfront/blkfront.c 2012-10-04 11:18:40.000000000 +0200
@@ -0,0 +1,1022 @@
+/******************************************************************************
+ * blkfront.c
@@ -3882,7 +3881,7 @@ and in case upstream wants to take the forward porting patches:
+
+MODULE_LICENSE("Dual BSD/GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/blkfront/block.h 2012-06-06 13:16:59.000000000 +0200
++++ 12.3/drivers/xen/blkfront/block.h 2012-06-06 13:16:59.000000000 +0200
@@ -0,0 +1,154 @@
+/******************************************************************************
+ * block.h
@@ -4039,7 +4038,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* __XEN_DRIVERS_BLOCK_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/blkfront/vbd.c 2012-03-12 12:51:05.000000000 +0100
++++ 12.3/drivers/xen/blkfront/vbd.c 2012-03-12 12:51:05.000000000 +0100
@@ -0,0 +1,606 @@
+/******************************************************************************
+ * vbd.c
@@ -4648,7 +4647,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* CONFIG_SYSFS */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/blktap/Makefile 2007-06-12 13:13:44.000000000 +0200
++++ 12.3/drivers/xen/blktap/Makefile 2007-06-12 13:13:44.000000000 +0200
@@ -0,0 +1,5 @@
+LINUXINCLUDE += -I../xen/include/public/io
+
@@ -4656,7 +4655,7 @@ and in case upstream wants to take the forward porting patches:
+
+xenblktap-y := xenbus.o interface.o blktap.o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/blktap/blktap.c 2012-12-06 15:59:02.000000000 +0100
++++ 12.3/drivers/xen/blktap/blktap.c 2013-01-25 13:04:32.000000000 +0100
@@ -0,0 +1,1763 @@
+/******************************************************************************
+ * drivers/xen/blktap/blktap.c
@@ -4787,10 +4786,10 @@ and in case upstream wants to take the forward porting patches:
+static int blktap_next_minor;
+
+/* Run-time switchable: /sys/module/blktap/parameters/ */
-+static unsigned int log_stats = 0;
-+static unsigned int debug_lvl = 0;
-+module_param(log_stats, int, 0644);
-+module_param(debug_lvl, int, 0644);
++static int log_stats;
++static unsigned int debug_lvl;
++module_param(log_stats, bool, 0644);
++module_param(debug_lvl, uint, 0644);
+
+/*
+ * Each outstanding request that we've passed to the lower device layers has a
@@ -6422,8 +6421,8 @@ and in case upstream wants to take the forward porting patches:
+
+MODULE_LICENSE("Dual BSD/GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/blktap/common.h 2012-06-06 13:16:59.000000000 +0200
-@@ -0,0 +1,114 @@
++++ 12.3/drivers/xen/blktap/common.h 2013-02-05 10:28:44.000000000 +0100
+@@ -0,0 +1,116 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2
@@ -6467,7 +6466,9 @@ and in case upstream wants to take the forward porting patches:
+#define DPRINTK(_f, _a...) pr_debug("(file=%s, line=%d) " _f, \
+ __FILE__ , __LINE__ , ## _a )
+
-+#define WPRINTK(fmt, args...) printk(KERN_WARNING "blk_tap: " fmt, ##args)
++#define WPRINTK(fmt, args...) \
++ ((void)(printk_ratelimit() && \
++ printk(KERN_WARNING "blktap: " fmt, ##args)))
+
+struct backend_info;
+
@@ -6539,7 +6540,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* __BLKIF__BACKEND__COMMON_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/blktap/interface.c 2012-04-04 08:57:09.000000000 +0200
++++ 12.3/drivers/xen/blktap/interface.c 2012-04-04 08:57:09.000000000 +0200
@@ -0,0 +1,133 @@
+/******************************************************************************
+ * drivers/xen/blktap/interface.c
@@ -6675,7 +6676,7 @@ and in case upstream wants to take the forward porting patches:
+ 0, 0, NULL, NULL);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/blktap/xenbus.c 2012-04-04 08:57:09.000000000 +0200
++++ 12.3/drivers/xen/blktap/xenbus.c 2012-04-04 08:57:09.000000000 +0200
@@ -0,0 +1,502 @@
+/* drivers/xen/blktap/xenbus.c
+ *
@@ -7180,13 +7181,13 @@ and in case upstream wants to take the forward porting patches:
+ WARN_ON(xenbus_register_backend(&blktap_driver));
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/blktap2/Makefile 2009-05-29 10:25:53.000000000 +0200
++++ 12.3/drivers/xen/blktap2/Makefile 2009-05-29 10:25:53.000000000 +0200
@@ -0,0 +1,3 @@
+obj-$(CONFIG_XEN_BLKDEV_TAP2) := blktap.o
+
+blktap-objs := control.o ring.o wait_queue.o device.o request.o sysfs.o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/blktap2/blktap.h 2012-06-06 13:16:59.000000000 +0200
++++ 12.3/drivers/xen/blktap2/blktap.h 2012-06-06 13:16:59.000000000 +0200
@@ -0,0 +1,255 @@
+#ifndef _BLKTAP_H_
+#define _BLKTAP_H_
@@ -7444,7 +7445,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/blktap2/control.c 2011-04-11 13:43:15.000000000 +0200
++++ 12.3/drivers/xen/blktap2/control.c 2011-04-11 13:43:15.000000000 +0200
@@ -0,0 +1,277 @@
+#include <linux/module.h>
+#include <linux/miscdevice.h>
@@ -7724,7 +7725,7 @@ and in case upstream wants to take the forward porting patches:
+module_exit(blktap_exit);
+MODULE_LICENSE("Dual BSD/GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/blktap2/device.c 2012-02-16 11:09:01.000000000 +0100
++++ 12.3/drivers/xen/blktap2/device.c 2012-02-16 11:09:01.000000000 +0100
@@ -0,0 +1,1178 @@
+#include <linux/fs.h>
+#include <linux/blkdev.h>
@@ -8905,7 +8906,7 @@ and in case upstream wants to take the forward porting patches:
+ BTERR("blktap device unregister failed\n");
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/blktap2/request.c 2010-01-04 11:56:34.000000000 +0100
++++ 12.3/drivers/xen/blktap2/request.c 2010-01-04 11:56:34.000000000 +0100
@@ -0,0 +1,296 @@
+#include <linux/spinlock.h>
+#include <xen/balloon.h>
@@ -9204,7 +9205,7 @@ and in case upstream wants to take the forward porting patches:
+ return err;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/blktap2/ring.c 2011-04-11 13:43:15.000000000 +0200
++++ 12.3/drivers/xen/blktap2/ring.c 2011-04-11 13:43:15.000000000 +0200
@@ -0,0 +1,610 @@
+#include <linux/module.h>
+#include <linux/signal.h>
@@ -9817,7 +9818,7 @@ and in case upstream wants to take the forward porting patches:
+ return 0;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/blktap2/sysfs.c 2012-02-16 11:09:01.000000000 +0100
++++ 12.3/drivers/xen/blktap2/sysfs.c 2012-02-16 11:09:01.000000000 +0100
@@ -0,0 +1,425 @@
+#include <linux/types.h>
+#include <linux/device.h>
@@ -10245,7 +10246,7 @@ and in case upstream wants to take the forward porting patches:
+ return 0;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/blktap2/wait_queue.c 2009-05-29 10:25:53.000000000 +0200
++++ 12.3/drivers/xen/blktap2/wait_queue.c 2009-05-29 10:25:53.000000000 +0200
@@ -0,0 +1,40 @@
+#include <linux/list.h>
+#include <linux/spinlock.h>
@@ -10288,11 +10289,11 @@ and in case upstream wants to take the forward porting patches:
+ spin_unlock_irqrestore(&deferred_work_lock, flags);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/char/Makefile 2007-07-10 09:42:30.000000000 +0200
++++ 12.3/drivers/xen/char/Makefile 2007-07-10 09:42:30.000000000 +0200
@@ -0,0 +1 @@
+obj-$(CONFIG_XEN_DEVMEM) := mem.o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/char/mem.c 2012-01-20 14:18:49.000000000 +0100
++++ 12.3/drivers/xen/char/mem.c 2012-01-20 14:18:49.000000000 +0100
@@ -0,0 +1,181 @@
+/*
+ * Originally from linux/drivers/char/mem.c
@@ -10476,13 +10477,13 @@ and in case upstream wants to take the forward porting patches:
+ .open = open_mem,
+};
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/console/Makefile 2007-06-12 13:13:44.000000000 +0200
++++ 12.3/drivers/xen/console/Makefile 2007-06-12 13:13:44.000000000 +0200
@@ -0,0 +1,2 @@
+
+obj-y := console.o xencons_ring.o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/console/console.c 2012-03-22 13:27:48.000000000 +0100
-@@ -0,0 +1,745 @@
++++ 12.3/drivers/xen/console/console.c 2013-02-05 10:28:44.000000000 +0100
+@@ -0,0 +1,741 @@
+/******************************************************************************
+ * console.c
+ *
@@ -10832,8 +10833,6 @@ and in case upstream wants to take the forward porting patches:
+#define DUMMY_TTY(_tty) ((xc_mode == XC_TTY) && \
+ ((_tty)->index != (xc_num - 1)))
+
-+static struct termios *xencons_termios[MAX_NR_CONSOLES];
-+static struct termios *xencons_termios_locked[MAX_NR_CONSOLES];
+static struct tty_struct *xencons_tty;
+static int xencons_priv_irq;
+static char x_char;
@@ -11168,8 +11167,6 @@ and in case upstream wants to take the forward porting patches:
+ DRV(xencons_driver)->flags =
+ TTY_DRIVER_REAL_RAW |
+ TTY_DRIVER_RESET_TERMIOS;
-+ DRV(xencons_driver)->termios = xencons_termios;
-+ DRV(xencons_driver)->termios_locked = xencons_termios_locked;
+
+ switch (xc_mode) {
+ case XC_XVC:
@@ -11229,7 +11226,7 @@ and in case upstream wants to take the forward porting patches:
+
+MODULE_LICENSE("Dual BSD/GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/console/xencons.h 2012-03-22 13:27:48.000000000 +0100
++++ 12.3/drivers/xen/console/xencons.h 2012-03-22 13:27:48.000000000 +0100
@@ -0,0 +1,12 @@
+#include <xen/evtchn.h>
+#include <xen/xencons.h>
@@ -11244,7 +11241,7 @@ and in case upstream wants to take the forward porting patches:
+int xencons_ring_init(void);
+int xencons_ring_send(const char *data, unsigned len);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/console/xencons_ring.c 2012-03-22 13:27:48.000000000 +0100
++++ 12.3/drivers/xen/console/xencons_ring.c 2012-03-22 13:27:48.000000000 +0100
@@ -0,0 +1,123 @@
+/*
+ * This program is free software; you can redistribute it and/or
@@ -11370,7 +11367,7 @@ and in case upstream wants to take the forward porting patches:
+ notify_daemon();
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/core/Makefile 2012-10-31 10:29:18.000000000 +0100
++++ 12.3/drivers/xen/core/Makefile 2012-10-31 10:29:18.000000000 +0100
@@ -0,0 +1,15 @@
+#
+# Makefile for the linux kernel.
@@ -11388,7 +11385,7 @@ and in case upstream wants to take the forward porting patches:
+obj-$(CONFIG_KEXEC) += machine_kexec.o
+obj-$(CONFIG_XEN_XENCOMM) += xencomm.o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/core/cpu_hotplug.c 2011-01-24 12:06:05.000000000 +0100
++++ 12.3/drivers/xen/core/cpu_hotplug.c 2013-01-25 13:04:32.000000000 +0100
@@ -0,0 +1,179 @@
+#include <linux/init.h>
+#include <linux/kernel.h>
@@ -11420,13 +11417,13 @@ and in case upstream wants to take the forward porting patches:
+static void vcpu_hotplug(unsigned int cpu, struct sys_device *dev)
+{
+ int err;
-+ char dir[32], state[32];
++ char dir[16], state[16];
+
+ if ((cpu >= NR_CPUS) || !cpu_possible(cpu))
+ return;
+
+ sprintf(dir, "cpu/%u", cpu);
-+ err = xenbus_scanf(XBT_NIL, dir, "availability", "%s", state);
++ err = xenbus_scanf(XBT_NIL, dir, "availability", "%15s", state);
+ if (err != 1) {
+ printk(KERN_ERR "XENBUS: Unable to read cpu state\n");
+ return;
@@ -11570,7 +11567,7 @@ and in case upstream wants to take the forward porting patches:
+ xenbus_allowed_cpumask = cpu_present_map;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/core/evtchn.c 2012-10-04 11:18:40.000000000 +0200
++++ 12.3/drivers/xen/core/evtchn.c 2012-10-04 11:18:40.000000000 +0200
@@ -0,0 +1,1219 @@
+/******************************************************************************
+ * evtchn.c
@@ -12792,7 +12789,7 @@ and in case upstream wants to take the forward porting patches:
+ }
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/core/firmware.c 2012-06-12 15:05:58.000000000 +0200
++++ 12.3/drivers/xen/core/firmware.c 2012-06-12 15:05:58.000000000 +0200
@@ -0,0 +1,75 @@
+#include <linux/kernel.h>
+#include <linux/errno.h>
@@ -12870,7 +12867,7 @@ and in case upstream wants to take the forward porting patches:
+#endif
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/core/gnttab.c 2012-11-14 12:23:04.000000000 +0100
++++ 12.3/drivers/xen/core/gnttab.c 2012-11-14 12:23:04.000000000 +0100
@@ -0,0 +1,864 @@
+/******************************************************************************
+ * gnttab.c
@@ -13737,7 +13734,7 @@ and in case upstream wants to take the forward porting patches:
+core_initcall(gnttab_init);
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/core/machine_kexec.c 2011-12-21 10:11:41.000000000 +0100
++++ 12.3/drivers/xen/core/machine_kexec.c 2011-12-21 10:11:41.000000000 +0100
@@ -0,0 +1,244 @@
+/*
+ * drivers/xen/core/machine_kexec.c
@@ -13984,7 +13981,7 @@ and in case upstream wants to take the forward porting patches:
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/core/machine_reboot.c 2011-10-17 10:45:09.000000000 +0200
++++ 12.3/drivers/xen/core/machine_reboot.c 2011-10-17 10:45:09.000000000 +0200
@@ -0,0 +1,242 @@
+#include <linux/version.h>
+#include <linux/kernel.h>
@@ -14229,7 +14226,7 @@ and in case upstream wants to take the forward porting patches:
+ return 0;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/core/reboot.c 2011-06-30 15:37:44.000000000 +0200
++++ 12.3/drivers/xen/core/reboot.c 2011-06-30 15:37:44.000000000 +0200
@@ -0,0 +1,338 @@
+#define __KERNEL_SYSCALLS__
+#include <linux/version.h>
@@ -14570,7 +14567,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* !defined(CONFIG_XEN) */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/core/smpboot.c 2012-04-04 08:57:09.000000000 +0200
++++ 12.3/drivers/xen/core/smpboot.c 2012-04-04 08:57:09.000000000 +0200
@@ -0,0 +1,462 @@
+/*
+ * Xen SMP booting functions
@@ -15035,7 +15032,7 @@ and in case upstream wants to take the forward porting patches:
+}
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/core/xen_proc.c 2011-04-11 13:43:15.000000000 +0200
++++ 12.3/drivers/xen/core/xen_proc.c 2011-04-11 13:43:15.000000000 +0200
@@ -0,0 +1,25 @@
+
+#include <linux/module.h>
@@ -15063,12 +15060,12 @@ and in case upstream wants to take the forward porting patches:
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/fbfront/Makefile 2007-06-12 13:13:45.000000000 +0200
++++ 12.3/drivers/xen/fbfront/Makefile 2007-06-12 13:13:45.000000000 +0200
@@ -0,0 +1,2 @@
+obj-$(CONFIG_XEN_FRAMEBUFFER) := xenfb.o
+obj-$(CONFIG_XEN_KEYBOARD) += xenkbd.o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/fbfront/xenfb.c 2012-10-04 11:18:40.000000000 +0200
++++ 12.3/drivers/xen/fbfront/xenfb.c 2013-01-25 13:04:32.000000000 +0100
@@ -0,0 +1,890 @@
+/*
+ * linux/drivers/video/xenfb.c -- Xen para-virtual frame buffer device
@@ -15210,8 +15207,8 @@ and in case upstream wants to take the forward porting patches:
+#define XENFB_DEFAULT_FB_LEN (XENFB_WIDTH * XENFB_HEIGHT * XENFB_DEPTH / 8)
+
+enum {KPARAM_MEM, KPARAM_WIDTH, KPARAM_HEIGHT, KPARAM_CNT};
-+static int video[KPARAM_CNT] = {2, XENFB_WIDTH, XENFB_HEIGHT};
-+module_param_array(video, int, NULL, 0);
++static unsigned int video[KPARAM_CNT] = {2, XENFB_WIDTH, XENFB_HEIGHT};
++module_param_array(video, uint, NULL, 0);
+MODULE_PARM_DESC(video,
+ "Size of video memory in MB and width,height in pixels, default = (2,800,600)");
+
@@ -15961,7 +15958,7 @@ and in case upstream wants to take the forward porting patches:
+
+MODULE_LICENSE("GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/fbfront/xenkbd.c 2012-10-04 11:18:40.000000000 +0200
++++ 12.3/drivers/xen/fbfront/xenkbd.c 2012-10-04 11:18:40.000000000 +0200
@@ -0,0 +1,368 @@
+/*
+ * linux/drivers/input/keyboard/xenkbd.c -- Xen para-virtual input device
@@ -16332,11 +16329,11 @@ and in case upstream wants to take the forward porting patches:
+
+MODULE_LICENSE("GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/gntdev/Makefile 2008-01-07 13:19:18.000000000 +0100
++++ 12.3/drivers/xen/gntdev/Makefile 2008-01-07 13:19:18.000000000 +0100
@@ -0,0 +1 @@
+obj-$(CONFIG_XEN_GRANT_DEV) := gntdev.o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/gntdev/gntdev.c 2012-05-14 08:37:24.000000000 +0200
++++ 12.3/drivers/xen/gntdev/gntdev.c 2012-05-14 08:37:24.000000000 +0200
@@ -0,0 +1,978 @@
+/******************************************************************************
+ * gntdev.c
@@ -17317,7 +17314,7 @@ and in case upstream wants to take the forward porting patches:
+ return 0;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/netback/Makefile 2007-07-12 08:54:23.000000000 +0200
++++ 12.3/drivers/xen/netback/Makefile 2007-07-12 08:54:23.000000000 +0200
@@ -0,0 +1,5 @@
+obj-$(CONFIG_XEN_NETDEV_BACKEND) := netbk.o
+obj-$(CONFIG_XEN_NETDEV_LOOPBACK) += netloop.o
@@ -17325,7 +17322,7 @@ and in case upstream wants to take the forward porting patches:
+netbk-y := netback.o xenbus.o interface.o accel.o
+netloop-y := loopback.o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/netback/accel.c 2011-06-30 15:37:44.000000000 +0200
++++ 12.3/drivers/xen/netback/accel.c 2011-06-30 15:37:44.000000000 +0200
@@ -0,0 +1,269 @@
+/******************************************************************************
+ * drivers/xen/netback/accel.c
@@ -17597,8 +17594,8 @@ and in case upstream wants to take the forward porting patches:
+ INIT_LIST_HEAD(&accelerators_list);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/netback/common.h 2012-06-06 13:16:59.000000000 +0200
-@@ -0,0 +1,219 @@
++++ 12.3/drivers/xen/netback/common.h 2013-02-05 10:28:44.000000000 +0100
+@@ -0,0 +1,222 @@
+/******************************************************************************
+ * arch/xen/drivers/netif/backend/common.h
+ *
@@ -17805,6 +17802,9 @@ and in case upstream wants to take the forward porting patches:
+struct net_device_stats *netif_be_get_stats(struct net_device *dev);
+irqreturn_t netif_be_int(int irq, void *dev_id, struct pt_regs *regs);
+
++/* Prevent the device from generating any further traffic. */
++void xenvif_carrier_off(netif_t *netif);
++
+static inline int netbk_can_queue(struct net_device *dev)
+{
+ netif_t *netif = netdev_priv(dev);
@@ -17819,8 +17819,8 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* __NETIF__BACKEND__COMMON_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/netback/interface.c 2011-10-17 10:45:09.000000000 +0200
-@@ -0,0 +1,381 @@
++++ 12.3/drivers/xen/netback/interface.c 2013-02-05 10:28:44.000000000 +0100
+@@ -0,0 +1,385 @@
+/******************************************************************************
+ * arch/xen/drivers/netif/backend/interface.c
+ *
@@ -18170,19 +18170,23 @@ and in case upstream wants to take the forward porting patches:
+ return err;
+}
+
++void xenvif_carrier_off(netif_t *netif)
++{
++ rtnl_lock();
++ netback_carrier_off(netif);
++ netif_carrier_off(netif->dev); /* discard queued packets */
++ if (netif_running(netif->dev))
++ __netif_down(netif);
++ rtnl_unlock();
++ netif_put(netif);
++}
++
+void netif_disconnect(struct backend_info *be)
+{
+ netif_t *netif = be->netif;
+
-+ if (netback_carrier_ok(netif)) {
-+ rtnl_lock();
-+ netback_carrier_off(netif);
-+ netif_carrier_off(netif->dev); /* discard queued packets */
-+ if (netif_running(netif->dev))
-+ __netif_down(netif);
-+ rtnl_unlock();
-+ netif_put(netif);
-+ }
++ if (netback_carrier_ok(netif))
++ xenvif_carrier_off(netif);
+
+ atomic_dec(&netif->refcnt);
+ wait_event(netif->waiting_to_free, atomic_read(&netif->refcnt) == 0);
@@ -18203,7 +18207,7 @@ and in case upstream wants to take the forward porting patches:
+ free_netdev(netif->dev);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/netback/loopback.c 2011-01-03 12:43:21.000000000 +0100
++++ 12.3/drivers/xen/netback/loopback.c 2011-01-03 12:43:21.000000000 +0100
@@ -0,0 +1,309 @@
+/******************************************************************************
+ * netback/loopback.c
@@ -18515,8 +18519,8 @@ and in case upstream wants to take the forward porting patches:
+
+MODULE_LICENSE("Dual BSD/GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/netback/netback.c 2012-06-06 13:16:59.000000000 +0200
-@@ -0,0 +1,1694 @@
++++ 12.3/drivers/xen/netback/netback.c 2013-02-05 10:28:44.000000000 +0100
+@@ -0,0 +1,1731 @@
+/******************************************************************************
+ * drivers/xen/netback/netback.c
+ *
@@ -19530,7 +19534,7 @@ and in case upstream wants to take the forward porting patches:
+
+ do {
+ make_tx_response(netif, txp, NETIF_RSP_ERROR);
-+ if (cons >= end)
++ if (cons == end)
+ break;
+ txp = RING_GET_REQUEST(&netif->tx, cons++);
+ } while (1);
@@ -19539,6 +19543,14 @@ and in case upstream wants to take the forward porting patches:
+ netif_put(netif);
+}
+
++static void netbk_fatal_tx_err(netif_t *netif)
++{
++ printk(KERN_ERR "%s: fatal error; disabling device\n",
++ netif->dev->name);
++ xenvif_carrier_off(netif);
++ netif_put(netif);
++}
++
+static int netbk_count_requests(netif_t *netif, netif_tx_request_t *first,
+ netif_tx_request_t *txp, int work_to_do)
+{
@@ -19550,19 +19562,25 @@ and in case upstream wants to take the forward porting patches:
+
+ do {
+ if (frags >= work_to_do) {
-+ DPRINTK("Need more frags\n");
++ printk(KERN_ERR "%s: Need more frags\n",
++ netif->dev->name);
++ netbk_fatal_tx_err(netif);
+ return -frags;
+ }
+
+ if (unlikely(frags >= MAX_SKB_FRAGS)) {
-+ DPRINTK("Too many frags\n");
++ printk(KERN_ERR "%s: Too many frags\n",
++ netif->dev->name);
++ netbk_fatal_tx_err(netif);
+ return -frags;
+ }
+
+ memcpy(txp, RING_GET_REQUEST(&netif->tx, cons + frags),
+ sizeof(*txp));
+ if (txp->size > first->size) {
-+ DPRINTK("Frags galore\n");
++ printk(KERN_ERR "%s: Frag is bigger than frame.\n",
++ netif->dev->name);
++ netbk_fatal_tx_err(netif);
+ return -frags;
+ }
+
@@ -19570,8 +19588,9 @@ and in case upstream wants to take the forward porting patches:
+ frags++;
+
+ if (unlikely((txp->offset + txp->size) > PAGE_SIZE)) {
-+ DPRINTK("txp->offset: %x, size: %u\n",
-+ txp->offset, txp->size);
++ printk(KERN_ERR "%s: txp->offset: %x, size: %u\n",
++ netif->dev->name, txp->offset, txp->size);
++ netbk_fatal_tx_err(netif);
+ return -frags;
+ }
+ } while ((txp++)->flags & NETTXF_more_data);
@@ -19714,7 +19733,9 @@ and in case upstream wants to take the forward porting patches:
+
+ do {
+ if (unlikely(work_to_do-- <= 0)) {
-+ DPRINTK("Missing extra info\n");
++ printk(KERN_ERR "%s: Missing extra info\n",
++ netif->dev->name);
++ netbk_fatal_tx_err(netif);
+ return -EBADR;
+ }
+
@@ -19723,7 +19744,9 @@ and in case upstream wants to take the forward porting patches:
+ if (unlikely(!extra.type ||
+ extra.type >= XEN_NETIF_EXTRA_TYPE_MAX)) {
+ netif->tx.req_cons = ++cons;
-+ DPRINTK("Invalid extra type: %d\n", extra.type);
++ printk(KERN_ERR "%s: Invalid extra type: %d\n",
++ netif->dev->name, extra.type);
++ netbk_fatal_tx_err(netif);
+ return -EINVAL;
+ }
+
@@ -19734,16 +19757,21 @@ and in case upstream wants to take the forward porting patches:
+ return work_to_do;
+}
+
-+static int netbk_set_skb_gso(struct sk_buff *skb, struct netif_extra_info *gso)
++static int netbk_set_skb_gso(netif_t *netif, struct sk_buff *skb,
++ struct netif_extra_info *gso)
+{
+ if (!gso->u.gso.size) {
-+ DPRINTK("GSO size must not be zero.\n");
++ printk(KERN_ERR "%s: GSO size must not be zero.\n",
++ netif->dev->name);
++ netbk_fatal_tx_err(netif);
+ return -EINVAL;
+ }
+
+ /* Currently only TCPv4 S.O. is supported. */
+ if (gso->u.gso.type != XEN_NETIF_GSO_TYPE_TCPV4) {
-+ DPRINTK("Bad GSO type %d.\n", gso->u.gso.type);
++ printk(KERN_ERR "%s: Bad GSO type %d.\n",
++ netif->dev->name, gso->u.gso.type);
++ netbk_fatal_tx_err(netif);
+ return -EINVAL;
+ }
+
@@ -19778,9 +19806,25 @@ and in case upstream wants to take the forward porting patches:
+ !list_empty(&net_schedule_list)) {
+ /* Get a netif from the list with work to do. */
+ netif = poll_net_schedule_list();
++ /*
++ * This can sometimes happen because the test of
++ * list_empty(net_schedule_list) at the top of the
++ * loop is unlocked. Just go back and have another
++ * look.
++ */
+ if (!netif)
+ continue;
+
++ if (netif->tx.sring->req_prod - netif->tx.req_cons >
++ NET_TX_RING_SIZE) {
++ printk(KERN_ERR "%s: Impossible number of requests. "
++ "req_prod %u, req_cons %u, size %lu\n",
++ netif->dev->name, netif->tx.sring->req_prod,
++ netif->tx.req_cons, NET_TX_RING_SIZE);
++ netbk_fatal_tx_err(netif);
++ continue;
++ }
++
+ RING_FINAL_CHECK_FOR_REQUESTS(&netif->tx, work_to_do);
+ if (!work_to_do) {
+ netif_put(netif);
@@ -19832,17 +19876,14 @@ and in case upstream wants to take the forward porting patches:
+ work_to_do = netbk_get_extras(netif, extras,
+ work_to_do);
+ i = netif->tx.req_cons;
-+ if (unlikely(work_to_do < 0)) {
-+ netbk_tx_err(netif, &txreq, i);
++ if (unlikely(work_to_do < 0))
+ continue;
-+ }
+ }
+
+ ret = netbk_count_requests(netif, &txreq, txfrags, work_to_do);
-+ if (unlikely(ret < 0)) {
-+ netbk_tx_err(netif, &txreq, i - ret);
++ if (unlikely(ret < 0))
+ continue;
-+ }
++
+ i += ret;
+
+ if (unlikely(txreq.size < ETH_HLEN)) {
@@ -19853,10 +19894,10 @@ and in case upstream wants to take the forward porting patches:
+
+ /* No crossing a page as the payload mustn't fragment. */
+ if (unlikely((txreq.offset + txreq.size) > PAGE_SIZE)) {
-+ DPRINTK("txreq.offset: %x, size: %u, end: %lu\n",
-+ txreq.offset, txreq.size,
-+ (txreq.offset &~PAGE_MASK) + txreq.size);
-+ netbk_tx_err(netif, &txreq, i);
++ printk(KERN_ERR "%s: txreq.offset: %x, size: %u, end: %lu\n",
++ netif->dev->name, txreq.offset, txreq.size,
++ (txreq.offset & ~PAGE_MASK) + txreq.size);
++ netbk_fatal_tx_err(netif);
+ continue;
+ }
+
@@ -19881,9 +19922,9 @@ and in case upstream wants to take the forward porting patches:
+ struct netif_extra_info *gso;
+ gso = &extras[XEN_NETIF_EXTRA_TYPE_GSO - 1];
+
-+ if (netbk_set_skb_gso(skb, gso)) {
++ if (netbk_set_skb_gso(netif, skb, gso)) {
++ /* Failure in netbk_set_skb_gso is fatal. */
+ kfree_skb(skb);
-+ netbk_tx_err(netif, &txreq, i);
+ continue;
+ }
+ }
@@ -20212,7 +20253,7 @@ and in case upstream wants to take the forward porting patches:
+
+MODULE_LICENSE("Dual BSD/GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/netback/xenbus.c 2012-01-06 10:19:49.000000000 +0100
++++ 12.3/drivers/xen/netback/xenbus.c 2012-01-06 10:19:49.000000000 +0100
@@ -0,0 +1,493 @@
+/* Xenbus code for netif backend
+ Copyright (C) 2005 Rusty Russell <rusty@rustcorp.com.au>
@@ -20708,14 +20749,14 @@ and in case upstream wants to take the forward porting patches:
+ WARN_ON(xenbus_register_backend(&netback_driver));
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/netfront/Makefile 2007-07-12 08:54:23.000000000 +0200
++++ 12.3/drivers/xen/netfront/Makefile 2007-07-12 08:54:23.000000000 +0200
@@ -0,0 +1,4 @@
+
+obj-$(CONFIG_XEN_NETDEV_FRONTEND) := xennet.o
+
+xennet-objs := netfront.o accel.o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/netfront/accel.c 2009-05-04 10:01:03.000000000 +0200
++++ 12.3/drivers/xen/netfront/accel.c 2009-05-04 10:01:03.000000000 +0200
@@ -0,0 +1,827 @@
+/******************************************************************************
+ * Virtual network driver for conversing with remote driver backends.
@@ -21545,7 +21586,7 @@ and in case upstream wants to take the forward porting patches:
+}
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/netfront/netfront.c 2012-10-04 11:18:40.000000000 +0200
++++ 12.3/drivers/xen/netfront/netfront.c 2012-10-04 11:18:40.000000000 +0200
@@ -0,0 +1,2252 @@
+/******************************************************************************
+ * Virtual network driver for conversing with remote driver backends.
@@ -23800,7 +23841,7 @@ and in case upstream wants to take the forward porting patches:
+
+MODULE_LICENSE("Dual BSD/GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/netfront/netfront.h 2012-06-06 13:16:59.000000000 +0200
++++ 12.3/drivers/xen/netfront/netfront.h 2012-06-06 13:16:59.000000000 +0200
@@ -0,0 +1,275 @@
+/******************************************************************************
+ * Virtual network driver for conversing with remote driver backends.
@@ -24078,7 +24119,7 @@ and in case upstream wants to take the forward porting patches:
+ struct xenbus_device *dev);
+#endif /* NETFRONT_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/xen-pciback/controller.c 2009-03-18 10:39:32.000000000 +0100
++++ 12.3/drivers/xen/xen-pciback/controller.c 2009-03-18 10:39:32.000000000 +0100
@@ -0,0 +1,443 @@
+/*
+ * Copyright (C) 2007 Hewlett-Packard Development Company, L.P.
@@ -24524,7 +24565,7 @@ and in case upstream wants to take the forward porting patches:
+}
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/xen-pciback/slot.c 2009-03-18 10:39:32.000000000 +0100
++++ 12.3/drivers/xen/xen-pciback/slot.c 2009-03-18 10:39:32.000000000 +0100
@@ -0,0 +1,187 @@
+/*
+ * PCI Backend - Provides a Virtual PCI bus (with real devices)
@@ -24714,7 +24755,7 @@ and in case upstream wants to take the forward porting patches:
+
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/pcifront/Makefile 2007-06-12 13:13:45.000000000 +0200
++++ 12.3/drivers/xen/pcifront/Makefile 2007-06-12 13:13:45.000000000 +0200
@@ -0,0 +1,7 @@
+obj-y += pcifront.o
+
@@ -24724,7 +24765,7 @@ and in case upstream wants to take the forward porting patches:
+EXTRA_CFLAGS += -DDEBUG
+endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/pcifront/pci.c 2007-06-12 13:13:45.000000000 +0200
++++ 12.3/drivers/xen/pcifront/pci.c 2007-06-12 13:13:45.000000000 +0200
@@ -0,0 +1,46 @@
+/*
+ * PCI Frontend Operations - ensure only one PCI frontend runs at a time
@@ -24773,7 +24814,7 @@ and in case upstream wants to take the forward porting patches:
+ spin_unlock(&pcifront_dev_lock);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/pcifront/pci_op.c 2012-04-04 08:57:09.000000000 +0200
++++ 12.3/drivers/xen/pcifront/pci_op.c 2013-01-25 13:04:32.000000000 +0100
@@ -0,0 +1,662 @@
+/*
+ * PCI Frontend Operations - Communicates with frontend
@@ -24789,8 +24830,8 @@ and in case upstream wants to take the forward porting patches:
+#include <xen/evtchn.h>
+#include "pcifront.h"
+
-+static int verbose_request = 0;
-+module_param(verbose_request, int, 0644);
++static int verbose_request;
++module_param(verbose_request, bool, 0644);
+
+static void pcifront_init_sd(struct pcifront_sd *sd,
+ unsigned int domain, unsigned int bus,
@@ -25438,7 +25479,7 @@ and in case upstream wants to take the forward porting patches:
+ return IRQ_HANDLED;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/pcifront/pcifront.h 2010-10-05 09:58:12.000000000 +0200
++++ 12.3/drivers/xen/pcifront/pcifront.h 2010-10-05 09:58:12.000000000 +0200
@@ -0,0 +1,56 @@
+/*
+ * PCI Frontend - Common data structures & function declarations
@@ -25497,7 +25538,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* __XEN_PCIFRONT_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/pcifront/xenbus.c 2012-10-04 11:18:40.000000000 +0200
++++ 12.3/drivers/xen/pcifront/xenbus.c 2012-10-04 11:18:40.000000000 +0200
@@ -0,0 +1,482 @@
+/*
+ * PCI Frontend Xenbus Setup - handles setup with backend (imports page/evtchn)
@@ -25982,13 +26023,13 @@ and in case upstream wants to take the forward porting patches:
+/* Initialize after the Xen PCI Frontend Stub is initialized */
+subsys_initcall(pcifront_init);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/privcmd/Makefile 2007-07-10 09:42:30.000000000 +0200
++++ 12.3/drivers/xen/privcmd/Makefile 2007-07-10 09:42:30.000000000 +0200
@@ -0,0 +1,3 @@
+
+obj-y += privcmd.o
+obj-$(CONFIG_COMPAT) += compat_privcmd.o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/privcmd/compat_privcmd.c 2010-01-27 14:01:48.000000000 +0100
++++ 12.3/drivers/xen/privcmd/compat_privcmd.c 2010-01-27 14:01:48.000000000 +0100
@@ -0,0 +1,144 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
@@ -26135,7 +26176,7 @@ and in case upstream wants to take the forward porting patches:
+ return ret;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/privcmd/privcmd.c 2012-01-20 14:18:49.000000000 +0100
++++ 12.3/drivers/xen/privcmd/privcmd.c 2012-01-20 14:18:49.000000000 +0100
@@ -0,0 +1,485 @@
+/******************************************************************************
+ * privcmd.c
@@ -26623,14 +26664,14 @@ and in case upstream wants to take the forward porting patches:
+
+__initcall(privcmd_init);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/scsiback/Makefile 2008-07-21 11:00:33.000000000 +0200
++++ 12.3/drivers/xen/scsiback/Makefile 2008-07-21 11:00:33.000000000 +0200
@@ -0,0 +1,4 @@
+obj-$(CONFIG_XEN_SCSI_BACKEND) := xen-scsibk.o
+
+xen-scsibk-y := interface.o scsiback.o xenbus.o translate.o emulate.o
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/scsiback/common.h 2012-06-06 13:16:59.000000000 +0200
++++ 12.3/drivers/xen/scsiback/common.h 2012-06-06 13:16:59.000000000 +0200
@@ -0,0 +1,175 @@
+/*
+ * Copyright (c) 2008, FUJITSU Limited
@@ -26808,7 +26849,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* __SCSIIF__BACKEND__COMMON_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/scsiback/emulate.c 2012-01-06 10:19:49.000000000 +0100
++++ 12.3/drivers/xen/scsiback/emulate.c 2012-01-06 10:19:49.000000000 +0100
@@ -0,0 +1,482 @@
+/*
+ * Xen SCSI backend driver
@@ -27293,7 +27334,7 @@ and in case upstream wants to take the forward porting patches:
+ return;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/scsiback/interface.c 2011-04-11 13:43:15.000000000 +0200
++++ 12.3/drivers/xen/scsiback/interface.c 2011-04-11 13:43:15.000000000 +0200
@@ -0,0 +1,141 @@
+/*
+ * interface management.
@@ -27437,8 +27478,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 2012-12-18 10:47:37.000000000 +0100
-@@ -0,0 +1,751 @@
++++ 12.3/drivers/xen/scsiback/scsiback.c 2013-02-05 10:28:44.000000000 +0100
+@@ -0,0 +1,745 @@
+/*
+ * Xen SCSI backend driver
+ *
@@ -27497,8 +27538,8 @@ and in case upstream wants to take the forward porting patches:
+module_param_named(reqs, vscsiif_reqs, uint, 0);
+MODULE_PARM_DESC(reqs, "Number of scsiback requests to allocate");
+
-+static unsigned int log_print_stat = 0;
-+module_param(log_print_stat, int, 0644);
++static int log_print_stat;
++module_param(log_print_stat, bool, 0644);
+
+#define SCSIBACK_INVALID_HANDLE (~0)
+
@@ -27660,10 +27701,8 @@ and in case upstream wants to take the forward porting patches:
+ resid = req->data_len;
+ errors = req->errors;
+
-+ if (errors != 0) {
-+ if (log_print_stat)
-+ scsiback_print_status(sense_buffer, errors, pending_req);
-+ }
++ if (errors && log_print_stat)
++ scsiback_print_status(sense_buffer, errors, pending_req);
+
+ /* The Host mode is through as for Emulation. */
+ if (pending_req->info->feature != VSCSI_TYPE_HOST)
@@ -28046,40 +28085,36 @@ and in case upstream wants to take the forward porting patches:
+
+ err = prepare_pending_reqs(info, ring_req,
+ pending_req);
-+ if (err == -EINVAL) {
-+ scsiback_do_resp_with_sense(NULL, (DRIVER_ERROR << 24),
-+ 0, pending_req);
-+ continue;
-+ } else if (err == -ENODEV) {
-+ scsiback_do_resp_with_sense(NULL, (DID_NO_CONNECT << 16),
-+ 0, pending_req);
-+ continue;
-+ }
-+
-+ if (pending_req->act == VSCSIIF_ACT_SCSI_CDB) {
-+
++ 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);
-+
-+ } else if (pending_req->act == VSCSIIF_ACT_SCSI_RESET) {
++ break;
++ case VSCSIIF_ACT_SCSI_RESET:
+ scsiback_device_reset_exec(pending_req);
-+ } else {
-+ printk(KERN_ERR "scsiback: invalid parameter for request\n");
-+ scsiback_do_resp_with_sense(NULL, (DRIVER_ERROR << 24),
-+ 0, pending_req);
-+ continue;
++ break;
++ default:
++ if(!err && printk_ratelimit())
++ printk(KERN_ERR "scsiback: invalid request\n");
++ scsiback_do_resp_with_sense(NULL, DRIVER_ERROR << 24,
++ 0, pending_req);
++ break;
++ case -ENODEV:
++ scsiback_do_resp_with_sense(NULL, DID_NO_CONNECT << 16,
++ 0, pending_req);
++ break;
+ }
++
++ /* Yield point for this unbounded loop. */
++ cond_resched();
+ }
+
+ if (RING_HAS_UNCONSUMED_REQUESTS(ring))
+ more_to_do = 1;
+
-+ /* Yield point for this unbounded loop. */
-+ cond_resched();
-+
+ return more_to_do;
+}
+
@@ -28191,7 +28226,7 @@ and in case upstream wants to take the forward porting patches:
+MODULE_DESCRIPTION("Xen SCSI backend driver");
+MODULE_LICENSE("Dual BSD/GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/scsiback/translate.c 2008-07-21 11:00:33.000000000 +0200
++++ 12.3/drivers/xen/scsiback/translate.c 2008-07-21 11:00:33.000000000 +0200
@@ -0,0 +1,168 @@
+/*
+ * Xen SCSI backend driver
@@ -28362,7 +28397,7 @@ and in case upstream wants to take the forward porting patches:
+
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/scsiback/xenbus.c 2012-01-20 14:18:49.000000000 +0100
++++ 12.3/drivers/xen/scsiback/xenbus.c 2012-01-20 14:18:49.000000000 +0100
@@ -0,0 +1,374 @@
+/*
+ * Xen SCSI backend driver
@@ -28739,13 +28774,13 @@ and in case upstream wants to take the forward porting patches:
+ xenbus_unregister_driver(&scsiback_driver);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/scsifront/Makefile 2008-07-21 11:00:33.000000000 +0200
++++ 12.3/drivers/xen/scsifront/Makefile 2008-07-21 11:00:33.000000000 +0200
@@ -0,0 +1,3 @@
+
+obj-$(CONFIG_XEN_SCSI_FRONTEND) := xenscsi.o
+xenscsi-objs := scsifront.o xenbus.o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/scsifront/common.h 2012-12-06 15:59:02.000000000 +0100
++++ 12.3/drivers/xen/scsifront/common.h 2012-12-06 15:59:02.000000000 +0100
@@ -0,0 +1,130 @@
+/*
+ * Xen SCSI frontend driver
@@ -28878,7 +28913,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* __XEN_DRIVERS_SCSIFRONT_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/scsifront/scsifront.c 2012-12-06 15:59:02.000000000 +0100
++++ 12.3/drivers/xen/scsifront/scsifront.c 2012-12-06 15:59:02.000000000 +0100
@@ -0,0 +1,550 @@
+/*
+ * Xen SCSI frontend driver
@@ -29431,7 +29466,7 @@ and in case upstream wants to take the forward porting patches:
+MODULE_DESCRIPTION("Xen SCSI frontend driver");
+MODULE_LICENSE("GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/scsifront/xenbus.c 2012-12-06 15:59:02.000000000 +0100
++++ 12.3/drivers/xen/scsifront/xenbus.c 2012-12-06 15:59:02.000000000 +0100
@@ -0,0 +1,423 @@
+/*
+ * Xen SCSI frontend driver
@@ -29857,7 +29892,7 @@ and in case upstream wants to take the forward porting patches:
+}
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netback/Makefile 2010-01-18 15:23:12.000000000 +0100
++++ 12.3/drivers/xen/sfc_netback/Makefile 2010-01-18 15:23:12.000000000 +0100
@@ -0,0 +1,12 @@
+EXTRA_CFLAGS += -Idrivers/xen/sfc_netback -Idrivers/xen/sfc_netutil -Idrivers/xen/netback -Idrivers/net/sfc -Idrivers/net/sfc/sfc_resource
+EXTRA_CFLAGS += -D__ci_driver__
@@ -29872,7 +29907,7 @@ and in case upstream wants to take the forward porting patches:
+
+sfc_netback-objs := accel.o accel_fwd.o accel_msg.o accel_solarflare.o accel_xenbus.o accel_debugfs.o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netback/accel.c 2009-04-07 13:58:48.000000000 +0200
++++ 12.3/drivers/xen/sfc_netback/accel.c 2009-04-07 13:58:48.000000000 +0200
@@ -0,0 +1,147 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -30022,7 +30057,7 @@ and in case upstream wants to take the forward porting patches:
+
+MODULE_LICENSE("GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netback/accel.h 2010-01-18 15:23:12.000000000 +0100
++++ 12.3/drivers/xen/sfc_netback/accel.h 2010-01-18 15:23:12.000000000 +0100
@@ -0,0 +1,391 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -30416,7 +30451,7 @@ and in case upstream wants to take the forward porting patches:
+
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netback/accel_debugfs.c 2008-02-26 10:54:11.000000000 +0100
++++ 12.3/drivers/xen/sfc_netback/accel_debugfs.c 2008-02-26 10:54:11.000000000 +0100
@@ -0,0 +1,148 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -30567,7 +30602,7 @@ and in case upstream wants to take the forward porting patches:
+
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netback/accel_fwd.c 2008-04-02 12:34:02.000000000 +0200
++++ 12.3/drivers/xen/sfc_netback/accel_fwd.c 2008-04-02 12:34:02.000000000 +0200
@@ -0,0 +1,420 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -30990,7 +31025,7 @@ and in case upstream wants to take the forward porting patches:
+ return;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netback/accel_msg.c 2008-02-20 09:32:49.000000000 +0100
++++ 12.3/drivers/xen/sfc_netback/accel_msg.c 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,392 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -31385,7 +31420,7 @@ and in case upstream wants to take the forward porting patches:
+ return;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netback/accel_solarflare.c 2010-01-18 15:23:12.000000000 +0100
++++ 12.3/drivers/xen/sfc_netback/accel_solarflare.c 2010-01-18 15:23:12.000000000 +0100
@@ -0,0 +1,1293 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -32681,7 +32716,7 @@ and in case upstream wants to take the forward porting patches:
+ spin_unlock_irqrestore(&accel_hw_priv->filter_lock, flags);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netback/accel_solarflare.h 2008-02-20 09:32:49.000000000 +0100
++++ 12.3/drivers/xen/sfc_netback/accel_solarflare.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,88 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -32772,7 +32807,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* NETBACK_ACCEL_SOLARFLARE_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netback/accel_xenbus.c 2010-01-04 11:56:34.000000000 +0100
++++ 12.3/drivers/xen/sfc_netback/accel_xenbus.c 2010-01-04 11:56:34.000000000 +0100
@@ -0,0 +1,833 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -33608,7 +33643,7 @@ and in case upstream wants to take the forward porting patches:
+ XenbusStateClosing);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netback/ci/compat.h 2008-02-20 09:32:49.000000000 +0100
++++ 12.3/drivers/xen/sfc_netback/ci/compat.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,53 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -33664,7 +33699,7 @@ and in case upstream wants to take the forward porting patches:
+
+/*! \cidoxg_end */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netback/ci/compat/gcc.h 2008-02-20 09:32:49.000000000 +0100
++++ 12.3/drivers/xen/sfc_netback/ci/compat/gcc.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,158 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -33825,7 +33860,7 @@ and in case upstream wants to take the forward porting patches:
+
+/*! \cidoxg_end */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netback/ci/compat/gcc_x86.h 2008-02-20 09:32:49.000000000 +0100
++++ 12.3/drivers/xen/sfc_netback/ci/compat/gcc_x86.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,115 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -33943,7 +33978,7 @@ and in case upstream wants to take the forward porting patches:
+
+/*! \cidoxg_end */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netback/ci/compat/primitive.h 2008-02-20 09:32:49.000000000 +0100
++++ 12.3/drivers/xen/sfc_netback/ci/compat/primitive.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,77 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -34023,7 +34058,7 @@ and in case upstream wants to take the forward porting patches:
+
+/*! \cidoxg_end */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netback/ci/compat/sysdep.h 2008-02-20 09:32:49.000000000 +0100
++++ 12.3/drivers/xen/sfc_netback/ci/compat/sysdep.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,166 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -34192,7 +34227,7 @@ and in case upstream wants to take the forward porting patches:
+
+/*! \cidoxg_end */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netback/ci/compat/utils.h 2008-02-20 09:32:49.000000000 +0100
++++ 12.3/drivers/xen/sfc_netback/ci/compat/utils.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,269 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -34464,7 +34499,7 @@ and in case upstream wants to take the forward porting patches:
+#endif /* __CI_COMPAT_UTILS_H__ */
+/*! \cidoxg_end */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netback/ci/compat/x86.h 2008-02-20 09:32:49.000000000 +0100
++++ 12.3/drivers/xen/sfc_netback/ci/compat/x86.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,48 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -34515,7 +34550,7 @@ and in case upstream wants to take the forward porting patches:
+
+/*! \cidoxg_end */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netback/ci/compat/x86_64.h 2008-02-20 09:32:49.000000000 +0100
++++ 12.3/drivers/xen/sfc_netback/ci/compat/x86_64.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,54 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -34572,7 +34607,7 @@ and in case upstream wants to take the forward porting patches:
+#endif /* __CI_COMPAT_X86_64_H__ */
+/*! \cidoxg_end */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netback/ci/tools/config.h 2008-02-20 09:32:49.000000000 +0100
++++ 12.3/drivers/xen/sfc_netback/ci/tools/config.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,49 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -34624,7 +34659,7 @@ and in case upstream wants to take the forward porting patches:
+#endif /* __CI_TOOLS_CONFIG_H__ */
+/*! \cidoxg_end */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netback/ci/tools/debug.h 2008-02-20 09:32:49.000000000 +0100
++++ 12.3/drivers/xen/sfc_netback/ci/tools/debug.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,336 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -34963,7 +34998,7 @@ and in case upstream wants to take the forward porting patches:
+
+/*! \cidoxg_end */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netback/ci/tools/log.h 2009-04-07 13:58:48.000000000 +0200
++++ 12.3/drivers/xen/sfc_netback/ci/tools/log.h 2009-04-07 13:58:48.000000000 +0200
@@ -0,0 +1,269 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -35235,7 +35270,7 @@ and in case upstream wants to take the forward porting patches:
+#endif /* __CI_TOOLS_LOG_H__ */
+/*! \cidoxg_end */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netback/ci/tools/platform/gcc_x86.h 2009-04-07 13:58:48.000000000 +0200
++++ 12.3/drivers/xen/sfc_netback/ci/tools/platform/gcc_x86.h 2009-04-07 13:58:48.000000000 +0200
@@ -0,0 +1,370 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -35608,7 +35643,7 @@ and in case upstream wants to take the forward porting patches:
+
+/*! \cidoxg_end */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netback/ci/tools/platform/linux_kernel.h 2008-02-20 09:32:49.000000000 +0100
++++ 12.3/drivers/xen/sfc_netback/ci/tools/platform/linux_kernel.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,362 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -35973,7 +36008,7 @@ and in case upstream wants to take the forward porting patches:
+#endif /* __CI_TOOLS_LINUX_KERNEL_H__ */
+/*! \cidoxg_end */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netback/ci/tools/sysdep.h 2008-02-20 09:32:49.000000000 +0100
++++ 12.3/drivers/xen/sfc_netback/ci/tools/sysdep.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,132 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -36108,7 +36143,7 @@ and in case upstream wants to take the forward porting patches:
+
+/*! \cidoxg_end */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netfront/Makefile 2008-02-26 10:54:11.000000000 +0100
++++ 12.3/drivers/xen/sfc_netfront/Makefile 2008-02-26 10:54:11.000000000 +0100
@@ -0,0 +1,11 @@
+EXTRA_CFLAGS += -Idrivers/xen/sfc_netfront -Idrivers/xen/sfc_netutil -Idrivers/xen/netfront
+EXTRA_CFLAGS += -D__ci_driver__
@@ -36122,7 +36157,7 @@ and in case upstream wants to take the forward porting patches:
+
+sfc_netfront-objs := accel_msg.o accel_bufs.o accel_netfront.o accel_vi.o accel_xenbus.o accel_tso.o accel_ssr.o accel_debugfs.o falcon_event.o falcon_vi.o pt_tx.o vi_init.o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netfront/accel.h 2009-04-07 13:58:48.000000000 +0200
++++ 12.3/drivers/xen/sfc_netfront/accel.h 2009-04-07 13:58:48.000000000 +0200
@@ -0,0 +1,495 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -36620,7 +36655,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* NETFRONT_ACCEL_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netfront/accel_bufs.c 2008-02-26 10:54:12.000000000 +0100
++++ 12.3/drivers/xen/sfc_netfront/accel_bufs.c 2008-02-26 10:54:12.000000000 +0100
@@ -0,0 +1,393 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -37016,7 +37051,7 @@ and in case upstream wants to take the forward porting patches:
+ return was_empty;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netfront/accel_bufs.h 2008-02-20 09:32:49.000000000 +0100
++++ 12.3/drivers/xen/sfc_netfront/accel_bufs.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,181 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -37200,7 +37235,7 @@ and in case upstream wants to take the forward porting patches:
+#endif /* NETFRONT_ACCEL_BUFS_H */
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netfront/accel_debugfs.c 2009-04-07 13:58:48.000000000 +0200
++++ 12.3/drivers/xen/sfc_netfront/accel_debugfs.c 2009-04-07 13:58:48.000000000 +0200
@@ -0,0 +1,227 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -37430,7 +37465,7 @@ and in case upstream wants to take the forward porting patches:
+ return 0;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netfront/accel_msg.c 2009-04-07 13:58:48.000000000 +0200
++++ 12.3/drivers/xen/sfc_netfront/accel_msg.c 2009-04-07 13:58:48.000000000 +0200
@@ -0,0 +1,564 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -37997,7 +38032,7 @@ and in case upstream wants to take the forward porting patches:
+ &lock_state, vnic->msg_channel_irq);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netfront/accel_netfront.c 2009-04-07 13:58:48.000000000 +0200
++++ 12.3/drivers/xen/sfc_netfront/accel_netfront.c 2009-04-07 13:58:48.000000000 +0200
@@ -0,0 +1,328 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -38328,7 +38363,7 @@ and in case upstream wants to take the forward porting patches:
+MODULE_LICENSE("GPL");
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netfront/accel_ssr.c 2008-02-20 09:32:49.000000000 +0100
++++ 12.3/drivers/xen/sfc_netfront/accel_ssr.c 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,308 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -38639,7 +38674,7 @@ and in case upstream wants to take the forward porting patches:
+ return 0;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netfront/accel_ssr.h 2008-02-20 09:32:49.000000000 +0100
++++ 12.3/drivers/xen/sfc_netfront/accel_ssr.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,88 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -38730,7 +38765,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* NETFRONT_ACCEL_SSR_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netfront/accel_tso.c 2008-02-26 10:54:12.000000000 +0100
++++ 12.3/drivers/xen/sfc_netfront/accel_tso.c 2008-02-26 10:54:12.000000000 +0100
@@ -0,0 +1,511 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -39244,7 +39279,7 @@ and in case upstream wants to take the forward porting patches:
+
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netfront/accel_tso.h 2008-02-20 09:32:49.000000000 +0100
++++ 12.3/drivers/xen/sfc_netfront/accel_tso.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,57 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -39304,7 +39339,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* NETFRONT_ACCEL_TSO_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 15:37:44.000000000 +0200
++++ 12.3/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 15:37:44.000000000 +0200
@@ -0,0 +1,1204 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -40511,7 +40546,7 @@ and in case upstream wants to take the forward porting patches:
+ return 1;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netfront/accel_xenbus.c 2008-02-20 09:32:49.000000000 +0100
++++ 12.3/drivers/xen/sfc_netfront/accel_xenbus.c 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,776 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -41290,7 +41325,7 @@ and in case upstream wants to take the forward porting patches:
+ return 0;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netfront/ef_vi_falcon.h 2009-04-07 13:58:48.000000000 +0200
++++ 12.3/drivers/xen/sfc_netfront/ef_vi_falcon.h 2009-04-07 13:58:48.000000000 +0200
@@ -0,0 +1,172 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -41465,7 +41500,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* __EF_VI_FALCON_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netfront/ef_vi_falcon_core.h 2008-02-20 09:32:49.000000000 +0100
++++ 12.3/drivers/xen/sfc_netfront/ef_vi_falcon_core.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,1075 @@
+
+#define EFVI_FALCON_EXTENDED_P_BAR 1
@@ -42543,7 +42578,7 @@ and in case upstream wants to take the forward porting patches:
+ #define EE_VPD_CYC_DAT_LBN 0
+ #define EE_VPD_CYC_DAT_WIDTH 32
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netfront/ef_vi_falcon_desc.h 2008-02-20 09:32:49.000000000 +0100
++++ 12.3/drivers/xen/sfc_netfront/ef_vi_falcon_desc.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,43 @@
+//////////////---- Descriptors C Headers ----//////////////
+// Receive Kernel IP Descriptor
@@ -42589,7 +42624,7 @@ and in case upstream wants to take the forward porting patches:
+ #define TX_USR_BYTE_OFS_LBN 0
+ #define TX_USR_BYTE_OFS_WIDTH 13
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netfront/ef_vi_falcon_event.h 2008-02-20 09:32:49.000000000 +0100
++++ 12.3/drivers/xen/sfc_netfront/ef_vi_falcon_event.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,123 @@
+//////////////---- Events Format C Header ----//////////////
+//////////////---- Event entry ----//////////////
@@ -42715,7 +42750,7 @@ and in case upstream wants to take the forward porting patches:
+ #define DRV_GEN_EV_DATA_LBN 0
+ #define DRV_GEN_EV_DATA_WIDTH 60
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netfront/ef_vi_internal.h 2008-02-20 09:32:49.000000000 +0100
++++ 12.3/drivers/xen/sfc_netfront/ef_vi_internal.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,256 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -42974,7 +43009,7 @@ and in case upstream wants to take the forward porting patches:
+#endif /* __CI_EF_VI_INTERNAL_H__ */
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netfront/etherfabric/ef_vi.h 2009-04-07 13:58:48.000000000 +0200
++++ 12.3/drivers/xen/sfc_netfront/etherfabric/ef_vi.h 2009-04-07 13:58:48.000000000 +0200
@@ -0,0 +1,647 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -43624,7 +43659,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* __EFAB_EF_VI_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netfront/falcon_event.c 2009-04-07 13:58:48.000000000 +0200
++++ 12.3/drivers/xen/sfc_netfront/falcon_event.c 2009-04-07 13:58:48.000000000 +0200
@@ -0,0 +1,346 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -43973,7 +44008,7 @@ and in case upstream wants to take the forward porting patches:
+
+/*! \cidoxg_end */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netfront/falcon_vi.c 2009-04-07 13:58:48.000000000 +0200
++++ 12.3/drivers/xen/sfc_netfront/falcon_vi.c 2009-04-07 13:58:48.000000000 +0200
@@ -0,0 +1,473 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -44449,7 +44484,7 @@ and in case upstream wants to take the forward porting patches:
+
+/*! \cidoxg_end */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netfront/pt_tx.c 2008-02-20 09:32:49.000000000 +0100
++++ 12.3/drivers/xen/sfc_netfront/pt_tx.c 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,91 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -44543,7 +44578,7 @@ and in case upstream wants to take the forward porting patches:
+
+/*! \cidoxg_end */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netfront/sysdep.h 2009-04-07 13:58:48.000000000 +0200
++++ 12.3/drivers/xen/sfc_netfront/sysdep.h 2009-04-07 13:58:48.000000000 +0200
@@ -0,0 +1,185 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -44731,7 +44766,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* __CI_CIUL_SYSDEP_LINUX_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netfront/vi_init.c 2008-02-20 09:32:49.000000000 +0100
++++ 12.3/drivers/xen/sfc_netfront/vi_init.c 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,183 @@
+/****************************************************************************
+ * Copyright 2002-2005: Level 5 Networks Inc.
@@ -44917,7 +44952,7 @@ and in case upstream wants to take the forward porting patches:
+ vm->tx_bell = (char*) io_mmap + (TX_DESC_UPD_REG_KER_OFST & 4095);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netutil/Makefile 2008-02-26 10:54:12.000000000 +0100
++++ 12.3/drivers/xen/sfc_netutil/Makefile 2008-02-26 10:54:12.000000000 +0100
@@ -0,0 +1,11 @@
+EXTRA_CFLAGS += -Idrivers/xen/sfc_netutil
+EXTRA_CFLAGS += -Werror
@@ -44931,7 +44966,7 @@ and in case upstream wants to take the forward porting patches:
+sfc_netutil-objs := accel_cuckoo_hash.o accel_msg_iface.o accel_util.o
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netutil/accel_cuckoo_hash.c 2011-10-17 10:45:09.000000000 +0200
++++ 12.3/drivers/xen/sfc_netutil/accel_cuckoo_hash.c 2011-10-17 10:45:09.000000000 +0200
@@ -0,0 +1,648 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -45582,7 +45617,7 @@ and in case upstream wants to take the forward porting patches:
+EXPORT_SYMBOL_GPL(cuckoo_hash_dump);
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netutil/accel_cuckoo_hash.h 2008-02-20 09:32:49.000000000 +0100
++++ 12.3/drivers/xen/sfc_netutil/accel_cuckoo_hash.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,227 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -45812,7 +45847,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* NET_ACCEL_CUCKOO_HASH_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netutil/accel_msg_iface.c 2008-02-20 09:32:49.000000000 +0100
++++ 12.3/drivers/xen/sfc_netutil/accel_msg_iface.c 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,301 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -46116,7 +46151,7 @@ and in case upstream wants to take the forward porting patches:
+}
+EXPORT_SYMBOL_GPL(net_accel_msg_complete_send_notify);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netutil/accel_msg_iface.h 2010-01-18 15:23:12.000000000 +0100
++++ 12.3/drivers/xen/sfc_netutil/accel_msg_iface.h 2010-01-18 15:23:12.000000000 +0100
@@ -0,0 +1,415 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -46534,7 +46569,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* NET_ACCEL_MSG_IFACE_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netutil/accel_shared_fifo.h 2008-02-20 09:32:49.000000000 +0100
++++ 12.3/drivers/xen/sfc_netutil/accel_shared_fifo.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,127 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -46664,7 +46699,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* NET_ACCEL_SHARED_FIFO_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netutil/accel_util.c 2010-09-23 15:39:04.000000000 +0200
++++ 12.3/drivers/xen/sfc_netutil/accel_util.c 2010-09-23 15:39:04.000000000 +0200
@@ -0,0 +1,336 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -47003,7 +47038,7 @@ and in case upstream wants to take the forward porting patches:
+
+MODULE_LICENSE("GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/sfc_netutil/accel_util.h 2008-02-20 09:32:49.000000000 +0100
++++ 12.3/drivers/xen/sfc_netutil/accel_util.h 2008-02-20 09:32:49.000000000 +0100
@@ -0,0 +1,127 @@
+/****************************************************************************
+ * Solarflare driver for Xen network acceleration
@@ -47133,14 +47168,14 @@ and in case upstream wants to take the forward porting patches:
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/tpmback/Makefile 2007-06-12 13:13:45.000000000 +0200
++++ 12.3/drivers/xen/tpmback/Makefile 2007-06-12 13:13:45.000000000 +0200
@@ -0,0 +1,4 @@
+
+obj-$(CONFIG_XEN_TPMDEV_BACKEND) += tpmbk.o
+
+tpmbk-y += tpmback.o interface.o xenbus.o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/tpmback/common.h 2011-12-21 10:02:58.000000000 +0100
++++ 12.3/drivers/xen/tpmback/common.h 2011-12-21 10:02:58.000000000 +0100
@@ -0,0 +1,94 @@
+/******************************************************************************
+ * drivers/xen/tpmback/common.h
@@ -47237,7 +47272,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* __TPMIF__BACKEND__COMMON_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/tpmback/interface.c 2011-10-17 10:45:09.000000000 +0200
++++ 12.3/drivers/xen/tpmback/interface.c 2011-10-17 10:45:09.000000000 +0200
@@ -0,0 +1,131 @@
+ /*****************************************************************************
+ * drivers/xen/tpmback/interface.c
@@ -47371,7 +47406,7 @@ and in case upstream wants to take the forward porting patches:
+ kmem_cache_destroy(tpmif_cachep);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/tpmback/tpmback.c 2010-09-23 15:39:04.000000000 +0200
++++ 12.3/drivers/xen/tpmback/tpmback.c 2010-09-23 15:39:04.000000000 +0200
@@ -0,0 +1,939 @@
+/******************************************************************************
+ * drivers/xen/tpmback/tpmback.c
@@ -48313,7 +48348,7 @@ and in case upstream wants to take the forward porting patches:
+
+MODULE_LICENSE("Dual BSD/GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/tpmback/xenbus.c 2011-12-21 10:02:58.000000000 +0100
++++ 12.3/drivers/xen/tpmback/xenbus.c 2011-12-21 10:02:58.000000000 +0100
@@ -0,0 +1,269 @@
+/* Xenbus code for tpmif backend
+ Copyright (C) 2005 IBM Corporation
@@ -48585,14 +48620,14 @@ and in case upstream wants to take the forward porting patches:
+ xenbus_unregister_driver(&tpmback_driver);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/usbback/Makefile 2009-04-07 13:58:49.000000000 +0200
++++ 12.3/drivers/xen/usbback/Makefile 2009-04-07 13:58:49.000000000 +0200
@@ -0,0 +1,4 @@
+obj-$(CONFIG_XEN_USB_BACKEND) := usbbk.o
+
+usbbk-y := usbstub.o xenbus.o interface.o usbback.o
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/usbback/interface.c 2011-04-11 13:43:15.000000000 +0200
++++ 12.3/drivers/xen/usbback/interface.c 2011-04-11 13:43:15.000000000 +0200
@@ -0,0 +1,190 @@
+/*
+ * interface.c
@@ -48785,8 +48820,8 @@ and in case upstream wants to take the forward porting patches:
+ kfree(usbif);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/usbback/usbback.c 2011-09-22 14:33:35.000000000 +0200
-@@ -0,0 +1,1160 @@
++++ 12.3/drivers/xen/usbback/usbback.c 2013-02-05 10:28:44.000000000 +0100
+@@ -0,0 +1,1162 @@
+/*
+ * usbback.c
+ *
@@ -48842,8 +48877,8 @@ and in case upstream wants to take the forward porting patches:
+#include "../../usb/core/hub.h"
+#endif
+
-+int usbif_reqs = USBIF_BACK_MAX_PENDING_REQS;
-+module_param_named(reqs, usbif_reqs, int, 0);
++static unsigned int usbif_reqs = 128;
++module_param_named(reqs, usbif_reqs, uint, 0);
+MODULE_PARM_DESC(reqs, "Number of usbback requests to allocate");
+
+struct pending_req_segment {
@@ -49770,7 +49805,9 @@ and in case upstream wants to take the forward porting patches:
+
+ while (rc != rp) {
+ if (RING_REQUEST_CONS_OVERFLOW(urb_ring, rc)) {
-+ printk(KERN_WARNING "RING_REQUEST_CONS_OVERFLOW\n");
++ if(printk_ratelimit())
++ printk(KERN_WARNING "usbback: "
++ "RING_REQUEST_CONS_OVERFLOW\n");
+ break;
+ }
+
@@ -49785,12 +49822,12 @@ and in case upstream wants to take the forward porting patches:
+
+ dispatch_request_to_pending_reqs(usbif, req,
+ pending_req);
++
++ cond_resched();
+ }
+
+ RING_FINAL_CHECK_FOR_REQUESTS(&usbif->urb_ring, more_to_do);
+
-+ cond_resched();
-+
+ return more_to_do;
+}
+
@@ -49948,7 +49985,7 @@ and in case upstream wants to take the forward porting patches:
+MODULE_DESCRIPTION("Xen USB backend driver (usbback)");
+MODULE_LICENSE("Dual BSD/GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/usbback/usbback.h 2012-06-06 13:16:59.000000000 +0200
++++ 12.3/drivers/xen/usbback/usbback.h 2012-06-06 13:16:59.000000000 +0200
@@ -0,0 +1,166 @@
+/*
+ * usbback.h
@@ -50117,7 +50154,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* __XEN_USBBACK_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/usbback/usbstub.c 2012-02-16 11:09:01.000000000 +0100
++++ 12.3/drivers/xen/usbback/usbstub.c 2012-02-16 11:09:01.000000000 +0100
@@ -0,0 +1,324 @@
+/*
+ * usbstub.c
@@ -50444,7 +50481,7 @@ and in case upstream wants to take the forward porting patches:
+ usb_deregister(&usbback_usb_driver);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/usbback/xenbus.c 2011-12-21 10:02:58.000000000 +0100
++++ 12.3/drivers/xen/usbback/xenbus.c 2011-12-21 10:02:58.000000000 +0100
@@ -0,0 +1,334 @@
+/*
+ * xenbus.c
@@ -50781,7 +50818,7 @@ and in case upstream wants to take the forward porting patches:
+ xenbus_unregister_driver(&usbback_driver);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/usbfront/Makefile 2009-10-15 11:45:41.000000000 +0200
++++ 12.3/drivers/xen/usbfront/Makefile 2009-10-15 11:45:41.000000000 +0200
@@ -0,0 +1,11 @@
+obj-$(CONFIG_XEN_USB_FRONTEND) := xen-hcd.o
+
@@ -50795,7 +50832,7 @@ and in case upstream wants to take the forward porting patches:
+EXTRA_CFLAGS += -DXENHCD_PM
+endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/usbfront/usbfront-dbg.c 2009-10-15 11:45:41.000000000 +0200
++++ 12.3/drivers/xen/usbfront/usbfront-dbg.c 2009-10-15 11:45:41.000000000 +0200
@@ -0,0 +1,100 @@
+/*
+ * usbfront-dbg.c
@@ -50898,7 +50935,7 @@ and in case upstream wants to take the forward porting patches:
+ class_device_remove_file(cldev, &class_device_attr_statistics);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/usbfront/usbfront-hcd.c 2009-10-15 11:45:41.000000000 +0200
++++ 12.3/drivers/xen/usbfront/usbfront-hcd.c 2009-10-15 11:45:41.000000000 +0200
@@ -0,0 +1,231 @@
+/*
+ * usbfront-hcd.c
@@ -51132,7 +51169,7 @@ and in case upstream wants to take the forward porting patches:
+#endif
+};
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/usbfront/usbfront-hub.c 2009-10-15 11:45:41.000000000 +0200
++++ 12.3/drivers/xen/usbfront/usbfront-hub.c 2009-10-15 11:45:41.000000000 +0200
@@ -0,0 +1,471 @@
+/*
+ * usbfront-hub.c
@@ -51606,7 +51643,7 @@ and in case upstream wants to take the forward porting patches:
+ return ret;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/usbfront/usbfront-q.c 2009-10-15 11:45:41.000000000 +0200
++++ 12.3/drivers/xen/usbfront/usbfront-q.c 2009-10-15 11:45:41.000000000 +0200
@@ -0,0 +1,541 @@
+/*
+ * usbfront-q.c
@@ -52150,7 +52187,7 @@ and in case upstream wants to take the forward porting patches:
+ return IRQ_HANDLED;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/usbfront/usbfront.h 2012-06-06 13:16:59.000000000 +0200
++++ 12.3/drivers/xen/usbfront/usbfront.h 2012-06-06 13:16:59.000000000 +0200
@@ -0,0 +1,204 @@
+/*
+ * usbfront.h
@@ -52357,7 +52394,7 @@ and in case upstream wants to take the forward porting patches:
+
+#endif /* __XEN_USBFRONT_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/usbfront/xenbus.c 2012-10-04 11:18:40.000000000 +0200
++++ 12.3/drivers/xen/usbfront/xenbus.c 2012-10-04 11:18:40.000000000 +0200
@@ -0,0 +1,415 @@
+/*
+ * xenbus.c
@@ -52775,7 +52812,7 @@ and in case upstream wants to take the forward porting patches:
+MODULE_DESCRIPTION("Xen USB Virtual Host Controller driver (usbfront)");
+MODULE_LICENSE("Dual BSD/GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/util.c 2007-07-10 09:42:30.000000000 +0200
++++ 12.3/drivers/xen/util.c 2007-07-10 09:42:30.000000000 +0200
@@ -0,0 +1,65 @@
+#include <linux/mm.h>
+#include <linux/module.h>
@@ -52843,7 +52880,7 @@ and in case upstream wants to take the forward porting patches:
+EXPORT_SYMBOL_GPL(free_vm_area);
+#endif /* CONFIG_X86 */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/xenbus/xenbus_backend_client.c 2011-04-11 13:43:15.000000000 +0200
++++ 12.3/drivers/xen/xenbus/xenbus_backend_client.c 2011-04-11 13:43:15.000000000 +0200
@@ -0,0 +1,106 @@
+/******************************************************************************
+ * Backend-client-facing interface for the Xenbus driver. In other words, the
@@ -52952,7 +52989,7 @@ and in case upstream wants to take the forward porting patches:
+
+MODULE_LICENSE("Dual BSD/GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/xenbus/xenbus_dev.c 2012-10-31 10:29:18.000000000 +0100
++++ 12.3/drivers/xen/xenbus/xenbus_dev.c 2012-10-31 10:29:18.000000000 +0100
@@ -0,0 +1,503 @@
+/*
+ * xenbus_dev.c
@@ -53458,7 +53495,7 @@ and in case upstream wants to take the forward porting patches:
+ return 0;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/xenoprof/xenoprofile.c 2012-02-16 11:09:01.000000000 +0100
++++ 12.3/drivers/xen/xenoprof/xenoprofile.c 2012-02-16 11:09:01.000000000 +0100
@@ -0,0 +1,590 @@
+/**
+ * @file xenoprofile.c
diff --git a/patches.xen/xen3-auto-xen-kconfig.diff b/patches.xen/xen3-auto-xen-kconfig.diff
index 01ef5f7f32..ebae03b709 100644
--- a/patches.xen/xen3-auto-xen-kconfig.diff
+++ b/patches.xen/xen3-auto-xen-kconfig.diff
@@ -1,4 +1,4 @@
-From http://xenbits.xen.org/linux-2.6.18-xen.hg (tip 1213:302f7c9423c9)
+From http://xenbits.xen.org/linux-2.6.18-xen.hg (tip 1222:d732224ce60e)
Subject: xen3 xen-kconfig
From: xen-devel@lists.xen.org
Patch-mainline: n/a
diff --git a/patches.xen/xen3-fixup-xen b/patches.xen/xen3-fixup-xen
index e626680f98..00a3d4c5e4 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 1213:302f7c9423c9)
+From http://xenbits.xen.org/linux-2.6.18-xen.hg (tip 1222:d732224ce60e)
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 632ca3a9f2..7eb3d46072 100644
--- a/patches.xen/xen3-patch-2.6.18
+++ b/patches.xen/xen3-patch-2.6.18
@@ -7,8 +7,8 @@ Acked-by: jbeulich@novell.com
2.6.35/kernel/time.c change removed (no longer applicable)
---- head.orig/arch/x86/Kconfig 2012-10-22 18:08:27.000000000 +0200
-+++ head/arch/x86/Kconfig 2012-10-23 14:39:20.000000000 +0200
+--- 12.3.orig/arch/x86/Kconfig 2012-10-22 18:08:27.000000000 +0200
++++ 12.3/arch/x86/Kconfig 2012-10-23 14:39:20.000000000 +0200
@@ -1650,7 +1650,7 @@ config KEXEC_JUMP
code in physical address mode via KEXEC
@@ -18,8 +18,8 @@ Acked-by: jbeulich@novell.com
default "0x1000000"
---help---
This gives the physical address where the kernel is loaded.
---- head.orig/arch/x86/kernel/Makefile 2012-10-22 17:22:42.000000000 +0200
-+++ head/arch/x86/kernel/Makefile 2012-10-23 14:39:25.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/Makefile 2012-10-22 17:22:42.000000000 +0200
++++ 12.3/arch/x86/kernel/Makefile 2012-10-23 14:39:25.000000000 +0200
@@ -119,5 +119,5 @@ ifeq ($(CONFIG_X86_64),y)
pci-dma_64-$(CONFIG_XEN) += pci-dma_32.o
endif
@@ -27,8 +27,8 @@ 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 2012-12-18 11:38:26.000000000 +0100
-+++ head/arch/x86/kernel/quirks.c 2011-09-07 15:20:23.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/quirks.c 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/arch/x86/kernel/quirks.c 2011-09-07 15:20:23.000000000 +0200
@@ -6,7 +6,7 @@
#include <asm/hpet.h>
@@ -60,8 +60,8 @@ Acked-by: jbeulich@novell.com
}
/* put back the original value for config space*/
---- head.orig/arch/x86/kernel/time-xen.c 2010-08-31 09:24:21.000000000 +0200
-+++ head/arch/x86/kernel/time-xen.c 2011-07-12 11:09:48.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/time-xen.c 2010-08-31 09:24:21.000000000 +0200
++++ 12.3/arch/x86/kernel/time-xen.c 2011-07-12 11:09:48.000000000 +0200
@@ -45,7 +45,6 @@
#include <linux/sysdev.h>
#include <linux/bcd.h>
@@ -393,8 +393,8 @@ Acked-by: jbeulich@novell.com
timer_name[cpu],
NULL);
if (irq < 0)
---- head.orig/arch/x86/pci/irq.c 2012-12-18 11:38:26.000000000 +0100
-+++ head/arch/x86/pci/irq.c 2011-08-09 10:33:29.000000000 +0200
+--- 12.3.orig/arch/x86/pci/irq.c 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/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;
struct irq_routing_table *rt;
@@ -416,9 +416,9 @@ Acked-by: jbeulich@novell.com
rt = pirq_check_routing_table(addr);
if (rt)
return rt;
---- head.orig/drivers/acpi/processor_perflib.c 2012-10-22 17:22:06.000000000 +0200
-+++ head/drivers/acpi/processor_perflib.c 2012-10-23 14:39:54.000000000 +0200
-@@ -646,6 +646,8 @@ end:
+--- 12.3.orig/drivers/acpi/processor_perflib.c 2013-02-05 10:45:48.000000000 +0100
++++ 12.3/drivers/acpi/processor_perflib.c 2013-02-05 10:46:13.000000000 +0100
+@@ -653,6 +653,8 @@ end:
return result;
}
@@ -427,14 +427,14 @@ Acked-by: jbeulich@novell.com
int acpi_processor_preregister_performance(
struct acpi_processor_performance __percpu *performance)
{
-@@ -861,3 +863,5 @@ acpi_processor_unregister_performance(st
+@@ -868,3 +870,5 @@ acpi_processor_unregister_performance(st
}
EXPORT_SYMBOL(acpi_processor_unregister_performance);
+
+#endif /* !CONFIG_PROCESSOR_EXTERNAL_CONTROL */
---- head.orig/arch/x86/include/mach-xen/asm/processor_32.h 2008-01-28 12:24:19.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:02:29.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/processor_32.h 2008-01-28 12:24:19.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:02:29.000000000 +0100
@@ -23,7 +23,7 @@
#include <xen/interface/physdev.h>
@@ -445,7 +445,7 @@ Acked-by: jbeulich@novell.com
struct desc_struct {
unsigned long a,b;
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/time.h 2011-07-11 10:35:24.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/time.h 2011-07-11 10:35:24.000000000 +0200
@@ -0,0 +1,6 @@
+#ifdef CONFIG_XEN_PRIVILEGED_GUEST
+struct timespec;
@@ -453,8 +453,8 @@ Acked-by: jbeulich@novell.com
+#endif
+
+#include_next <asm/time.h>
---- head.orig/arch/x86/include/asm/thread_info.h 2012-12-18 11:38:26.000000000 +0100
-+++ head/arch/x86/include/asm/thread_info.h 2012-10-23 14:39:36.000000000 +0200
+--- 12.3.orig/arch/x86/include/asm/thread_info.h 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/arch/x86/include/asm/thread_info.h 2012-10-23 14:39:36.000000000 +0200
@@ -151,11 +151,15 @@ struct thread_info {
_TIF_USER_RETURN_NOTIFY)
@@ -471,8 +471,8 @@ Acked-by: jbeulich@novell.com
#define PREEMPT_ACTIVE 0x10000000
---- head.orig/drivers/xen/netfront/netfront.c 2012-10-04 11:18:40.000000000 +0200
-+++ head/drivers/xen/netfront/netfront.c 2012-12-18 11:54:56.000000000 +0100
+--- 12.3.orig/drivers/xen/netfront/netfront.c 2012-10-04 11:18:40.000000000 +0200
++++ 12.3/drivers/xen/netfront/netfront.c 2012-12-18 11:54:56.000000000 +0100
@@ -33,6 +33,7 @@
#include <linux/module.h>
#include <linux/version.h>
@@ -490,8 +490,8 @@ Acked-by: jbeulich@novell.com
if (unlikely(frags > MAX_SKB_FRAGS + 1)) {
printk(KERN_ALERT "xennet: skb rides the rocket: %d frags\n",
frags);
---- head.orig/kernel/time/timekeeping.c 2012-12-18 11:38:26.000000000 +0100
-+++ head/kernel/time/timekeeping.c 2012-10-23 14:39:12.000000000 +0200
+--- 12.3.orig/kernel/time/timekeeping.c 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/kernel/time/timekeeping.c 2012-10-23 14:39:12.000000000 +0200
@@ -21,6 +21,9 @@
#include <linux/time.h>
#include <linux/tick.h>
diff --git a/patches.xen/xen3-patch-2.6.19 b/patches.xen/xen3-patch-2.6.19
index 9510dbd14d..fa6d98b329 100644
--- a/patches.xen/xen3-patch-2.6.19
+++ b/patches.xen/xen3-patch-2.6.19
@@ -7,8 +7,8 @@ Acked-by: jbeulich@novell.com
3.1/arch/x86/kernel/step.c (now using user_64bit_mode())
---- head.orig/arch/x86/Kconfig 2012-10-23 14:39:20.000000000 +0200
-+++ head/arch/x86/Kconfig 2012-10-23 14:41:11.000000000 +0200
+--- 12.3.orig/arch/x86/Kconfig 2012-10-23 14:39:20.000000000 +0200
++++ 12.3/arch/x86/Kconfig 2012-10-23 14:41:11.000000000 +0200
@@ -599,6 +599,7 @@ config SCHED_OMIT_FRAME_POINTER
menuconfig PARAVIRT_GUEST
@@ -17,8 +17,8 @@ Acked-by: jbeulich@novell.com
---help---
Say Y here to get to see options related to running Linux under
various hypervisors. This option alone does not add any kernel code.
---- head.orig/arch/x86/kernel/acpi/boot.c 2012-12-18 11:38:26.000000000 +0100
-+++ head/arch/x86/kernel/acpi/boot.c 2012-07-05 10:35:17.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/acpi/boot.c 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/arch/x86/kernel/acpi/boot.c 2012-07-05 10:35:17.000000000 +0200
@@ -70,8 +70,12 @@ int acpi_strict;
u8 acpi_sci_flags __initdata;
@@ -71,8 +71,8 @@ Acked-by: jbeulich@novell.com
static int __init parse_acpi_skip_timer_override(char *arg)
{
acpi_skip_timer_override = 1;
---- head.orig/arch/x86/kernel/apic/apic-xen.c 2007-06-12 13:12:48.000000000 +0200
-+++ head/arch/x86/kernel/apic/apic-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/apic/apic-xen.c 2007-06-12 13:12:48.000000000 +0200
++++ 12.3/arch/x86/kernel/apic/apic-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -54,7 +54,6 @@ static cpumask_t timer_bcast_ipi;
/*
* Knob to control our willingness to enable the local APIC.
@@ -113,8 +113,8 @@ Acked-by: jbeulich@novell.com
#endif
}
}
---- head.orig/arch/x86/kernel/cpu/common-xen.c 2012-07-05 09:59:30.000000000 +0200
-+++ head/arch/x86/kernel/cpu/common-xen.c 2012-07-05 10:35:22.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/cpu/common-xen.c 2012-07-05 09:59:30.000000000 +0200
++++ 12.3/arch/x86/kernel/cpu/common-xen.c 2012-07-05 10:35:22.000000000 +0200
@@ -48,7 +48,7 @@ struct cpu_dev * cpu_devs[X86_VENDOR_NUM
extern int disable_pse;
@@ -178,8 +178,8 @@ Acked-by: jbeulich@novell.com
/* Clear all 6 debug registers: */
set_debugreg(0, 0);
---- head.orig/arch/x86/kernel/cpu/mcheck/mce_dom0.c 2011-10-17 10:45:09.000000000 +0200
-+++ head/arch/x86/kernel/cpu/mcheck/mce_dom0.c 2011-08-15 10:44:20.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/cpu/mcheck/mce_dom0.c 2011-10-17 10:45:09.000000000 +0200
++++ 12.3/arch/x86/kernel/cpu/mcheck/mce_dom0.c 2011-08-15 10:44:20.000000000 +0200
@@ -53,8 +53,7 @@ static struct mc_info *g_mi;
/*dom0 mce virq handler, logging physical mce error info*/
@@ -198,8 +198,8 @@ Acked-by: jbeulich@novell.com
+ mce_dom0_interrupt(VIRQ_MCA, NULL);
}
---- head.orig/arch/x86/kernel/entry_32-xen.S 2012-10-31 10:29:18.000000000 +0100
-+++ head/arch/x86/kernel/entry_32-xen.S 2012-10-31 10:59:54.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/entry_32-xen.S 2013-01-25 13:04:32.000000000 +0100
++++ 12.3/arch/x86/kernel/entry_32-xen.S 2013-01-25 14:05:58.000000000 +0100
@@ -80,8 +80,12 @@ VM_MASK = 0x00020000
NMI_MASK = 0x80000000
@@ -425,7 +425,7 @@ Acked-by: jbeulich@novell.com
cmpl $scrit,%eax
jb 0f
cmpl $ecrit,%eax
-@@ -928,7 +933,7 @@ ENTRY(device_not_available)
+@@ -927,7 +932,7 @@ ENTRY(device_not_available)
CFI_ADJUST_CFA_OFFSET 4
SAVE_ALL
#ifndef CONFIG_XEN
@@ -434,7 +434,7 @@ Acked-by: jbeulich@novell.com
testl $0x4, %eax # EM (math emulation bit)
je device_available_emulate
pushl $0 # temporary storage for ORIG_EIP
-@@ -963,9 +968,15 @@ device_available_emulate:
+@@ -962,9 +967,15 @@ device_available_emulate:
jne ok; \
label: \
movl SYSENTER_stack_esp0+offset(%esp),%esp; \
@@ -451,7 +451,7 @@ Acked-by: jbeulich@novell.com
#endif /* CONFIG_XEN */
KPROBE_ENTRY(debug)
-@@ -984,7 +995,8 @@ debug_stack_correct:
+@@ -983,7 +994,8 @@ debug_stack_correct:
call do_debug
jmp ret_from_exception
CFI_ENDPROC
@@ -461,7 +461,7 @@ Acked-by: jbeulich@novell.com
#ifndef CONFIG_XEN
/*
* NMI is doubly nasty. It can happen _while_ we're handling
-@@ -994,7 +1006,7 @@ debug_stack_correct:
+@@ -993,7 +1005,7 @@ debug_stack_correct:
* check whether we got an NMI on the debug path where the debug
* fault happened on the sysenter path.
*/
@@ -470,7 +470,7 @@ Acked-by: jbeulich@novell.com
RING0_INT_FRAME
pushl %eax
CFI_ADJUST_CFA_OFFSET 4
-@@ -1019,6 +1031,7 @@ ENTRY(nmi)
+@@ -1018,6 +1030,7 @@ ENTRY(nmi)
cmpl $sysenter_entry,12(%esp)
je nmi_debug_stack_check
nmi_stack_correct:
@@ -478,7 +478,7 @@ Acked-by: jbeulich@novell.com
pushl %eax
CFI_ADJUST_CFA_OFFSET 4
SAVE_ALL
-@@ -1029,9 +1042,12 @@ nmi_stack_correct:
+@@ -1028,9 +1041,12 @@ nmi_stack_correct:
CFI_ENDPROC
nmi_stack_fixup:
@@ -491,7 +491,7 @@ Acked-by: jbeulich@novell.com
cmpw $__KERNEL_CS,16(%esp)
jne nmi_stack_correct
cmpl $debug,(%esp)
-@@ -1042,8 +1058,10 @@ nmi_debug_stack_check:
+@@ -1041,8 +1057,10 @@ nmi_debug_stack_check:
jmp nmi_stack_correct
nmi_16bit_stack:
@@ -504,7 +504,7 @@ Acked-by: jbeulich@novell.com
pushl %ss
CFI_ADJUST_CFA_OFFSET 4
pushl %esp
-@@ -1064,14 +1082,14 @@ nmi_16bit_stack:
+@@ -1063,14 +1081,14 @@ nmi_16bit_stack:
call do_nmi
RESTORE_REGS
lss 12+4(%esp), %esp # back to 16bit stack
@@ -521,7 +521,7 @@ Acked-by: jbeulich@novell.com
RING0_INT_FRAME
pushl %eax
CFI_ADJUST_CFA_OFFSET 4
-@@ -1083,6 +1101,7 @@ ENTRY(nmi)
+@@ -1082,6 +1100,7 @@ ENTRY(nmi)
jmp restore_all
CFI_ENDPROC
#endif
@@ -529,7 +529,7 @@ Acked-by: jbeulich@novell.com
KPROBE_ENTRY(int3)
RING0_INT_FRAME
-@@ -1094,7 +1113,7 @@ KPROBE_ENTRY(int3)
+@@ -1093,7 +1112,7 @@ KPROBE_ENTRY(int3)
call do_int3
jmp ret_from_exception
CFI_ENDPROC
@@ -538,7 +538,7 @@ Acked-by: jbeulich@novell.com
ENTRY(overflow)
RING0_INT_FRAME
-@@ -1159,7 +1178,7 @@ KPROBE_ENTRY(general_protection)
+@@ -1158,7 +1177,7 @@ KPROBE_ENTRY(general_protection)
CFI_ADJUST_CFA_OFFSET 4
jmp error_code
CFI_ENDPROC
@@ -547,7 +547,7 @@ Acked-by: jbeulich@novell.com
ENTRY(alignment_check)
RING0_EC_FRAME
-@@ -1168,13 +1187,14 @@ ENTRY(alignment_check)
+@@ -1167,13 +1186,14 @@ ENTRY(alignment_check)
jmp error_code
CFI_ENDPROC
@@ -566,7 +566,7 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_X86_MCE
ENTRY(machine_check)
-@@ -1236,6 +1256,19 @@ ENTRY(fixup_4gb_segment)
+@@ -1235,6 +1255,19 @@ ENTRY(fixup_4gb_segment)
jmp error_code
CFI_ENDPROC
@@ -586,8 +586,8 @@ Acked-by: jbeulich@novell.com
.section .rodata,"a"
#include "syscall_table.S"
---- head.orig/arch/x86/kernel/head_32-xen.S 2012-12-06 15:59:02.000000000 +0100
-+++ head/arch/x86/kernel/head_32-xen.S 2011-08-09 10:35:35.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/head_32-xen.S 2012-12-06 15:59:02.000000000 +0100
++++ 12.3/arch/x86/kernel/head_32-xen.S 2011-08-09 10:35:35.000000000 +0200
@@ -63,7 +63,7 @@ ENTRY(startup_32)
movl %eax,%gs
cld # gcc2 wants the direction flag cleared at all times
@@ -597,8 +597,8 @@ Acked-by: jbeulich@novell.com
jmp start_kernel
#define HYPERCALL_PAGE_OFFSET 0x1000
---- head.orig/arch/x86/kernel/io_apic_32-xen.c 2009-03-18 10:39:31.000000000 +0100
-+++ head/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/io_apic_32-xen.c 2009-03-18 10:39:31.000000000 +0100
++++ 12.3/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -31,6 +31,9 @@
#include <linux/acpi.h>
#include <linux/module.h>
@@ -1678,8 +1678,8 @@ Acked-by: jbeulich@novell.com
+ return 0;
+}
+early_param("noapic", parse_noapic);
---- head.orig/arch/x86/kernel/microcode_core-xen.c 2011-12-21 10:11:41.000000000 +0100
-+++ head/arch/x86/kernel/microcode_core-xen.c 2011-12-01 14:59:39.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/microcode_core-xen.c 2011-12-21 10:11:41.000000000 +0100
++++ 12.3/arch/x86/kernel/microcode_core-xen.c 2011-12-01 14:59:39.000000000 +0100
@@ -2,6 +2,7 @@
* Intel CPU Microcode Update Driver for Linux
*
@@ -1815,8 +1815,8 @@ Acked-by: jbeulich@novell.com
module_init(microcode_init)
module_exit(microcode_exit)
-MODULE_ALIAS_MISCDEV(MICROCODE_MINOR);
---- head.orig/arch/x86/kernel/mpparse-xen.c 2007-06-12 13:12:48.000000000 +0200
-+++ head/arch/x86/kernel/mpparse-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/mpparse-xen.c 2007-06-12 13:12:48.000000000 +0200
++++ 12.3/arch/x86/kernel/mpparse-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -30,6 +30,7 @@
#include <asm/io_apic.h>
@@ -1983,8 +1983,8 @@ Acked-by: jbeulich@novell.com
/*
* Mapping between Global System Interrups, which
* represent all possible interrupts, and IRQs
---- head.orig/arch/x86/kernel/pci-dma-xen.c 2012-11-14 12:23:04.000000000 +0100
-+++ head/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/pci-dma-xen.c 2012-11-14 12:23:04.000000000 +0100
++++ 12.3/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -110,8 +110,7 @@ dma_map_sg(struct device *hwdev, struct
{
int i, rc;
@@ -2043,8 +2043,8 @@ Acked-by: jbeulich@novell.com
if (swiotlb)
swiotlb_unmap_single(dev, dma_addr, size, direction);
else
---- head.orig/arch/x86/kernel/process_32-xen.c 2012-08-10 08:16:46.000000000 +0200
-+++ head/arch/x86/kernel/process_32-xen.c 2012-08-10 10:27:53.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/process_32-xen.c 2012-08-10 08:16:46.000000000 +0200
++++ 12.3/arch/x86/kernel/process_32-xen.c 2012-08-10 10:27:53.000000000 +0200
@@ -37,6 +37,7 @@
#include <linux/kallsyms.h>
#include <linux/ptrace.h>
@@ -2134,8 +2134,8 @@ Acked-by: jbeulich@novell.com
sp -= get_random_int() % 8192;
return sp & ~0xf;
}
---- head.orig/arch/x86/kernel/setup_32-xen.c 2012-06-06 13:16:59.000000000 +0200
-+++ head/arch/x86/kernel/setup_32-xen.c 2012-06-06 13:46:10.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/setup_32-xen.c 2012-06-06 13:16:59.000000000 +0200
++++ 12.3/arch/x86/kernel/setup_32-xen.c 2012-06-06 13:46:10.000000000 +0200
@@ -56,6 +56,7 @@
#include <asm/apic.h>
#include <asm/e820.h>
@@ -2710,8 +2710,8 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_ACPI
acpi_boot_init();
---- head.orig/arch/x86/kernel/smp_32-xen.c 2007-12-10 08:47:31.000000000 +0100
-+++ head/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/smp_32-xen.c 2007-12-10 08:47:31.000000000 +0100
++++ 12.3/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -279,8 +279,7 @@ static inline void leave_mm (unsigned lo
* 2) Leave the mm if we are in the lazy tlb mode.
*/
@@ -2811,8 +2811,8 @@ Acked-by: jbeulich@novell.com
+ return 0;
+}
+EXPORT_SYMBOL(smp_call_function_single);
---- head.orig/arch/x86/kernel/time-xen.c 2011-07-12 11:09:48.000000000 +0200
-+++ head/arch/x86/kernel/time-xen.c 2011-07-12 11:10:26.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/time-xen.c 2011-07-12 11:09:48.000000000 +0200
++++ 12.3/arch/x86/kernel/time-xen.c 2011-07-12 11:10:26.000000000 +0200
@@ -88,7 +88,6 @@ int pit_latch_buggy; /* ext
unsigned long vxtime_hz = PIT_TICK_RATE;
struct vxtime_data __vxtime __section_vxtime; /* for vsyscalls */
@@ -2996,8 +2996,8 @@ Acked-by: jbeulich@novell.com
if ((hpet_enable() >= 0) && hpet_use_timer) {
printk("Using HPET for base-timer\n");
---- head.orig/arch/x86/kernel/traps_32-xen.c 2012-07-05 09:59:30.000000000 +0200
-+++ head/arch/x86/kernel/traps_32-xen.c 2012-07-05 10:35:00.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/traps_32-xen.c 2012-07-05 09:59:30.000000000 +0200
++++ 12.3/arch/x86/kernel/traps_32-xen.c 2012-07-05 10:35:00.000000000 +0200
@@ -28,6 +28,7 @@
#include <linux/kprobes.h>
#include <linux/kexec.h>
@@ -3444,8 +3444,8 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_KPROBES
fastcall void __kprobes do_int3(struct pt_regs *regs, long error_code)
{
---- head.orig/arch/x86/mach-xen/setup.c 2011-09-07 14:16:54.000000000 +0200
-+++ head/arch/x86/mach-xen/setup.c 2011-08-09 10:35:06.000000000 +0200
+--- 12.3.orig/arch/x86/mach-xen/setup.c 2011-09-07 14:16:54.000000000 +0200
++++ 12.3/arch/x86/mach-xen/setup.c 2011-08-09 10:35:06.000000000 +0200
@@ -102,8 +102,10 @@ void __init pre_setup_arch_hook(void)
setup_xen_features();
@@ -3459,8 +3459,8 @@ Acked-by: jbeulich@novell.com
if (HYPERVISOR_memory_op(XENMEM_machphys_mapping, &mapping) == 0) {
machine_to_phys_mapping = (unsigned long *)mapping.v_start;
---- head.orig/arch/x86/mm/fault_32-xen.c 2010-09-23 15:39:04.000000000 +0200
-+++ head/arch/x86/mm/fault_32-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/arch/x86/mm/fault_32-xen.c 2010-09-23 15:39:04.000000000 +0200
++++ 12.3/arch/x86/mm/fault_32-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -27,21 +27,24 @@
#include <asm/uaccess.h>
#include <asm/desc.h>
@@ -3547,8 +3547,8 @@ Acked-by: jbeulich@novell.com
yield();
down_read(&mm->mmap_sem);
goto survive;
---- head.orig/arch/x86/mm/highmem_32-xen.c 2008-10-29 09:55:56.000000000 +0100
-+++ head/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/arch/x86/mm/highmem_32-xen.c 2008-10-29 09:55:56.000000000 +0100
++++ 12.3/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -38,11 +38,9 @@ static void *__kmap_atomic(struct page *
idx = type + KM_TYPE_NR*smp_processor_id();
@@ -3615,8 +3615,8 @@ Acked-by: jbeulich@novell.com
return (void*) vaddr;
}
---- head.orig/arch/x86/mm/hypervisor.c 2012-06-06 13:16:59.000000000 +0200
-+++ head/arch/x86/mm/hypervisor.c 2012-05-31 14:42:14.000000000 +0200
+--- 12.3.orig/arch/x86/mm/hypervisor.c 2012-06-06 13:16:59.000000000 +0200
++++ 12.3/arch/x86/mm/hypervisor.c 2012-05-31 14:42:14.000000000 +0200
@@ -31,6 +31,7 @@
*/
@@ -3947,8 +3947,8 @@ Acked-by: jbeulich@novell.com
if (++i == MAX_BATCHED_FULL_PTES) {
if ((rc = HYPERVISOR_mmu_update(
&u[0], i, NULL, DOMID_SELF)) != 0)
---- head.orig/arch/x86/mm/init_32-xen.c 2011-10-17 10:45:09.000000000 +0200
-+++ head/arch/x86/mm/init_32-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/arch/x86/mm/init_32-xen.c 2011-10-17 10:45:09.000000000 +0200
++++ 12.3/arch/x86/mm/init_32-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -313,8 +313,7 @@ static void __init permanent_kmaps_init(
static void __meminit free_new_highpage(struct page *page, int pfn)
{
@@ -4127,8 +4127,8 @@ Acked-by: jbeulich@novell.com
unsigned long start_pfn = start >> PAGE_SHIFT;
unsigned long nr_pages = size >> PAGE_SHIFT;
---- head.orig/arch/x86/mm/ioremap-xen.c 2011-04-11 13:43:15.000000000 +0200
-+++ head/arch/x86/mm/ioremap-xen.c 2011-02-07 15:37:37.000000000 +0100
+--- 12.3.orig/arch/x86/mm/ioremap-xen.c 2011-04-11 13:43:15.000000000 +0200
++++ 12.3/arch/x86/mm/ioremap-xen.c 2011-02-07 15:37:37.000000000 +0100
@@ -12,7 +12,7 @@
#include <linux/init.h>
#include <linux/slab.h>
@@ -4176,8 +4176,8 @@ Acked-by: jbeulich@novell.com
vunmap((void __force *) addr);
return NULL;
}
---- head.orig/arch/x86/mm/pgtable_32-xen.c 2010-09-23 15:39:04.000000000 +0200
-+++ head/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/arch/x86/mm/pgtable_32-xen.c 2010-09-23 15:39:04.000000000 +0200
++++ 12.3/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -68,7 +68,9 @@ void show_mem(void)
printk(KERN_INFO "%lu pages writeback\n",
global_page_state(NR_WRITEBACK));
@@ -4233,8 +4233,8 @@ Acked-by: jbeulich@novell.com
}
pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
---- head.orig/arch/x86/ia32/ia32entry-xen.S 2008-04-02 12:34:02.000000000 +0200
-+++ head/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/arch/x86/ia32/ia32entry-xen.S 2008-04-02 12:34:02.000000000 +0200
++++ 12.3/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:29:16.000000000 +0100
@@ -83,6 +83,7 @@
*/
ENTRY(ia32_sysenter_target)
@@ -4284,8 +4284,8 @@ Acked-by: jbeulich@novell.com
.quad compat_sys_move_pages
+ .quad sys_getcpu
ia32_syscall_end:
---- head.orig/arch/x86/kernel/Makefile 2012-10-23 14:39:25.000000000 +0200
-+++ head/arch/x86/kernel/Makefile 2012-10-23 14:41:14.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/Makefile 2012-10-23 14:39:25.000000000 +0200
++++ 12.3/arch/x86/kernel/Makefile 2012-10-23 14:41:14.000000000 +0200
@@ -106,7 +106,7 @@ obj-$(CONFIG_X86_XEN) += fixup.o
###
# 64 bit specific files
@@ -4304,8 +4304,8 @@ Acked-by: jbeulich@novell.com
+ reboot.o smpboot_$(BITS).o tsc_$(BITS).o
+disabled-obj-$(CONFIG_XEN_UNPRIVILEGED_GUEST) += mpparse_64.o
%/head_$(BITS).o %/head_$(BITS).s: $(if $(CONFIG_XEN),EXTRA_AFLAGS,dummy) :=
---- head.orig/arch/x86/kernel/e820_64-xen.c 2009-12-04 08:45:56.000000000 +0100
-+++ head/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/e820_64-xen.c 2009-12-04 08:45:56.000000000 +0100
++++ 12.3/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -16,6 +16,7 @@
#include <linux/string.h>
#include <linux/kexec.h>
@@ -4797,8 +4797,8 @@ Acked-by: jbeulich@novell.com
}
unsigned long pci_mem_start = 0xaeedbabe;
---- head.orig/arch/x86/kernel/early_printk-xen.c 2007-06-12 13:13:01.000000000 +0200
-+++ head/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/early_printk-xen.c 2007-06-12 13:13:01.000000000 +0200
++++ 12.3/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -244,20 +244,16 @@ void early_printk(const char *fmt, ...)
static int __initdata keep_early;
@@ -4845,8 +4845,8 @@ Acked-by: jbeulich@novell.com
}
-__setup("earlyprintk=", setup_early_printk);
---- head.orig/arch/x86/kernel/entry_64-xen.S 2012-10-31 10:29:18.000000000 +0100
-+++ head/arch/x86/kernel/entry_64-xen.S 2011-10-07 11:17:17.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/entry_64-xen.S 2012-10-31 10:29:18.000000000 +0100
++++ 12.3/arch/x86/kernel/entry_64-xen.S 2011-10-07 11:17:17.000000000 +0200
@@ -4,9 +4,6 @@
* Copyright (C) 1991, 1992 Linus Torvalds
* Copyright (C) 2000, 2001, 2002 Andi Kleen SuSE Labs
@@ -5089,8 +5089,8 @@ Acked-by: jbeulich@novell.com
ENTRY(alignment_check)
errorentry do_alignment_check
---- head.orig/arch/x86/kernel/head_64-xen.S 2012-12-06 15:59:02.000000000 +0100
-+++ head/arch/x86/kernel/head_64-xen.S 2012-12-06 16:06:11.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/head_64-xen.S 2012-12-06 15:59:02.000000000 +0100
++++ 12.3/arch/x86/kernel/head_64-xen.S 2012-12-06 16:06:11.000000000 +0100
@@ -5,9 +5,6 @@
* Copyright (C) 2000 Pavel Machek <pavel@suse.cz>
* Copyright (C) 2000 Karsten Keil <kkeil@suse.de>
@@ -5110,8 +5110,8 @@ Acked-by: jbeulich@novell.com
gdt_end:
/* asm/segment.h:GDT_ENTRIES must match this */
/* This should be a multiple of the cache line size */
---- head.orig/arch/x86/kernel/head64-xen.c 2011-08-08 12:54:10.000000000 +0200
-+++ head/arch/x86/kernel/head64-xen.c 2011-08-09 10:35:40.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/head64-xen.c 2011-08-08 12:54:10.000000000 +0200
++++ 12.3/arch/x86/kernel/head64-xen.c 2011-08-09 10:35:40.000000000 +0200
@@ -7,6 +7,9 @@
* Modified for Xen.
*/
@@ -5203,8 +5203,8 @@ Acked-by: jbeulich@novell.com
- setup_boot_cpu_data();
start_kernel();
}
---- head.orig/arch/x86/kernel/io_apic_64-xen.c 2009-03-18 10:39:31.000000000 +0100
-+++ head/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/io_apic_64-xen.c 2009-03-18 10:39:31.000000000 +0100
++++ 12.3/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -26,9 +26,12 @@
#include <linux/delay.h>
#include <linux/sched.h>
@@ -6904,8 +6904,8 @@ Acked-by: jbeulich@novell.com
spin_unlock_irqrestore(&ioapic_lock, flags);
return 0;
---- head.orig/arch/x86/kernel/ioport-xen.c 2008-01-28 12:24:19.000000000 +0100
-+++ head/arch/x86/kernel/ioport-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/ioport-xen.c 2008-01-28 12:24:19.000000000 +0100
++++ 12.3/arch/x86/kernel/ioport-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -58,6 +58,7 @@ asmlinkage long sys_ioperm(unsigned long
memset(bitmap, 0xff, IO_BITMAP_BYTES);
@@ -6914,8 +6914,8 @@ Acked-by: jbeulich@novell.com
set_xen_guest_handle(set_iobitmap.bitmap, (char *)bitmap);
set_iobitmap.nr_ports = IO_BITMAP_BITS;
---- head.orig/arch/x86/kernel/process_64-xen.c 2012-08-10 08:16:46.000000000 +0200
-+++ head/arch/x86/kernel/process_64-xen.c 2012-08-10 10:27:54.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/process_64-xen.c 2012-08-10 08:16:46.000000000 +0200
++++ 12.3/arch/x86/kernel/process_64-xen.c 2012-08-10 10:27:54.000000000 +0200
@@ -88,25 +88,24 @@ void idle_notifier_unregister(struct not
}
EXPORT_SYMBOL(idle_notifier_unregister);
@@ -7122,8 +7122,8 @@ Acked-by: jbeulich@novell.com
sp -= get_random_int() % 8192;
return sp & ~0xf;
}
---- head.orig/arch/x86/kernel/setup_64-xen.c 2012-06-06 13:16:59.000000000 +0200
-+++ head/arch/x86/kernel/setup_64-xen.c 2012-06-06 13:46:12.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/setup_64-xen.c 2012-06-06 13:16:59.000000000 +0200
++++ 12.3/arch/x86/kernel/setup_64-xen.c 2012-06-06 13:46:12.000000000 +0200
@@ -88,9 +88,6 @@ extern struct edid_info edid_info;
shared_info_t *HYPERVISOR_shared_info = (shared_info_t *)empty_zero_page;
EXPORT_SYMBOL(HYPERVISOR_shared_info);
@@ -7560,8 +7560,8 @@ Acked-by: jbeulich@novell.com
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* VIA/Cyrix/Centaur-defined */
---- head.orig/arch/x86/kernel/smp_64-xen.c 2008-04-02 12:34:02.000000000 +0200
-+++ head/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/smp_64-xen.c 2008-04-02 12:34:02.000000000 +0200
++++ 12.3/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -381,9 +381,8 @@ int smp_call_function_single (int cpu, v
/* prevent preemption and reschedule on another processor */
int me = get_cpu();
@@ -7623,8 +7623,8 @@ Acked-by: jbeulich@novell.com
- return 0; /* Should not happen */
-#endif
-}
---- head.orig/arch/x86/kernel/traps_64-xen.c 2012-07-05 09:59:30.000000000 +0200
-+++ head/arch/x86/kernel/traps_64-xen.c 2012-07-05 10:35:02.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/traps_64-xen.c 2012-07-05 09:59:30.000000000 +0200
++++ 12.3/arch/x86/kernel/traps_64-xen.c 2012-07-05 10:35:02.000000000 +0200
@@ -23,6 +23,7 @@
#include <linux/delay.h>
#include <linux/spinlock.h>
@@ -8080,8 +8080,8 @@ Acked-by: jbeulich@novell.com
-__setup("call_trace=", call_trace_setup);
+early_param("call_trace", call_trace_setup);
#endif
---- head.orig/arch/x86/kernel/vsyscall_64-xen.c 2007-06-18 08:38:13.000000000 +0200
-+++ head/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/vsyscall_64-xen.c 2007-06-18 08:38:13.000000000 +0200
++++ 12.3/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -26,6 +26,10 @@
#include <linux/seqlock.h>
#include <linux/jiffies.h>
@@ -8275,8 +8275,8 @@ Acked-by: jbeulich@novell.com
return 0;
}
---- head.orig/arch/x86/mm/fault_64-xen.c 2011-10-07 10:44:29.000000000 +0200
-+++ head/arch/x86/mm/fault_64-xen.c 2011-07-26 09:24:01.000000000 +0200
+--- 12.3.orig/arch/x86/mm/fault_64-xen.c 2011-10-07 10:44:29.000000000 +0200
++++ 12.3/arch/x86/mm/fault_64-xen.c 2011-07-26 09:24:01.000000000 +0200
@@ -40,8 +40,7 @@
#define PF_RSVD (1<<3)
#define PF_INSTR (1<<4)
@@ -8414,8 +8414,8 @@ Acked-by: jbeulich@novell.com
pgd_page_table(unlock, page);
}
spin_unlock(&pgd_lock);
---- head.orig/arch/x86/mm/init_64-xen.c 2011-10-17 10:45:09.000000000 +0200
-+++ head/arch/x86/mm/init_64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/arch/x86/mm/init_64-xen.c 2011-10-17 10:45:09.000000000 +0200
++++ 12.3/arch/x86/mm/init_64-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -61,8 +61,6 @@ EXPORT_SYMBOL(__kernel_page_user);
int after_bootmem;
@@ -8728,8 +8728,8 @@ Acked-by: jbeulich@novell.com
}
int kern_addr_valid(unsigned long addr)
---- head.orig/arch/x86/mm/pageattr_64-xen.c 2009-03-18 10:39:31.000000000 +0100
-+++ head/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/arch/x86/mm/pageattr_64-xen.c 2009-03-18 10:39:31.000000000 +0100
++++ 12.3/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -377,8 +377,8 @@ static void revert_page(unsigned long ad
BUG_ON(pud_none(*pud));
pmd = pmd_offset(pud, address);
@@ -8794,8 +8794,8 @@ Acked-by: jbeulich@novell.com
}
}
up_write(&init_mm.mmap_sem);
---- head.orig/drivers/char/tpm/tpm_xen.c 2012-03-12 12:51:05.000000000 +0100
-+++ head/drivers/char/tpm/tpm_xen.c 2012-03-12 13:31:05.000000000 +0100
+--- 12.3.orig/drivers/char/tpm/tpm_xen.c 2012-03-12 12:51:05.000000000 +0100
++++ 12.3/drivers/char/tpm/tpm_xen.c 2012-03-12 13:31:05.000000000 +0100
@@ -85,8 +85,7 @@ static struct tpm_private *my_priv;
/* local function prototypes */
@@ -8815,8 +8815,8 @@ Acked-by: jbeulich@novell.com
{
struct tpm_private *tp = tpm_priv;
unsigned long flags;
---- head.orig/drivers/pci/Kconfig 2012-10-22 16:33:47.000000000 +0200
-+++ head/drivers/pci/Kconfig 2012-10-23 14:41:04.000000000 +0200
+--- 12.3.orig/drivers/pci/Kconfig 2012-10-22 16:33:47.000000000 +0200
++++ 12.3/drivers/pci/Kconfig 2012-10-23 14:41:04.000000000 +0200
@@ -87,7 +87,7 @@ config XEN_PCIDEV_FRONTEND
config HT_IRQ
bool "Interrupts on hypertransport devices"
@@ -8826,8 +8826,8 @@ Acked-by: jbeulich@novell.com
help
This allows native hypertransport devices to use interrupts.
---- head.orig/drivers/pci/msi-xen.c 2012-10-31 10:29:18.000000000 +0100
-+++ head/drivers/pci/msi-xen.c 2012-10-31 10:59:40.000000000 +0100
+--- 12.3.orig/drivers/pci/msi-xen.c 2012-10-31 10:29:18.000000000 +0100
++++ 12.3/drivers/pci/msi-xen.c 2012-10-31 10:59:40.000000000 +0100
@@ -6,6 +6,7 @@
* Copyright (C) Tom Long Nguyen (tom.l.nguyen@intel.com)
*/
@@ -9059,8 +9059,8 @@ Acked-by: jbeulich@novell.com
* allocated for this device function, are reclaimed to unused state,
* which may be used later on.
**/
---- head.orig/drivers/xen/Kconfig 2011-11-03 11:58:46.000000000 +0100
-+++ head/drivers/xen/Kconfig 2012-10-04 11:50:42.000000000 +0200
+--- 12.3.orig/drivers/xen/Kconfig 2011-11-03 11:58:46.000000000 +0100
++++ 12.3/drivers/xen/Kconfig 2012-10-04 11:50:42.000000000 +0200
@@ -368,6 +368,10 @@ endmenu
config HAVE_IRQ_IGNORE_UNHANDLED
def_bool y
@@ -9072,8 +9072,8 @@ Acked-by: jbeulich@novell.com
config NO_IDLE_HZ
def_bool y
---- head.orig/drivers/xen/balloon/balloon.c 2012-06-06 13:16:59.000000000 +0200
-+++ head/drivers/xen/balloon/balloon.c 2012-06-06 13:46:41.000000000 +0200
+--- 12.3.orig/drivers/xen/balloon/balloon.c 2012-06-06 13:16:59.000000000 +0200
++++ 12.3/drivers/xen/balloon/balloon.c 2012-06-06 13:46:41.000000000 +0200
@@ -38,6 +38,7 @@
#include <linux/errno.h>
#include <linux/list.h>
@@ -9271,8 +9271,8 @@ Acked-by: jbeulich@novell.com
bs.driver_pages--;
balloon_unlock(flags);
---- head.orig/drivers/xen/blkback/blkback.c 2012-04-04 08:57:09.000000000 +0200
-+++ head/drivers/xen/blkback/blkback.c 2012-03-26 12:19:17.000000000 +0200
+--- 12.3.orig/drivers/xen/blkback/blkback.c 2013-02-05 10:28:44.000000000 +0100
++++ 12.3/drivers/xen/blkback/blkback.c 2012-03-26 12:19:17.000000000 +0200
@@ -297,7 +297,7 @@ static void blkif_notify_work(blkif_t *b
wake_up(&blkif->wq);
}
@@ -9282,8 +9282,8 @@ Acked-by: jbeulich@novell.com
{
blkif_notify_work(dev_id);
return IRQ_HANDLED;
---- head.orig/drivers/xen/blkback/common.h 2012-06-06 13:16:59.000000000 +0200
-+++ head/drivers/xen/blkback/common.h 2012-06-06 13:46:49.000000000 +0200
+--- 12.3.orig/drivers/xen/blkback/common.h 2012-06-06 13:16:59.000000000 +0200
++++ 12.3/drivers/xen/blkback/common.h 2012-06-06 13:46:49.000000000 +0200
@@ -136,7 +136,7 @@ void blkif_interface_init(void);
void blkif_xenbus_init(void);
@@ -9293,8 +9293,8 @@ Acked-by: jbeulich@novell.com
int blkif_schedule(void *arg);
void blkback_barrier(struct xenbus_transaction, struct backend_info *,
---- head.orig/drivers/xen/blkfront/blkfront.c 2012-10-04 11:18:40.000000000 +0200
-+++ head/drivers/xen/blkfront/blkfront.c 2012-10-04 11:50:38.000000000 +0200
+--- 12.3.orig/drivers/xen/blkfront/blkfront.c 2012-10-04 11:18:40.000000000 +0200
++++ 12.3/drivers/xen/blkfront/blkfront.c 2012-10-04 11:50:38.000000000 +0200
@@ -69,9 +69,9 @@ static int setup_blkring(struct xenbus_d
static void kick_pending_request_queues(struct blkfront_info *);
@@ -9356,8 +9356,8 @@ Acked-by: jbeulich@novell.com
}
int blkfront_is_ready(struct xenbus_device *dev)
---- head.orig/drivers/xen/blktap/blktap.c 2012-12-06 15:59:02.000000000 +0100
-+++ head/drivers/xen/blktap/blktap.c 2012-05-23 13:04:38.000000000 +0200
+--- 12.3.orig/drivers/xen/blktap/blktap.c 2013-01-25 13:04:32.000000000 +0100
++++ 12.3/drivers/xen/blktap/blktap.c 2012-05-23 13:04:38.000000000 +0200
@@ -1273,7 +1273,7 @@ static void blkif_notify_work(blkif_t *b
wake_up(&blkif->wq);
}
@@ -9367,9 +9367,9 @@ Acked-by: jbeulich@novell.com
{
blkif_notify_work(dev_id);
return IRQ_HANDLED;
---- head.orig/drivers/xen/blktap/common.h 2012-06-06 13:16:59.000000000 +0200
-+++ head/drivers/xen/blktap/common.h 2012-06-06 13:46:52.000000000 +0200
-@@ -105,7 +105,7 @@ void tap_blkif_interface_init(void);
+--- 12.3.orig/drivers/xen/blktap/common.h 2013-02-05 10:28:44.000000000 +0100
++++ 12.3/drivers/xen/blktap/common.h 2013-02-05 10:46:26.000000000 +0100
+@@ -107,7 +107,7 @@ void tap_blkif_interface_init(void);
void tap_blkif_xenbus_init(void);
@@ -9378,8 +9378,8 @@ Acked-by: jbeulich@novell.com
int tap_blkif_schedule(void *arg);
int dom_to_devid(domid_t domid, int xenbus_id, blkif_t *blkif);
---- head.orig/drivers/xen/blktap2/sysfs.c 2012-02-16 11:09:01.000000000 +0100
-+++ head/drivers/xen/blktap2/sysfs.c 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/drivers/xen/blktap2/sysfs.c 2012-02-16 11:09:01.000000000 +0100
++++ 12.3/drivers/xen/blktap2/sysfs.c 2011-01-31 17:29:16.000000000 +0100
@@ -150,7 +150,7 @@ blktap_sysfs_pause_device(struct class_d
err = blktap_device_pause(tap);
if (!err) {
@@ -9468,9 +9468,9 @@ Acked-by: jbeulich@novell.com
- return 0;
+ return err;
}
---- head.orig/drivers/xen/console/console.c 2012-03-22 13:40:44.000000000 +0100
-+++ head/drivers/xen/console/console.c 2012-03-22 13:43:32.000000000 +0100
-@@ -352,7 +352,7 @@ static struct tty_struct *xencons_tty;
+--- 12.3.orig/drivers/xen/console/console.c 2012-03-22 13:40:44.000000000 +0100
++++ 12.3/drivers/xen/console/console.c 2013-02-05 10:46:30.000000000 +0100
+@@ -350,7 +350,7 @@ static struct tty_struct *xencons_tty;
static int xencons_priv_irq;
static char x_char;
@@ -9479,7 +9479,7 @@ Acked-by: jbeulich@novell.com
{
int i;
unsigned long flags;
-@@ -377,8 +377,7 @@ void xencons_rx(char *buf, unsigned len,
+@@ -375,8 +375,7 @@ void xencons_rx(char *buf, unsigned len,
if (time_before(jiffies, sysrq_timeout)) {
spin_unlock_irqrestore(
&xencons_lock, flags);
@@ -9489,7 +9489,7 @@ Acked-by: jbeulich@novell.com
spin_lock_irqsave(
&xencons_lock, flags);
continue;
-@@ -443,14 +442,13 @@ void xencons_tx(void)
+@@ -441,14 +440,13 @@ void xencons_tx(void)
}
/* Privileged receive callback and transmit kicker. */
@@ -9506,7 +9506,7 @@ Acked-by: jbeulich@novell.com
xencons_tx();
-@@ -638,7 +636,7 @@ static void xencons_close(struct tty_str
+@@ -636,7 +634,7 @@ static void xencons_close(struct tty_str
spin_unlock_irqrestore(&xencons_lock, flags);
}
@@ -9515,8 +9515,8 @@ Acked-by: jbeulich@novell.com
.open = xencons_open,
.close = xencons_close,
.write = xencons_write,
---- head.orig/drivers/xen/console/xencons.h 2012-03-22 13:27:48.000000000 +0100
-+++ head/drivers/xen/console/xencons.h 2012-03-22 13:43:22.000000000 +0100
+--- 12.3.orig/drivers/xen/console/xencons.h 2012-03-22 13:27:48.000000000 +0100
++++ 12.3/drivers/xen/console/xencons.h 2012-03-22 13:43:22.000000000 +0100
@@ -5,7 +5,7 @@ void xencons_force_flush(void);
/* Interrupt work hooks. Receive data, or kick data out. */
@@ -9526,8 +9526,8 @@ Acked-by: jbeulich@novell.com
void xencons_tx(void);
int xencons_ring_init(void);
---- head.orig/drivers/xen/console/xencons_ring.c 2012-03-22 13:27:48.000000000 +0100
-+++ head/drivers/xen/console/xencons_ring.c 2012-03-22 13:43:28.000000000 +0100
+--- 12.3.orig/drivers/xen/console/xencons_ring.c 2012-03-22 13:27:48.000000000 +0100
++++ 12.3/drivers/xen/console/xencons_ring.c 2012-03-22 13:43:28.000000000 +0100
@@ -64,7 +64,7 @@ int xencons_ring_send(const char *data,
return sent;
}
@@ -9546,8 +9546,8 @@ Acked-by: jbeulich@novell.com
cons++;
}
---- head.orig/drivers/xen/core/evtchn.c 2012-10-04 11:18:40.000000000 +0200
-+++ head/drivers/xen/core/evtchn.c 2012-10-04 11:50:34.000000000 +0200
+--- 12.3.orig/drivers/xen/core/evtchn.c 2012-10-04 11:18:40.000000000 +0200
++++ 12.3/drivers/xen/core/evtchn.c 2012-10-04 11:50:34.000000000 +0200
@@ -551,7 +551,7 @@ static void unbind_from_irq(unsigned int
int bind_caller_port_to_irqhandler(
@@ -9827,8 +9827,8 @@ Acked-by: jbeulich@novell.com
+ handle_fasteoi_irq, "fasteoi");
}
}
---- head.orig/drivers/xen/core/gnttab.c 2012-11-14 12:23:04.000000000 +0100
-+++ head/drivers/xen/core/gnttab.c 2012-03-12 13:31:19.000000000 +0100
+--- 12.3.orig/drivers/xen/core/gnttab.c 2012-11-14 12:23:04.000000000 +0100
++++ 12.3/drivers/xen/core/gnttab.c 2012-03-12 13:31:19.000000000 +0100
@@ -595,6 +595,7 @@ static void gnttab_page_free(struct page
BUG_ON(order);
ClearPageForeign(page);
@@ -9846,8 +9846,8 @@ Acked-by: jbeulich@novell.com
*pagep = new_page;
SetPageForeign(page, gnttab_page_free);
---- head.orig/drivers/xen/core/reboot.c 2011-06-30 15:37:44.000000000 +0200
-+++ head/drivers/xen/core/reboot.c 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/drivers/xen/core/reboot.c 2011-06-30 15:37:44.000000000 +0200
++++ 12.3/drivers/xen/core/reboot.c 2011-01-31 17:29:16.000000000 +0100
@@ -1,4 +1,3 @@
-#define __KERNEL_SYSCALLS__
#include <linux/version.h>
@@ -9879,8 +9879,8 @@ Acked-by: jbeulich@novell.com
{
switch_shutdown_state(SHUTDOWN_SUSPEND);
return IRQ_HANDLED;
---- head.orig/drivers/xen/core/smpboot.c 2012-01-20 14:38:21.000000000 +0100
-+++ head/drivers/xen/core/smpboot.c 2012-01-20 14:44:39.000000000 +0100
+--- 12.3.orig/drivers/xen/core/smpboot.c 2012-01-20 14:38:21.000000000 +0100
++++ 12.3/drivers/xen/core/smpboot.c 2012-01-20 14:44:39.000000000 +0100
@@ -23,8 +23,8 @@
#include <xen/cpu_hotplug.h>
#include <xen/xenbus.h>
@@ -9901,8 +9901,8 @@ Acked-by: jbeulich@novell.com
#endif
void __init prefill_possible_map(void)
---- head.orig/drivers/xen/fbfront/xenfb.c 2012-10-04 11:18:40.000000000 +0200
-+++ head/drivers/xen/fbfront/xenfb.c 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/drivers/xen/fbfront/xenfb.c 2013-01-25 13:04:32.000000000 +0100
++++ 12.3/drivers/xen/fbfront/xenfb.c 2011-01-31 17:29:16.000000000 +0100
@@ -524,8 +524,7 @@ static struct fb_ops xenfb_fb_ops = {
.fb_set_par = xenfb_set_par,
};
@@ -9913,8 +9913,8 @@ Acked-by: jbeulich@novell.com
{
/*
* No in events recognized, simply ignore them all.
---- head.orig/drivers/xen/fbfront/xenkbd.c 2012-10-04 11:18:40.000000000 +0200
-+++ head/drivers/xen/fbfront/xenkbd.c 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/drivers/xen/fbfront/xenkbd.c 2012-10-04 11:18:40.000000000 +0200
++++ 12.3/drivers/xen/fbfront/xenkbd.c 2011-01-31 17:29:16.000000000 +0100
@@ -46,7 +46,7 @@ static void xenkbd_disconnect_backend(st
* to do that.
*/
@@ -9924,8 +9924,8 @@ Acked-by: jbeulich@novell.com
{
struct xenkbd_info *info = dev_id;
struct xenkbd_page *page = info->page;
---- head.orig/drivers/xen/gntdev/gntdev.c 2012-05-14 08:37:24.000000000 +0200
-+++ head/drivers/xen/gntdev/gntdev.c 2012-05-23 13:04:13.000000000 +0200
+--- 12.3.orig/drivers/xen/gntdev/gntdev.c 2012-05-14 08:37:24.000000000 +0200
++++ 12.3/drivers/xen/gntdev/gntdev.c 2012-05-23 13:04:13.000000000 +0200
@@ -687,24 +687,23 @@ static pte_t gntdev_clear_pte(struct vm_
BUG();
}
@@ -9966,8 +9966,8 @@ Acked-by: jbeulich@novell.com
nr = 0;
}
---- head.orig/drivers/xen/netback/accel.c 2011-06-30 15:37:44.000000000 +0200
-+++ head/drivers/xen/netback/accel.c 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/drivers/xen/netback/accel.c 2011-06-30 15:37:44.000000000 +0200
++++ 12.3/drivers/xen/netback/accel.c 2011-01-31 17:29:16.000000000 +0100
@@ -65,7 +65,7 @@ static int match_accelerator(struct xenb
if (IS_ERR(eth_name)) {
@@ -9977,8 +9977,8 @@ Acked-by: jbeulich@novell.com
__FUNCTION__, PTR_ERR(eth_name));
return 0;
} else {
---- head.orig/drivers/xen/netback/common.h 2012-06-06 13:16:59.000000000 +0200
-+++ head/drivers/xen/netback/common.h 2012-06-06 13:47:45.000000000 +0200
+--- 12.3.orig/drivers/xen/netback/common.h 2013-02-05 10:28:44.000000000 +0100
++++ 12.3/drivers/xen/netback/common.h 2013-01-25 14:05:52.000000000 +0100
@@ -92,6 +92,7 @@ typedef struct netif_st {
/* Statistics */
@@ -9994,10 +9994,10 @@ Acked-by: jbeulich@novell.com
-irqreturn_t netif_be_int(int irq, void *dev_id, struct pt_regs *regs);
+irqreturn_t netif_be_int(int irq, void *dev_id);
- static inline int netbk_can_queue(struct net_device *dev)
- {
---- head.orig/drivers/xen/netback/interface.c 2011-10-17 10:45:09.000000000 +0200
-+++ head/drivers/xen/netback/interface.c 2011-11-03 12:01:26.000000000 +0100
+ /* Prevent the device from generating any further traffic. */
+ void xenvif_carrier_off(netif_t *netif);
+--- 12.3.orig/drivers/xen/netback/interface.c 2013-02-05 10:28:44.000000000 +0100
++++ 12.3/drivers/xen/netback/interface.c 2011-11-03 12:01:26.000000000 +0100
@@ -173,6 +173,7 @@ static const struct netif_stat {
u16 offset;
} netbk_stats[] = {
@@ -10006,8 +10006,8 @@ Acked-by: jbeulich@novell.com
};
static int netbk_get_stats_count(struct net_device *dev)
---- head.orig/drivers/xen/netback/loopback.c 2011-01-03 12:43:21.000000000 +0100
-+++ head/drivers/xen/netback/loopback.c 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/drivers/xen/netback/loopback.c 2011-01-03 12:43:21.000000000 +0100
++++ 12.3/drivers/xen/netback/loopback.c 2011-01-31 17:29:16.000000000 +0100
@@ -152,16 +152,6 @@ static int loopback_start_xmit(struct sk
np->stats.rx_bytes += skb->len;
np->stats.rx_packets++;
@@ -10025,8 +10025,8 @@ Acked-by: jbeulich@novell.com
skb->pkt_type = PACKET_HOST; /* overridden by eth_type_trans() */
skb->protocol = eth_type_trans(skb, dev);
skb->dev = dev;
---- head.orig/drivers/xen/netback/netback.c 2012-06-06 13:16:59.000000000 +0200
-+++ head/drivers/xen/netback/netback.c 2012-06-06 13:47:50.000000000 +0200
+--- 12.3.orig/drivers/xen/netback/netback.c 2013-02-05 10:28:44.000000000 +0100
++++ 12.3/drivers/xen/netback/netback.c 2013-01-25 14:05:40.000000000 +0100
@@ -41,6 +41,7 @@
#include <xen/evtchn.h>
#include <xen/gnttab.h>
@@ -10060,7 +10060,7 @@ Acked-by: jbeulich@novell.com
if (meta[npo.meta_cons].copy)
offset = 0;
-@@ -1445,18 +1449,12 @@ static void net_tx_action(unsigned long
+@@ -1482,18 +1486,12 @@ static void net_tx_action(unsigned long
netif_idx_release(pending_idx);
}
@@ -10083,7 +10083,7 @@ Acked-by: jbeulich@novell.com
netbk_fill_frags(skb);
-@@ -1473,6 +1471,12 @@ static void net_tx_action(unsigned long
+@@ -1510,6 +1508,12 @@ static void net_tx_action(unsigned long
skb->dev = netif->dev;
skb->protocol = eth_type_trans(skb, skb->dev);
@@ -10096,7 +10096,7 @@ Acked-by: jbeulich@novell.com
netif->stats.rx_bytes += skb->len;
netif->stats.rx_packets++;
-@@ -1521,7 +1525,7 @@ static void netif_page_release(struct pa
+@@ -1558,7 +1562,7 @@ static void netif_page_release(struct pa
netif_idx_release(idx);
}
@@ -10105,7 +10105,7 @@ Acked-by: jbeulich@novell.com
{
netif_t *netif = dev_id;
-@@ -1588,7 +1592,7 @@ static netif_rx_response_t *make_rx_resp
+@@ -1625,7 +1629,7 @@ static netif_rx_response_t *make_rx_resp
}
#ifdef NETBE_DEBUG_INTERRUPT
@@ -10114,8 +10114,8 @@ Acked-by: jbeulich@novell.com
{
struct list_head *ent;
netif_t *netif;
---- head.orig/drivers/xen/netfront/netfront.c 2012-12-18 11:54:56.000000000 +0100
-+++ head/drivers/xen/netfront/netfront.c 2012-12-18 11:57:21.000000000 +0100
+--- 12.3.orig/drivers/xen/netfront/netfront.c 2012-12-18 11:54:56.000000000 +0100
++++ 12.3/drivers/xen/netfront/netfront.c 2012-12-18 11:57:21.000000000 +0100
@@ -64,6 +64,7 @@
#include <asm/uaccess.h>
#include <xen/interface/grant_table.h>
@@ -10257,8 +10257,8 @@ Acked-by: jbeulich@novell.com
};
#ifdef CONFIG_SYSFS
---- head.orig/drivers/xen/netfront/netfront.h 2012-06-06 13:16:59.000000000 +0200
-+++ head/drivers/xen/netfront/netfront.h 2011-02-09 15:35:17.000000000 +0100
+--- 12.3.orig/drivers/xen/netfront/netfront.h 2012-06-06 13:16:59.000000000 +0200
++++ 12.3/drivers/xen/netfront/netfront.h 2011-02-09 15:35:17.000000000 +0100
@@ -151,6 +151,7 @@ struct netfront_info {
struct net_device *netdev;
@@ -10267,8 +10267,8 @@ Acked-by: jbeulich@novell.com
struct netif_tx_front_ring tx;
struct netif_rx_front_ring rx;
---- head.orig/drivers/xen/pcifront/pcifront.h 2010-10-05 09:58:12.000000000 +0200
-+++ head/drivers/xen/pcifront/pcifront.h 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/drivers/xen/pcifront/pcifront.h 2010-10-05 09:58:12.000000000 +0200
++++ 12.3/drivers/xen/pcifront/pcifront.h 2011-01-31 17:29:16.000000000 +0100
@@ -51,6 +51,6 @@ void pcifront_free_roots(struct pcifront
void pcifront_do_aer( void *data);
@@ -10277,8 +10277,8 @@ Acked-by: jbeulich@novell.com
+irqreturn_t pcifront_handler_aer(int irq, void *dev);
#endif /* __XEN_PCIFRONT_H__ */
---- head.orig/drivers/xen/pcifront/pci_op.c 2012-04-04 08:57:09.000000000 +0200
-+++ head/drivers/xen/pcifront/pci_op.c 2012-04-04 09:49:51.000000000 +0200
+--- 12.3.orig/drivers/xen/pcifront/pci_op.c 2013-01-25 13:04:32.000000000 +0100
++++ 12.3/drivers/xen/pcifront/pci_op.c 2012-04-04 09:49:51.000000000 +0200
@@ -654,7 +654,7 @@ void pcifront_do_aer(void *data)
}
@@ -10288,8 +10288,8 @@ Acked-by: jbeulich@novell.com
{
struct pcifront_device *pdev = dev;
schedule_pcifront_aer_op(pdev);
---- head.orig/drivers/xen/privcmd/compat_privcmd.c 2010-01-27 14:01:48.000000000 +0100
-+++ head/drivers/xen/privcmd/compat_privcmd.c 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/drivers/xen/privcmd/compat_privcmd.c 2010-01-27 14:01:48.000000000 +0100
++++ 12.3/drivers/xen/privcmd/compat_privcmd.c 2011-01-31 17:29:16.000000000 +0100
@@ -18,7 +18,6 @@
* Authors: Jimi Xenidis <jimix@watson.ibm.com>
*/
@@ -10298,8 +10298,8 @@ Acked-by: jbeulich@novell.com
#include <linux/compat.h>
#include <linux/ioctl.h>
#include <linux/syscalls.h>
---- head.orig/drivers/xen/privcmd/privcmd.c 2012-01-20 14:18:49.000000000 +0100
-+++ head/drivers/xen/privcmd/privcmd.c 2012-01-20 14:44:49.000000000 +0100
+--- 12.3.orig/drivers/xen/privcmd/privcmd.c 2012-01-20 14:18:49.000000000 +0100
++++ 12.3/drivers/xen/privcmd/privcmd.c 2012-01-20 14:44:49.000000000 +0100
@@ -65,43 +65,16 @@ static long privcmd_ioctl(struct file *f
if (copy_from_user(&hypercall, udata, sizeof(hypercall)))
return -EFAULT;
@@ -10360,8 +10360,8 @@ Acked-by: jbeulich@novell.com
vma->vm_ops = &privcmd_vm_ops;
vma->vm_private_data = NULL;
---- head.orig/drivers/xen/scsiback/common.h 2012-06-06 13:16:59.000000000 +0200
-+++ head/drivers/xen/scsiback/common.h 2012-06-06 13:48:05.000000000 +0200
+--- 12.3.orig/drivers/xen/scsiback/common.h 2012-06-06 13:16:59.000000000 +0200
++++ 12.3/drivers/xen/scsiback/common.h 2012-06-06 13:48:05.000000000 +0200
@@ -137,7 +137,7 @@ typedef struct {
#define VSCSI_TYPE_HOST 1
@@ -10371,9 +10371,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 2012-12-18 10:47:37.000000000 +0100
-+++ head/drivers/xen/scsiback/scsiback.c 2012-12-06 16:05:50.000000000 +0100
-@@ -451,7 +451,7 @@ void scsiback_cmd_exec(pending_req_t *pe
+--- 12.3.orig/drivers/xen/scsiback/scsiback.c 2013-02-05 10:28:44.000000000 +0100
++++ 12.3/drivers/xen/scsiback/scsiback.c 2013-01-25 14:05:46.000000000 +0100
+@@ -449,7 +449,7 @@ void scsiback_cmd_exec(pending_req_t *pe
write = (data_dir == DMA_TO_DEVICE);
rq = blk_get_request(pending_req->sdev->request_queue, write, GFP_KERNEL);
@@ -10382,7 +10382,7 @@ Acked-by: jbeulich@novell.com
rq->cmd_len = cmd_len;
memcpy(rq->cmd, pending_req->cmnd, cmd_len);
-@@ -495,7 +495,7 @@ static void scsiback_device_reset_exec(p
+@@ -493,7 +493,7 @@ static void scsiback_device_reset_exec(p
}
@@ -10391,8 +10391,8 @@ Acked-by: jbeulich@novell.com
{
scsiback_notify_work((struct vscsibk_info *)dev_id);
return IRQ_HANDLED;
---- head.orig/drivers/xen/scsifront/common.h 2012-12-06 15:59:02.000000000 +0100
-+++ head/drivers/xen/scsifront/common.h 2012-12-04 12:25:34.000000000 +0100
+--- 12.3.orig/drivers/xen/scsifront/common.h 2012-12-06 15:59:02.000000000 +0100
++++ 12.3/drivers/xen/scsifront/common.h 2012-12-04 12:25:34.000000000 +0100
@@ -124,7 +124,7 @@ struct vscsifrnt_info {
int scsifront_xenbus_init(void);
void scsifront_xenbus_unregister(void);
@@ -10402,8 +10402,8 @@ Acked-by: jbeulich@novell.com
#endif /* __XEN_DRIVERS_SCSIFRONT_H__ */
---- head.orig/drivers/xen/scsifront/scsifront.c 2012-12-06 15:59:02.000000000 +0100
-+++ head/drivers/xen/scsifront/scsifront.c 2012-12-06 16:05:56.000000000 +0100
+--- 12.3.orig/drivers/xen/scsifront/scsifront.c 2012-12-06 15:59:02.000000000 +0100
++++ 12.3/drivers/xen/scsifront/scsifront.c 2012-12-06 16:05:56.000000000 +0100
@@ -103,7 +103,7 @@ static void scsifront_do_request(struct
notify_remote_via_irq(irq);
}
@@ -10413,8 +10413,8 @@ Acked-by: jbeulich@novell.com
{
scsifront_notify_work((struct vscsifrnt_info *)dev_id);
return IRQ_HANDLED;
---- head.orig/drivers/xen/sfc_netback/accel_xenbus.c 2010-01-04 11:56:34.000000000 +0100
-+++ head/drivers/xen/sfc_netback/accel_xenbus.c 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/drivers/xen/sfc_netback/accel_xenbus.c 2010-01-04 11:56:34.000000000 +0100
++++ 12.3/drivers/xen/sfc_netback/accel_xenbus.c 2011-01-31 17:29:16.000000000 +0100
@@ -69,8 +69,7 @@ static void unlink_bend(struct netback_a
@@ -10435,8 +10435,8 @@ Acked-by: jbeulich@novell.com
{
VPRINTK("netirq %d from device %s\n", irq,
((struct xenbus_device *)context)->nodename);
---- head.orig/drivers/xen/sfc_netfront/accel.h 2009-04-07 13:58:48.000000000 +0200
-+++ head/drivers/xen/sfc_netfront/accel.h 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/drivers/xen/sfc_netfront/accel.h 2009-04-07 13:58:48.000000000 +0200
++++ 12.3/drivers/xen/sfc_netfront/accel.h 2011-01-31 17:29:16.000000000 +0100
@@ -467,10 +467,8 @@ void netfront_accel_msg_tx_fastpath(netf
u32 ip, u16 port, u8 protocol);
@@ -10450,8 +10450,8 @@ Acked-by: jbeulich@novell.com
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
extern void netfront_accel_msg_from_bend(struct work_struct *context);
---- head.orig/drivers/xen/sfc_netfront/accel_msg.c 2009-04-07 13:58:48.000000000 +0200
-+++ head/drivers/xen/sfc_netfront/accel_msg.c 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/drivers/xen/sfc_netfront/accel_msg.c 2009-04-07 13:58:48.000000000 +0200
++++ 12.3/drivers/xen/sfc_netfront/accel_msg.c 2011-01-31 17:29:16.000000000 +0100
@@ -488,8 +488,7 @@ void netfront_accel_msg_from_bend(void *
}
@@ -10472,8 +10472,8 @@ Acked-by: jbeulich@novell.com
{
netfront_accel_vnic *vnic = (netfront_accel_vnic *)context;
struct net_device *net_dev = vnic->net_dev;
---- head.orig/drivers/xen/sfc_netfront/accel_tso.c 2008-02-26 10:54:12.000000000 +0100
-+++ head/drivers/xen/sfc_netfront/accel_tso.c 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/drivers/xen/sfc_netfront/accel_tso.c 2008-02-26 10:54:12.000000000 +0100
++++ 12.3/drivers/xen/sfc_netfront/accel_tso.c 2011-01-31 17:29:16.000000000 +0100
@@ -363,7 +363,7 @@ int netfront_accel_enqueue_skb_tso(netfr
tso_check_safe(skb);
@@ -10483,8 +10483,8 @@ Acked-by: jbeulich@novell.com
EPRINTK("Trying to TSO send a packet without HW checksum\n");
tso_start(&state, skb);
---- head.orig/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 15:37:44.000000000 +0200
-+++ head/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 16:03:00.000000000 +0200
+--- 12.3.orig/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 15:37:44.000000000 +0200
++++ 12.3/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 16:03:00.000000000 +0200
@@ -463,7 +463,7 @@ netfront_accel_enqueue_skb_multi(netfron
frag_i = -1;
@@ -10503,8 +10503,8 @@ Acked-by: jbeulich@novell.com
/* Set to zero to encourage falcon to work it out for us */
*(u16*)(skb->h.raw + skb->csum) = 0;
}
---- head.orig/drivers/xen/tpmback/common.h 2011-12-21 10:02:58.000000000 +0100
-+++ head/drivers/xen/tpmback/common.h 2011-12-21 10:33:05.000000000 +0100
+--- 12.3.orig/drivers/xen/tpmback/common.h 2011-12-21 10:02:58.000000000 +0100
++++ 12.3/drivers/xen/tpmback/common.h 2011-12-21 10:33:05.000000000 +0100
@@ -70,7 +70,7 @@ void tpmif_deschedule_work(tpmif_t * tpm
int tpmif_xenbus_init(void);
void tpmif_xenbus_exit(void);
@@ -10514,8 +10514,8 @@ Acked-by: jbeulich@novell.com
long int tpmback_get_instance(struct backend_info *bi);
---- head.orig/drivers/xen/tpmback/tpmback.c 2010-09-23 15:39:04.000000000 +0200
-+++ head/drivers/xen/tpmback/tpmback.c 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/drivers/xen/tpmback/tpmback.c 2010-09-23 15:39:04.000000000 +0200
++++ 12.3/drivers/xen/tpmback/tpmback.c 2011-01-31 17:29:16.000000000 +0100
@@ -497,7 +497,7 @@ static ssize_t vtpm_op_read(struct file
list_del(&pak->next);
write_unlock_irqrestore(&dataex.pak_lock, flags);
@@ -10534,8 +10534,8 @@ Acked-by: jbeulich@novell.com
{
tpmif_t *tpmif = (tpmif_t *) dev_id;
---- head.orig/drivers/xen/usbback/usbback.c 2011-09-22 14:33:35.000000000 +0200
-+++ head/drivers/xen/usbback/usbback.c 2011-04-11 14:27:33.000000000 +0200
+--- 12.3.orig/drivers/xen/usbback/usbback.c 2013-02-05 10:28:44.000000000 +0100
++++ 12.3/drivers/xen/usbback/usbback.c 2011-04-11 14:27:33.000000000 +0200
@@ -290,7 +290,7 @@ static void usbbk_notify_work(usbif_t *u
wake_up(&usbif->wq);
}
@@ -10554,8 +10554,8 @@ Acked-by: jbeulich@novell.com
{
pending_req_t *pending_req = (pending_req_t *)urb->context;
---- head.orig/drivers/xen/usbback/usbback.h 2012-06-06 13:16:59.000000000 +0200
-+++ head/drivers/xen/usbback/usbback.h 2012-06-06 13:48:22.000000000 +0200
+--- 12.3.orig/drivers/xen/usbback/usbback.h 2012-06-06 13:16:59.000000000 +0200
++++ 12.3/drivers/xen/usbback/usbback.h 2012-06-06 13:48:22.000000000 +0200
@@ -151,7 +151,7 @@ int portid_add(const char *busid,
int portid_remove(const domid_t domid,
const unsigned int handle,
@@ -10565,8 +10565,8 @@ Acked-by: jbeulich@novell.com
int usbbk_schedule(void *arg);
struct usbstub *find_attached_device(usbif_t *usbif, int port);
void usbbk_attach_device(usbif_t *usbif, struct usbstub *stub);
---- head.orig/drivers/xen/usbback/usbstub.c 2012-02-16 11:09:01.000000000 +0100
-+++ head/drivers/xen/usbback/usbstub.c 2011-03-11 10:54:35.000000000 +0100
+--- 12.3.orig/drivers/xen/usbback/usbstub.c 2012-02-16 11:09:01.000000000 +0100
++++ 12.3/drivers/xen/usbback/usbstub.c 2011-03-11 10:54:35.000000000 +0100
@@ -283,7 +283,7 @@ static ssize_t usbstub_show_portids(stru
static DRIVER_ATTR(port_ids, S_IRUSR, usbstub_show_portids, NULL);
@@ -10594,8 +10594,8 @@ Acked-by: jbeulich@novell.com
&driver_attr_port_ids);
usb_deregister(&usbback_usb_driver);
}
---- head.orig/drivers/xen/usbfront/usbfront.h 2012-06-06 13:16:59.000000000 +0200
-+++ head/drivers/xen/usbfront/usbfront.h 2012-06-06 13:48:26.000000000 +0200
+--- 12.3.orig/drivers/xen/usbfront/usbfront.h 2012-06-06 13:16:59.000000000 +0200
++++ 12.3/drivers/xen/usbfront/usbfront.h 2012-06-06 13:48:26.000000000 +0200
@@ -196,7 +196,7 @@ timer_action(struct usbfront_info *info,
extern struct kmem_cache *xenhcd_urbp_cachep;
extern struct hc_driver xen_usb20_hc_driver;
@@ -10605,8 +10605,8 @@ Acked-by: jbeulich@novell.com
void xenhcd_rhport_state_change(struct usbfront_info *info,
int port, enum usb_device_speed speed);
int xenhcd_schedule(void *arg);
---- head.orig/drivers/xen/usbfront/usbfront-dbg.c 2009-10-15 11:45:41.000000000 +0200
-+++ head/drivers/xen/usbfront/usbfront-dbg.c 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/drivers/xen/usbfront/usbfront-dbg.c 2009-10-15 11:45:41.000000000 +0200
++++ 12.3/drivers/xen/usbfront/usbfront-dbg.c 2011-01-31 17:29:16.000000000 +0100
@@ -90,7 +90,9 @@ static CLASS_DEVICE_ATTR(statistics, S_I
static inline void create_debug_file(struct usbfront_info *info)
{
@@ -10618,8 +10618,8 @@ Acked-by: jbeulich@novell.com
}
static inline void remove_debug_file(struct usbfront_info *info)
---- head.orig/drivers/xen/usbfront/usbfront-q.c 2009-10-15 11:45:41.000000000 +0200
-+++ head/drivers/xen/usbfront/usbfront-q.c 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/drivers/xen/usbfront/usbfront-q.c 2009-10-15 11:45:41.000000000 +0200
++++ 12.3/drivers/xen/usbfront/usbfront-q.c 2011-01-31 17:29:16.000000000 +0100
@@ -236,7 +236,7 @@ __acquires(info->lock)
COUNT(info->stats.complete);
}
@@ -10638,8 +10638,8 @@ Acked-by: jbeulich@novell.com
{
xenhcd_notify_work((struct usbfront_info *) dev_id);
return IRQ_HANDLED;
---- head.orig/drivers/xen/xenbus/xenbus_comms.c 2011-04-11 13:43:15.000000000 +0200
-+++ head/drivers/xen/xenbus/xenbus_comms.c 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/drivers/xen/xenbus/xenbus_comms.c 2011-04-11 13:43:15.000000000 +0200
++++ 12.3/drivers/xen/xenbus/xenbus_comms.c 2011-01-31 17:29:16.000000000 +0100
@@ -54,7 +54,7 @@ static DECLARE_WORK(probe_work, xenbus_p
static DECLARE_WAIT_QUEUE_HEAD(xb_waitq);
@@ -10649,8 +10649,8 @@ Acked-by: jbeulich@novell.com
{
int old, new;
---- head.orig/drivers/xen/xenoprof/xenoprofile.c 2012-02-16 11:09:01.000000000 +0100
-+++ head/drivers/xen/xenoprof/xenoprofile.c 2012-02-16 12:29:10.000000000 +0100
+--- 12.3.orig/drivers/xen/xenoprof/xenoprofile.c 2012-02-16 11:09:01.000000000 +0100
++++ 12.3/drivers/xen/xenoprof/xenoprofile.c 2012-02-16 12:29:10.000000000 +0100
@@ -198,8 +198,7 @@ done:
oprofile_add_domain_switch(COORDINATOR_DOMAIN);
}
@@ -10661,8 +10661,8 @@ Acked-by: jbeulich@novell.com
{
struct xenoprof_buf * buf;
static unsigned long flag;
---- head.orig/arch/x86/include/mach-xen/asm/desc_32.h 2008-01-28 12:24:19.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/desc_32.h 2008-01-28 12:24:19.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:29:16.000000000 +0100
@@ -32,52 +32,110 @@ static inline struct desc_struct *get_cp
return (struct desc_struct *)per_cpu(cpu_gdt_descr, cpu).address;
}
@@ -10823,8 +10823,8 @@ Acked-by: jbeulich@novell.com
static inline void clear_LDT(void)
{
int cpu = get_cpu();
---- head.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2007-06-12 13:14:02.000000000 +0200
-+++ head/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2007-06-12 13:14:02.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:29:16.000000000 +0100
@@ -55,7 +55,7 @@ enum fixed_addresses {
#ifdef CONFIG_X86_LOCAL_APIC
FIX_APIC_BASE, /* local (CPU) APIC) -- required for SMP or not */
@@ -10846,8 +10846,8 @@ Acked-by: jbeulich@novell.com
#define set_fixmap(idx, phys) \
__set_fixmap(idx, phys, PAGE_KERNEL)
---- head.orig/arch/x86/include/mach-xen/asm/hypercall_32.h 2012-10-31 10:29:18.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/hypercall_32.h 2012-10-31 10:58:57.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/hypercall_32.h 2012-10-31 10:29:18.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/hypercall_32.h 2012-10-31 10:58:57.000000000 +0100
@@ -127,6 +127,23 @@
__res; \
})
@@ -10918,8 +10918,8 @@ Acked-by: jbeulich@novell.com
return _hypercall3(int, grant_table_op, cmd, uop, count);
}
---- head.orig/arch/x86/include/mach-xen/asm/hypercall_64.h 2012-10-31 10:29:18.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/hypercall_64.h 2012-10-31 10:59:05.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/hypercall_64.h 2012-10-31 10:29:18.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/hypercall_64.h 2012-10-31 10:59:05.000000000 +0100
@@ -134,6 +134,23 @@
__res; \
})
@@ -10989,8 +10989,8 @@ Acked-by: jbeulich@novell.com
return _hypercall3(int, grant_table_op, cmd, uop, count);
}
---- head.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2012-10-31 10:29:18.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/hypervisor.h 2012-10-31 10:59:11.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2012-10-31 10:29:18.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/hypervisor.h 2012-10-31 10:59:11.000000000 +0100
@@ -42,6 +42,7 @@
#include <xen/interface/sched.h>
#include <xen/interface/nmi.h>
@@ -11061,8 +11061,8 @@ Acked-by: jbeulich@novell.com
static inline int
HYPERVISOR_yield(
void)
---- head.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2008-04-02 12:34:02.000000000 +0200
-+++ head/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2008-04-02 12:34:02.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:29:16.000000000 +0100
@@ -53,7 +53,6 @@ static inline int pte_exec_kernel(pte_t
* not possible, use pte_get_and_clear to obtain the old pte
* value and then use set_pte to update it. -ben
@@ -11119,8 +11119,8 @@ Acked-by: jbeulich@novell.com
static inline int pte_same(pte_t a, pte_t b)
{
return a.pte_low == b.pte_low && a.pte_high == b.pte_high;
---- head.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-04-11 13:43:15.000000000 +0200
-+++ head/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:37:16.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-04-11 13:43:15.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:37:16.000000000 +0100
@@ -260,31 +260,89 @@ static inline pte_t pte_mkhuge(pte_t pte
# include <asm/pgtable-2level.h>
#endif
@@ -11331,8 +11331,8 @@ Acked-by: jbeulich@novell.com
#include <asm-generic/pgtable.h>
#endif /* _I386_PGTABLE_H */
---- head.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:02:29.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:02:29.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:29:16.000000000 +0100
@@ -146,6 +146,18 @@ static inline void detect_ht(struct cpui
#define X86_EFLAGS_VIP 0x00100000 /* Virtual Interrupt Pending */
#define X86_EFLAGS_ID 0x00200000 /* CPUID detection flag */
@@ -11444,8 +11444,8 @@ Acked-by: jbeulich@novell.com
/* from system description table in BIOS. Mostly for MCA use, but
others may find it useful. */
extern unsigned int machine_id;
---- head.orig/arch/x86/include/mach-xen/asm/smp_32.h 2007-06-12 13:14:02.000000000 +0200
-+++ head/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/smp_32.h 2007-06-12 13:14:02.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:29:16.000000000 +0100
@@ -79,25 +79,36 @@ static inline int hard_smp_processor_id(
return GET_APIC_ID(*(unsigned long *)(APIC_BASE+APIC_ID));
}
@@ -11490,8 +11490,8 @@ Acked-by: jbeulich@novell.com
+#endif
+
#endif
---- head.orig/arch/x86/include/mach-xen/asm/tlbflush_32.h 2007-11-26 16:59:25.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/tlbflush_32.h 2007-11-26 16:59:25.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:29:16.000000000 +0100
@@ -8,8 +8,6 @@
#define __flush_tlb_global() xen_tlb_flush()
#define __flush_tlb_all() xen_tlb_flush()
@@ -11501,8 +11501,8 @@ Acked-by: jbeulich@novell.com
#define cpu_has_invlpg (boot_cpu_data.x86 > 3)
#define __flush_tlb_single(addr) xen_invlpg(addr)
---- head.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2007-06-12 13:14:13.000000000 +0200
-+++ head/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2007-06-12 13:14:13.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:29:16.000000000 +0100
@@ -41,7 +41,7 @@ enum fixed_addresses {
#ifdef CONFIG_X86_LOCAL_APIC
FIX_APIC_BASE, /* local (CPU) APIC) -- required for SMP or not */
@@ -11512,8 +11512,8 @@ Acked-by: jbeulich@novell.com
FIX_IO_APIC_BASE_0,
FIX_IO_APIC_BASE_END = FIX_IO_APIC_BASE_0 + MAX_IO_APICS-1,
#endif
---- head.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-04-11 13:43:15.000000000 +0200
-+++ head/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-02-07 15:37:14.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-04-11 13:43:15.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-02-07 15:37:14.000000000 +0100
@@ -44,12 +44,9 @@ extern unsigned long __supported_pte_mas
#define swapper_pg_dir init_level4_pgt
@@ -11692,8 +11692,8 @@ Acked-by: jbeulich@novell.com
#define __HAVE_ARCH_PTEP_GET_AND_CLEAR
#define __HAVE_ARCH_PTEP_GET_AND_CLEAR_FULL
#define __HAVE_ARCH_PTEP_CLEAR_FLUSH
---- head.orig/arch/x86/include/mach-xen/asm/processor_64.h 2008-03-06 08:54:32.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/processor_64.h 2008-03-06 08:54:32.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:29:16.000000000 +0100
@@ -484,6 +484,8 @@ static inline void __mwait(unsigned long
: :"a" (eax), "c" (ecx));
}
@@ -11703,8 +11703,8 @@ Acked-by: jbeulich@novell.com
#define stack_current() \
({ \
struct thread_info *ti; \
---- head.orig/arch/x86/include/mach-xen/asm/smp_64.h 2007-06-12 13:14:13.000000000 +0200
-+++ head/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/smp_64.h 2007-06-12 13:14:13.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:29:16.000000000 +0100
@@ -4,15 +4,12 @@
/*
* We need the APIC definitions automatically as part of 'smp.h'
@@ -11810,8 +11810,8 @@ Acked-by: jbeulich@novell.com
+#endif /* !CONFIG_SMP */
#endif
---- head.orig/arch/x86/include/mach-xen/asm/tlbflush_64.h 2007-11-26 16:59:25.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/tlbflush_64.h 2007-11-26 16:59:25.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:29:16.000000000 +0100
@@ -12,9 +12,6 @@
*/
#define __flush_tlb_global() xen_tlb_flush()
@@ -11822,8 +11822,8 @@ Acked-by: jbeulich@novell.com
#define __flush_tlb_all() __flush_tlb_global()
#define __flush_tlb_one(addr) xen_invlpg((unsigned long)addr)
---- head.orig/include/xen/evtchn.h 2009-03-19 11:35:59.000000000 +0100
-+++ head/include/xen/evtchn.h 2012-10-23 14:40:45.000000000 +0200
+--- 12.3.orig/include/xen/evtchn.h 2009-03-19 11:35:59.000000000 +0100
++++ 12.3/include/xen/evtchn.h 2012-10-23 14:40:45.000000000 +0200
@@ -54,34 +54,34 @@
*/
int bind_caller_port_to_irqhandler(
@@ -11865,7 +11865,7 @@ Acked-by: jbeulich@novell.com
const char *devname,
void *dev_id);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/include/xen/net-util.h 2011-02-09 15:49:42.000000000 +0100
++++ 12.3/include/xen/net-util.h 2011-02-09 15:49:42.000000000 +0100
@@ -0,0 +1,74 @@
+#ifndef __XEN_NETUTIL_H__
+#define __XEN_NETUTIL_H__
@@ -11941,8 +11941,8 @@ Acked-by: jbeulich@novell.com
+}
+
+#endif /* __XEN_NETUTIL_H__ */
---- head.orig/mm/mprotect.c 2011-06-30 15:38:52.000000000 +0200
-+++ head/mm/mprotect.c 2011-01-31 17:29:16.000000000 +0100
+--- 12.3.orig/mm/mprotect.c 2011-06-30 15:38:52.000000000 +0200
++++ 12.3/mm/mprotect.c 2011-01-31 17:29:16.000000000 +0100
@@ -97,7 +97,7 @@ static inline void change_pmd_range(stru
}
if (pmd_none_or_clear_bad(pmd))
@@ -11952,9 +11952,9 @@ Acked-by: jbeulich@novell.com
continue;
change_pte_range(vma->vm_mm, pmd, addr, next, newprot,
dirty_accountable);
---- head.orig/mm/page_alloc.c 2012-10-22 17:20:00.000000000 +0200
-+++ head/mm/page_alloc.c 2012-12-18 11:57:11.000000000 +0100
-@@ -5196,6 +5196,23 @@ static void __setup_per_zone_wmarks(void
+--- 12.3.orig/mm/page_alloc.c 2012-10-22 17:20:00.000000000 +0200
++++ 12.3/mm/page_alloc.c 2013-01-25 14:05:33.000000000 +0100
+@@ -5177,6 +5177,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 0870320888..87de5fb995 100644
--- a/patches.xen/xen3-patch-2.6.20
+++ b/patches.xen/xen3-patch-2.6.20
@@ -5,8 +5,8 @@ Patch-mainline: 2.6.20
Automatically created from "patches.kernel.org/patch-2.6.20" by xen-port-patches.py
Acked-by: jbeulich@novell.com
---- head.orig/arch/x86/Kconfig 2012-10-23 14:41:11.000000000 +0200
-+++ head/arch/x86/Kconfig 2012-10-23 14:41:27.000000000 +0200
+--- 12.3.orig/arch/x86/Kconfig 2012-10-23 14:41:11.000000000 +0200
++++ 12.3/arch/x86/Kconfig 2012-10-23 14:41:27.000000000 +0200
@@ -1693,6 +1693,7 @@ config PHYSICAL_START
config RELOCATABLE
@@ -25,8 +25,8 @@ Acked-by: jbeulich@novell.com
default "0x1000000"
range 0x2000 0x1000000
---help---
---- head.orig/arch/x86/kernel/asm-offsets_32.c 2012-02-08 10:56:16.000000000 +0100
-+++ head/arch/x86/kernel/asm-offsets_32.c 2012-02-08 11:30:59.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/asm-offsets_32.c 2012-02-08 10:56:16.000000000 +0100
++++ 12.3/arch/x86/kernel/asm-offsets_32.c 2012-02-08 11:30:59.000000000 +0100
@@ -69,6 +69,11 @@ void foo(void)
DEFINE(SYSENTER_stack_sp0, 0);
#endif
@@ -39,8 +39,8 @@ Acked-by: jbeulich@novell.com
#if defined(CONFIG_LGUEST) || defined(CONFIG_LGUEST_GUEST) || defined(CONFIG_LGUEST_MODULE)
BLANK();
OFFSET(LGUEST_DATA_irq_enabled, lguest_data, irq_enabled);
---- head.orig/arch/x86/kernel/cpu/common-xen.c 2012-07-05 10:35:22.000000000 +0200
-+++ head/arch/x86/kernel/cpu/common-xen.c 2012-07-05 10:44:27.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/cpu/common-xen.c 2012-07-05 10:35:22.000000000 +0200
++++ 12.3/arch/x86/kernel/cpu/common-xen.c 2012-07-05 10:44:27.000000000 +0200
@@ -22,6 +22,7 @@
#define phys_pkg_id(a,b) a
#endif
@@ -446,8 +446,8 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_HOTPLUG_CPU
void __cpuinit cpu_uninit(void)
{
---- head.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2008-01-28 12:24:18.000000000 +0100
-+++ head/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 17:32:16.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2008-01-28 12:24:18.000000000 +0100
++++ 12.3/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -12,7 +12,7 @@
static DEFINE_MUTEX(mtrr_mutex);
@@ -468,7 +468,7 @@ Acked-by: jbeulich@novell.com
struct xen_platform_op op;
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ 12.3/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -0,0 +1,1002 @@
+#include <linux/kernel.h>
+#include <linux/types.h>
@@ -1472,8 +1472,8 @@ Acked-by: jbeulich@novell.com
+ return 0;
+}
+early_param("memmap", parse_memmap);
---- head.orig/arch/x86/kernel/entry_32-xen.S 2012-10-31 10:59:54.000000000 +0100
-+++ head/arch/x86/kernel/entry_32-xen.S 2012-10-31 11:00:19.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/entry_32-xen.S 2013-01-25 14:05:58.000000000 +0100
++++ 12.3/arch/x86/kernel/entry_32-xen.S 2013-01-25 14:06:12.000000000 +0100
@@ -30,12 +30,13 @@
* 18(%esp) - %eax
* 1C(%esp) - %ds
@@ -2130,7 +2130,7 @@ Acked-by: jbeulich@novell.com
.byte -1,-1,-1,-1 # movb $1,1(%esi) = __DISABLE_INTERRUPTS
.previous
-@@ -944,7 +936,7 @@ ENTRY(device_not_available)
+@@ -943,7 +935,7 @@ ENTRY(device_not_available)
jmp ret_from_exception
device_available_emulate:
#endif
@@ -2139,7 +2139,7 @@ Acked-by: jbeulich@novell.com
call math_state_restore
jmp ret_from_exception
CFI_ENDPROC
-@@ -1014,7 +1006,7 @@ KPROBE_ENTRY(nmi)
+@@ -1013,7 +1005,7 @@ KPROBE_ENTRY(nmi)
cmpw $__ESPFIX_SS, %ax
popl %eax
CFI_ADJUST_CFA_OFFSET -4
@@ -2148,7 +2148,7 @@ Acked-by: jbeulich@novell.com
cmpl $sysenter_entry,(%esp)
je nmi_stack_fixup
pushl %eax
-@@ -1057,7 +1049,7 @@ nmi_debug_stack_check:
+@@ -1056,7 +1048,7 @@ nmi_debug_stack_check:
FIX_STACK(24,nmi_stack_correct, 1)
jmp nmi_stack_correct
@@ -2157,7 +2157,7 @@ Acked-by: jbeulich@novell.com
/* We have a RING0_INT_FRAME here.
*
* create the pointer to lss back
-@@ -1066,7 +1058,6 @@ nmi_16bit_stack:
+@@ -1065,7 +1057,6 @@ nmi_16bit_stack:
CFI_ADJUST_CFA_OFFSET 4
pushl %esp
CFI_ADJUST_CFA_OFFSET 4
@@ -2165,7 +2165,7 @@ Acked-by: jbeulich@novell.com
addw $4, (%esp)
/* copy the iret frame of 12 bytes */
.rept 3
-@@ -1077,11 +1068,11 @@ nmi_16bit_stack:
+@@ -1076,11 +1067,11 @@ nmi_16bit_stack:
CFI_ADJUST_CFA_OFFSET 4
SAVE_ALL
FIXUP_ESPFIX_STACK # %eax == %esp
@@ -2179,7 +2179,7 @@ Acked-by: jbeulich@novell.com
1: INTERRUPT_RETURN
CFI_ENDPROC
.section __ex_table,"a"
-@@ -1097,12 +1088,25 @@ KPROBE_ENTRY(nmi)
+@@ -1096,12 +1087,25 @@ KPROBE_ENTRY(nmi)
xorl %edx,%edx # zero error code
movl %esp,%eax # pt_regs pointer
call do_nmi
@@ -2206,7 +2206,7 @@ Acked-by: jbeulich@novell.com
KPROBE_ENTRY(int3)
RING0_INT_FRAME
pushl $-1 # mark this as an int
-@@ -1218,37 +1222,6 @@ ENTRY(spurious_interrupt_bug)
+@@ -1217,37 +1221,6 @@ ENTRY(spurious_interrupt_bug)
CFI_ENDPROC
#endif /* !CONFIG_XEN */
@@ -2244,8 +2244,8 @@ Acked-by: jbeulich@novell.com
ENTRY(fixup_4gb_segment)
RING0_EC_FRAME
pushl $do_fixup_4gb_segment
---- head.orig/arch/x86/kernel/head_32-xen.S 2011-08-09 10:35:35.000000000 +0200
-+++ head/arch/x86/kernel/head_32-xen.S 2012-12-06 16:06:24.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/head_32-xen.S 2011-08-09 10:35:35.000000000 +0200
++++ 12.3/arch/x86/kernel/head_32-xen.S 2012-12-06 16:06:24.000000000 +0100
@@ -9,6 +9,7 @@
#include <asm/cache.h>
#include <asm/thread_info.h>
@@ -2362,8 +2362,8 @@ Acked-by: jbeulich@novell.com
.ascii ",FEATURES=writable_page_tables"
.ascii "|writable_descriptor_tables"
.ascii "|auto_translated_physmap"
---- head.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:32:16.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ 12.3/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -34,6 +34,7 @@
#include <linux/pci.h>
#include <linux/msi.h>
@@ -2556,8 +2556,8 @@ Acked-by: jbeulich@novell.com
set_native_irq_info(irq, TARGET_CPUS);
spin_unlock_irqrestore(&ioapic_lock, flags);
---- head.orig/arch/x86/kernel/microcode_core-xen.c 2011-12-01 14:59:39.000000000 +0100
-+++ head/arch/x86/kernel/microcode_core-xen.c 2011-12-01 14:59:46.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/microcode_core-xen.c 2011-12-01 14:59:39.000000000 +0100
++++ 12.3/arch/x86/kernel/microcode_core-xen.c 2011-12-01 14:59:46.000000000 +0100
@@ -1,7 +1,7 @@
/*
* Intel CPU Microcode Update Driver for Linux
@@ -2585,8 +2585,8 @@ Acked-by: jbeulich@novell.com
return 0;
}
---- head.orig/arch/x86/kernel/mpparse-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head/arch/x86/kernel/mpparse-xen.c 2011-01-31 17:32:16.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/mpparse-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ 12.3/arch/x86/kernel/mpparse-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -36,7 +36,7 @@
/* Have we found an MP table */
@@ -2636,8 +2636,8 @@ Acked-by: jbeulich@novell.com
{
struct mpc_config_processor processor;
int boot_cpu = 0;
---- head.orig/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:32:16.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ 12.3/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -273,7 +273,7 @@ EXPORT_SYMBOL(dma_free_coherent);
int dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,
dma_addr_t device_addr, size_t size, int flags)
@@ -2673,8 +2673,8 @@ Acked-by: jbeulich@novell.com
return 0;
}
EXPORT_SYMBOL(dma_declare_coherent_memory);
---- head.orig/arch/x86/kernel/process_32-xen.c 2012-08-10 10:27:53.000000000 +0200
-+++ head/arch/x86/kernel/process_32-xen.c 2012-07-05 10:41:22.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/process_32-xen.c 2012-08-10 10:27:53.000000000 +0200
++++ 12.3/arch/x86/kernel/process_32-xen.c 2012-07-05 10:41:22.000000000 +0200
@@ -60,6 +60,7 @@
#include <asm/tlbflush.h>
@@ -2799,8 +2799,8 @@ Acked-by: jbeulich@novell.com
return prev_p;
}
---- head.orig/arch/x86/kernel/setup_32-xen.c 2012-06-06 13:46:10.000000000 +0200
-+++ head/arch/x86/kernel/setup_32-xen.c 2012-06-06 13:48:43.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/setup_32-xen.c 2012-06-06 13:46:10.000000000 +0200
++++ 12.3/arch/x86/kernel/setup_32-xen.c 2012-06-06 13:48:43.000000000 +0200
@@ -76,9 +76,6 @@
#include <xen/interface/kexec.h>
#endif
@@ -3887,8 +3887,8 @@ Acked-by: jbeulich@novell.com
if (is_initial_xendomain()) {
#ifdef CONFIG_VT
---- head.orig/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:32:16.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ 12.3/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -659,6 +659,10 @@ int smp_call_function_single(int cpu, vo
put_cpu();
return -EBUSY;
@@ -3900,8 +3900,8 @@ Acked-by: jbeulich@novell.com
spin_lock_bh(&call_lock);
__smp_call_function_single(cpu, func, info, nonatomic, wait);
spin_unlock_bh(&call_lock);
---- head.orig/arch/x86/kernel/time-xen.c 2011-07-12 11:10:26.000000000 +0200
-+++ head/arch/x86/kernel/time-xen.c 2011-07-12 11:10:37.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/time-xen.c 2011-07-12 11:10:26.000000000 +0200
++++ 12.3/arch/x86/kernel/time-xen.c 2011-07-12 11:10:37.000000000 +0200
@@ -60,6 +60,7 @@
#include <asm/uaccess.h>
#include <asm/processor.h>
@@ -3957,8 +3957,8 @@ Acked-by: jbeulich@novell.com
}
#endif
---- head.orig/arch/x86/kernel/traps_32-xen.c 2012-07-05 10:35:00.000000000 +0200
-+++ head/arch/x86/kernel/traps_32-xen.c 2012-07-05 10:41:26.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/traps_32-xen.c 2012-07-05 10:35:00.000000000 +0200
++++ 12.3/arch/x86/kernel/traps_32-xen.c 2012-07-05 10:41:26.000000000 +0200
@@ -29,6 +29,8 @@
#include <linux/kexec.h>
#include <linux/unwind.h>
@@ -4295,8 +4295,8 @@ Acked-by: jbeulich@novell.com
-}
-__setup("call_trace=", call_trace_setup);
-#endif
---- head.orig/arch/x86/kernel/vmlinux.lds.S 2012-12-06 15:58:43.000000000 +0100
-+++ head/arch/x86/kernel/vmlinux.lds.S 2011-09-07 15:22:44.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/vmlinux.lds.S 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/arch/x86/kernel/vmlinux.lds.S 2011-09-07 15:22:44.000000000 +0200
@@ -83,6 +83,10 @@ SECTIONS
{
#ifdef CONFIG_X86_32
@@ -4308,8 +4308,8 @@ Acked-by: jbeulich@novell.com
phys_startup_32 = startup_32 - LOAD_OFFSET;
#else
. = __START_KERNEL;
---- head.orig/arch/x86/kvm/Kconfig 2012-12-06 15:58:43.000000000 +0100
-+++ head/arch/x86/kvm/Kconfig 2011-01-31 17:32:16.000000000 +0100
+--- 12.3.orig/arch/x86/kvm/Kconfig 2013-02-05 10:40:07.000000000 +0100
++++ 12.3/arch/x86/kvm/Kconfig 2011-01-31 17:32:16.000000000 +0100
@@ -7,6 +7,7 @@ source "virt/kvm/Kconfig"
menuconfig VIRTUALIZATION
bool "Virtualization"
@@ -4318,8 +4318,8 @@ Acked-by: jbeulich@novell.com
default y
---help---
Say Y here to get to see options for using your Linux host to run other
---- head.orig/arch/x86/mm/fault_32-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head/arch/x86/mm/fault_32-xen.c 2011-01-31 17:32:16.000000000 +0100
+--- 12.3.orig/arch/x86/mm/fault_32-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ 12.3/arch/x86/mm/fault_32-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -22,9 +22,9 @@
#include <linux/highmem.h>
#include <linux/module.h>
@@ -4364,8 +4364,8 @@ Acked-by: jbeulich@novell.com
break;
prefetch = (instr_lo == 0xF) &&
(opcode == 0x0D || opcode == 0x18);
---- head.orig/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:32:16.000000000 +0100
+--- 12.3.orig/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ 12.3/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -32,7 +32,7 @@ static void *__kmap_atomic(struct page *
unsigned long vaddr;
@@ -4420,8 +4420,8 @@ Acked-by: jbeulich@novell.com
idx = type + KM_TYPE_NR*smp_processor_id();
vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
---- head.orig/arch/x86/mm/init_32-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head/arch/x86/mm/init_32-xen.c 2011-01-31 17:32:16.000000000 +0100
+--- 12.3.orig/arch/x86/mm/init_32-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ 12.3/arch/x86/mm/init_32-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -233,8 +233,6 @@ static inline int page_kills_ppro(unsign
#endif
@@ -4482,8 +4482,8 @@ Acked-by: jbeulich@novell.com
void __init pgtable_cache_init(void)
{
---- head.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:32:16.000000000 +0100
+--- 12.3.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ 12.3/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -203,7 +203,7 @@ void pte_free(struct page *pte)
__free_page(pte);
}
@@ -4511,8 +4511,8 @@ Acked-by: jbeulich@novell.com
{
unsigned long flags; /* can be called from interrupt context */
---- head.orig/arch/x86/kernel/entry_64-xen.S 2011-10-07 11:17:17.000000000 +0200
-+++ head/arch/x86/kernel/entry_64-xen.S 2011-10-07 11:18:32.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/entry_64-xen.S 2011-10-07 11:17:17.000000000 +0200
++++ 12.3/arch/x86/kernel/entry_64-xen.S 2011-10-07 11:18:32.000000000 +0200
@@ -263,7 +263,6 @@ ENTRY(system_call)
movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
GET_THREAD_INFO(%rcx)
@@ -4650,8 +4650,8 @@ Acked-by: jbeulich@novell.com
- CFI_ENDPROC
-ENDPROC(arch_unwind_init_running)
-#endif
---- head.orig/arch/x86/kernel/head64-xen.c 2011-08-09 10:35:40.000000000 +0200
-+++ head/arch/x86/kernel/head64-xen.c 2011-01-31 17:32:16.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/head64-xen.c 2011-08-09 10:35:40.000000000 +0200
++++ 12.3/arch/x86/kernel/head64-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -101,7 +101,10 @@ void __init x86_64_start_kernel(char * r
}
@@ -4664,8 +4664,8 @@ Acked-by: jbeulich@novell.com
set_intr_gate(i, early_idt_handler);
asm volatile("lidt %0" :: "m" (idt_descr));
#endif
---- head.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:32:16.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ 12.3/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -202,14 +202,20 @@ static struct IO_APIC_route_entry ioapic
* the interrupt, and we need to make sure the entry is fully populated
* before that happens.
@@ -4858,8 +4858,8 @@ Acked-by: jbeulich@novell.com
}
}
---- head.orig/arch/x86/kernel/process_64-xen.c 2012-08-10 10:27:54.000000000 +0200
-+++ head/arch/x86/kernel/process_64-xen.c 2012-07-05 10:41:23.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/process_64-xen.c 2012-08-10 10:27:54.000000000 +0200
++++ 12.3/arch/x86/kernel/process_64-xen.c 2012-07-05 10:41:23.000000000 +0200
@@ -118,29 +118,23 @@ void exit_idle(void)
static void poll_idle (void)
{
@@ -4914,8 +4914,8 @@ Acked-by: jbeulich@novell.com
enter_idle();
idle();
/* In many cases the interrupt that ended idle
---- head.orig/arch/x86/kernel/setup_64-xen.c 2012-06-06 13:46:12.000000000 +0200
-+++ head/arch/x86/kernel/setup_64-xen.c 2012-06-06 13:48:44.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/setup_64-xen.c 2012-06-06 13:46:12.000000000 +0200
++++ 12.3/arch/x86/kernel/setup_64-xen.c 2012-06-06 13:48:44.000000000 +0200
@@ -574,8 +574,7 @@ void __init setup_arch(char **cmdline_p)
if (LOADER_TYPE && INITRD_START) {
if (INITRD_START + INITRD_SIZE <= (end_pfn << PAGE_SHIFT)) {
@@ -4968,8 +4968,8 @@ Acked-by: jbeulich@novell.com
c->x86_max_cores = intel_num_cpu_cores(c);
srat_detect_node();
---- head.orig/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:32:16.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ 12.3/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -384,12 +384,17 @@ int smp_call_function_single (int cpu, v
put_cpu();
return 0;
@@ -4988,8 +4988,8 @@ Acked-by: jbeulich@novell.com
/*
* this function sends a 'generic call function' IPI to all other CPUs
---- head.orig/arch/x86/kernel/traps_64-xen.c 2012-07-05 10:35:02.000000000 +0200
-+++ head/arch/x86/kernel/traps_64-xen.c 2012-07-05 10:41:27.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/traps_64-xen.c 2012-07-05 10:35:02.000000000 +0200
++++ 12.3/arch/x86/kernel/traps_64-xen.c 2012-07-05 10:41:27.000000000 +0200
@@ -30,9 +30,10 @@
#include <linux/kprobes.h>
#include <linux/kexec.h>
@@ -5215,8 +5215,8 @@ Acked-by: jbeulich@novell.com
-}
-early_param("call_trace", call_trace_setup);
-#endif
---- head.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:32:16.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ 12.3/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -42,6 +42,7 @@
#include <asm/topology.h>
@@ -5258,8 +5258,8 @@ Acked-by: jbeulich@novell.com
__set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_page0, PAGE_KERNEL_VSYSCALL);
}
---- head.orig/arch/x86/mm/fault_64-xen.c 2011-07-26 09:24:01.000000000 +0200
-+++ head/arch/x86/mm/fault_64-xen.c 2011-07-26 09:27:24.000000000 +0200
+--- 12.3.orig/arch/x86/mm/fault_64-xen.c 2011-07-26 09:24:01.000000000 +0200
++++ 12.3/arch/x86/mm/fault_64-xen.c 2011-07-26 09:27:24.000000000 +0200
@@ -23,9 +23,9 @@
#include <linux/compiler.h>
#include <linux/module.h>
@@ -5307,8 +5307,8 @@ Acked-by: jbeulich@novell.com
}
void dump_pagetable(unsigned long address)
---- head.orig/arch/x86/mm/init_64-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head/arch/x86/mm/init_64-xen.c 2011-01-31 17:32:16.000000000 +0100
+--- 12.3.orig/arch/x86/mm/init_64-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ 12.3/arch/x86/mm/init_64-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -1164,14 +1164,15 @@ static __init int x8664_sysctl_init(void
__initcall(x8664_sysctl_init);
#endif
@@ -5328,8 +5328,8 @@ Acked-by: jbeulich@novell.com
};
struct vm_area_struct *get_gate_vma(struct task_struct *tsk)
---- head.orig/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:32:16.000000000 +0100
+--- 12.3.orig/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ 12.3/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:32:16.000000000 +0100
@@ -330,34 +330,40 @@ static struct page *split_large_page(uns
return base;
}
@@ -5416,8 +5416,8 @@ Acked-by: jbeulich@novell.com
}
}
---- head.orig/drivers/pci/msi-xen.c 2012-10-31 10:59:40.000000000 +0100
-+++ head/drivers/pci/msi-xen.c 2012-10-31 11:00:13.000000000 +0100
+--- 12.3.orig/drivers/pci/msi-xen.c 2012-10-31 10:59:40.000000000 +0100
++++ 12.3/drivers/pci/msi-xen.c 2012-10-31 11:00:13.000000000 +0100
@@ -292,10 +292,8 @@ void disable_msi_mode(struct pci_dev *de
pci_write_config_word(dev, msi_control_reg(pos), control);
dev->msix_enabled = 0;
@@ -5444,8 +5444,8 @@ Acked-by: jbeulich@novell.com
}
#ifdef CONFIG_PM
---- head.orig/drivers/xen/balloon/balloon.c 2012-06-06 13:46:41.000000000 +0200
-+++ head/drivers/xen/balloon/balloon.c 2012-06-06 13:48:56.000000000 +0200
+--- 12.3.orig/drivers/xen/balloon/balloon.c 2012-06-06 13:46:41.000000000 +0200
++++ 12.3/drivers/xen/balloon/balloon.c 2012-06-06 13:48:56.000000000 +0200
@@ -101,8 +101,8 @@ static unsigned long __read_mostly total
static LIST_HEAD(ballooned_pages);
@@ -5466,8 +5466,8 @@ Acked-by: jbeulich@novell.com
{
int need_sleep = 0;
long credit;
---- head.orig/drivers/xen/blkback/blkback.c 2012-03-26 12:19:17.000000000 +0200
-+++ head/drivers/xen/blkback/blkback.c 2012-03-26 12:21:29.000000000 +0200
+--- 12.3.orig/drivers/xen/blkback/blkback.c 2012-03-26 12:19:17.000000000 +0200
++++ 12.3/drivers/xen/blkback/blkback.c 2012-03-26 12:21:29.000000000 +0200
@@ -37,6 +37,7 @@
#include <linux/spinlock.h>
@@ -5476,8 +5476,8 @@ Acked-by: jbeulich@novell.com
#include <linux/list.h>
#include <linux/delay.h>
#include <xen/balloon.h>
---- head.orig/drivers/xen/blkback/interface.c 2012-04-04 08:57:09.000000000 +0200
-+++ head/drivers/xen/blkback/interface.c 2011-04-11 14:29:25.000000000 +0200
+--- 12.3.orig/drivers/xen/blkback/interface.c 2012-04-04 08:57:09.000000000 +0200
++++ 12.3/drivers/xen/blkback/interface.c 2011-04-11 14:29:25.000000000 +0200
@@ -35,7 +35,7 @@
#include <linux/kthread.h>
#include <linux/vmalloc.h>
@@ -5487,8 +5487,8 @@ Acked-by: jbeulich@novell.com
blkif_t *blkif_alloc(domid_t domid)
{
---- head.orig/drivers/xen/blkfront/blkfront.c 2012-10-04 11:50:38.000000000 +0200
-+++ head/drivers/xen/blkfront/blkfront.c 2012-10-04 11:50:59.000000000 +0200
+--- 12.3.orig/drivers/xen/blkfront/blkfront.c 2012-10-04 11:50:38.000000000 +0200
++++ 12.3/drivers/xen/blkfront/blkfront.c 2012-10-04 11:50:59.000000000 +0200
@@ -70,7 +70,7 @@ static int setup_blkring(struct xenbus_d
static void kick_pending_request_queues(struct blkfront_info *);
@@ -5519,8 +5519,8 @@ Acked-by: jbeulich@novell.com
spin_lock_irq(&info->io_lock);
if (info->connected == BLKIF_STATE_CONNECTED)
kick_pending_request_queues(info);
---- head.orig/drivers/xen/blktap/blktap.c 2012-05-23 13:04:38.000000000 +0200
-+++ head/drivers/xen/blktap/blktap.c 2011-01-31 17:32:16.000000000 +0100
+--- 12.3.orig/drivers/xen/blktap/blktap.c 2012-05-23 13:04:38.000000000 +0200
++++ 12.3/drivers/xen/blktap/blktap.c 2011-01-31 17:32:16.000000000 +0100
@@ -40,6 +40,7 @@
#include <linux/spinlock.h>
@@ -5529,8 +5529,8 @@ Acked-by: jbeulich@novell.com
#include <linux/list.h>
#include <asm/hypervisor.h>
#include "common.h"
---- head.orig/drivers/xen/blktap/interface.c 2012-04-04 08:57:09.000000000 +0200
-+++ head/drivers/xen/blktap/interface.c 2011-04-11 14:29:39.000000000 +0200
+--- 12.3.orig/drivers/xen/blktap/interface.c 2012-04-04 08:57:09.000000000 +0200
++++ 12.3/drivers/xen/blktap/interface.c 2011-04-11 14:29:39.000000000 +0200
@@ -35,7 +35,7 @@
#include <xen/evtchn.h>
#include <linux/vmalloc.h>
@@ -5540,8 +5540,8 @@ Acked-by: jbeulich@novell.com
blkif_t *tap_alloc_blkif(domid_t domid)
{
---- head.orig/drivers/xen/char/mem.c 2012-01-20 14:18:49.000000000 +0100
-+++ head/drivers/xen/char/mem.c 2012-01-20 14:45:18.000000000 +0100
+--- 12.3.orig/drivers/xen/char/mem.c 2012-01-20 14:18:49.000000000 +0100
++++ 12.3/drivers/xen/char/mem.c 2012-01-20 14:45:18.000000000 +0100
@@ -148,7 +148,7 @@ static loff_t memory_lseek(struct file *
{
loff_t ret;
@@ -5560,8 +5560,8 @@ Acked-by: jbeulich@novell.com
return ret;
}
---- head.orig/drivers/xen/console/console.c 2012-03-22 13:43:32.000000000 +0100
-+++ head/drivers/xen/console/console.c 2012-03-22 13:43:53.000000000 +0100
+--- 12.3.orig/drivers/xen/console/console.c 2013-02-05 10:46:30.000000000 +0100
++++ 12.3/drivers/xen/console/console.c 2013-02-05 10:47:19.000000000 +0100
@@ -77,11 +77,6 @@ static int xc_num = -1;
#define XEN_HVC_MAJOR 229
#define XEN_HVC_MINOR 0
@@ -5574,18 +5574,7 @@ Acked-by: jbeulich@novell.com
static int __init xencons_setup(char *str)
{
char *q;
-@@ -346,8 +341,8 @@ void __init dom0_init_screen_info(const
- #define DUMMY_TTY(_tty) ((xc_mode == XC_TTY) && \
- ((_tty)->index != (xc_num - 1)))
-
--static struct termios *xencons_termios[MAX_NR_CONSOLES];
--static struct termios *xencons_termios_locked[MAX_NR_CONSOLES];
-+static struct ktermios *xencons_termios[MAX_NR_CONSOLES];
-+static struct ktermios *xencons_termios_locked[MAX_NR_CONSOLES];
- static struct tty_struct *xencons_tty;
- static int xencons_priv_irq;
- static char x_char;
-@@ -363,7 +358,9 @@ void xencons_rx(char *buf, unsigned len)
+@@ -361,7 +356,9 @@ void xencons_rx(char *buf, unsigned len)
for (i = 0; i < len; i++) {
#ifdef CONFIG_MAGIC_SYSRQ
@@ -5596,8 +5585,8 @@ Acked-by: jbeulich@novell.com
if (buf[i] == '\x0f') { /* ^O */
if (!sysrq_requested) {
sysrq_requested = jiffies;
---- head.orig/drivers/xen/core/evtchn.c 2012-10-04 11:50:34.000000000 +0200
-+++ head/drivers/xen/core/evtchn.c 2012-10-04 11:51:05.000000000 +0200
+--- 12.3.orig/drivers/xen/core/evtchn.c 2012-10-04 11:50:34.000000000 +0200
++++ 12.3/drivers/xen/core/evtchn.c 2012-10-04 11:51:05.000000000 +0200
@@ -40,7 +40,6 @@
#include <asm/atomic.h>
#include <asm/system.h>
@@ -5650,8 +5639,8 @@ Acked-by: jbeulich@novell.com
}
static void restore_cpu_virqs(unsigned int cpu)
---- head.orig/drivers/xen/core/gnttab.c 2012-03-12 13:31:19.000000000 +0100
-+++ head/drivers/xen/core/gnttab.c 2012-10-18 12:21:44.000000000 +0200
+--- 12.3.orig/drivers/xen/core/gnttab.c 2012-03-12 13:31:19.000000000 +0100
++++ 12.3/drivers/xen/core/gnttab.c 2012-10-18 12:21:44.000000000 +0200
@@ -40,7 +40,7 @@
#include <xen/gnttab.h>
#include <asm/pgtable.h>
@@ -5679,8 +5668,8 @@ Acked-by: jbeulich@novell.com
return 0;
cpu_relax();
}
---- head.orig/drivers/xen/core/reboot.c 2011-01-31 17:29:16.000000000 +0100
-+++ head/drivers/xen/core/reboot.c 2011-01-31 17:32:16.000000000 +0100
+--- 12.3.orig/drivers/xen/core/reboot.c 2011-01-31 17:29:16.000000000 +0100
++++ 12.3/drivers/xen/core/reboot.c 2011-01-31 17:32:16.000000000 +0100
@@ -33,8 +33,8 @@ static int suspend_cancelled;
/* Can we leave APs online when we suspend? */
static int fast_suspend;
@@ -5716,8 +5705,8 @@ Acked-by: jbeulich@novell.com
{
int err;
---- head.orig/drivers/xen/core/smpboot.c 2012-01-20 14:44:39.000000000 +0100
-+++ head/drivers/xen/core/smpboot.c 2012-03-22 16:07:26.000000000 +0100
+--- 12.3.orig/drivers/xen/core/smpboot.c 2012-01-20 14:44:39.000000000 +0100
++++ 12.3/drivers/xen/core/smpboot.c 2012-03-22 16:07:26.000000000 +0100
@@ -154,7 +154,12 @@ static void xen_smp_intr_exit(unsigned i
void __cpuinit cpu_bringup(void)
@@ -5770,8 +5759,8 @@ Acked-by: jbeulich@novell.com
#ifdef __x86_64__
cpu_pda(cpu)->pcurrent = idle;
cpu_pda(cpu)->cpunumber = cpu;
---- head.orig/drivers/xen/fbfront/xenfb.c 2011-01-31 17:29:16.000000000 +0100
-+++ head/drivers/xen/fbfront/xenfb.c 2011-01-31 17:32:16.000000000 +0100
+--- 12.3.orig/drivers/xen/fbfront/xenfb.c 2011-01-31 17:29:16.000000000 +0100
++++ 12.3/drivers/xen/fbfront/xenfb.c 2011-01-31 17:32:16.000000000 +0100
@@ -25,6 +25,7 @@
#include <linux/vmalloc.h>
#include <linux/mm.h>
@@ -5780,8 +5769,8 @@ Acked-by: jbeulich@novell.com
#include <asm/hypervisor.h>
#include <xen/evtchn.h>
#include <xen/interface/io/fbif.h>
---- head.orig/drivers/xen/netback/loopback.c 2011-01-31 17:29:16.000000000 +0100
-+++ head/drivers/xen/netback/loopback.c 2011-01-31 17:32:16.000000000 +0100
+--- 12.3.orig/drivers/xen/netback/loopback.c 2011-01-31 17:29:16.000000000 +0100
++++ 12.3/drivers/xen/netback/loopback.c 2011-01-31 17:32:16.000000000 +0100
@@ -54,6 +54,7 @@
#include <net/dst.h>
#include <net/xfrm.h> /* secpath_reset() */
@@ -5790,8 +5779,8 @@ Acked-by: jbeulich@novell.com
static int nloopbacks = -1;
module_param(nloopbacks, int, 0);
---- head.orig/drivers/xen/pcifront/pci_op.c 2012-04-04 09:49:51.000000000 +0200
-+++ head/drivers/xen/pcifront/pci_op.c 2012-04-04 09:50:05.000000000 +0200
+--- 12.3.orig/drivers/xen/pcifront/pci_op.c 2012-04-04 09:49:51.000000000 +0200
++++ 12.3/drivers/xen/pcifront/pci_op.c 2012-04-04 09:50:05.000000000 +0200
@@ -626,9 +626,9 @@ static pci_ers_result_t pcifront_common_
}
@@ -5804,8 +5793,8 @@ Acked-by: jbeulich@novell.com
int cmd = pdev->sh_info->aer_op.cmd;
pci_channel_state_t state =
(pci_channel_state_t)pdev->sh_info->aer_op.err;
---- head.orig/drivers/xen/pcifront/pcifront.h 2011-01-31 17:29:16.000000000 +0100
-+++ head/drivers/xen/pcifront/pcifront.h 2011-01-31 17:32:16.000000000 +0100
+--- 12.3.orig/drivers/xen/pcifront/pcifront.h 2011-01-31 17:29:16.000000000 +0100
++++ 12.3/drivers/xen/pcifront/pcifront.h 2011-01-31 17:32:16.000000000 +0100
@@ -49,7 +49,7 @@ int pcifront_rescan_root(struct pcifront
unsigned int domain, unsigned int bus);
void pcifront_free_roots(struct pcifront_device *pdev);
@@ -5815,8 +5804,8 @@ Acked-by: jbeulich@novell.com
irqreturn_t pcifront_handler_aer(int irq, void *dev);
---- head.orig/drivers/xen/pcifront/xenbus.c 2012-10-04 11:18:40.000000000 +0200
-+++ head/drivers/xen/pcifront/xenbus.c 2012-03-12 13:31:59.000000000 +0100
+--- 12.3.orig/drivers/xen/pcifront/xenbus.c 2012-10-04 11:18:40.000000000 +0200
++++ 12.3/drivers/xen/pcifront/xenbus.c 2012-03-12 13:31:59.000000000 +0100
@@ -49,7 +49,7 @@ static struct pcifront_device *alloc_pde
pdev->gnt_ref = GRANT_INVALID_REF;
pdev->irq = -1;
@@ -5826,8 +5815,8 @@ Acked-by: jbeulich@novell.com
dev_dbg(&xdev->dev, "Allocated pdev @ 0x%p pdev->sh_info @ 0x%p\n",
pdev, pdev->sh_info);
---- head.orig/drivers/xen/scsiback/interface.c 2011-04-11 13:43:15.000000000 +0200
-+++ head/drivers/xen/scsiback/interface.c 2011-04-11 14:30:02.000000000 +0200
+--- 12.3.orig/drivers/xen/scsiback/interface.c 2011-04-11 13:43:15.000000000 +0200
++++ 12.3/drivers/xen/scsiback/interface.c 2011-04-11 14:30:02.000000000 +0200
@@ -41,7 +41,7 @@
#include <linux/vmalloc.h>
@@ -5837,9 +5826,9 @@ Acked-by: jbeulich@novell.com
struct vscsibk_info *vscsibk_info_alloc(domid_t domid)
{
---- head.orig/drivers/xen/scsiback/scsiback.c 2012-12-06 16:05:50.000000000 +0100
-+++ head/drivers/xen/scsiback/scsiback.c 2012-12-06 16:06:32.000000000 +0100
-@@ -333,13 +333,11 @@ static int scsiback_merge_bio(struct req
+--- 12.3.orig/drivers/xen/scsiback/scsiback.c 2013-01-25 14:05:46.000000000 +0100
++++ 12.3/drivers/xen/scsiback/scsiback.c 2013-01-25 14:06:09.000000000 +0100
+@@ -331,13 +331,11 @@ static int scsiback_merge_bio(struct req
if (!rq->bio)
blk_rq_bio_prep(q, rq, bio);
@@ -5854,8 +5843,8 @@ Acked-by: jbeulich@novell.com
}
return 0;
---- head.orig/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 16:03:00.000000000 +0200
-+++ head/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 16:03:44.000000000 +0200
+--- 12.3.orig/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 16:03:00.000000000 +0200
++++ 12.3/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 16:03:44.000000000 +0200
@@ -465,7 +465,7 @@ netfront_accel_enqueue_skb_multi(netfron
if (skb->ip_summed == CHECKSUM_PARTIAL) {
@@ -5874,8 +5863,8 @@ Acked-by: jbeulich@novell.com
}
NETFRONT_ACCEL_PKTBUFF_FOR_EACH_FRAGMENT
(skb, idx, frag_data, frag_len, {
---- head.orig/drivers/xen/tpmback/interface.c 2011-10-17 10:45:09.000000000 +0200
-+++ head/drivers/xen/tpmback/interface.c 2011-04-11 14:30:27.000000000 +0200
+--- 12.3.orig/drivers/xen/tpmback/interface.c 2011-10-17 10:45:09.000000000 +0200
++++ 12.3/drivers/xen/tpmback/interface.c 2011-04-11 14:30:27.000000000 +0200
@@ -18,7 +18,7 @@
#include <xen/evtchn.h>
#include <xen/gnttab.h>
@@ -5885,8 +5874,8 @@ Acked-by: jbeulich@novell.com
int num_frontends = 0;
LIST_HEAD(tpmif_list);
---- head.orig/drivers/xen/usbback/usbback.c 2011-04-11 14:27:33.000000000 +0200
-+++ head/drivers/xen/usbback/usbback.c 2011-04-11 14:30:35.000000000 +0200
+--- 12.3.orig/drivers/xen/usbback/usbback.c 2011-04-11 14:27:33.000000000 +0200
++++ 12.3/drivers/xen/usbback/usbback.c 2011-04-11 14:30:35.000000000 +0200
@@ -536,9 +536,10 @@ struct set_interface_request {
struct work_struct work;
};
@@ -5953,8 +5942,8 @@ Acked-by: jbeulich@novell.com
usb_get_dev(udev);
schedule_work(&req->work);
---- head.orig/drivers/xen/xenbus/xenbus_comms.c 2011-01-31 17:29:16.000000000 +0100
-+++ head/drivers/xen/xenbus/xenbus_comms.c 2011-01-31 17:32:16.000000000 +0100
+--- 12.3.orig/drivers/xen/xenbus/xenbus_comms.c 2011-01-31 17:29:16.000000000 +0100
++++ 12.3/drivers/xen/xenbus/xenbus_comms.c 2011-01-31 17:32:16.000000000 +0100
@@ -49,8 +49,8 @@
static int xenbus_irq;
@@ -5966,8 +5955,8 @@ Acked-by: jbeulich@novell.com
static DECLARE_WAIT_QUEUE_HEAD(xb_waitq);
---- head.orig/drivers/xen/xenbus/xenbus_probe.c 2012-03-12 12:51:05.000000000 +0100
-+++ head/drivers/xen/xenbus/xenbus_probe.c 2012-03-12 13:31:47.000000000 +0100
+--- 12.3.orig/drivers/xen/xenbus/xenbus_probe.c 2012-03-12 12:51:05.000000000 +0100
++++ 12.3/drivers/xen/xenbus/xenbus_probe.c 2012-03-12 13:31:47.000000000 +0100
@@ -979,7 +979,7 @@ static void xenbus_reset_state(void)
}
#endif
@@ -5977,8 +5966,8 @@ Acked-by: jbeulich@novell.com
{
BUG_ON(!is_xenstored_ready());
---- head.orig/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:29:16.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:32:16.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:29:16.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:32:16.000000000 +0100
@@ -4,8 +4,6 @@
#include <asm/ldt.h>
#include <asm/segment.h>
@@ -6164,8 +6153,8 @@ Acked-by: jbeulich@novell.com
#endif /* !__ASSEMBLY__ */
#endif
---- head.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:29:16.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:32:16.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:29:16.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:32:16.000000000 +0100
@@ -13,13 +13,16 @@
#ifndef _ASM_FIXMAP_H
#define _ASM_FIXMAP_H
@@ -6184,8 +6173,8 @@ Acked-by: jbeulich@novell.com
#ifndef __ASSEMBLY__
#include <linux/kernel.h>
---- head.orig/arch/x86/include/mach-xen/asm/highmem.h 2008-10-29 09:55:56.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 17:32:16.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/highmem.h 2008-10-29 09:55:56.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 17:32:16.000000000 +0100
@@ -85,7 +85,7 @@ static inline void clear_user_highpage(s
void copy_highpage(struct page *to, struct page *from);
@@ -6195,8 +6184,8 @@ Acked-by: jbeulich@novell.com
{
copy_highpage(to, from);
}
---- head.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2012-10-31 10:59:11.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/hypervisor.h 2012-10-31 11:00:36.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2012-10-31 10:59:11.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/hypervisor.h 2012-10-31 11:00:36.000000000 +0100
@@ -45,15 +45,6 @@
#include <asm/percpu.h>
#include <asm/ptrace.h>
@@ -6213,8 +6202,8 @@ Acked-by: jbeulich@novell.com
extern shared_info_t *HYPERVISOR_shared_info;
---- head.orig/arch/x86/include/mach-xen/asm/irqflags_32.h 2007-06-12 13:14:02.000000000 +0200
-+++ head/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:32:16.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/irqflags_32.h 2007-06-12 13:14:02.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:32:16.000000000 +0100
@@ -22,9 +22,6 @@
#define __raw_local_save_flags() (current_vcpu_info()->evtchn_upcall_mask)
@@ -6309,8 +6298,8 @@ Acked-by: jbeulich@novell.com
#endif /* __ASSEMBLY__ */
/*
---- head.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2007-06-12 13:14:02.000000000 +0200
-+++ head/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:32:16.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2007-06-12 13:14:02.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:32:16.000000000 +0100
@@ -27,14 +27,13 @@ static inline void enter_lazy_tlb(struct
static inline void __prepare_arch_switch(void)
{
@@ -6350,8 +6339,8 @@ Acked-by: jbeulich@novell.com
static inline void activate_mm(struct mm_struct *prev, struct mm_struct *next)
{
---- head.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:29:16.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:32:16.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:29:16.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:32:16.000000000 +0100
@@ -1,8 +1,6 @@
#ifndef _I386_PGTABLE_3LEVEL_H
#define _I386_PGTABLE_3LEVEL_H
@@ -6450,8 +6439,8 @@ Acked-by: jbeulich@novell.com
#define __pte_mfn(_pte) (((_pte).pte_low >> PAGE_SHIFT) | \
((_pte).pte_high << (32-PAGE_SHIFT)))
#define pte_mfn(_pte) ((_pte).pte_low & _PAGE_PRESENT ? \
---- head.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:37:16.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-01-31 17:32:16.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:37:16.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-01-31 17:32:16.000000000 +0100
@@ -38,14 +38,14 @@ struct vm_area_struct;
#define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))
extern unsigned long empty_zero_page[1024];
@@ -6500,8 +6489,8 @@ Acked-by: jbeulich@novell.com
#define __HAVE_ARCH_PTEP_GET_AND_CLEAR_FULL
#define ptep_get_and_clear_full(mm, addr, ptep, full) \
((full) ? ({ \
---- head.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:29:16.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:32:16.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:29:16.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:32:16.000000000 +0100
@@ -20,6 +20,7 @@
#include <linux/threads.h>
#include <asm/percpu.h>
@@ -6780,8 +6769,8 @@ Acked-by: jbeulich@novell.com
+extern void secondary_cpu_init(void);
+
#endif /* __ASM_I386_PROCESSOR_H */
---- head.orig/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:29:16.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:32:16.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:29:16.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:32:16.000000000 +0100
@@ -8,6 +8,7 @@
#include <linux/kernel.h>
#include <linux/threads.h>
@@ -6799,8 +6788,8 @@ Acked-by: jbeulich@novell.com
extern cpumask_t cpu_possible_map;
#define cpu_callin_map cpu_possible_map
---- head.orig/arch/x86/include/mach-xen/asm/desc_64.h 2008-01-28 12:24:19.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/desc_64.h 2011-01-31 17:32:16.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/desc_64.h 2008-01-28 12:24:19.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/desc_64.h 2011-01-31 17:32:16.000000000 +0100
@@ -9,62 +9,11 @@
#include <linux/string.h>
@@ -6865,8 +6854,8 @@ Acked-by: jbeulich@novell.com
extern struct desc_ptr idt_descr, cpu_gdt_descr[NR_CPUS];
extern struct desc_struct cpu_gdt_table[GDT_ENTRIES];
---- head.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-02-07 15:37:14.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-01-31 17:32:16.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-02-07 15:37:14.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-01-31 17:32:16.000000000 +0100
@@ -237,19 +237,18 @@ extern unsigned int __kernel_page_user;
static inline unsigned long pgd_bad(pgd_t pgd)
@@ -6906,8 +6895,8 @@ Acked-by: jbeulich@novell.com
#define pfn_pmd(nr,prot) (__pmd(((nr) << PAGE_SHIFT) | pgprot_val(prot)))
#define pmd_pfn(x) ((pmd_val(x) & __PHYSICAL_MASK) >> PAGE_SHIFT)
---- head.orig/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:29:16.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:32:16.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:29:16.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:32:16.000000000 +0100
@@ -484,6 +484,14 @@ static inline void __mwait(unsigned long
: :"a" (eax), "c" (ecx));
}
@@ -6923,8 +6912,8 @@ Acked-by: jbeulich@novell.com
extern void mwait_idle_with_hints(unsigned long eax, unsigned long ecx);
#define stack_current() \
---- head.orig/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:29:16.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:32:16.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:29:16.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:32:16.000000000 +0100
@@ -88,11 +88,6 @@ extern u8 x86_cpu_to_log_apicid[NR_CPUS]
extern u8 bios_cpu_apicid[];
@@ -6951,8 +6940,8 @@ Acked-by: jbeulich@novell.com
#endif /* !CONFIG_SMP */
#endif
---- head.orig/include/xen/evtchn.h 2012-10-23 14:40:45.000000000 +0200
-+++ head/include/xen/evtchn.h 2012-10-23 14:41:34.000000000 +0200
+--- 12.3.orig/include/xen/evtchn.h 2012-10-23 14:40:45.000000000 +0200
++++ 12.3/include/xen/evtchn.h 2012-10-23 14:41:34.000000000 +0200
@@ -37,7 +37,7 @@
#include <linux/interrupt.h>
#include <asm/hypervisor.h>
@@ -6978,8 +6967,8 @@ Acked-by: jbeulich@novell.com
}
static inline void notify_remote_via_evtchn(int port)
---- head.orig/include/xen/net-util.h 2011-02-09 15:49:42.000000000 +0100
-+++ head/include/xen/net-util.h 2011-02-09 15:50:19.000000000 +0100
+--- 12.3.orig/include/xen/net-util.h 2011-02-09 15:49:42.000000000 +0100
++++ 12.3/include/xen/net-util.h 2011-02-09 15:50:19.000000000 +0100
@@ -39,12 +39,12 @@ static inline int skb_checksum_setup(str
switch (iph->protocol) {
@@ -7004,8 +6993,8 @@ Acked-by: jbeulich@novell.com
goto out;
if (csum) {
---- head.orig/kernel/kexec.c 2012-10-22 18:08:43.000000000 +0200
-+++ head/kernel/kexec.c 2012-10-23 14:41:40.000000000 +0200
+--- 12.3.orig/kernel/kexec.c 2012-10-22 18:08:43.000000000 +0200
++++ 12.3/kernel/kexec.c 2012-10-23 14:41:40.000000000 +0200
@@ -369,7 +369,7 @@ static struct page *kimage_alloc_pages(g
if (limit == ~0UL)
address_bits = BITS_PER_LONG;
diff --git a/patches.xen/xen3-patch-2.6.21 b/patches.xen/xen3-patch-2.6.21
index 04d62780c1..89c30416a9 100644
--- a/patches.xen/xen3-patch-2.6.21
+++ b/patches.xen/xen3-patch-2.6.21
@@ -5,8 +5,8 @@ Patch-mainline: 2.6.21
Automatically created from "patches.kernel.org/patch-2.6.21" by xen-port-patches.py
Acked-by: jbeulich@novell.com
---- head.orig/arch/x86/Kconfig 2012-10-23 14:41:27.000000000 +0200
-+++ head/arch/x86/Kconfig 2012-10-23 14:42:00.000000000 +0200
+--- 12.3.orig/arch/x86/Kconfig 2012-10-23 14:41:27.000000000 +0200
++++ 12.3/arch/x86/Kconfig 2012-10-23 14:42:00.000000000 +0200
@@ -98,10 +98,10 @@ config X86
select HAVE_ARCH_SECCOMP_FILTER
select BUILDTIME_EXTABLE_SORT
@@ -21,8 +21,8 @@ Acked-by: jbeulich@novell.com
select GENERIC_TIME_VSYSCALL if X86_64
select KTIME_SCALAR if X86_32
select GENERIC_STRNCPY_FROM_USER
---- head.orig/arch/x86/kernel/Makefile 2012-10-23 14:41:14.000000000 +0200
-+++ head/arch/x86/kernel/Makefile 2012-10-23 14:42:03.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/Makefile 2012-10-23 14:41:14.000000000 +0200
++++ 12.3/arch/x86/kernel/Makefile 2012-10-23 14:42:03.000000000 +0200
@@ -119,7 +119,7 @@ ifeq ($(CONFIG_X86_64),y)
pci-dma_64-$(CONFIG_XEN) += pci-dma_32.o
endif
@@ -33,8 +33,8 @@ Acked-by: jbeulich@novell.com
+ reboot.o smpboot_$(BITS).o tsc_$(BITS).o tsc_sync.o
disabled-obj-$(CONFIG_XEN_UNPRIVILEGED_GUEST) += mpparse_64.o
%/head_$(BITS).o %/head_$(BITS).s: $(if $(CONFIG_XEN),EXTRA_AFLAGS,dummy) :=
---- head.orig/arch/x86/kernel/apic/apic-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head/arch/x86/kernel/apic/apic-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/apic/apic-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ 12.3/arch/x86/kernel/apic/apic-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -25,6 +25,8 @@
#include <linux/kernel_stat.h>
#include <linux/sysdev.h>
@@ -131,8 +131,8 @@ Acked-by: jbeulich@novell.com
int setup_profiling_timer(unsigned int multiplier)
{
return -EINVAL;
---- head.orig/arch/x86/kernel/cpu/common-xen.c 2012-07-05 10:44:27.000000000 +0200
-+++ head/arch/x86/kernel/cpu/common-xen.c 2012-07-05 10:45:39.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/cpu/common-xen.c 2012-07-05 10:44:27.000000000 +0200
++++ 12.3/arch/x86/kernel/cpu/common-xen.c 2012-07-05 10:45:39.000000000 +0200
@@ -619,7 +619,7 @@ void __init early_cpu_init(void)
struct pt_regs * __devinit idle_regs(struct pt_regs *regs)
{
@@ -178,8 +178,8 @@ Acked-by: jbeulich@novell.com
/* Clear all 6 debug registers: */
set_debugreg(0, 0);
---- head.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ 12.3/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -14,6 +14,7 @@
#include <asm/pgtable.h>
#include <asm/page.h>
@@ -219,8 +219,8 @@ Acked-by: jbeulich@novell.com
return sum == 0;
}
---- head.orig/arch/x86/kernel/entry_32-xen.S 2012-10-31 11:00:19.000000000 +0100
-+++ head/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:08:37.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/entry_32-xen.S 2013-01-25 14:06:12.000000000 +0100
++++ 12.3/arch/x86/kernel/entry_32-xen.S 2013-01-25 14:06:19.000000000 +0100
@@ -30,7 +30,7 @@
* 18(%esp) - %eax
* 1C(%esp) - %ds
@@ -460,7 +460,7 @@ Acked-by: jbeulich@novell.com
.byte 10,10,10 # add $4,%esp
.byte 11 # iret
.byte -1,-1,-1,-1 # movb $1,1(%esi) = __DISABLE_INTERRUPTS
-@@ -909,6 +931,7 @@ ENTRY(coprocessor_error)
+@@ -908,6 +930,7 @@ ENTRY(coprocessor_error)
CFI_ADJUST_CFA_OFFSET 4
jmp error_code
CFI_ENDPROC
@@ -468,7 +468,7 @@ Acked-by: jbeulich@novell.com
ENTRY(simd_coprocessor_error)
RING0_INT_FRAME
-@@ -918,6 +941,7 @@ ENTRY(simd_coprocessor_error)
+@@ -917,6 +940,7 @@ ENTRY(simd_coprocessor_error)
CFI_ADJUST_CFA_OFFSET 4
jmp error_code
CFI_ENDPROC
@@ -476,7 +476,7 @@ Acked-by: jbeulich@novell.com
ENTRY(device_not_available)
RING0_INT_FRAME
-@@ -940,6 +964,7 @@ device_available_emulate:
+@@ -939,6 +963,7 @@ device_available_emulate:
call math_state_restore
jmp ret_from_exception
CFI_ENDPROC
@@ -484,7 +484,7 @@ Acked-by: jbeulich@novell.com
#ifndef CONFIG_XEN
/*
-@@ -1101,10 +1126,12 @@ ENTRY(native_iret)
+@@ -1100,10 +1125,12 @@ ENTRY(native_iret)
.align 4
.long 1b,iret_exc
.previous
@@ -497,7 +497,7 @@ Acked-by: jbeulich@novell.com
#endif
KPROBE_ENTRY(int3)
-@@ -1127,6 +1154,7 @@ ENTRY(overflow)
+@@ -1126,6 +1153,7 @@ ENTRY(overflow)
CFI_ADJUST_CFA_OFFSET 4
jmp error_code
CFI_ENDPROC
@@ -505,7 +505,7 @@ Acked-by: jbeulich@novell.com
ENTRY(bounds)
RING0_INT_FRAME
-@@ -1136,6 +1164,7 @@ ENTRY(bounds)
+@@ -1135,6 +1163,7 @@ ENTRY(bounds)
CFI_ADJUST_CFA_OFFSET 4
jmp error_code
CFI_ENDPROC
@@ -513,7 +513,7 @@ Acked-by: jbeulich@novell.com
ENTRY(invalid_op)
RING0_INT_FRAME
-@@ -1145,6 +1174,7 @@ ENTRY(invalid_op)
+@@ -1144,6 +1173,7 @@ ENTRY(invalid_op)
CFI_ADJUST_CFA_OFFSET 4
jmp error_code
CFI_ENDPROC
@@ -521,7 +521,7 @@ Acked-by: jbeulich@novell.com
ENTRY(coprocessor_segment_overrun)
RING0_INT_FRAME
-@@ -1154,6 +1184,7 @@ ENTRY(coprocessor_segment_overrun)
+@@ -1153,6 +1183,7 @@ ENTRY(coprocessor_segment_overrun)
CFI_ADJUST_CFA_OFFSET 4
jmp error_code
CFI_ENDPROC
@@ -529,7 +529,7 @@ Acked-by: jbeulich@novell.com
ENTRY(invalid_TSS)
RING0_EC_FRAME
-@@ -1161,6 +1192,7 @@ ENTRY(invalid_TSS)
+@@ -1160,6 +1191,7 @@ ENTRY(invalid_TSS)
CFI_ADJUST_CFA_OFFSET 4
jmp error_code
CFI_ENDPROC
@@ -537,7 +537,7 @@ Acked-by: jbeulich@novell.com
ENTRY(segment_not_present)
RING0_EC_FRAME
-@@ -1168,6 +1200,7 @@ ENTRY(segment_not_present)
+@@ -1167,6 +1199,7 @@ ENTRY(segment_not_present)
CFI_ADJUST_CFA_OFFSET 4
jmp error_code
CFI_ENDPROC
@@ -545,7 +545,7 @@ Acked-by: jbeulich@novell.com
ENTRY(stack_segment)
RING0_EC_FRAME
-@@ -1175,6 +1208,7 @@ ENTRY(stack_segment)
+@@ -1174,6 +1207,7 @@ ENTRY(stack_segment)
CFI_ADJUST_CFA_OFFSET 4
jmp error_code
CFI_ENDPROC
@@ -553,7 +553,7 @@ Acked-by: jbeulich@novell.com
KPROBE_ENTRY(general_protection)
RING0_EC_FRAME
-@@ -1190,6 +1224,7 @@ ENTRY(alignment_check)
+@@ -1189,6 +1223,7 @@ ENTRY(alignment_check)
CFI_ADJUST_CFA_OFFSET 4
jmp error_code
CFI_ENDPROC
@@ -561,7 +561,7 @@ Acked-by: jbeulich@novell.com
ENTRY(divide_error)
RING0_INT_FRAME
-@@ -1199,6 +1234,7 @@ ENTRY(divide_error)
+@@ -1198,6 +1233,7 @@ ENTRY(divide_error)
CFI_ADJUST_CFA_OFFSET 4
jmp error_code
CFI_ENDPROC
@@ -569,7 +569,7 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_X86_MCE
ENTRY(machine_check)
-@@ -1209,6 +1245,7 @@ ENTRY(machine_check)
+@@ -1208,6 +1244,7 @@ ENTRY(machine_check)
CFI_ADJUST_CFA_OFFSET 4
jmp error_code
CFI_ENDPROC
@@ -577,7 +577,7 @@ Acked-by: jbeulich@novell.com
#endif
#ifndef CONFIG_XEN
-@@ -1220,6 +1257,7 @@ ENTRY(spurious_interrupt_bug)
+@@ -1219,6 +1256,7 @@ ENTRY(spurious_interrupt_bug)
CFI_ADJUST_CFA_OFFSET 4
jmp error_code
CFI_ENDPROC
@@ -585,7 +585,7 @@ Acked-by: jbeulich@novell.com
#endif /* !CONFIG_XEN */
ENTRY(fixup_4gb_segment)
-@@ -1228,6 +1266,7 @@ ENTRY(fixup_4gb_segment)
+@@ -1227,6 +1265,7 @@ ENTRY(fixup_4gb_segment)
CFI_ADJUST_CFA_OFFSET 4
jmp error_code
CFI_ENDPROC
@@ -593,8 +593,8 @@ Acked-by: jbeulich@novell.com
ENTRY(kernel_thread_helper)
pushl $0 # fake return address for unwinder
---- head.orig/arch/x86/kernel/head_32-xen.S 2012-12-06 16:06:24.000000000 +0100
-+++ head/arch/x86/kernel/head_32-xen.S 2011-08-09 10:36:25.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/head_32-xen.S 2012-12-06 16:06:24.000000000 +0100
++++ 12.3/arch/x86/kernel/head_32-xen.S 2011-08-09 10:36:25.000000000 +0200
@@ -28,6 +28,7 @@
#define X86_CAPABILITY new_cpu_data+CPUINFO_x86_capability
#define X86_VENDOR_ID new_cpu_data+CPUINFO_x86_vendor_id
@@ -627,8 +627,8 @@ Acked-by: jbeulich@novell.com
/* get the PDA pointer */
movl $boot_pda, %eax
---- head.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ 12.3/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -167,7 +167,7 @@ static inline void io_apic_write(unsigne
*/
static inline void io_apic_modify(unsigned int apic, unsigned int reg, unsigned int value)
@@ -779,8 +779,8 @@ Acked-by: jbeulich@novell.com
spin_unlock_irqrestore(&ioapic_lock, flags);
return 0;
---- head.orig/arch/x86/kernel/microcode_core-xen.c 2011-12-01 14:59:46.000000000 +0100
-+++ head/arch/x86/kernel/microcode_core-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/microcode_core-xen.c 2011-12-01 14:59:46.000000000 +0100
++++ 12.3/arch/x86/kernel/microcode_core-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -108,7 +108,7 @@ static ssize_t microcode_write (struct f
return ret;
}
@@ -790,8 +790,8 @@ Acked-by: jbeulich@novell.com
.owner = THIS_MODULE,
.write = microcode_write,
.open = microcode_open,
---- head.orig/arch/x86/kernel/mpparse-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head/arch/x86/kernel/mpparse-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/mpparse-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ 12.3/arch/x86/kernel/mpparse-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -1079,7 +1079,7 @@ int mp_register_gsi(u32 gsi, int trigger
static int gsi_to_irq[MAX_GSI_NUM];
@@ -810,8 +810,8 @@ Acked-by: jbeulich@novell.com
gsi = pci_irq++;
gsi_to_irq[irq] = gsi;
} else {
---- head.orig/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ 12.3/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -308,7 +308,7 @@ int dma_declare_coherent_memory(struct d
return DMA_MEMORY_IO;
@@ -821,8 +821,8 @@ Acked-by: jbeulich@novell.com
out:
if (mem_base)
iounmap(mem_base);
---- head.orig/arch/x86/kernel/pcspeaker.c 2012-12-18 11:38:26.000000000 +0100
-+++ head/arch/x86/kernel/pcspeaker.c 2011-01-31 17:32:22.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/pcspeaker.c 2013-01-25 13:57:40.000000000 +0100
++++ 12.3/arch/x86/kernel/pcspeaker.c 2011-01-31 17:32:22.000000000 +0100
@@ -6,6 +6,11 @@ static __init int add_pcspkr(void)
{
struct platform_device *pd;
@@ -835,8 +835,8 @@ Acked-by: jbeulich@novell.com
pd = platform_device_register_simple("pcspkr", -1, NULL, 0);
return IS_ERR(pd) ? PTR_ERR(pd) : 0;
---- head.orig/arch/x86/kernel/process_32-xen.c 2012-07-05 10:41:22.000000000 +0200
-+++ head/arch/x86/kernel/process_32-xen.c 2012-07-05 10:45:50.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/process_32-xen.c 2012-07-05 10:41:22.000000000 +0200
++++ 12.3/arch/x86/kernel/process_32-xen.c 2012-07-05 10:45:50.000000000 +0200
@@ -38,6 +38,7 @@
#include <linux/ptrace.h>
#include <linux/random.h>
@@ -949,8 +949,8 @@ Acked-by: jbeulich@novell.com
return prev_p;
}
---- head.orig/arch/x86/kernel/setup_32-xen.c 2012-06-06 13:48:43.000000000 +0200
-+++ head/arch/x86/kernel/setup_32-xen.c 2012-06-06 13:49:07.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/setup_32-xen.c 2012-06-06 13:48:43.000000000 +0200
++++ 12.3/arch/x86/kernel/setup_32-xen.c 2012-06-06 13:49:07.000000000 +0200
@@ -33,7 +33,6 @@
#include <linux/initrd.h>
#include <linux/bootmem.h>
@@ -1040,8 +1040,8 @@ Acked-by: jbeulich@novell.com
- * c-basic-offset:8
- * End:
- */
---- head.orig/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ 12.3/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -335,8 +335,7 @@ static void flush_tlb_others(cpumask_t c
/*
* i'm not happy about this global shared spinlock in the
@@ -1061,8 +1061,8 @@ Acked-by: jbeulich@novell.com
flush_mm = NULL;
flush_va = 0;
---- head.orig/arch/x86/kernel/time-xen.c 2011-07-12 11:10:37.000000000 +0200
-+++ head/arch/x86/kernel/time-xen.c 2011-07-12 11:13:30.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/time-xen.c 2011-07-12 11:10:37.000000000 +0200
++++ 12.3/arch/x86/kernel/time-xen.c 2011-07-12 11:13:30.000000000 +0200
@@ -50,6 +50,7 @@
#include <linux/kernel_stat.h>
#include <linux/posix-timers.h>
@@ -1597,8 +1597,8 @@ Acked-by: jbeulich@novell.com
return 0;
}
__initcall(xen_sysctl_init);
---- head.orig/arch/x86/kernel/traps_32-xen.c 2012-07-05 10:41:26.000000000 +0200
-+++ head/arch/x86/kernel/traps_32-xen.c 2012-07-05 10:45:45.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/traps_32-xen.c 2012-07-05 10:41:26.000000000 +0200
++++ 12.3/arch/x86/kernel/traps_32-xen.c 2012-07-05 10:45:45.000000000 +0200
@@ -100,6 +100,7 @@ asmlinkage void fixup_4gb_segment(void);
asmlinkage void machine_check(void);
@@ -1673,8 +1673,8 @@ Acked-by: jbeulich@novell.com
+ return 1;
+}
+__setup("code_bytes=", code_bytes_setup);
---- head.orig/arch/x86/mm/fault_32-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head/arch/x86/mm/fault_32-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- 12.3.orig/arch/x86/mm/fault_32-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ 12.3/arch/x86/mm/fault_32-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -46,43 +46,17 @@ int unregister_page_fault_notifier(struc
}
EXPORT_SYMBOL_GPL(unregister_page_fault_notifier);
@@ -1745,8 +1745,8 @@ Acked-by: jbeulich@novell.com
return;
/* It's safe to allow irq's after cr2 has been saved and the vmalloc
---- head.orig/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- 12.3.orig/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ 12.3/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -33,14 +33,16 @@ static void *__kmap_atomic(struct page *
/* even !CONFIG_PREEMPT needs this, for in_atomic in do_page_fault */
@@ -1775,8 +1775,8 @@ Acked-by: jbeulich@novell.com
return (void*) vaddr;
}
---- head.orig/arch/x86/mm/init_32-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head/arch/x86/mm/init_32-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- 12.3.orig/arch/x86/mm/init_32-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ 12.3/arch/x86/mm/init_32-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -66,6 +66,7 @@ static pmd_t * __init one_md_table_init(
#ifdef CONFIG_X86_PAE
@@ -1793,8 +1793,8 @@ Acked-by: jbeulich@novell.com
make_lowmem_page_readonly(page_table,
XENFEAT_writable_page_tables);
set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
---- head.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- 12.3.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ 12.3/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -149,6 +149,8 @@ void __set_fixmap (enum fixed_addresses
void __init reserve_top_address(unsigned long reserve)
{
@@ -1874,8 +1874,8 @@ Acked-by: jbeulich@novell.com
kmem_cache_free(pmd_cache, pmd);
}
---- head.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:29:16.000000000 +0100
-+++ head/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:32:22.000000000 +0100
+--- 12.3.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:29:16.000000000 +0100
++++ 12.3/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:32:22.000000000 +0100
@@ -465,7 +465,7 @@ ia32_sys_call_table:
.quad sys32_vm86_warning /* vm86old */
.quad compat_sys_wait4
@@ -1900,8 +1900,8 @@ Acked-by: jbeulich@novell.com
.quad sys_getcpu
+ .quad sys_epoll_pwait
ia32_syscall_end:
---- head.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ 12.3/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -90,6 +90,13 @@ static inline int bad_addr(unsigned long
return 1;
}
@@ -1963,8 +1963,8 @@ Acked-by: jbeulich@novell.com
{
if (userdef) {
printk(KERN_INFO "user-defined physical RAM map:\n");
---- head.orig/arch/x86/kernel/entry_64-xen.S 2011-10-07 11:18:32.000000000 +0200
-+++ head/arch/x86/kernel/entry_64-xen.S 2011-10-07 11:20:12.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/entry_64-xen.S 2011-10-07 11:18:32.000000000 +0200
++++ 12.3/arch/x86/kernel/entry_64-xen.S 2011-10-07 11:20:12.000000000 +0200
@@ -632,6 +632,9 @@ END(invalidate_interrupt\num)
ENTRY(call_function_interrupt)
apicinterrupt CALL_FUNCTION_VECTOR,smp_call_function_interrupt
@@ -1975,8 +1975,8 @@ Acked-by: jbeulich@novell.com
#endif
ENTRY(apic_timer_interrupt)
---- head.orig/arch/x86/kernel/head64-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head/arch/x86/kernel/head64-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/head64-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ 12.3/arch/x86/kernel/head64-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -45,8 +45,6 @@ static void __init clear_bss(void)
#define OLD_CL_BASE_ADDR 0x90000
#define OLD_CL_OFFSET 0x90022
@@ -2004,8 +2004,8 @@ Acked-by: jbeulich@novell.com
#endif
}
---- head.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ 12.3/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -36,6 +36,7 @@
#include <acpi/acpi_bus.h>
#endif
@@ -2820,8 +2820,8 @@ Acked-by: jbeulich@novell.com
else
set_ioapic_affinity_irq(irq, TARGET_CPUS);
}
---- head.orig/arch/x86/kernel/process_64-xen.c 2012-07-05 10:41:23.000000000 +0200
-+++ head/arch/x86/kernel/process_64-xen.c 2011-02-02 08:31:05.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/process_64-xen.c 2012-07-05 10:41:23.000000000 +0200
++++ 12.3/arch/x86/kernel/process_64-xen.c 2011-02-02 08:31:05.000000000 +0100
@@ -337,14 +337,17 @@ void load_gs_index(unsigned gs)
void flush_thread(void)
{
@@ -2845,8 +2845,8 @@ Acked-by: jbeulich@novell.com
tsk->thread.debugreg0 = 0;
tsk->thread.debugreg1 = 0;
---- head.orig/arch/x86/kernel/setup_64-xen.c 2012-06-06 13:48:44.000000000 +0200
-+++ head/arch/x86/kernel/setup_64-xen.c 2012-06-06 13:49:08.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/setup_64-xen.c 2012-06-06 13:48:44.000000000 +0200
++++ 12.3/arch/x86/kernel/setup_64-xen.c 2012-06-06 13:49:08.000000000 +0200
@@ -141,7 +141,7 @@ EXPORT_SYMBOL_GPL(edid_info);
extern int root_mountflags;
@@ -3120,8 +3120,8 @@ Acked-by: jbeulich@novell.com
-}
-device_initcall(add_pcspkr);
-#endif
---- head.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ 12.3/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -26,6 +26,7 @@
#include <linux/seqlock.h>
#include <linux/jiffies.h>
@@ -3339,8 +3339,8 @@ Acked-by: jbeulich@novell.com
#endif
on_each_cpu(cpu_vsyscall_init, NULL, 0, 1);
hotcpu_notifier(cpu_vsyscall_notifier, 0);
---- head.orig/arch/x86/mm/fault_64-xen.c 2011-07-26 09:27:24.000000000 +0200
-+++ head/arch/x86/mm/fault_64-xen.c 2011-07-26 09:27:34.000000000 +0200
+--- 12.3.orig/arch/x86/mm/fault_64-xen.c 2011-07-26 09:27:24.000000000 +0200
++++ 12.3/arch/x86/mm/fault_64-xen.c 2011-07-26 09:27:34.000000000 +0200
@@ -56,38 +56,17 @@ int unregister_page_fault_notifier(struc
}
EXPORT_SYMBOL_GPL(unregister_page_fault_notifier);
@@ -3406,8 +3406,8 @@ Acked-by: jbeulich@novell.com
return;
if (likely(regs->eflags & X86_EFLAGS_IF))
---- head.orig/arch/x86/mm/init_64-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head/arch/x86/mm/init_64-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- 12.3.orig/arch/x86/mm/init_64-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ 12.3/arch/x86/mm/init_64-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -1145,20 +1145,30 @@ int kern_addr_valid(unsigned long addr)
extern int exception_trace, page_fault_trace;
@@ -3446,8 +3446,8 @@ Acked-by: jbeulich@novell.com
return 0;
}
__initcall(x8664_sysctl_init);
---- head.orig/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- 12.3.orig/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ 12.3/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -350,8 +350,8 @@ static void flush_kernel_map(void *arg)
void *adr = page_address(pg);
if (cpu_has_clflush)
@@ -3476,8 +3476,8 @@ Acked-by: jbeulich@novell.com
large_pte = pte_mkhuge(large_pte);
set_pte((pte_t *)pmd, large_pte);
}
---- head.orig/drivers/acpi/processor_extcntl.c 2011-01-31 14:53:38.000000000 +0100
-+++ head/drivers/acpi/processor_extcntl.c 2011-01-31 17:32:22.000000000 +0100
+--- 12.3.orig/drivers/acpi/processor_extcntl.c 2011-01-31 14:53:38.000000000 +0100
++++ 12.3/drivers/acpi/processor_extcntl.c 2011-01-31 17:32:22.000000000 +0100
@@ -32,9 +32,8 @@
#define ACPI_PROCESSOR_COMPONENT 0x01000000
@@ -3518,8 +3518,8 @@ Acked-by: jbeulich@novell.com
if (ACPI_FAILURE(status))
return status;
---- head.orig/drivers/pci/msi-xen.c 2012-10-31 11:00:13.000000000 +0100
-+++ head/drivers/pci/msi-xen.c 2012-10-31 11:00:49.000000000 +0100
+--- 12.3.orig/drivers/pci/msi-xen.c 2012-10-31 11:00:13.000000000 +0100
++++ 12.3/drivers/pci/msi-xen.c 2012-10-31 11:00:49.000000000 +0100
@@ -42,8 +42,6 @@ struct msi_dev_list {
struct list_head list;
spinlock_t pirq_list_lock;
@@ -4098,8 +4098,8 @@ Acked-by: jbeulich@novell.com
dev->irq = msi_dev_entry->default_irq;
}
---- head.orig/drivers/xen/balloon/sysfs.c 2012-02-29 10:23:59.000000000 +0100
-+++ head/drivers/xen/balloon/sysfs.c 2011-01-31 17:32:22.000000000 +0100
+--- 12.3.orig/drivers/xen/balloon/sysfs.c 2012-02-29 10:23:59.000000000 +0100
++++ 12.3/drivers/xen/balloon/sysfs.c 2011-01-31 17:32:22.000000000 +0100
@@ -34,6 +34,7 @@
#include <linux/stat.h>
#include <linux/string.h>
@@ -4108,8 +4108,8 @@ Acked-by: jbeulich@novell.com
#include "common.h"
#ifdef HAVE_XEN_PLATFORM_COMPAT_H
---- head.orig/drivers/xen/core/evtchn.c 2012-10-04 11:51:05.000000000 +0200
-+++ head/drivers/xen/core/evtchn.c 2012-10-04 11:53:07.000000000 +0200
+--- 12.3.orig/drivers/xen/core/evtchn.c 2012-10-04 11:51:05.000000000 +0200
++++ 12.3/drivers/xen/core/evtchn.c 2012-10-04 11:53:07.000000000 +0200
@@ -145,7 +145,7 @@ static void _bind_evtchn_to_cpu(unsigned
if (irq >= 0) {
@@ -4160,8 +4160,8 @@ Acked-by: jbeulich@novell.com
}
static struct irq_chip pirq_chip = {
---- head.orig/drivers/xen/core/machine_kexec.c 2011-12-21 10:11:41.000000000 +0100
-+++ head/drivers/xen/core/machine_kexec.c 2012-02-17 09:55:35.000000000 +0100
+--- 12.3.orig/drivers/xen/core/machine_kexec.c 2011-12-21 10:11:41.000000000 +0100
++++ 12.3/drivers/xen/core/machine_kexec.c 2012-02-17 09:55:35.000000000 +0100
@@ -217,7 +217,7 @@ void xen_machine_kexec_unload(struct kim
* stop all CPUs and kexec. That is it combines machine_shutdown()
* and machine_kexec() in Linux kexec terms.
@@ -4171,8 +4171,8 @@ Acked-by: jbeulich@novell.com
{
xen_kexec_exec_t xke;
---- head.orig/drivers/xen/core/smpboot.c 2012-03-22 16:07:26.000000000 +0100
-+++ head/drivers/xen/core/smpboot.c 2012-01-20 14:45:36.000000000 +0100
+--- 12.3.orig/drivers/xen/core/smpboot.c 2012-03-22 16:07:26.000000000 +0100
++++ 12.3/drivers/xen/core/smpboot.c 2012-01-20 14:45:36.000000000 +0100
@@ -112,7 +112,7 @@ static int __cpuinit xen_smp_intr_init(u
rc = bind_ipi_to_irqhandler(RESCHEDULE_VECTOR,
cpu,
@@ -4232,8 +4232,8 @@ Acked-by: jbeulich@novell.com
cpu_data[cpu] = boot_cpu_data;
cpu_data[cpu].apicid = apicid;
---- head.orig/drivers/xen/netback/interface.c 2011-11-03 12:01:26.000000000 +0100
-+++ head/drivers/xen/netback/interface.c 2011-11-03 12:03:20.000000000 +0100
+--- 12.3.orig/drivers/xen/netback/interface.c 2011-11-03 12:01:26.000000000 +0100
++++ 12.3/drivers/xen/netback/interface.c 2011-11-03 12:03:20.000000000 +0100
@@ -165,7 +165,7 @@ static void netbk_get_drvinfo(struct net
struct ethtool_drvinfo *info)
{
@@ -4243,8 +4243,8 @@ Acked-by: jbeulich@novell.com
}
static const struct netif_stat {
---- head.orig/drivers/xen/netfront/netfront.c 2012-12-18 11:57:21.000000000 +0100
-+++ head/drivers/xen/netfront/netfront.c 2012-12-18 11:57:42.000000000 +0100
+--- 12.3.orig/drivers/xen/netfront/netfront.c 2012-12-18 11:57:21.000000000 +0100
++++ 12.3/drivers/xen/netfront/netfront.c 2012-12-18 11:57:42.000000000 +0100
@@ -1811,7 +1811,7 @@ static void netfront_get_drvinfo(struct
struct ethtool_drvinfo *info)
{
@@ -4363,8 +4363,8 @@ Acked-by: jbeulich@novell.com
}
#endif /* CONFIG_SYSFS */
---- head.orig/drivers/xen/tpmback/common.h 2011-12-21 10:33:05.000000000 +0100
-+++ head/drivers/xen/tpmback/common.h 2011-11-28 09:46:47.000000000 +0100
+--- 12.3.orig/drivers/xen/tpmback/common.h 2011-12-21 10:33:05.000000000 +0100
++++ 12.3/drivers/xen/tpmback/common.h 2011-11-28 09:46:47.000000000 +0100
@@ -63,7 +63,7 @@ typedef struct tpmif_st {
void tpmif_disconnect_complete(tpmif_t * tpmif);
@@ -4374,8 +4374,8 @@ Acked-by: jbeulich@novell.com
void tpmif_interface_exit(void);
void tpmif_schedule_work(tpmif_t * tpmif);
void tpmif_deschedule_work(tpmif_t * tpmif);
---- head.orig/drivers/xen/tpmback/interface.c 2011-04-11 14:30:27.000000000 +0200
-+++ head/drivers/xen/tpmback/interface.c 2011-04-11 14:31:42.000000000 +0200
+--- 12.3.orig/drivers/xen/tpmback/interface.c 2011-04-11 14:30:27.000000000 +0200
++++ 12.3/drivers/xen/tpmback/interface.c 2011-04-11 14:31:42.000000000 +0200
@@ -119,13 +119,14 @@ void tpmif_disconnect_complete(tpmif_t *
free_tpmif(tpmif);
}
@@ -4393,8 +4393,8 @@ Acked-by: jbeulich@novell.com
{
kmem_cache_destroy(tpmif_cachep);
}
---- head.orig/drivers/xen/tpmback/tpmback.c 2011-01-31 17:29:16.000000000 +0100
-+++ head/drivers/xen/tpmback/tpmback.c 2011-01-31 17:32:22.000000000 +0100
+--- 12.3.orig/drivers/xen/tpmback/tpmback.c 2011-01-31 17:29:16.000000000 +0100
++++ 12.3/drivers/xen/tpmback/tpmback.c 2011-01-31 17:32:22.000000000 +0100
@@ -918,22 +918,30 @@ static int __init tpmback_init(void)
spin_lock_init(&tpm_schedule_list_lock);
INIT_LIST_HEAD(&tpm_schedule_list);
@@ -4430,8 +4430,8 @@ Acked-by: jbeulich@novell.com
+module_exit(tpmback_exit)
MODULE_LICENSE("Dual BSD/GPL");
---- head.orig/drivers/xen/xenoprof/xenoprofile.c 2012-02-16 12:29:10.000000000 +0100
-+++ head/drivers/xen/xenoprof/xenoprofile.c 2012-02-16 12:29:42.000000000 +0100
+--- 12.3.orig/drivers/xen/xenoprof/xenoprofile.c 2012-02-16 12:29:10.000000000 +0100
++++ 12.3/drivers/xen/xenoprof/xenoprofile.c 2012-02-16 12:29:42.000000000 +0100
@@ -239,7 +239,7 @@ static int bind_virq(void)
result = bind_virq_to_irqhandler(VIRQ_XENOPROF,
i,
@@ -4441,8 +4441,8 @@ Acked-by: jbeulich@novell.com
"xenoprof",
NULL);
---- head.orig/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:32:16.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:32:22.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:32:16.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:32:22.000000000 +0100
@@ -21,7 +21,7 @@ struct Xgt_desc_struct {
extern struct Xgt_desc_struct idt_descr;
@@ -4452,8 +4452,8 @@ Acked-by: jbeulich@novell.com
static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
{
---- head.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2012-10-31 11:00:36.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/hypervisor.h 2012-10-31 11:00:47.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2012-10-31 11:00:36.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/hypervisor.h 2012-10-31 11:00:47.000000000 +0100
@@ -158,6 +158,19 @@ static inline void arch_leave_lazy_mmu_m
#define arch_use_lazy_mmu_mode() unlikely(__get_cpu_var(xen_lazy_mmu))
#endif
@@ -4483,8 +4483,8 @@ Acked-by: jbeulich@novell.com
HYPERVISOR_shutdown(
unsigned int reason)
{
---- head.orig/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:32:16.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:32:22.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:32:16.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:32:22.000000000 +0100
@@ -108,7 +108,7 @@ sysexit_scrit: /**** START OF SYSEXIT CR
sysexit_ecrit: /**** END OF SYSEXIT CRITICAL REGION ****/ ; \
mov $__KERNEL_PDA, %ecx ; \
@@ -4494,8 +4494,8 @@ Acked-by: jbeulich@novell.com
call evtchn_do_upcall ; \
add $4,%esp ; \
jmp ret_from_intr
---- head.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:32:16.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:32:22.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:32:16.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:32:22.000000000 +0100
@@ -27,13 +27,13 @@ static inline void enter_lazy_tlb(struct
static inline void __prepare_arch_switch(void)
{
@@ -4523,8 +4523,8 @@ Acked-by: jbeulich@novell.com
static inline void activate_mm(struct mm_struct *prev, struct mm_struct *next)
{
---- head.orig/arch/x86/include/mach-xen/asm/pgalloc_32.h 2008-07-21 11:00:33.000000000 +0200
-+++ head/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 17:32:22.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/pgalloc_32.h 2008-07-21 11:00:33.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 17:32:22.000000000 +0100
@@ -6,12 +6,23 @@
#include <linux/mm.h> /* for struct page */
#include <asm/io.h> /* for phys_to_virt and page_to_pseudophys */
@@ -4564,8 +4564,8 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_X86_PAE
/*
---- head.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-01-31 17:32:16.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-01-31 17:32:22.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-01-31 17:32:16.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-01-31 17:32:22.000000000 +0100
@@ -275,6 +275,7 @@ static inline pte_t pte_mkhuge(pte_t pte
*/
#define pte_update(mm, addr, ptep) do { } while (0)
@@ -4605,8 +4605,8 @@ Acked-by: jbeulich@novell.com
#define pte_unmap(pte) kunmap_atomic(pte, KM_PTE0)
#define pte_unmap_nested(pte) kunmap_atomic(pte, KM_PTE1)
#else
---- head.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:32:16.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:32:22.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:32:16.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:32:22.000000000 +0100
@@ -431,7 +431,7 @@ struct thread_struct {
.vm86_info = NULL, \
.sysenter_cs = __KERNEL_CS, \
@@ -4627,8 +4627,8 @@ Acked-by: jbeulich@novell.com
set_fs(USER_DS); \
regs->xds = __USER_DS; \
regs->xes = __USER_DS; \
---- head.orig/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:32:16.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:32:22.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:32:16.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:32:22.000000000 +0100
@@ -52,6 +52,11 @@ extern void cpu_exit_clear(void);
extern void cpu_uninit(void);
#endif
@@ -4641,8 +4641,8 @@ Acked-by: jbeulich@novell.com
/*
* This function is needed by all SMP systems. It must _always_ be valid
* from the initial startup. We map APIC_BASE very early in page_setup(),
---- head.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-01-31 17:32:16.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-01-31 17:32:22.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-01-31 17:32:16.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-01-31 17:32:22.000000000 +0100
@@ -416,15 +416,6 @@ static inline int pmd_large(pmd_t pte) {
#define mk_pte(page, pgprot) pfn_pte(page_to_pfn(page), (pgprot))
#define mk_pte_huge(entry) (__pte_val(entry) |= _PAGE_PRESENT | _PAGE_PSE)
@@ -4659,8 +4659,8 @@ Acked-by: jbeulich@novell.com
/* Change flags of a PTE */
static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
{
---- head.orig/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:32:16.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:32:22.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:32:16.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:32:22.000000000 +0100
@@ -7,6 +7,7 @@
#include <linux/threads.h>
#include <linux/cpumask.h>
@@ -4678,8 +4678,8 @@ Acked-by: jbeulich@novell.com
#define NO_PROC_ID 0xFF /* No processor magic marker */
---- head.orig/include/xen/xenbus.h 2011-12-21 10:02:58.000000000 +0100
-+++ head/include/xen/xenbus.h 2011-12-21 10:42:02.000000000 +0100
+--- 12.3.orig/include/xen/xenbus.h 2011-12-21 10:02:58.000000000 +0100
++++ 12.3/include/xen/xenbus.h 2011-12-21 10:42:02.000000000 +0100
@@ -118,6 +118,7 @@ struct xenbus_driver {
#define DEFINE_XENBUS_DRIVER(var, drvname, methods...) \
struct xenbus_driver var ## _driver = { \
@@ -4699,8 +4699,8 @@ Acked-by: jbeulich@novell.com
void xenbus_unregister_driver(struct xenbus_driver *drv);
struct xenbus_transaction
---- head.orig/lib/swiotlb-xen.c 2012-11-14 12:23:04.000000000 +0100
-+++ head/lib/swiotlb-xen.c 2011-01-31 17:32:22.000000000 +0100
+--- 12.3.orig/lib/swiotlb-xen.c 2012-11-14 12:23:04.000000000 +0100
++++ 12.3/lib/swiotlb-xen.c 2011-01-31 17:32:22.000000000 +0100
@@ -143,8 +143,8 @@ __setup("swiotlb=", setup_io_tlb_npages)
* Statically reserve bounce buffer space and initialize bounce buffer data
* structures for the software IO TLB used to implement the PCI DMA API.
diff --git a/patches.xen/xen3-patch-2.6.22 b/patches.xen/xen3-patch-2.6.22
index b93e6ec97c..e8541b0d08 100644
--- a/patches.xen/xen3-patch-2.6.22
+++ b/patches.xen/xen3-patch-2.6.22
@@ -5,8 +5,8 @@ Patch-mainline: 2.6.22
Automatically created from "patches.kernel.org/patch-2.6.22" by xen-port-patches.py
Acked-by: jbeulich@novell.com
---- head.orig/arch/x86/Kconfig 2012-10-23 14:42:00.000000000 +0200
-+++ head/arch/x86/Kconfig 2012-10-23 14:42:59.000000000 +0200
+--- 12.3.orig/arch/x86/Kconfig 2012-10-23 14:42:00.000000000 +0200
++++ 12.3/arch/x86/Kconfig 2012-10-23 14:42:59.000000000 +0200
@@ -1693,7 +1693,7 @@ config PHYSICAL_START
config RELOCATABLE
@@ -32,16 +32,16 @@ Acked-by: jbeulich@novell.com
---help---
Find out whether you have a PCI motherboard. PCI is the name of a
bus system, i.e. the way the CPU talks to the other stuff inside
---- head.orig/arch/x86/kernel/Makefile 2012-10-23 14:42:03.000000000 +0200
-+++ head/arch/x86/kernel/Makefile 2012-10-23 14:42:57.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/Makefile 2012-10-23 14:42:03.000000000 +0200
++++ 12.3/arch/x86/kernel/Makefile 2012-10-23 14:42:57.000000000 +0200
@@ -122,4 +122,4 @@ endif
disabled-obj-$(CONFIG_XEN) := early-quirks.o hpet.o i8237.o i8253.o i8259_$(BITS).o \
reboot.o smpboot_$(BITS).o tsc_$(BITS).o tsc_sync.o
disabled-obj-$(CONFIG_XEN_UNPRIVILEGED_GUEST) += mpparse_64.o
-%/head_$(BITS).o %/head_$(BITS).s: $(if $(CONFIG_XEN),EXTRA_AFLAGS,dummy) :=
+%/head_64.o %/head_64.s: $(if $(CONFIG_XEN),EXTRA_AFLAGS,dummy) :=
---- head.orig/arch/x86/kernel/apic/apic-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head/arch/x86/kernel/apic/apic-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/apic/apic-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ 12.3/arch/x86/kernel/apic/apic-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -19,7 +19,6 @@
#include <linux/mm.h>
#include <linux/delay.h>
@@ -50,8 +50,8 @@ Acked-by: jbeulich@novell.com
#include <linux/interrupt.h>
#include <linux/mc146818rtc.h>
#include <linux/kernel_stat.h>
---- head.orig/arch/x86/kernel/asm-offsets_32.c 2012-02-08 11:30:59.000000000 +0100
-+++ head/arch/x86/kernel/asm-offsets_32.c 2012-02-08 11:31:30.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/asm-offsets_32.c 2012-02-08 11:30:59.000000000 +0100
++++ 12.3/arch/x86/kernel/asm-offsets_32.c 2012-02-08 11:31:30.000000000 +0100
@@ -69,11 +69,6 @@ void foo(void)
DEFINE(SYSENTER_stack_sp0, 0);
#endif
@@ -64,8 +64,8 @@ Acked-by: jbeulich@novell.com
#if defined(CONFIG_LGUEST) || defined(CONFIG_LGUEST_GUEST) || defined(CONFIG_LGUEST_MODULE)
BLANK();
OFFSET(LGUEST_DATA_irq_enabled, lguest_data, irq_enabled);
---- head.orig/arch/x86/kernel/cpu/common-xen.c 2012-07-05 10:45:39.000000000 +0200
-+++ head/arch/x86/kernel/cpu/common-xen.c 2012-07-05 11:42:58.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/cpu/common-xen.c 2012-07-05 10:45:39.000000000 +0200
++++ 12.3/arch/x86/kernel/cpu/common-xen.c 2012-07-05 11:42:58.000000000 +0200
@@ -22,16 +22,40 @@
#define phys_pkg_id(a,b) a
#endif
@@ -367,8 +367,8 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_HOTPLUG_CPU
void __cpuinit cpu_uninit(void)
{
---- head.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ 12.3/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -167,7 +167,7 @@ mtrr_del(int reg, unsigned long base, un
EXPORT_SYMBOL(mtrr_add);
EXPORT_SYMBOL(mtrr_del);
@@ -378,8 +378,8 @@ Acked-by: jbeulich@novell.com
{
}
---- head.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ 12.3/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -162,26 +162,27 @@ static struct resource standard_io_resou
static int __init romsignature(const unsigned char *rom)
@@ -507,8 +507,8 @@ Acked-by: jbeulich@novell.com
start = 0x100000ULL;
size = end - start;
}
---- head.orig/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:08:37.000000000 +0200
-+++ head/arch/x86/kernel/entry_32-xen.S 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/entry_32-xen.S 2013-01-25 14:06:19.000000000 +0100
++++ 12.3/arch/x86/kernel/entry_32-xen.S 2011-01-31 17:32:29.000000000 +0100
@@ -15,7 +15,7 @@
* I changed all the .align's to 4 (16 byte alignment), as that's faster
* on a 486.
@@ -615,8 +615,8 @@ Acked-by: jbeulich@novell.com
movl %ecx, %fs
UNWIND_ESPFIX_STACK
popl %ecx
---- head.orig/arch/x86/kernel/head_32-xen.S 2011-08-09 10:36:25.000000000 +0200
-+++ head/arch/x86/kernel/head_32-xen.S 2012-12-06 16:06:48.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/head_32-xen.S 2011-08-09 10:36:25.000000000 +0200
++++ 12.3/arch/x86/kernel/head_32-xen.S 2012-12-06 16:06:48.000000000 +0100
@@ -38,7 +38,8 @@ ENTRY(startup_32)
/* Set up the stack pointer */
movl $(init_thread_union+THREAD_SIZE),%esp
@@ -744,8 +744,8 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_XEN_UNPRIVILEGED_GUEST
# define XEN_DOM0_CAP 0
# define XEN_DOM0_CAP_STR ""
---- head.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ 12.3/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -25,7 +25,6 @@
#include <linux/init.h>
#include <linux/delay.h>
@@ -870,8 +870,8 @@ Acked-by: jbeulich@novell.com
}
void arch_teardown_msi_irq(unsigned int irq)
---- head.orig/arch/x86/kernel/microcode_core-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head/arch/x86/kernel/microcode_core-xen.c 2011-12-01 15:01:09.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/microcode_core-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ 12.3/arch/x86/kernel/microcode_core-xen.c 2011-12-01 15:01:09.000000000 +0100
@@ -138,7 +138,7 @@ static int __init microcode_dev_init (vo
return 0;
}
@@ -881,8 +881,8 @@ Acked-by: jbeulich@novell.com
{
misc_deregister(&microcode_dev);
}
---- head.orig/arch/x86/kernel/mpparse-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head/arch/x86/kernel/mpparse-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/mpparse-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ 12.3/arch/x86/kernel/mpparse-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -18,7 +18,6 @@
#include <linux/acpi.h>
#include <linux/delay.h>
@@ -900,8 +900,8 @@ Acked-by: jbeulich@novell.com
if (!num_processors)
printk(KERN_ERR "SMP mptable: no processors registered!\n");
return num_processors;
---- head.orig/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ 12.3/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -13,6 +13,7 @@
#include <linux/pci.h>
#include <linux/module.h>
@@ -952,8 +952,8 @@ Acked-by: jbeulich@novell.com
dma_addr_t
dma_map_single(struct device *dev, void *ptr, size_t size,
enum dma_data_direction direction)
---- head.orig/arch/x86/kernel/process_32-xen.c 2012-07-05 10:45:50.000000000 +0200
-+++ head/arch/x86/kernel/process_32-xen.c 2012-07-05 10:49:20.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/process_32-xen.c 2012-07-05 10:45:50.000000000 +0200
++++ 12.3/arch/x86/kernel/process_32-xen.c 2012-07-05 10:49:20.000000000 +0200
@@ -21,7 +21,6 @@
#include <linux/mm.h>
#include <linux/elfcore.h>
@@ -1051,8 +1051,8 @@ Acked-by: jbeulich@novell.com
return prev_p;
}
---- head.orig/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ 12.3/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -13,7 +13,6 @@
#include <linux/mm.h>
#include <linux/delay.h>
@@ -1373,8 +1373,8 @@ Acked-by: jbeulich@novell.com
- return 0;
-}
-EXPORT_SYMBOL(smp_call_function_single);
---- head.orig/arch/x86/kernel/time-xen.c 2011-07-12 11:13:30.000000000 +0200
-+++ head/arch/x86/kernel/time-xen.c 2012-02-10 13:26:34.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/time-xen.c 2011-07-12 11:13:30.000000000 +0200
++++ 12.3/arch/x86/kernel/time-xen.c 2012-02-10 13:26:34.000000000 +0100
@@ -42,7 +42,6 @@
#include <linux/init.h>
#include <linux/smp.h>
@@ -1672,8 +1672,8 @@ Acked-by: jbeulich@novell.com
/* No locking required. Interrupts are disabled on all CPUs. */
void time_resume(void)
---- head.orig/arch/x86/kernel/traps_32-xen.c 2012-07-05 10:45:45.000000000 +0200
-+++ head/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/traps_32-xen.c 2012-07-05 10:45:45.000000000 +0200
++++ 12.3/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -52,7 +52,7 @@
#include <asm/unwind.h>
#include <asm/smp.h>
@@ -1784,8 +1784,8 @@ Acked-by: jbeulich@novell.com
unsigned long base = (kesp - uesp) & -THREAD_SIZE;
unsigned long new_kesp = kesp - base;
unsigned long lim_pages = (new_kesp | (THREAD_SIZE - 1)) >> PAGE_SHIFT;
---- head.orig/arch/x86/mm/fault_32-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head/arch/x86/mm/fault_32-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/mm/fault_32-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ 12.3/arch/x86/mm/fault_32-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -14,19 +14,20 @@
#include <linux/mman.h>
#include <linux/mm.h>
@@ -1906,8 +1906,8 @@ Acked-by: jbeulich@novell.com
}
}
-#endif
---- head.orig/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ 12.3/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -26,7 +26,7 @@ void kunmap(struct page *page)
* However when holding an atomic kmap is is not legal to sleep, so atomic
* kmaps are appropriate for short, tight code paths only.
@@ -1950,8 +1950,8 @@ Acked-by: jbeulich@novell.com
EXPORT_SYMBOL(kunmap_atomic);
EXPORT_SYMBOL(kmap_atomic_to_page);
EXPORT_SYMBOL(clear_highpage);
---- head.orig/arch/x86/mm/hypervisor.c 2012-05-31 14:42:14.000000000 +0200
-+++ head/arch/x86/mm/hypervisor.c 2012-05-31 14:43:34.000000000 +0200
+--- 12.3.orig/arch/x86/mm/hypervisor.c 2012-05-31 14:42:14.000000000 +0200
++++ 12.3/arch/x86/mm/hypervisor.c 2012-05-31 14:43:34.000000000 +0200
@@ -414,13 +414,13 @@ void xen_tlb_flush_all(void)
}
EXPORT_SYMBOL_GPL(xen_tlb_flush_all);
@@ -1985,8 +1985,8 @@ Acked-by: jbeulich@novell.com
BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
}
EXPORT_SYMBOL_GPL(xen_invlpg_mask);
---- head.orig/arch/x86/mm/init_32-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head/arch/x86/mm/init_32-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/mm/init_32-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ 12.3/arch/x86/mm/init_32-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -22,6 +22,7 @@
#include <linux/init.h>
#include <linux/highmem.h>
@@ -2258,8 +2258,8 @@ Acked-by: jbeulich@novell.com
}
void free_initmem(void)
---- head.orig/arch/x86/mm/ioremap-xen.c 2011-02-07 15:37:37.000000000 +0100
-+++ head/arch/x86/mm/ioremap-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/mm/ioremap-xen.c 2011-02-07 15:37:37.000000000 +0100
++++ 12.3/arch/x86/mm/ioremap-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -13,6 +13,7 @@
#include <linux/slab.h>
#include <linux/module.h>
@@ -2268,8 +2268,8 @@ Acked-by: jbeulich@novell.com
#include <asm/fixmap.h>
#include <asm/cacheflush.h>
#include <asm/tlbflush.h>
---- head.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ 12.3/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -13,6 +13,7 @@
#include <linux/pagemap.h>
#include <linux/spinlock.h>
@@ -2593,8 +2593,8 @@ Acked-by: jbeulich@novell.com
{
struct task_struct *tsk = current;
---- head.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:32:22.000000000 +0100
-+++ head/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:32:22.000000000 +0100
++++ 12.3/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:32:29.000000000 +0100
@@ -431,11 +431,7 @@ ia32_sys_call_table:
.quad sys_symlink
.quad sys_lstat
@@ -2643,8 +2643,8 @@ Acked-by: jbeulich@novell.com
+ .quad compat_sys_timerfd
+ .quad sys_eventfd
+ia32_syscall_end:
---- head.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ 12.3/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -17,6 +17,8 @@
#include <linux/kexec.h>
#include <linux/module.h>
@@ -2704,8 +2704,8 @@ Acked-by: jbeulich@novell.com
if (paddr >= (end_pfn << PAGE_SHIFT))
break;
---- head.orig/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ 12.3/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -11,13 +11,12 @@
#ifdef __i386__
@@ -2770,8 +2770,8 @@ Acked-by: jbeulich@novell.com
- }
-}
-
---- head.orig/arch/x86/kernel/entry_64-xen.S 2011-10-07 11:20:12.000000000 +0200
-+++ head/arch/x86/kernel/entry_64-xen.S 2011-10-06 11:55:00.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/entry_64-xen.S 2011-10-07 11:20:12.000000000 +0200
++++ 12.3/arch/x86/kernel/entry_64-xen.S 2011-10-06 11:55:00.000000000 +0200
@@ -178,7 +178,7 @@ NMI_MASK = 0x80000000
2: /* Slow iret via hypervisor. */
@@ -2806,8 +2806,8 @@ Acked-by: jbeulich@novell.com
+ CFI_ENDPROC
+ENDPROC(ignore_sysret)
+#endif
---- head.orig/arch/x86/kernel/head_64-xen.S 2012-12-06 16:06:11.000000000 +0100
-+++ head/arch/x86/kernel/head_64-xen.S 2012-12-06 16:06:50.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/head_64-xen.S 2012-12-06 16:06:11.000000000 +0100
++++ 12.3/arch/x86/kernel/head_64-xen.S 2012-12-06 16:06:50.000000000 +0100
@@ -5,6 +5,7 @@
* Copyright (C) 2000 Pavel Machek <pavel@suse.cz>
* Copyright (C) 2000 Karsten Keil <kkeil@suse.de>
@@ -2902,8 +2902,8 @@ Acked-by: jbeulich@novell.com
.endm
.section __xen_guest
---- head.orig/arch/x86/kernel/head64-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head/arch/x86/kernel/head64-xen.c 2011-08-09 10:37:35.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/head64-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ 12.3/arch/x86/kernel/head64-xen.c 2011-08-09 10:37:35.000000000 +0200
@@ -25,13 +25,21 @@
#include <asm/setup.h>
#include <asm/desc.h>
@@ -2985,8 +2985,8 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_SMP
cpu_set(0, cpu_online_map);
#endif
---- head.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ 12.3/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -25,7 +25,6 @@
#include <linux/init.h>
#include <linux/delay.h>
@@ -3095,8 +3095,8 @@ Acked-by: jbeulich@novell.com
}
void arch_teardown_msi_irq(unsigned int irq)
---- head.orig/arch/x86/kernel/ioport-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ head/arch/x86/kernel/ioport-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/ioport-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ 12.3/arch/x86/kernel/ioport-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -13,10 +13,10 @@
#include <linux/ioport.h>
#include <linux/mm.h>
@@ -3109,8 +3109,8 @@ Acked-by: jbeulich@novell.com
#include <xen/interface/physdev.h>
/* Set EXTENT bits starting at BASE in BITMAP to value TURN_ON. */
---- head.orig/arch/x86/kernel/ldt-xen.c 2007-06-12 13:13:01.000000000 +0200
-+++ head/arch/x86/kernel/ldt-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/ldt-xen.c 2007-06-12 13:13:01.000000000 +0200
++++ 12.3/arch/x86/kernel/ldt-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -13,7 +13,6 @@
#include <linux/string.h>
#include <linux/mm.h>
@@ -3119,8 +3119,8 @@ Acked-by: jbeulich@novell.com
#include <linux/vmalloc.h>
#include <linux/slab.h>
---- head.orig/arch/x86/kernel/process_64-xen.c 2011-02-02 08:31:05.000000000 +0100
-+++ head/arch/x86/kernel/process_64-xen.c 2011-02-02 08:31:39.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/process_64-xen.c 2011-02-02 08:31:05.000000000 +0100
++++ 12.3/arch/x86/kernel/process_64-xen.c 2011-02-02 08:31:39.000000000 +0100
@@ -39,6 +39,7 @@
#include <linux/random.h>
#include <linux/notifier.h>
@@ -3170,8 +3170,8 @@ Acked-by: jbeulich@novell.com
__save_init_fpu(prev_p); /* _not_ save_init_fpu() */
mcl->op = __HYPERVISOR_fpu_taskswitch;
mcl->args[0] = 1;
---- head.orig/arch/x86/kernel/setup_64-xen.c 2012-06-06 13:49:08.000000000 +0200
-+++ head/arch/x86/kernel/setup_64-xen.c 2012-06-06 13:49:31.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/setup_64-xen.c 2012-06-06 13:49:08.000000000 +0200
++++ 12.3/arch/x86/kernel/setup_64-xen.c 2012-06-06 13:49:31.000000000 +0200
@@ -120,6 +120,8 @@ int bootloader_type;
unsigned long saved_video_mode;
@@ -3254,8 +3254,8 @@ Acked-by: jbeulich@novell.com
};
---- head.orig/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ head/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ 12.3/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -14,7 +14,6 @@
#include <linux/mm.h>
#include <linux/delay.h>
@@ -3319,8 +3319,8 @@ Acked-by: jbeulich@novell.com
}
/*
---- head.orig/arch/x86/kernel/traps_64-xen.c 2012-07-05 10:41:27.000000000 +0200
-+++ head/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/traps_64-xen.c 2012-07-05 10:41:27.000000000 +0200
++++ 12.3/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -32,6 +32,7 @@
#include <linux/unwind.h>
#include <linux/uaccess.h>
@@ -3455,8 +3455,8 @@ Acked-by: jbeulich@novell.com
if (notify_die(DIE_GPF, "general protection fault", regs,
error_code, 13, SIGSEGV) == NOTIFY_STOP)
return;
---- head.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ 12.3/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -45,14 +45,34 @@
#define __vsyscall(nr) __attribute__ ((unused,__section__(".vsyscall_" #nr)))
@@ -3594,8 +3594,8 @@ Acked-by: jbeulich@novell.com
smp_call_function_single(cpu, cpu_vsyscall_init, NULL, 0, 1);
return NOTIFY_DONE;
}
---- head.orig/arch/x86/mm/fault_64-xen.c 2011-07-26 09:27:34.000000000 +0200
-+++ head/arch/x86/mm/fault_64-xen.c 2011-07-26 09:27:41.000000000 +0200
+--- 12.3.orig/arch/x86/mm/fault_64-xen.c 2011-07-26 09:27:34.000000000 +0200
++++ 12.3/arch/x86/mm/fault_64-xen.c 2011-07-26 09:27:41.000000000 +0200
@@ -15,22 +15,22 @@
#include <linux/mman.h>
#include <linux/mm.h>
@@ -3657,8 +3657,8 @@ Acked-by: jbeulich@novell.com
pgd_t *pgd;
pgd = (pgd_t *)page_address(page) + pgd_index(address);
---- head.orig/arch/x86/mm/init_64-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head/arch/x86/mm/init_64-xen.c 2011-11-03 12:08:43.000000000 +0100
+--- 12.3.orig/arch/x86/mm/init_64-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ 12.3/arch/x86/mm/init_64-xen.c 2011-11-03 12:08:43.000000000 +0100
@@ -25,10 +25,12 @@
#include <linux/bootmem.h>
#include <linux/proc_fs.h>
@@ -3892,8 +3892,8 @@ Acked-by: jbeulich@novell.com
+ SMP_CACHE_BYTES, (4UL*1024*1024*1024), 0);
+}
+#endif
---- head.orig/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ 12.3/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -215,13 +215,13 @@ void mm_pin_all(void)
preempt_enable();
}
@@ -3954,8 +3954,8 @@ Acked-by: jbeulich@novell.com
/* Handle kernel mapping too which aliases part of the
* lowmem */
if (__pa(address) < KERNEL_TEXT_SIZE) {
---- head.orig/drivers/char/tpm/tpm_xen.c 2012-03-12 13:31:05.000000000 +0100
-+++ head/drivers/char/tpm/tpm_xen.c 2012-03-12 13:33:35.000000000 +0100
+--- 12.3.orig/drivers/char/tpm/tpm_xen.c 2012-03-12 13:31:05.000000000 +0100
++++ 12.3/drivers/char/tpm/tpm_xen.c 2012-03-12 13:33:35.000000000 +0100
@@ -461,7 +461,7 @@ static int tpmif_connect(struct xenbus_d
tp->backend_id = domid;
@@ -3965,8 +3965,8 @@ Acked-by: jbeulich@novell.com
if (err <= 0) {
WPRINTK("bind_listening_port_to_irqhandler failed "
"(err=%d)\n", err);
---- head.orig/drivers/hwmon/Kconfig 2012-12-18 11:38:26.000000000 +0100
-+++ head/drivers/hwmon/Kconfig 2012-10-23 14:42:53.000000000 +0200
+--- 12.3.orig/drivers/hwmon/Kconfig 2013-01-25 13:57:40.000000000 +0100
++++ 12.3/drivers/hwmon/Kconfig 2012-10-23 14:42:53.000000000 +0200
@@ -455,7 +455,7 @@ config SENSORS_HIH6130
config SENSORS_CORETEMP
@@ -3977,7 +3977,7 @@ Acked-by: jbeulich@novell.com
If you say yes here you get support for the temperature
sensor inside your CPU. Most of the family 6 CPUs
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/hwmon/coretemp-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/drivers/hwmon/coretemp-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -0,0 +1,449 @@
+/*
+ * coretemp.c - Linux kernel module for hardware monitoring
@@ -4428,8 +4428,8 @@ Acked-by: jbeulich@novell.com
+
+module_init(coretemp_init)
+module_exit(coretemp_exit)
---- head.orig/drivers/pci/msi-xen.c 2012-10-31 11:00:49.000000000 +0100
-+++ head/drivers/pci/msi-xen.c 2012-10-31 11:01:55.000000000 +0100
+--- 12.3.orig/drivers/pci/msi-xen.c 2012-10-31 11:00:49.000000000 +0100
++++ 12.3/drivers/pci/msi-xen.c 2012-10-31 11:01:55.000000000 +0100
@@ -12,17 +12,16 @@
#include <linux/interrupt.h>
#include <linux/init.h>
@@ -4742,8 +4742,8 @@ Acked-by: jbeulich@novell.com
+{
+ return 0;
+}
---- head.orig/drivers/xen/blkfront/blkfront.c 2012-10-04 11:50:59.000000000 +0200
-+++ head/drivers/xen/blkfront/blkfront.c 2012-03-12 13:33:33.000000000 +0100
+--- 12.3.orig/drivers/xen/blkfront/blkfront.c 2012-10-04 11:50:59.000000000 +0200
++++ 12.3/drivers/xen/blkfront/blkfront.c 2012-03-12 13:33:33.000000000 +0100
@@ -244,7 +244,7 @@ static int setup_blkring(struct xenbus_d
info->ring_ref = err;
@@ -4753,8 +4753,8 @@ Acked-by: jbeulich@novell.com
if (err <= 0) {
xenbus_dev_fatal(dev, err,
"bind_listening_port_to_irqhandler");
---- head.orig/drivers/xen/core/machine_reboot.c 2011-10-17 10:45:09.000000000 +0200
-+++ head/drivers/xen/core/machine_reboot.c 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/drivers/xen/core/machine_reboot.c 2011-10-17 10:45:09.000000000 +0200
++++ 12.3/drivers/xen/core/machine_reboot.c 2011-01-31 17:32:29.000000000 +0100
@@ -80,6 +80,8 @@ static void post_suspend(int suspend_can
#ifdef CONFIG_SMP
cpu_initialized_map = cpu_online_map;
@@ -4764,8 +4764,8 @@ Acked-by: jbeulich@novell.com
}
shinfo_mfn = xen_start_info->shared_info >> PAGE_SHIFT;
---- head.orig/drivers/xen/core/smpboot.c 2012-01-20 14:45:36.000000000 +0100
-+++ head/drivers/xen/core/smpboot.c 2012-03-22 16:08:04.000000000 +0100
+--- 12.3.orig/drivers/xen/core/smpboot.c 2012-01-20 14:45:36.000000000 +0100
++++ 12.3/drivers/xen/core/smpboot.c 2012-03-22 16:08:04.000000000 +0100
@@ -154,13 +154,12 @@ static void xen_smp_intr_exit(unsigned i
void __cpuinit cpu_bringup(void)
@@ -4875,8 +4875,8 @@ Acked-by: jbeulich@novell.com
prefill_possible_map();
}
---- head.orig/drivers/xen/fbfront/xenkbd.c 2011-01-31 17:29:16.000000000 +0100
-+++ head/drivers/xen/fbfront/xenkbd.c 2011-10-04 15:30:07.000000000 +0200
+--- 12.3.orig/drivers/xen/fbfront/xenkbd.c 2011-01-31 17:29:16.000000000 +0100
++++ 12.3/drivers/xen/fbfront/xenkbd.c 2011-10-04 15:30:07.000000000 +0200
@@ -137,11 +137,11 @@ int __devinit xenkbd_probe(struct xenbus
kbd->id.bustype = BUS_PCI;
kbd->id.vendor = 0x5853;
@@ -4907,8 +4907,8 @@ Acked-by: jbeulich@novell.com
__set_bit(EV_KEY, ptr->evbit);
for (i = BTN_LEFT; i <= BTN_TASK; i++)
---- head.orig/drivers/xen/netback/common.h 2012-06-06 13:47:45.000000000 +0200
-+++ head/drivers/xen/netback/common.h 2012-06-06 13:49:42.000000000 +0200
+--- 12.3.orig/drivers/xen/netback/common.h 2013-01-25 14:05:52.000000000 +0100
++++ 12.3/drivers/xen/netback/common.h 2013-01-25 14:06:29.000000000 +0100
@@ -98,7 +98,6 @@ typedef struct netif_st {
struct list_head list; /* scheduling list */
atomic_t refcnt;
@@ -4924,9 +4924,9 @@ Acked-by: jbeulich@novell.com
-struct net_device_stats *netif_be_get_stats(struct net_device *dev);
irqreturn_t netif_be_int(int irq, void *dev_id);
- static inline int netbk_can_queue(struct net_device *dev)
---- head.orig/drivers/xen/netback/interface.c 2011-11-03 12:03:20.000000000 +0100
-+++ head/drivers/xen/netback/interface.c 2011-04-11 14:38:22.000000000 +0200
+ /* Prevent the device from generating any further traffic. */
+--- 12.3.orig/drivers/xen/netback/interface.c 2011-11-03 12:03:20.000000000 +0100
++++ 12.3/drivers/xen/netback/interface.c 2011-04-11 14:38:22.000000000 +0200
@@ -257,7 +257,6 @@ netif_t *netif_alloc(struct device *pare
init_timer(&netif->tx_queue_timeout);
@@ -4935,8 +4935,8 @@ Acked-by: jbeulich@novell.com
dev->open = net_open;
dev->stop = net_close;
dev->change_mtu = netbk_change_mtu;
---- head.orig/drivers/xen/netback/loopback.c 2011-01-31 17:32:16.000000000 +0100
-+++ head/drivers/xen/netback/loopback.c 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/drivers/xen/netback/loopback.c 2011-01-31 17:32:16.000000000 +0100
++++ 12.3/drivers/xen/netback/loopback.c 2011-01-31 17:32:29.000000000 +0100
@@ -62,14 +62,17 @@ MODULE_PARM_DESC(nloopbacks, "Number of
struct net_private {
@@ -5031,8 +5031,8 @@ Acked-by: jbeulich@novell.com
dev->set_multicast_list = loopback_set_multicast_list;
dev->change_mtu = NULL; /* allow arbitrary mtu */
---- head.orig/drivers/xen/netback/netback.c 2012-06-06 13:47:50.000000000 +0200
-+++ head/drivers/xen/netback/netback.c 2012-06-06 13:49:44.000000000 +0200
+--- 12.3.orig/drivers/xen/netback/netback.c 2013-01-25 14:05:40.000000000 +0100
++++ 12.3/drivers/xen/netback/netback.c 2013-01-25 14:06:30.000000000 +0100
@@ -210,7 +210,7 @@ static struct sk_buff *netbk_copy_skb(st
goto err;
@@ -5094,7 +5094,7 @@ Acked-by: jbeulich@novell.com
static int __on_net_schedule_list(netif_t *netif)
{
return netif->list.next != NULL;
-@@ -1422,10 +1420,12 @@ static void net_tx_action(unsigned long
+@@ -1459,10 +1457,12 @@ static void net_tx_action(unsigned long
mop = tx_map_ops;
while ((skb = __skb_dequeue(&tx_queue)) != NULL) {
@@ -5107,7 +5107,7 @@ Acked-by: jbeulich@novell.com
txp = &pending_tx_info[pending_idx].req;
/* Check the remap error code. */
-@@ -1433,6 +1433,7 @@ static void net_tx_action(unsigned long
+@@ -1470,6 +1470,7 @@ static void net_tx_action(unsigned long
DPRINTK("netback grant failed.\n");
skb_shinfo(skb)->nr_frags = 0;
kfree_skb(skb);
@@ -5115,7 +5115,7 @@ Acked-by: jbeulich@novell.com
continue;
}
-@@ -1468,8 +1469,7 @@ static void net_tx_action(unsigned long
+@@ -1505,8 +1506,7 @@ static void net_tx_action(unsigned long
__pskb_pull_tail(skb, target - skb_headlen(skb));
}
@@ -5125,7 +5125,7 @@ Acked-by: jbeulich@novell.com
if (skb_checksum_setup(skb, &netif->rx_gso_csum_fixups)) {
DPRINTK("Can't setup checksum in net_tx_action\n");
-@@ -1477,18 +1477,19 @@ static void net_tx_action(unsigned long
+@@ -1514,18 +1514,19 @@ static void net_tx_action(unsigned long
continue;
}
@@ -5149,7 +5149,7 @@ Acked-by: jbeulich@novell.com
}
out:
-@@ -1685,7 +1686,7 @@ static int __init netback_init(void)
+@@ -1722,7 +1723,7 @@ static int __init netback_init(void)
(void)bind_virq_to_irqhandler(VIRQ_DEBUG,
0,
netif_be_dbg,
@@ -5158,8 +5158,8 @@ Acked-by: jbeulich@novell.com
"net-be-dbg",
&netif_be_dbg);
#endif
---- head.orig/drivers/xen/netback/xenbus.c 2012-01-06 10:19:49.000000000 +0100
-+++ head/drivers/xen/netback/xenbus.c 2012-01-03 11:55:56.000000000 +0100
+--- 12.3.orig/drivers/xen/netback/xenbus.c 2012-01-06 10:19:49.000000000 +0100
++++ 12.3/drivers/xen/netback/xenbus.c 2012-01-03 11:55:56.000000000 +0100
@@ -19,6 +19,7 @@
#include <stdarg.h>
@@ -5278,8 +5278,8 @@ Acked-by: jbeulich@novell.com
xenbus_switch_state(dev, XenbusStateClosing);
break;
---- head.orig/drivers/xen/netfront/accel.c 2009-05-04 10:01:03.000000000 +0200
-+++ head/drivers/xen/netfront/accel.c 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/drivers/xen/netfront/accel.c 2009-05-04 10:01:03.000000000 +0200
++++ 12.3/drivers/xen/netfront/accel.c 2011-01-31 17:32:29.000000000 +0100
@@ -548,7 +548,7 @@ static void accelerator_remove_hooks(str
/* Last chance to get statistics from the accelerator */
@@ -5308,8 +5308,8 @@ Acked-by: jbeulich@novell.com
spin_unlock_irqrestore(&accelerator->vif_states_lock, flags);
}
return rc;
---- head.orig/drivers/xen/netfront/netfront.c 2012-12-18 11:57:42.000000000 +0100
-+++ head/drivers/xen/netfront/netfront.c 2012-12-18 11:57:55.000000000 +0100
+--- 12.3.orig/drivers/xen/netfront/netfront.c 2012-12-18 11:57:42.000000000 +0100
++++ 12.3/drivers/xen/netfront/netfront.c 2012-12-18 11:57:55.000000000 +0100
@@ -514,7 +514,7 @@ static int setup_device(struct xenbus_de
memcpy(netdev->dev_addr, info->mac, ETH_ALEN);
@@ -5377,8 +5377,8 @@ Acked-by: jbeulich@novell.com
}
static int xennet_set_mac_address(struct net_device *dev, void *p)
---- head.orig/drivers/xen/netfront/netfront.h 2011-02-09 15:35:17.000000000 +0100
-+++ head/drivers/xen/netfront/netfront.h 2012-06-06 13:49:51.000000000 +0200
+--- 12.3.orig/drivers/xen/netfront/netfront.h 2011-02-09 15:35:17.000000000 +0100
++++ 12.3/drivers/xen/netfront/netfront.h 2012-06-06 13:49:51.000000000 +0200
@@ -150,9 +150,6 @@ struct netfront_info {
struct list_head list;
struct net_device *netdev;
@@ -5399,8 +5399,8 @@ Acked-by: jbeulich@novell.com
/* Private pointer to state internal to accelerator module */
void *accel_priv;
/* The accelerator used by this netfront device */
---- head.orig/drivers/xen/pcifront/xenbus.c 2012-03-12 13:31:59.000000000 +0100
-+++ head/drivers/xen/pcifront/xenbus.c 2012-03-12 13:33:18.000000000 +0100
+--- 12.3.orig/drivers/xen/pcifront/xenbus.c 2012-03-12 13:31:59.000000000 +0100
++++ 12.3/drivers/xen/pcifront/xenbus.c 2012-03-12 13:33:18.000000000 +0100
@@ -11,10 +11,6 @@
#include <xen/gnttab.h>
#include "pcifront.h"
@@ -5421,8 +5421,8 @@ Acked-by: jbeulich@novell.com
"pcifront", pdev);
if (err < 0) {
xenbus_dev_fatal(pdev->xdev, err,
---- head.orig/drivers/xen/scsiback/emulate.c 2012-01-06 10:19:49.000000000 +0100
-+++ head/drivers/xen/scsiback/emulate.c 2012-01-09 11:04:26.000000000 +0100
+--- 12.3.orig/drivers/xen/scsiback/emulate.c 2012-01-06 10:19:49.000000000 +0100
++++ 12.3/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;
}
@@ -5435,8 +5435,8 @@ Acked-by: jbeulich@novell.com
{
void *from;
void *to = buf;
---- head.orig/drivers/xen/scsifront/xenbus.c 2012-12-06 15:59:02.000000000 +0100
-+++ head/drivers/xen/scsifront/xenbus.c 2012-11-14 12:38:02.000000000 +0100
+--- 12.3.orig/drivers/xen/scsifront/xenbus.c 2012-12-06 15:59:02.000000000 +0100
++++ 12.3/drivers/xen/scsifront/xenbus.c 2012-11-14 12:38:02.000000000 +0100
@@ -99,7 +99,7 @@ static int scsifront_alloc_ring(struct v
err = bind_listening_port_to_irqhandler(
@@ -5446,8 +5446,8 @@ Acked-by: jbeulich@novell.com
if (err <= 0) {
xenbus_dev_fatal(dev, err, "bind_listening_port_to_irqhandler");
---- head.orig/drivers/xen/sfc_netback/accel_fwd.c 2008-04-02 12:34:02.000000000 +0200
-+++ head/drivers/xen/sfc_netback/accel_fwd.c 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/drivers/xen/sfc_netback/accel_fwd.c 2008-04-02 12:34:02.000000000 +0200
++++ 12.3/drivers/xen/sfc_netback/accel_fwd.c 2011-01-31 17:32:29.000000000 +0100
@@ -308,7 +308,7 @@ static struct netback_accel *for_a_vnic(
static inline int packet_is_arp_reply(struct sk_buff *skb)
{
@@ -5473,8 +5473,8 @@ Acked-by: jbeulich@novell.com
DPRINTK("%s: found gratuitous ARP for " MAC_FMT "\n",
__FUNCTION__, MAC_ARG(mac));
---- head.orig/drivers/xen/sfc_netback/accel_solarflare.c 2010-01-18 15:23:12.000000000 +0100
-+++ head/drivers/xen/sfc_netback/accel_solarflare.c 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/drivers/xen/sfc_netback/accel_solarflare.c 2010-01-18 15:23:12.000000000 +0100
++++ 12.3/drivers/xen/sfc_netback/accel_solarflare.c 2011-01-31 17:32:29.000000000 +0100
@@ -113,7 +113,7 @@ bend_dl_tx_packet(struct efx_dl_device *
BUG_ON(port == NULL);
@@ -5484,8 +5484,8 @@ Acked-by: jbeulich@novell.com
netback_accel_tx_packet(skb, port->fwd_priv);
else {
DPRINTK("Ignoring packet with missing mac address\n");
---- head.orig/drivers/xen/sfc_netfront/accel_tso.c 2011-01-31 17:29:16.000000000 +0100
-+++ head/drivers/xen/sfc_netfront/accel_tso.c 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/drivers/xen/sfc_netfront/accel_tso.c 2011-01-31 17:29:16.000000000 +0100
++++ 12.3/drivers/xen/sfc_netfront/accel_tso.c 2011-01-31 17:32:29.000000000 +0100
@@ -33,10 +33,9 @@
#include "accel_tso.h"
@@ -5547,8 +5547,8 @@ Acked-by: jbeulich@novell.com
}
tsoh_iph->tot_len = htons(ip_length);
---- head.orig/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 16:03:44.000000000 +0200
-+++ head/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 16:06:37.000000000 +0200
+--- 12.3.orig/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 16:03:44.000000000 +0200
++++ 12.3/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 16:06:37.000000000 +0200
@@ -465,7 +465,7 @@ netfront_accel_enqueue_skb_multi(netfron
if (skb->ip_summed == CHECKSUM_PARTIAL) {
@@ -5575,8 +5575,8 @@ Acked-by: jbeulich@novell.com
skb->protocol = eth_type_trans(skb, net_dev);
/* CHECKSUM_UNNECESSARY as hardware has done it already */
skb->ip_summed = CHECKSUM_UNNECESSARY;
---- head.orig/drivers/xen/sfc_netfront/accel_xenbus.c 2008-02-20 09:32:49.000000000 +0100
-+++ head/drivers/xen/sfc_netfront/accel_xenbus.c 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/drivers/xen/sfc_netfront/accel_xenbus.c 2008-02-20 09:32:49.000000000 +0100
++++ 12.3/drivers/xen/sfc_netfront/accel_xenbus.c 2011-01-31 17:32:29.000000000 +0100
@@ -356,7 +356,7 @@ static int vnic_setup_domU_shared_state(
/* Create xenbus msg event channel */
err = bind_listening_port_to_irqhandler
@@ -5595,8 +5595,8 @@ Acked-by: jbeulich@novell.com
if (err < 0) {
EPRINTK("Couldn't bind net event channel\n");
goto fail_net_irq;
---- head.orig/drivers/xen/usbfront/xenbus.c 2012-10-04 11:18:40.000000000 +0200
-+++ head/drivers/xen/usbfront/xenbus.c 2012-03-12 13:33:24.000000000 +0100
+--- 12.3.orig/drivers/xen/usbfront/xenbus.c 2012-10-04 11:18:40.000000000 +0200
++++ 12.3/drivers/xen/usbfront/xenbus.c 2012-03-12 13:33:24.000000000 +0100
@@ -109,7 +109,7 @@ static int setup_rings(struct xenbus_dev
info->conn_ring_ref = err;
@@ -5606,8 +5606,8 @@ Acked-by: jbeulich@novell.com
if (err <= 0) {
xenbus_dev_fatal(dev, err,
"bind_listening_port_to_irqhandler");
---- head.orig/drivers/xen/xenbus/xenbus_xs.c 2012-10-31 10:58:23.000000000 +0100
-+++ head/drivers/xen/xenbus/xenbus_xs.c 2011-06-30 16:06:45.000000000 +0200
+--- 12.3.orig/drivers/xen/xenbus/xenbus_xs.c 2012-10-31 10:58:23.000000000 +0100
++++ 12.3/drivers/xen/xenbus/xenbus_xs.c 2011-06-30 16:06:45.000000000 +0200
@@ -538,18 +538,15 @@ int xenbus_printf(struct xenbus_transact
{
va_list ap;
@@ -5631,8 +5631,8 @@ Acked-by: jbeulich@novell.com
ret = xenbus_write(t, dir, node, printf_buffer);
kfree(printf_buffer);
---- head.orig/fs/aio.c 2012-08-20 10:17:31.000000000 +0200
-+++ head/fs/aio.c 2012-08-20 10:37:21.000000000 +0200
+--- 12.3.orig/fs/aio.c 2012-08-20 10:17:31.000000000 +0200
++++ 12.3/fs/aio.c 2012-08-20 10:37:21.000000000 +0200
@@ -41,7 +41,7 @@
#ifdef CONFIG_EPOLL
@@ -5661,8 +5661,8 @@ Acked-by: jbeulich@novell.com
if (error)
return error;
---- head.orig/arch/x86/include/asm/boot.h 2012-12-18 11:38:26.000000000 +0100
-+++ head/arch/x86/include/asm/boot.h 2012-06-13 15:12:23.000000000 +0200
+--- 12.3.orig/arch/x86/include/asm/boot.h 2013-01-25 13:57:40.000000000 +0100
++++ 12.3/arch/x86/include/asm/boot.h 2012-06-13 15:12:23.000000000 +0200
@@ -16,7 +16,7 @@
& ~(CONFIG_PHYSICAL_ALIGN - 1))
@@ -5673,7 +5673,7 @@ Acked-by: jbeulich@novell.com
#else
#define MIN_KERNEL_ALIGN_LG2 (PAGE_SHIFT + THREAD_SIZE_ORDER)
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/cmpxchg_32.h 2011-12-23 11:18:49.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/cmpxchg_32.h 2011-12-23 11:18:49.000000000 +0100
@@ -0,0 +1,26 @@
+#ifndef _ASM_X86_XEN_CMPXCHG_32_H
+#define _ASM_X86_XEN_CMPXCHG_32_H
@@ -5701,8 +5701,8 @@ Acked-by: jbeulich@novell.com
+}
+
+#endif /* _ASM_X86_XEN_CMPXCHG_32_H */
---- head.orig/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:32:22.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:32:22.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:32:29.000000000 +0100
@@ -11,23 +11,24 @@
#include <asm/mmu.h>
@@ -5867,8 +5867,8 @@ Acked-by: jbeulich@novell.com
#endif
#ifndef CONFIG_X86_NO_IDT
---- head.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:32:16.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:32:16.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:32:29.000000000 +0100
@@ -19,10 +19,8 @@
* the start of the fixmap.
*/
@@ -5892,8 +5892,8 @@ Acked-by: jbeulich@novell.com
FIX_SHARED_INFO,
#define NR_FIX_ISAMAPS 256
FIX_ISAMAP_END,
---- head.orig/arch/x86/include/mach-xen/asm/gnttab_dma.h 2012-11-14 12:23:04.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/gnttab_dma.h 2012-11-14 12:55:32.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/gnttab_dma.h 2012-11-14 12:23:04.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/gnttab_dma.h 2012-11-14 12:55:32.000000000 +0100
@@ -33,7 +33,7 @@ static inline maddr_t gnttab_dma_map_pag
unsigned long offset)
{
@@ -5903,8 +5903,8 @@ Acked-by: jbeulich@novell.com
BUG_ON(pgnr >> order);
__gnttab_dma_map_page(page);
---- head.orig/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 17:32:16.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 17:32:16.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 17:32:29.000000000 +0100
@@ -67,12 +67,17 @@ extern void FASTCALL(kunmap_high(struct
void *kmap(struct page *page);
@@ -5924,8 +5924,8 @@ Acked-by: jbeulich@novell.com
#define flush_cache_kmaps() do { } while (0)
void clear_highpage(struct page *);
---- head.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2012-10-31 11:00:47.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/hypervisor.h 2012-10-31 11:01:51.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2012-10-31 11:00:47.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/hypervisor.h 2012-10-31 11:01:51.000000000 +0100
@@ -67,6 +67,8 @@ extern start_info_t *xen_start_info;
#define is_initial_xendomain() 0
#endif
@@ -5957,8 +5957,8 @@ Acked-by: jbeulich@novell.com
#define arch_use_lazy_mmu_mode() unlikely(__get_cpu_var(xen_lazy_mmu))
#endif
---- head.orig/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:32:22.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:32:22.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:32:29.000000000 +0100
@@ -11,6 +11,40 @@
#define _ASM_IRQFLAGS_H
@@ -6070,8 +6070,8 @@ Acked-by: jbeulich@novell.com
push %esp ; \
mov %ecx, %fs ; \
call evtchn_do_upcall ; \
---- head.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:32:22.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:32:22.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:32:29.000000000 +0100
@@ -6,6 +6,20 @@
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
@@ -6121,8 +6121,8 @@ Acked-by: jbeulich@novell.com
+ } while(0)
#endif
---- head.orig/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 17:32:22.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 17:32:22.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 17:32:29.000000000 +0100
@@ -1,7 +1,6 @@
#ifndef _I386_PGALLOC_H
#define _I386_PGALLOC_H
@@ -6138,8 +6138,8 @@ Acked-by: jbeulich@novell.com
-#define check_pgt_cache() do { } while (0)
-
#endif /* _I386_PGALLOC_H */
---- head.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:32:16.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:32:16.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:32:29.000000000 +0100
@@ -52,32 +52,40 @@ static inline int pte_exec_kernel(pte_t
* value and then use set_pte to update it. -ben
*/
@@ -6258,8 +6258,8 @@ Acked-by: jbeulich@novell.com
-void vmalloc_sync_all(void);
-
#endif /* _I386_PGTABLE_3LEVEL_H */
---- head.orig/arch/x86/include/mach-xen/asm/pgtable-3level-defs.h 2007-06-12 13:14:02.000000000 +0200
-+++ head/arch/x86/include/mach-xen/asm/pgtable-3level-defs.h 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/pgtable-3level-defs.h 2007-06-12 13:14:02.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/pgtable-3level-defs.h 2011-01-31 17:32:29.000000000 +0100
@@ -1,7 +1,7 @@
#ifndef _I386_PGTABLE_3LEVEL_DEFS_H
#define _I386_PGTABLE_3LEVEL_DEFS_H
@@ -6269,8 +6269,8 @@ Acked-by: jbeulich@novell.com
/*
* PGDIR_SHIFT determines what a top-level page table entry can map
---- head.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-01-31 17:32:22.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:38:07.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-01-31 17:32:22.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:38:07.000000000 +0100
@@ -24,11 +24,11 @@
#include <linux/slab.h>
#include <linux/list.h>
@@ -6444,8 +6444,8 @@ Acked-by: jbeulich@novell.com
#include <asm-generic/pgtable.h>
#endif /* _I386_PGTABLE_H */
---- head.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:32:22.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:32:22.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:32:29.000000000 +0100
@@ -21,6 +21,7 @@
#include <asm/percpu.h>
#include <linux/cpumask.h>
@@ -6688,8 +6688,8 @@ Acked-by: jbeulich@novell.com
+extern int force_mwait;
#endif /* __ASM_I386_PROCESSOR_H */
---- head.orig/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:32:22.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:32:22.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:32:29.000000000 +0100
@@ -8,19 +8,15 @@
#include <linux/kernel.h>
#include <linux/threads.h>
@@ -6854,8 +6854,8 @@ Acked-by: jbeulich@novell.com
extern u8 apicid_2_node[];
#ifdef CONFIG_X86_LOCAL_APIC
---- head.orig/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:29:16.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:29:16.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:32:29.000000000 +0100
@@ -29,8 +29,13 @@
* and page-granular flushes are available only on i486 and up.
*/
@@ -6891,7 +6891,7 @@ Acked-by: jbeulich@novell.com
#define flush_tlb_kernel_range(start, end) flush_tlb_all()
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/cmpxchg_64.h 2011-12-23 11:18:57.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/cmpxchg_64.h 2011-12-23 11:18:57.000000000 +0100
@@ -0,0 +1,16 @@
+#ifndef _ASM_X86_XEN_CMPXCHG_64_H
+#define _ASM_X86_XEN_CMPXCHG_64_H
@@ -6909,8 +6909,8 @@ Acked-by: jbeulich@novell.com
+#define cmpxchg64_local cmpxchg_local
+
+#endif /* _ASM_X86_XEN_CMPXCHG_64_H */
---- head.orig/arch/x86/include/mach-xen/asm/desc_64.h 2011-01-31 17:32:16.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/desc_64.h 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/desc_64.h 2011-01-31 17:32:16.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/desc_64.h 2011-01-31 17:32:29.000000000 +0100
@@ -127,16 +127,6 @@ static inline void set_ldt_desc(unsigned
DESC_LDT, size * 8 - 1);
}
@@ -6959,8 +6959,8 @@ Acked-by: jbeulich@novell.com
}
/*
---- head.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:29:16.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:29:16.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:32:29.000000000 +0100
@@ -15,7 +15,6 @@
#include <asm/apicdef.h>
#include <asm/page.h>
@@ -6969,8 +6969,8 @@ Acked-by: jbeulich@novell.com
#include <asm/acpi.h>
/*
---- head.orig/arch/x86/include/mach-xen/asm/irqflags_64.h 2007-06-12 13:14:13.000000000 +0200
-+++ head/arch/x86/include/mach-xen/asm/irqflags_64.h 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/irqflags_64.h 2007-06-12 13:14:13.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/irqflags_64.h 2011-01-31 17:32:29.000000000 +0100
@@ -9,6 +9,7 @@
*/
#ifndef _ASM_IRQFLAGS_H
@@ -7026,8 +7026,8 @@ Acked-by: jbeulich@novell.com
#else /* __ASSEMBLY__: */
# ifdef CONFIG_TRACE_IRQFLAGS
---- head.orig/arch/x86/include/mach-xen/asm/mmu_context_64.h 2007-06-12 13:14:13.000000000 +0200
-+++ head/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/mmu_context_64.h 2007-06-12 13:14:13.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 17:32:29.000000000 +0100
@@ -9,6 +9,9 @@
#include <asm/pgtable.h>
#include <asm/tlbflush.h>
@@ -7038,8 +7038,8 @@ Acked-by: jbeulich@novell.com
/*
* possibly do the LDT unload here?
*/
---- head.orig/arch/x86/include/mach-xen/asm/pgalloc_64.h 2010-09-23 15:39:04.000000000 +0200
-+++ head/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/pgalloc_64.h 2010-09-23 15:39:04.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 17:32:29.000000000 +0100
@@ -1,7 +1,6 @@
#ifndef _X86_64_PGALLOC_H
#define _X86_64_PGALLOC_H
@@ -7089,8 +7089,8 @@ Acked-by: jbeulich@novell.com
}
static inline pgd_t *pgd_alloc(struct mm_struct *mm)
---- head.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-01-31 17:32:22.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-02-07 15:38:08.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-01-31 17:32:22.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-02-07 15:38:08.000000000 +0100
@@ -1,12 +1,14 @@
#ifndef _X86_64_PGTABLE_H
#define _X86_64_PGTABLE_H
@@ -7301,8 +7301,8 @@ Acked-by: jbeulich@novell.com
+#endif /* !__ASSEMBLY__ */
#endif /* _X86_64_PGTABLE_H */
---- head.orig/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:32:16.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:32:16.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:32:29.000000000 +0100
@@ -20,6 +20,7 @@
#include <asm/percpu.h>
#include <linux/personality.h>
@@ -7386,8 +7386,8 @@ Acked-by: jbeulich@novell.com
* NSC/Cyrix CPU indexed register access macros
*/
---- head.orig/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:32:22.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:32:22.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:32:29.000000000 +0100
@@ -11,12 +11,11 @@
extern int disable_apic;
@@ -7440,8 +7440,8 @@ Acked-by: jbeulich@novell.com
#endif
/*
---- head.orig/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:29:16.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:29:16.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:32:29.000000000 +0100
@@ -2,7 +2,9 @@
#define _X8664_TLBFLUSH_H
@@ -7452,8 +7452,8 @@ Acked-by: jbeulich@novell.com
#define __flush_tlb() xen_tlb_flush()
---- head.orig/include/linux/msi.h 2012-12-18 11:38:26.000000000 +0100
-+++ head/include/linux/msi.h 2012-04-04 14:03:08.000000000 +0200
+--- 12.3.orig/include/linux/msi.h 2013-01-25 13:57:40.000000000 +0100
++++ 12.3/include/linux/msi.h 2012-04-04 14:03:08.000000000 +0200
@@ -4,6 +4,8 @@
#include <linux/kobject.h>
#include <linux/list.h>
@@ -7475,8 +7475,8 @@ Acked-by: jbeulich@novell.com
/*
* The arch hook for setup up msi irqs
*/
---- head.orig/include/xen/net-util.h 2011-02-09 15:50:19.000000000 +0100
-+++ head/include/xen/net-util.h 2011-02-09 15:53:07.000000000 +0100
+--- 12.3.orig/include/xen/net-util.h 2011-02-09 15:50:19.000000000 +0100
++++ 12.3/include/xen/net-util.h 2011-02-09 15:53:07.000000000 +0100
@@ -11,6 +11,7 @@ static inline int skb_checksum_setup(str
unsigned long *fixup_counter)
{
@@ -7524,8 +7524,8 @@ Acked-by: jbeulich@novell.com
goto out;
if (csum) {
---- head.orig/kernel/irq/chip.c 2012-12-18 11:38:26.000000000 +0100
-+++ head/kernel/irq/chip.c 2012-04-10 16:15:06.000000000 +0200
+--- 12.3.orig/kernel/irq/chip.c 2013-01-25 13:57:40.000000000 +0100
++++ 12.3/kernel/irq/chip.c 2012-04-10 16:15:06.000000000 +0200
@@ -89,6 +89,7 @@ int irq_set_handler_data(unsigned int ir
}
EXPORT_SYMBOL(irq_set_handler_data);
@@ -7542,8 +7542,8 @@ Acked-by: jbeulich@novell.com
/**
* irq_set_chip_data - set irq chip data for an irq
---- head.orig/lib/swiotlb-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ head/lib/swiotlb-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/lib/swiotlb-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ 12.3/lib/swiotlb-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -751,7 +751,6 @@ swiotlb_dma_supported (struct device *hw
return (mask >= ((1UL << dma_bits) - 1));
}
@@ -7552,8 +7552,8 @@ Acked-by: jbeulich@novell.com
EXPORT_SYMBOL(swiotlb_map_single);
EXPORT_SYMBOL(swiotlb_unmap_single);
EXPORT_SYMBOL(swiotlb_map_sg);
---- head.orig/mm/vmalloc.c 2012-12-18 11:38:26.000000000 +0100
-+++ head/mm/vmalloc.c 2012-08-20 10:37:16.000000000 +0200
+--- 12.3.orig/mm/vmalloc.c 2013-01-25 13:57:40.000000000 +0100
++++ 12.3/mm/vmalloc.c 2012-08-20 10:37:16.000000000 +0200
@@ -1592,6 +1592,13 @@ static void *__vmalloc_area_node(struct
struct page **pages;
unsigned int nr_pages, array_size, i;
@@ -7594,8 +7594,8 @@ Acked-by: jbeulich@novell.com
#else
#define GFP_VMALLOC32 GFP_KERNEL
#endif
---- head.orig/scripts/Makefile.xen.awk 2007-08-06 15:10:49.000000000 +0200
-+++ head/scripts/Makefile.xen.awk 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/scripts/Makefile.xen.awk 2007-08-06 15:10:49.000000000 +0200
++++ 12.3/scripts/Makefile.xen.awk 2011-01-31 17:32:29.000000000 +0100
@@ -13,7 +13,7 @@ BEGIN {
next
}
diff --git a/patches.xen/xen3-patch-2.6.23 b/patches.xen/xen3-patch-2.6.23
index fe67576bd6..ef00210ec6 100644
--- a/patches.xen/xen3-patch-2.6.23
+++ b/patches.xen/xen3-patch-2.6.23
@@ -5,8 +5,8 @@ Patch-mainline: 2.6.23
Automatically created from "patches.kernel.org/patch-2.6.23" by xen-port-patches.py
Acked-by: jbeulich@novell.com
---- head.orig/arch/x86/Kbuild 2012-12-18 11:38:26.000000000 +0100
-+++ head/arch/x86/Kbuild 2012-06-13 15:13:30.000000000 +0200
+--- 12.3.orig/arch/x86/Kbuild 2013-02-05 10:40:06.000000000 +0100
++++ 12.3/arch/x86/Kbuild 2012-06-13 15:13:30.000000000 +0200
@@ -1,7 +1,7 @@
obj-$(CONFIG_KVM) += kvm/
@@ -16,8 +16,8 @@ Acked-by: jbeulich@novell.com
# lguest paravirtualization support
obj-$(CONFIG_LGUEST_GUEST) += lguest/
---- head.orig/arch/x86/kernel/asm-offsets.c 2012-12-18 11:38:26.000000000 +0100
-+++ head/arch/x86/kernel/asm-offsets.c 2011-04-13 12:42:43.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/asm-offsets.c 2013-02-05 10:40:06.000000000 +0100
++++ 12.3/arch/x86/kernel/asm-offsets.c 2011-04-13 12:42:43.000000000 +0200
@@ -17,7 +17,7 @@
#include <asm/bootparam.h>
#include <asm/suspend.h>
@@ -36,8 +36,8 @@ Acked-by: jbeulich@novell.com
BLANK();
OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
OFFSET(XEN_vcpu_info_pending, vcpu_info, evtchn_upcall_pending);
---- head.orig/arch/x86/kernel/cpu/common-xen.c 2012-07-05 11:42:58.000000000 +0200
-+++ head/arch/x86/kernel/cpu/common-xen.c 2012-07-05 10:49:35.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/cpu/common-xen.c 2012-07-05 11:42:58.000000000 +0200
++++ 12.3/arch/x86/kernel/cpu/common-xen.c 2012-07-05 10:49:35.000000000 +0200
@@ -369,6 +369,8 @@ static void __cpuinit generic_identify(s
if ( xlvl >= 0x80000004 )
get_model_name(c); /* Default name */
@@ -63,8 +63,8 @@ Acked-by: jbeulich@novell.com
nexgen_init_cpu();
umc_init_cpu();
early_cpu_detect();
---- head.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -167,7 +167,7 @@ mtrr_del(int reg, unsigned long base, un
EXPORT_SYMBOL(mtrr_add);
EXPORT_SYMBOL(mtrr_del);
@@ -74,8 +74,8 @@ Acked-by: jbeulich@novell.com
{
}
---- head.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -10,6 +10,7 @@
#include <linux/efi.h>
#include <linux/pfn.h>
@@ -131,8 +131,8 @@ Acked-by: jbeulich@novell.com
break;
}
}
---- head.orig/arch/x86/kernel/entry_32.S 2012-10-31 10:44:17.000000000 +0100
-+++ head/arch/x86/kernel/entry_32.S 2012-10-31 11:04:52.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/entry_32.S 2013-01-25 14:04:15.000000000 +0100
++++ 12.3/arch/x86/kernel/entry_32.S 2013-01-25 14:06:50.000000000 +0100
@@ -1058,7 +1058,7 @@ END(spurious_interrupt_bug)
*/
.popsection
@@ -142,7 +142,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)
-@@ -1149,7 +1149,7 @@ ENDPROC(xen_failsafe_callback)
+@@ -1148,7 +1148,7 @@ ENDPROC(xen_failsafe_callback)
BUILD_INTERRUPT3(xen_hvm_callback_vector, XEN_HVM_EVTCHN_CALLBACK,
xen_evtchn_do_upcall)
@@ -151,8 +151,8 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_FUNCTION_TRACER
#ifdef CONFIG_DYNAMIC_FTRACE
---- head.orig/arch/x86/kernel/entry_32-xen.S 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/kernel/entry_32-xen.S 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/entry_32-xen.S 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/kernel/entry_32-xen.S 2011-01-31 17:49:31.000000000 +0100
@@ -452,9 +452,6 @@ restore_nocheck_notrace:
1: INTERRUPT_RETURN
.section .fixup,"ax"
@@ -163,8 +163,8 @@ Acked-by: jbeulich@novell.com
pushl $0 # no error code
pushl $do_iret_error
jmp error_code
---- head.orig/arch/x86/kernel/head_32-xen.S 2012-12-06 16:06:48.000000000 +0100
-+++ head/arch/x86/kernel/head_32-xen.S 2012-12-06 16:07:12.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/head_32-xen.S 2012-12-06 16:06:48.000000000 +0100
++++ 12.3/arch/x86/kernel/head_32-xen.S 2012-12-06 16:07:12.000000000 +0100
@@ -93,7 +93,10 @@ ENTRY(_stext)
/*
* BSS section
@@ -236,8 +236,8 @@ Acked-by: jbeulich@novell.com
- ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long, 1)
+ ELFNOTE(Xen, XEN_ELFNOTE_LOADER, .asciz "generic")
+ ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long 1)
---- head.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -402,14 +402,6 @@ static void set_ioapic_affinity_irq(unsi
# include <linux/slab.h> /* kmalloc() */
# include <linux/timer.h> /* time_after() */
@@ -351,8 +351,8 @@ Acked-by: jbeulich@novell.com
{
unsigned long t1 = jiffies;
---- head.orig/arch/x86/kernel/microcode_core-xen.c 2011-12-01 15:01:09.000000000 +0100
-+++ head/arch/x86/kernel/microcode_core-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/microcode_core-xen.c 2011-12-01 15:01:09.000000000 +0100
++++ 12.3/arch/x86/kernel/microcode_core-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -33,6 +33,7 @@
#include <linux/miscdevice.h>
#include <linux/spinlock.h>
@@ -361,8 +361,8 @@ Acked-by: jbeulich@novell.com
#include <linux/mutex.h>
#include <linux/cpu.h>
#include <linux/firmware.h>
---- head.orig/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -24,7 +24,7 @@
#include <asm/bug.h>
@@ -372,8 +372,8 @@ Acked-by: jbeulich@novell.com
int iommu_merge __read_mostly = 0;
EXPORT_SYMBOL(iommu_merge);
---- head.orig/arch/x86/kernel/process_32-xen.c 2012-07-05 10:49:20.000000000 +0200
-+++ head/arch/x86/kernel/process_32-xen.c 2012-07-05 10:49:33.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/process_32-xen.c 2012-07-05 10:49:20.000000000 +0200
++++ 12.3/arch/x86/kernel/process_32-xen.c 2012-07-05 10:49:33.000000000 +0200
@@ -241,6 +241,7 @@ early_param("idle", idle_setup);
void show_regs(struct pt_regs * regs)
{
@@ -489,8 +489,8 @@ Acked-by: jbeulich@novell.com
/*
* Leave lazy mode, flushing any hypercalls made here.
---- head.orig/arch/x86/kernel/setup_32-xen.c 2012-06-06 13:49:07.000000000 +0200
-+++ head/arch/x86/kernel/setup_32-xen.c 2012-06-06 13:52:42.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/setup_32-xen.c 2012-06-06 13:49:07.000000000 +0200
++++ 12.3/arch/x86/kernel/setup_32-xen.c 2012-06-06 13:52:42.000000000 +0200
@@ -114,19 +114,10 @@ static unsigned int highmem_pages = -1;
/*
* Setup options
@@ -577,8 +577,8 @@ Acked-by: jbeulich@novell.com
if (is_initial_xendomain()) {
#ifdef CONFIG_VT
---- head.orig/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -22,6 +22,7 @@
#include <asm/mtrr.h>
@@ -603,8 +603,8 @@ Acked-by: jbeulich@novell.com
{
if (per_cpu(cpu_tlbstate, cpu).state == TLBSTATE_OK)
BUG();
---- head.orig/arch/x86/kernel/time-xen.c 2012-02-10 13:26:34.000000000 +0100
-+++ head/arch/x86/kernel/time-xen.c 2012-02-10 13:26:46.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/time-xen.c 2012-02-10 13:26:34.000000000 +0100
++++ 12.3/arch/x86/kernel/time-xen.c 2012-02-10 13:26:46.000000000 +0100
@@ -74,11 +74,12 @@
#include <xen/evtchn.h>
#include <xen/interface/vcpu.h>
@@ -679,8 +679,8 @@ Acked-by: jbeulich@novell.com
}
extern void (*late_time_init)(void);
---- head.orig/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/kernel/traps_32-xen.c 2012-06-18 09:23:11.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/kernel/traps_32-xen.c 2012-06-18 09:23:11.000000000 +0200
@@ -41,6 +41,10 @@
#include <linux/mca.h>
#endif
@@ -879,8 +879,8 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_KPROBES
fastcall void __kprobes do_int3(struct pt_regs *regs, long error_code)
{
---- head.orig/arch/x86/mach-xen/setup.c 2011-08-09 10:35:06.000000000 +0200
-+++ head/arch/x86/mach-xen/setup.c 2011-09-07 15:28:26.000000000 +0200
+--- 12.3.orig/arch/x86/mach-xen/setup.c 2011-08-09 10:35:06.000000000 +0200
++++ 12.3/arch/x86/mach-xen/setup.c 2011-09-07 15:28:26.000000000 +0200
@@ -12,6 +12,7 @@
#include <asm/e820.h>
#include <asm/setup.h>
@@ -917,8 +917,8 @@ Acked-by: jbeulich@novell.com
+ set_pmd(pmd, __pmd(__pa_symbol(swapper_pg_pmd) | _PAGE_TABLE));
+ }
}
---- head.orig/arch/x86/mm/fault_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/mm/fault_32-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/arch/x86/mm/fault_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/mm/fault_32-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -346,7 +346,10 @@ static inline pmd_t *vmalloc_sync_one(pg
pmd_k = pmd_offset(pud_k, address);
if (!pmd_present(*pmd_k))
@@ -1004,8 +1004,8 @@ Acked-by: jbeulich@novell.com
tsk->thread.cr2 = address;
/* Kernel addresses are always protection faults */
tsk->thread.error_code = error_code | (address >= TASK_SIZE);
---- head.orig/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -34,17 +34,16 @@ void *kmap_atomic_prot(struct page *page
/* even !CONFIG_PREEMPT needs this, for in_atomic in do_page_fault */
pagefault_disable();
@@ -1027,8 +1027,8 @@ Acked-by: jbeulich@novell.com
}
void *kmap_atomic(struct page *page, enum km_type type)
---- head.orig/arch/x86/mm/init_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/mm/init_32-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/arch/x86/mm/init_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/mm/init_32-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -96,7 +96,7 @@ static pte_t * __init one_page_table_ini
#endif
pte_t *page_table = (pte_t *) alloc_bootmem_low_pages(PAGE_SIZE);
@@ -1091,8 +1091,8 @@ Acked-by: jbeulich@novell.com
if (!SHARED_KERNEL_PMD) {
/* If we're in PAE mode and have a non-shared
kernel pmd, then the pgd size must be a
---- head.orig/arch/x86/mm/ioremap-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/mm/ioremap-xen.c 2011-02-07 15:38:30.000000000 +0100
+--- 12.3.orig/arch/x86/mm/ioremap-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/mm/ioremap-xen.c 2011-02-07 15:38:30.000000000 +0100
@@ -344,9 +344,8 @@ void iounmap(volatile void __iomem *addr
/* Reset the direct mapping. Can block */
@@ -1104,8 +1104,8 @@ Acked-by: jbeulich@novell.com
PAGE_KERNEL);
global_flush_tlb();
}
---- head.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -198,7 +198,7 @@ void pte_free(struct page *pte)
va, pfn_pte(pfn, PAGE_KERNEL), 0))
BUG();
@@ -1204,8 +1204,8 @@ Acked-by: jbeulich@novell.com
(atomic_read(&mm->mm_count) == 1) &&
!mm->context.has_foreign_mappings)
mm_unpin(mm);
---- head.orig/arch/x86/xen/Kconfig 2012-12-18 11:38:26.000000000 +0100
-+++ head/arch/x86/xen/Kconfig 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/arch/x86/xen/Kconfig 2013-02-05 10:40:06.000000000 +0100
++++ 12.3/arch/x86/xen/Kconfig 2011-01-31 17:49:31.000000000 +0100
@@ -2,7 +2,7 @@
# This Kconfig describes xen options
#
@@ -1215,8 +1215,8 @@ Acked-by: jbeulich@novell.com
bool "Xen guest support"
select PARAVIRT
select PARAVIRT_CLOCK
---- head.orig/arch/x86/xen/xen-head.S 2012-12-18 11:38:26.000000000 +0100
-+++ head/arch/x86/xen/xen-head.S 2012-10-23 14:49:29.000000000 +0200
+--- 12.3.orig/arch/x86/xen/xen-head.S 2013-02-05 10:40:06.000000000 +0100
++++ 12.3/arch/x86/xen/xen-head.S 2012-10-23 14:49:29.000000000 +0200
@@ -1,7 +1,7 @@
/* Xen-specific pieces of head.S, intended to be included in the right
place in head.S */
@@ -1232,8 +1232,8 @@ Acked-by: jbeulich@novell.com
-#endif /*CONFIG_XEN */
+#endif /* CONFIG_PARAVIRT_XEN */
---- head.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:49:31.000000000 +0100
@@ -105,7 +105,7 @@ ENTRY(ia32_sysenter_target)
movl $VSYSCALL32_SYSEXIT,8(%rsp)
movq %rax,(%rsp)
@@ -1275,8 +1275,8 @@ Acked-by: jbeulich@novell.com
.quad sys_eventfd
+ .quad sys32_fallocate
ia32_syscall_end:
---- head.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -224,37 +224,6 @@ unsigned long __init e820_end_of_ram(voi
}
@@ -1460,8 +1460,8 @@ Acked-by: jbeulich@novell.com
(unsigned long long) e820.map[i].addr,
(unsigned long long) (e820.map[i].addr + e820.map[i].size));
switch (e820.map[i].type) {
---- head.orig/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -174,6 +174,7 @@ static __init void early_serial_init(cha
* mappings. Someone should fix this for domain 0. For now, use fake serial.
*/
@@ -1496,8 +1496,8 @@ Acked-by: jbeulich@novell.com
}
if (keep_early)
---- head.orig/arch/x86/kernel/entry_64-xen.S 2011-10-06 11:55:00.000000000 +0200
-+++ head/arch/x86/kernel/entry_64-xen.S 2011-10-07 11:21:43.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/entry_64-xen.S 2011-10-06 11:55:00.000000000 +0200
++++ 12.3/arch/x86/kernel/entry_64-xen.S 2011-10-07 11:21:43.000000000 +0200
@@ -313,7 +313,7 @@ sysret_signal:
TRACE_IRQS_ON
/* sti */
@@ -1525,8 +1525,8 @@ Acked-by: jbeulich@novell.com
jz retint_restore_args
TRACE_IRQS_ON
XEN_UNBLOCK_EVENTS(%rsi)
---- head.orig/arch/x86/kernel/head_64-xen.S 2012-12-06 16:06:50.000000000 +0100
-+++ head/arch/x86/kernel/head_64-xen.S 2012-12-06 16:07:11.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/head_64-xen.S 2012-12-06 16:06:50.000000000 +0100
++++ 12.3/arch/x86/kernel/head_64-xen.S 2012-12-06 16:07:11.000000000 +0100
@@ -25,7 +25,7 @@
#include <xen/interface/elfnote.h>
#include <xen/interface/features.h>
@@ -1603,8 +1603,8 @@ Acked-by: jbeulich@novell.com
- ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long, 1)
+ ELFNOTE(Xen, XEN_ELFNOTE_LOADER, .asciz "generic")
+ ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long 1)
---- head.orig/arch/x86/kernel/head64-xen.c 2011-08-09 10:37:35.000000000 +0200
-+++ head/arch/x86/kernel/head64-xen.c 2011-08-09 10:41:42.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/head64-xen.c 2011-08-09 10:37:35.000000000 +0200
++++ 12.3/arch/x86/kernel/head64-xen.c 2011-08-09 10:41:42.000000000 +0200
@@ -89,7 +89,7 @@ void __init x86_64_start_kernel(char * r
struct xen_machphys_mapping mapping;
int i;
@@ -1614,8 +1614,8 @@ Acked-by: jbeulich@novell.com
xen_start_info = (struct start_info *)real_mode_data;
if (!xen_feature(XENFEAT_auto_translated_physmap))
---- head.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -165,7 +165,9 @@ static inline void io_apic_write(unsigne
#endif
}
@@ -1738,8 +1738,8 @@ Acked-by: jbeulich@novell.com
}
static struct irq_chip ioapic_chip __read_mostly = {
---- head.orig/arch/x86/kernel/ldt-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/kernel/ldt-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/ldt-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/kernel/ldt-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -114,6 +114,8 @@ int init_new_context(struct task_struct
memset(&mm->context, 0, sizeof(mm->context));
init_MUTEX(&mm->context.sem);
@@ -1758,8 +1758,8 @@ Acked-by: jbeulich@novell.com
spin_lock(&mm_unpinned_lock);
list_del(&mm->context.unpinned);
spin_unlock(&mm_unpinned_lock);
---- head.orig/arch/x86/kernel/process_64-xen.c 2011-02-02 08:31:39.000000000 +0100
-+++ head/arch/x86/kernel/process_64-xen.c 2011-02-02 08:31:50.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/process_64-xen.c 2011-02-02 08:31:39.000000000 +0100
++++ 12.3/arch/x86/kernel/process_64-xen.c 2011-02-02 08:31:50.000000000 +0100
@@ -26,6 +26,7 @@
#include <linux/sched.h>
#include <linux/kernel.h>
@@ -1791,8 +1791,8 @@ Acked-by: jbeulich@novell.com
}
void show_regs(struct pt_regs *regs)
---- head.orig/arch/x86/kernel/setup_64-xen.c 2012-06-06 13:49:31.000000000 +0200
-+++ head/arch/x86/kernel/setup_64-xen.c 2012-06-06 13:52:43.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/setup_64-xen.c 2012-06-06 13:49:31.000000000 +0200
++++ 12.3/arch/x86/kernel/setup_64-xen.c 2012-06-06 13:52:43.000000000 +0200
@@ -826,6 +826,8 @@ static void __cpuinit init_amd(struct cp
level = cpuid_eax(1);
if (c->x86 == 15 && ((level >= 0x0f48 && level < 0x0f50) || level >= 0x0f58))
@@ -1875,8 +1875,8 @@ Acked-by: jbeulich@novell.com
};
static char *x86_power_flags[] = {
"ts", /* temperature sensor */
---- head.orig/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -362,7 +362,7 @@ __smp_call_function_single(int cpu, void
}
@@ -1913,8 +1913,8 @@ Acked-by: jbeulich@novell.com
put_cpu();
return 0;
}
---- head.orig/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -34,6 +34,10 @@
#include <linux/bug.h>
#include <linux/kdebug.h>
@@ -1985,8 +1985,8 @@ Acked-by: jbeulich@novell.com
if (panic_on_unrecovered_nmi)
panic("NMI: Not continuing");
---- head.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -42,6 +42,7 @@
#include <asm/segment.h>
#include <asm/desc.h>
@@ -2032,8 +2032,8 @@ Acked-by: jbeulich@novell.com
write_sequnlock_irqrestore(&vsyscall_gtod_data.lock, flags);
}
---- head.orig/arch/x86/mm/fault_64-xen.c 2011-07-26 09:27:41.000000000 +0200
-+++ head/arch/x86/mm/fault_64-xen.c 2011-08-15 10:44:41.000000000 +0200
+--- 12.3.orig/arch/x86/mm/fault_64-xen.c 2011-07-26 09:27:41.000000000 +0200
++++ 12.3/arch/x86/mm/fault_64-xen.c 2011-08-15 10:44:41.000000000 +0200
@@ -160,7 +160,9 @@ void dump_pagetable(unsigned long addres
pmd_t *pmd;
pte_t *pte;
@@ -2155,8 +2155,8 @@ Acked-by: jbeulich@novell.com
goto no_context;
do_sigbus:
---- head.orig/arch/x86/mm/init_64-xen.c 2011-11-03 12:08:43.000000000 +0100
-+++ head/arch/x86/mm/init_64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/arch/x86/mm/init_64-xen.c 2011-11-03 12:08:43.000000000 +0100
++++ 12.3/arch/x86/mm/init_64-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -66,6 +66,9 @@ int after_bootmem;
DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
extern unsigned long start_pfn;
@@ -2280,8 +2280,8 @@ Acked-by: jbeulich@novell.com
+ return "[vsyscall]";
+ return NULL;
+}
---- head.orig/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -171,7 +171,7 @@ void mm_pin(struct mm_struct *mm)
mm_walk(mm, PAGE_KERNEL_RO);
xen_pgd_pin(__pa(mm->pgd)); /* kernel */
@@ -2386,8 +2386,8 @@ Acked-by: jbeulich@novell.com
ClearPagePrivate(pg);
__free_page(pg);
}
---- head.orig/arch/x86/oprofile/xenoprof.c 2008-01-28 12:24:19.000000000 +0100
-+++ head/arch/x86/oprofile/xenoprof.c 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/arch/x86/oprofile/xenoprof.c 2008-01-28 12:24:19.000000000 +0100
++++ 12.3/arch/x86/oprofile/xenoprof.c 2011-01-31 17:49:31.000000000 +0100
@@ -18,9 +18,9 @@
#include <linux/init.h>
#include <linux/oprofile.h>
@@ -2399,8 +2399,8 @@ Acked-by: jbeulich@novell.com
#include <xen/interface/xen.h>
#include <xen/interface/xenoprof.h>
#include <xen/xenoprof.h>
---- head.orig/arch/x86/vdso/vdso32/note.S 2012-12-18 11:38:26.000000000 +0100
-+++ head/arch/x86/vdso/vdso32/note.S 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/arch/x86/vdso/vdso32/note.S 2013-02-05 10:40:06.000000000 +0100
++++ 12.3/arch/x86/vdso/vdso32/note.S 2011-01-31 17:49:31.000000000 +0100
@@ -13,7 +13,7 @@ ELFNOTE_START(Linux, 0, "a")
.long LINUX_VERSION_CODE
ELFNOTE_END
@@ -2423,8 +2423,8 @@ Acked-by: jbeulich@novell.com
.byte VDSO_NOTE_NONEGSEG_BIT; .asciz "nosegneg" /* bit, name */
ELFNOTE_END
#endif
---- head.orig/drivers/Makefile 2012-10-22 17:22:16.000000000 +0200
-+++ head/drivers/Makefile 2012-10-23 14:48:53.000000000 +0200
+--- 12.3.orig/drivers/Makefile 2012-10-22 17:22:16.000000000 +0200
++++ 12.3/drivers/Makefile 2012-10-23 14:48:53.000000000 +0200
@@ -32,7 +32,7 @@ obj-y += amba/
obj-$(CONFIG_DMA_ENGINE) += dma/
@@ -2434,8 +2434,8 @@ Acked-by: jbeulich@novell.com
# regulators early, since some subsystems rely on them to initialize
obj-$(CONFIG_REGULATOR) += regulator/
---- head.orig/drivers/block/Kconfig 2012-12-18 11:38:26.000000000 +0100
-+++ head/drivers/block/Kconfig 2012-11-14 12:38:26.000000000 +0100
+--- 12.3.orig/drivers/block/Kconfig 2013-02-05 10:40:06.000000000 +0100
++++ 12.3/drivers/block/Kconfig 2012-11-14 12:38:26.000000000 +0100
@@ -477,9 +477,9 @@ config XILINX_SYSACE
help
Include support for the Xilinx SystemACE CompactFlash interface
@@ -2448,8 +2448,8 @@ Acked-by: jbeulich@novell.com
default y
select XEN_XENBUS_FRONTEND
help
---- head.orig/drivers/block/Makefile 2012-12-18 11:38:26.000000000 +0100
-+++ head/drivers/block/Makefile 2012-10-23 14:49:03.000000000 +0200
+--- 12.3.orig/drivers/block/Makefile 2013-02-05 10:40:06.000000000 +0100
++++ 12.3/drivers/block/Makefile 2012-10-23 14:49:03.000000000 +0200
@@ -35,7 +35,7 @@ obj-$(CONFIG_VIODASD) += viodasd.o
obj-$(CONFIG_BLK_DEV_SX8) += sx8.o
obj-$(CONFIG_BLK_DEV_HD) += hd.o
@@ -2459,8 +2459,8 @@ Acked-by: jbeulich@novell.com
obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/
obj-$(CONFIG_BLK_DEV_DRBD) += drbd/
obj-$(CONFIG_BLK_DEV_RBD) += rbd.o
---- head.orig/drivers/tty/hvc/Kconfig 2012-12-18 11:38:26.000000000 +0100
-+++ head/drivers/tty/hvc/Kconfig 2012-04-10 16:36:21.000000000 +0200
+--- 12.3.orig/drivers/tty/hvc/Kconfig 2013-02-05 10:40:06.000000000 +0100
++++ 12.3/drivers/tty/hvc/Kconfig 2012-04-10 16:36:21.000000000 +0200
@@ -59,7 +59,7 @@ config HVC_IUCV
config HVC_XEN
@@ -2470,8 +2470,8 @@ Acked-by: jbeulich@novell.com
select HVC_DRIVER
select HVC_IRQ
default y
---- head.orig/drivers/net/Kconfig 2012-12-18 11:38:26.000000000 +0100
-+++ head/drivers/net/Kconfig 2012-10-23 14:49:09.000000000 +0200
+--- 12.3.orig/drivers/net/Kconfig 2013-02-05 10:40:06.000000000 +0100
++++ 12.3/drivers/net/Kconfig 2012-10-23 14:49:09.000000000 +0200
@@ -303,9 +303,9 @@ source "drivers/net/wan/Kconfig"
source "drivers/net/ieee802154/Kconfig"
@@ -2484,8 +2484,8 @@ Acked-by: jbeulich@novell.com
select XEN_XENBUS_FRONTEND
default y
help
---- head.orig/drivers/net/Makefile 2012-12-18 11:38:26.000000000 +0100
-+++ head/drivers/net/Makefile 2012-10-23 14:49:15.000000000 +0200
+--- 12.3.orig/drivers/net/Makefile 2013-02-05 10:40:06.000000000 +0100
++++ 12.3/drivers/net/Makefile 2012-10-23 14:49:15.000000000 +0200
@@ -57,7 +57,7 @@ obj-$(CONFIG_WIMAX) += wimax/
obj-$(CONFIG_IEEE802154) += ieee802154/
@@ -2495,8 +2495,8 @@ Acked-by: jbeulich@novell.com
obj-$(CONFIG_XEN_NETDEV_BACKEND) += xen-netback/
obj-$(CONFIG_USB_CATC) += usb/
---- head.orig/drivers/xen/Kconfig 2012-10-04 11:50:42.000000000 +0200
-+++ head/drivers/xen/Kconfig 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/drivers/xen/Kconfig 2012-10-04 11:50:42.000000000 +0200
++++ 12.3/drivers/xen/Kconfig 2011-01-31 17:49:31.000000000 +0100
@@ -23,6 +23,9 @@ config XEN_PRIVILEGED_GUEST
config XEN_UNPRIVILEGED_GUEST
def_bool !XEN_PRIVILEGED_GUEST
@@ -2507,8 +2507,8 @@ Acked-by: jbeulich@novell.com
config XEN_PRIVCMD
def_bool y
---- head.orig/drivers/xen/Makefile 2011-10-19 10:32:29.000000000 +0200
-+++ head/drivers/xen/Makefile 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/drivers/xen/Makefile 2011-10-19 10:32:29.000000000 +0200
++++ 12.3/drivers/xen/Makefile 2011-01-31 17:49:31.000000000 +0100
@@ -1,10 +1,14 @@
-obj-y += core/
-obj-y += console/
@@ -2530,8 +2530,8 @@ Acked-by: jbeulich@novell.com
obj-$(CONFIG_XEN_BALLOON) += balloon/
obj-$(CONFIG_XEN_BLKDEV_BACKEND) += blkback/
obj-$(CONFIG_XEN_BLKDEV_TAP) += blktap/
---- head.orig/drivers/xen/balloon/balloon.c 2012-06-06 13:48:56.000000000 +0200
-+++ head/drivers/xen/balloon/balloon.c 2012-06-06 13:52:53.000000000 +0200
+--- 12.3.orig/drivers/xen/balloon/balloon.c 2012-06-06 13:48:56.000000000 +0200
++++ 12.3/drivers/xen/balloon/balloon.c 2012-06-06 13:52:53.000000000 +0200
@@ -317,13 +317,9 @@ static int increase_reservation(unsigned
#ifndef MODULE
@@ -2546,8 +2546,8 @@ Acked-by: jbeulich@novell.com
vm_total_pages = nr_free_pagecache_pages();
#endif
---- head.orig/drivers/xen/blkback/blkback.c 2012-03-26 12:21:29.000000000 +0200
-+++ head/drivers/xen/blkback/blkback.c 2012-03-26 12:21:55.000000000 +0200
+--- 12.3.orig/drivers/xen/blkback/blkback.c 2012-03-26 12:21:29.000000000 +0200
++++ 12.3/drivers/xen/blkback/blkback.c 2012-03-26 12:21:55.000000000 +0200
@@ -157,7 +157,7 @@ static void unplug_queue(blkif_t *blkif)
static void plug_queue(blkif_t *blkif, struct block_device *bdev)
@@ -2557,8 +2557,8 @@ Acked-by: jbeulich@novell.com
if (q == blkif->plug)
return;
---- head.orig/drivers/xen/blkback/common.h 2012-06-06 13:46:49.000000000 +0200
-+++ head/drivers/xen/blkback/common.h 2012-06-06 13:52:57.000000000 +0200
+--- 12.3.orig/drivers/xen/blkback/common.h 2012-06-06 13:46:49.000000000 +0200
++++ 12.3/drivers/xen/blkback/common.h 2012-06-06 13:52:57.000000000 +0200
@@ -35,7 +35,6 @@
#include <asm/hypervisor.h>
#include <xen/barrier.h>
@@ -2576,8 +2576,8 @@ Acked-by: jbeulich@novell.com
/* statistics */
unsigned long st_print;
---- head.orig/drivers/xen/blkback/interface.c 2011-04-11 14:29:25.000000000 +0200
-+++ head/drivers/xen/blkback/interface.c 2012-04-04 10:14:31.000000000 +0200
+--- 12.3.orig/drivers/xen/blkback/interface.c 2011-04-11 14:29:25.000000000 +0200
++++ 12.3/drivers/xen/blkback/interface.c 2012-04-04 10:14:31.000000000 +0200
@@ -133,5 +133,5 @@ void blkif_free(blkif_t *blkif)
void __init blkif_interface_init(void)
{
@@ -2585,8 +2585,8 @@ Acked-by: jbeulich@novell.com
- 0, 0, NULL, NULL);
+ 0, 0, NULL);
}
---- head.orig/drivers/xen/blkback/xenbus.c 2012-12-18 10:47:37.000000000 +0100
-+++ head/drivers/xen/blkback/xenbus.c 2012-12-18 11:59:09.000000000 +0100
+--- 12.3.orig/drivers/xen/blkback/xenbus.c 2012-12-18 10:47:37.000000000 +0100
++++ 12.3/drivers/xen/blkback/xenbus.c 2012-12-18 11:59:09.000000000 +0100
@@ -27,8 +27,6 @@
pr_debug("blkback/xenbus (%s:%d) " fmt ".\n", \
__FUNCTION__, __LINE__, ##args)
@@ -2623,8 +2623,8 @@ Acked-by: jbeulich@novell.com
return 0;
}
---- head.orig/drivers/xen/blkfront/blkfront.c 2012-03-12 13:33:33.000000000 +0100
-+++ head/drivers/xen/blkfront/blkfront.c 2012-10-04 11:53:51.000000000 +0200
+--- 12.3.orig/drivers/xen/blkfront/blkfront.c 2012-03-12 13:33:33.000000000 +0100
++++ 12.3/drivers/xen/blkfront/blkfront.c 2012-10-04 11:53:51.000000000 +0200
@@ -603,14 +603,20 @@ int blkif_ioctl(struct inode *inode, str
return -EINVAL;
@@ -2656,8 +2656,8 @@ Acked-by: jbeulich@novell.com
{
struct blkfront_info *info = NULL;
struct request *req;
---- head.orig/drivers/xen/blkfront/block.h 2012-06-06 13:16:59.000000000 +0200
-+++ head/drivers/xen/blkfront/block.h 2012-06-06 13:53:02.000000000 +0200
+--- 12.3.orig/drivers/xen/blkfront/block.h 2012-06-06 13:16:59.000000000 +0200
++++ 12.3/drivers/xen/blkfront/block.h 2012-06-06 13:53:02.000000000 +0200
@@ -101,7 +101,7 @@ struct blkfront_info
struct scatterlist sg[BLKIF_MAX_SEGMENTS_PER_REQUEST];
unsigned int irq;
@@ -2676,8 +2676,8 @@ Acked-by: jbeulich@novell.com
/* Virtual block-device subsystem. */
/* Note that xlvbd_add doesn't call add_disk for you: you're expected
---- head.orig/drivers/xen/blkfront/vbd.c 2012-03-12 12:51:05.000000000 +0100
-+++ head/drivers/xen/blkfront/vbd.c 2012-03-12 13:38:18.000000000 +0100
+--- 12.3.orig/drivers/xen/blkfront/vbd.c 2012-03-12 12:51:05.000000000 +0100
++++ 12.3/drivers/xen/blkfront/vbd.c 2012-03-12 13:38:18.000000000 +0100
@@ -357,7 +357,7 @@ static int
xlvbd_init_blk_queue(struct gendisk *gd, u16 sector_size,
struct blkfront_info *info)
@@ -2687,8 +2687,8 @@ Acked-by: jbeulich@novell.com
rq = blk_init_queue(do_blkif_request, &info->io_lock);
if (rq == NULL)
---- head.orig/drivers/xen/blktap/common.h 2012-06-06 13:46:52.000000000 +0200
-+++ head/drivers/xen/blktap/common.h 2012-06-06 13:53:10.000000000 +0200
+--- 12.3.orig/drivers/xen/blktap/common.h 2013-02-05 10:46:26.000000000 +0100
++++ 12.3/drivers/xen/blktap/common.h 2013-02-05 10:47:33.000000000 +0100
@@ -34,7 +34,6 @@
#include <asm/hypervisor.h>
#include <xen/barrier.h>
@@ -2697,7 +2697,7 @@ Acked-by: jbeulich@novell.com
#include <xen/xenbus.h>
#include <xen/interface/event_channel.h>
-@@ -64,7 +63,7 @@ typedef struct blkif_st {
+@@ -66,7 +65,7 @@ typedef struct blkif_st {
wait_queue_head_t wq;
struct task_struct *xenblkd;
unsigned int waiting_reqs;
@@ -2706,8 +2706,8 @@ Acked-by: jbeulich@novell.com
/* statistics */
unsigned long st_print;
---- head.orig/drivers/xen/blktap/interface.c 2011-04-11 14:29:39.000000000 +0200
-+++ head/drivers/xen/blktap/interface.c 2012-04-04 10:14:34.000000000 +0200
+--- 12.3.orig/drivers/xen/blktap/interface.c 2011-04-11 14:29:39.000000000 +0200
++++ 12.3/drivers/xen/blktap/interface.c 2012-04-04 10:14:34.000000000 +0200
@@ -129,5 +129,5 @@ void tap_blkif_kmem_cache_free(blkif_t *
void __init tap_blkif_interface_init(void)
{
@@ -2715,8 +2715,8 @@ Acked-by: jbeulich@novell.com
- 0, 0, NULL, NULL);
+ 0, 0, NULL);
}
---- head.orig/drivers/xen/blktap/xenbus.c 2012-04-04 08:57:09.000000000 +0200
-+++ head/drivers/xen/blktap/xenbus.c 2012-02-16 12:30:42.000000000 +0100
+--- 12.3.orig/drivers/xen/blktap/xenbus.c 2012-04-04 08:57:09.000000000 +0200
++++ 12.3/drivers/xen/blktap/xenbus.c 2012-02-16 12:30:42.000000000 +0100
@@ -50,8 +50,6 @@ struct backend_info
int group_added;
};
@@ -2753,8 +2753,8 @@ Acked-by: jbeulich@novell.com
return 0;
}
---- head.orig/drivers/xen/blktap2/blktap.h 2012-06-06 13:16:59.000000000 +0200
-+++ head/drivers/xen/blktap2/blktap.h 2012-06-06 13:53:14.000000000 +0200
+--- 12.3.orig/drivers/xen/blktap2/blktap.h 2012-06-06 13:16:59.000000000 +0200
++++ 12.3/drivers/xen/blktap2/blktap.h 2012-06-06 13:53:14.000000000 +0200
@@ -204,6 +204,7 @@ blktap_validate_params(struct blktap *ta
}
@@ -2763,8 +2763,8 @@ Acked-by: jbeulich@novell.com
int blktap_ring_init(int *);
int blktap_ring_free(void);
---- head.orig/drivers/xen/blktap2/control.c 2011-04-11 13:43:15.000000000 +0200
-+++ head/drivers/xen/blktap2/control.c 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/drivers/xen/blktap2/control.c 2011-04-11 13:43:15.000000000 +0200
++++ 12.3/drivers/xen/blktap2/control.c 2011-01-31 17:49:31.000000000 +0100
@@ -194,14 +194,20 @@ blktap_control_destroy_device(struct blk
clear_bit(BLKTAP_SHUTDOWN_REQUESTED, &tap->dev_inuse);
@@ -2789,8 +2789,8 @@ Acked-by: jbeulich@novell.com
static int __init
blktap_control_init(void)
{
---- head.orig/drivers/xen/blktap2/device.c 2012-02-16 11:09:01.000000000 +0100
-+++ head/drivers/xen/blktap2/device.c 2012-02-16 12:30:32.000000000 +0100
+--- 12.3.orig/drivers/xen/blktap2/device.c 2012-02-16 11:09:01.000000000 +0100
++++ 12.3/drivers/xen/blktap2/device.c 2012-02-16 12:30:32.000000000 +0100
@@ -811,7 +811,7 @@ static void
blktap_device_run_queue(struct blktap *tap)
{
@@ -2817,8 +2817,8 @@ Acked-by: jbeulich@novell.com
- BTERR("blktap device unregister failed\n");
+ unregister_blkdev(blktap_device_major, "tapdev");
}
---- head.orig/drivers/xen/blktap2/sysfs.c 2011-01-31 17:29:16.000000000 +0100
-+++ head/drivers/xen/blktap2/sysfs.c 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/drivers/xen/blktap2/sysfs.c 2011-01-31 17:29:16.000000000 +0100
++++ 12.3/drivers/xen/blktap2/sysfs.c 2011-01-31 17:49:31.000000000 +0100
@@ -334,6 +334,24 @@ blktap_sysfs_create(struct blktap *tap)
return err;
}
@@ -2863,8 +2863,8 @@ Acked-by: jbeulich@novell.com
}
static ssize_t
---- head.orig/drivers/xen/core/gnttab.c 2012-10-18 12:21:44.000000000 +0200
-+++ head/drivers/xen/core/gnttab.c 2012-03-12 13:38:38.000000000 +0100
+--- 12.3.orig/drivers/xen/core/gnttab.c 2012-10-18 12:21:44.000000000 +0200
++++ 12.3/drivers/xen/core/gnttab.c 2012-03-12 13:38:38.000000000 +0100
@@ -43,7 +43,6 @@
#include <asm/system.h>
#include <asm/io.h>
@@ -2873,8 +2873,8 @@ Acked-by: jbeulich@novell.com
#include <asm/gnttab_dma.h>
#ifdef HAVE_XEN_PLATFORM_COMPAT_H
---- head.orig/drivers/xen/core/reboot.c 2011-01-31 17:32:16.000000000 +0100
-+++ head/drivers/xen/core/reboot.c 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/drivers/xen/core/reboot.c 2011-01-31 17:32:16.000000000 +0100
++++ 12.3/drivers/xen/core/reboot.c 2011-01-31 17:49:31.000000000 +0100
@@ -3,6 +3,7 @@
#include <linux/unistd.h>
#include <linux/module.h>
@@ -2883,8 +2883,8 @@ Acked-by: jbeulich@novell.com
#include <linux/sysrq.h>
#include <asm/hypervisor.h>
#include <xen/xenbus.h>
---- head.orig/drivers/xen/core/xen_proc.c 2011-04-11 13:43:15.000000000 +0200
-+++ head/drivers/xen/core/xen_proc.c 2011-04-01 13:07:57.000000000 +0200
+--- 12.3.orig/drivers/xen/core/xen_proc.c 2011-04-11 13:43:15.000000000 +0200
++++ 12.3/drivers/xen/core/xen_proc.c 2011-04-01 13:07:57.000000000 +0200
@@ -1,11 +1,15 @@
-
+#include <linux/init.h>
@@ -2912,8 +2912,8 @@ Acked-by: jbeulich@novell.com
void remove_xen_proc_entry(const char *name)
{
---- head.orig/drivers/xen/netback/common.h 2012-06-06 13:49:42.000000000 +0200
-+++ head/drivers/xen/netback/common.h 2012-06-06 13:53:20.000000000 +0200
+--- 12.3.orig/drivers/xen/netback/common.h 2013-01-25 14:06:29.000000000 +0100
++++ 12.3/drivers/xen/netback/common.h 2012-06-06 13:53:20.000000000 +0200
@@ -39,7 +39,6 @@
#include <linux/wait.h>
#include <xen/interface/io/netif.h>
@@ -2922,8 +2922,8 @@ Acked-by: jbeulich@novell.com
#include <xen/xenbus.h>
#include <xen/interface/event_channel.h>
---- head.orig/drivers/xen/scsiback/common.h 2012-06-06 13:48:05.000000000 +0200
-+++ head/drivers/xen/scsiback/common.h 2012-06-06 13:53:26.000000000 +0200
+--- 12.3.orig/drivers/xen/scsiback/common.h 2012-06-06 13:48:05.000000000 +0200
++++ 12.3/drivers/xen/scsiback/common.h 2012-06-06 13:53:26.000000000 +0200
@@ -48,7 +48,6 @@
#include <scsi/scsi_eh.h>
#include <asm/hypervisor.h>
@@ -2932,8 +2932,8 @@ Acked-by: jbeulich@novell.com
#include <xen/xenbus.h>
#include <xen/interface/io/ring.h>
#include <xen/interface/io/vscsiif.h>
---- head.orig/drivers/xen/scsiback/interface.c 2011-04-11 14:30:02.000000000 +0200
-+++ head/drivers/xen/scsiback/interface.c 2011-04-11 14:52:22.000000000 +0200
+--- 12.3.orig/drivers/xen/scsiback/interface.c 2011-04-11 14:30:02.000000000 +0200
++++ 12.3/drivers/xen/scsiback/interface.c 2011-04-11 14:52:22.000000000 +0200
@@ -126,7 +126,7 @@ void scsiback_free(struct vscsibk_info *
int __init scsiback_interface_init(void)
{
@@ -2943,8 +2943,8 @@ Acked-by: jbeulich@novell.com
if (!scsiback_cachep) {
printk(KERN_ERR "scsiback: can't init scsi cache\n");
return -ENOMEM;
---- head.orig/drivers/xen/scsifront/scsifront.c 2012-12-06 16:05:56.000000000 +0100
-+++ head/drivers/xen/scsifront/scsifront.c 2012-12-06 16:07:02.000000000 +0100
+--- 12.3.orig/drivers/xen/scsifront/scsifront.c 2012-12-06 16:05:56.000000000 +0100
++++ 12.3/drivers/xen/scsifront/scsifront.c 2012-12-06 16:07:02.000000000 +0100
@@ -146,7 +146,7 @@ static void scsifront_cdb_cmd_done(struc
add_id_to_freelist(info, id);
@@ -2974,8 +2974,8 @@ Acked-by: jbeulich@novell.com
vscsiif_request_t *ring_req;
uint16_t rqid;
---- head.orig/drivers/xen/sfc_netback/accel_solarflare.c 2011-01-31 17:32:29.000000000 +0100
-+++ head/drivers/xen/sfc_netback/accel_solarflare.c 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/drivers/xen/sfc_netback/accel_solarflare.c 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/drivers/xen/sfc_netback/accel_solarflare.c 2011-01-31 17:49:31.000000000 +0100
@@ -37,7 +37,6 @@
#include "ci/efhw/public.h"
@@ -2984,8 +2984,8 @@ Acked-by: jbeulich@novell.com
#include <linux/list.h>
#include <linux/mutex.h>
---- head.orig/drivers/xen/sfc_netutil/accel_util.c 2010-09-23 15:39:04.000000000 +0200
-+++ head/drivers/xen/sfc_netutil/accel_util.c 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/drivers/xen/sfc_netutil/accel_util.c 2010-09-23 15:39:04.000000000 +0200
++++ 12.3/drivers/xen/sfc_netutil/accel_util.c 2011-01-31 17:49:31.000000000 +0100
@@ -28,7 +28,6 @@
#include <asm/pgtable.h>
#include <asm/hypercall.h>
@@ -2994,8 +2994,8 @@ Acked-by: jbeulich@novell.com
#include <xen/gnttab.h>
#include "accel_util.h"
---- head.orig/drivers/xen/tpmback/common.h 2011-11-28 09:46:47.000000000 +0100
-+++ head/drivers/xen/tpmback/common.h 2011-11-28 09:47:23.000000000 +0100
+--- 12.3.orig/drivers/xen/tpmback/common.h 2011-11-28 09:46:47.000000000 +0100
++++ 12.3/drivers/xen/tpmback/common.h 2011-11-28 09:47:23.000000000 +0100
@@ -9,7 +9,6 @@
#include <linux/interrupt.h>
#include <linux/mm.h>
@@ -3004,8 +3004,8 @@ Acked-by: jbeulich@novell.com
#include <xen/xenbus.h>
#include <xen/interface/event_channel.h>
#include <xen/interface/io/tpmif.h>
---- head.orig/drivers/xen/tpmback/interface.c 2011-04-11 14:31:42.000000000 +0200
-+++ head/drivers/xen/tpmback/interface.c 2011-04-11 14:52:30.000000000 +0200
+--- 12.3.orig/drivers/xen/tpmback/interface.c 2011-04-11 14:31:42.000000000 +0200
++++ 12.3/drivers/xen/tpmback/interface.c 2011-04-11 14:52:30.000000000 +0200
@@ -13,6 +13,7 @@
#include "common.h"
@@ -3023,8 +3023,8 @@ Acked-by: jbeulich@novell.com
return tpmif_cachep ? 0 : -ENOMEM;
}
---- head.orig/drivers/xen/usbback/usbback.h 2012-06-06 13:48:22.000000000 +0200
-+++ head/drivers/xen/usbback/usbback.h 2012-06-06 13:53:31.000000000 +0200
+--- 12.3.orig/drivers/xen/usbback/usbback.h 2012-06-06 13:48:22.000000000 +0200
++++ 12.3/drivers/xen/usbback/usbback.h 2012-06-06 13:53:31.000000000 +0200
@@ -55,7 +55,6 @@
#include <linux/list.h>
#include <linux/kref.h>
@@ -3033,8 +3033,8 @@ Acked-by: jbeulich@novell.com
#include <xen/xenbus.h>
#include <xen/interface/event_channel.h>
#include <xen/interface/io/usbif.h>
---- head.orig/drivers/xen/usbfront/xenbus.c 2012-03-12 13:33:24.000000000 +0100
-+++ head/drivers/xen/usbfront/xenbus.c 2012-10-04 11:53:32.000000000 +0200
+--- 12.3.orig/drivers/xen/usbfront/xenbus.c 2012-03-12 13:33:24.000000000 +0100
++++ 12.3/drivers/xen/usbfront/xenbus.c 2012-10-04 11:53:32.000000000 +0200
@@ -392,7 +392,7 @@ static int __init usbfront_init(void)
return -ENODEV;
@@ -3044,8 +3044,8 @@ Acked-by: jbeulich@novell.com
if (!xenhcd_urbp_cachep) {
printk(KERN_ERR "usbfront failed to create kmem cache\n");
return -ENOMEM;
---- head.orig/drivers/xen/util.c 2007-07-10 09:42:30.000000000 +0200
-+++ head/drivers/xen/util.c 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/drivers/xen/util.c 2007-07-10 09:42:30.000000000 +0200
++++ 12.3/drivers/xen/util.c 2011-01-31 17:49:31.000000000 +0100
@@ -1,8 +1,5 @@
-#include <linux/mm.h>
+#include <linux/err.h>
@@ -3102,8 +3102,8 @@ Acked-by: jbeulich@novell.com
-}
-EXPORT_SYMBOL_GPL(free_vm_area);
-#endif /* CONFIG_X86 */
---- head.orig/drivers/xen/xenbus/xenbus_backend_client.c 2011-04-11 13:43:15.000000000 +0200
-+++ head/drivers/xen/xenbus/xenbus_backend_client.c 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/drivers/xen/xenbus/xenbus_backend_client.c 2011-04-11 13:43:15.000000000 +0200
++++ 12.3/drivers/xen/xenbus/xenbus_backend_client.c 2011-01-31 17:49:31.000000000 +0100
@@ -32,9 +32,9 @@
#include <linux/err.h>
@@ -3115,8 +3115,8 @@ Acked-by: jbeulich@novell.com
/* Based on Rusty Russell's skeleton driver's map_page */
struct vm_struct *xenbus_map_ring_valloc(struct xenbus_device *dev, grant_ref_t gnt_ref)
---- head.orig/drivers/xen/xenbus/xenbus_client.c 2011-11-28 09:44:25.000000000 +0100
-+++ head/drivers/xen/xenbus/xenbus_client.c 2011-06-30 16:10:27.000000000 +0200
+--- 12.3.orig/drivers/xen/xenbus/xenbus_client.c 2011-11-28 09:44:25.000000000 +0100
++++ 12.3/drivers/xen/xenbus/xenbus_client.c 2011-06-30 16:10:27.000000000 +0200
@@ -30,19 +30,25 @@
* IN THE SOFTWARE.
*/
@@ -3562,8 +3562,8 @@ Acked-by: jbeulich@novell.com
enum xenbus_state xenbus_read_driver_state(const char *path)
{
int result;
---- head.orig/drivers/xen/xenbus/xenbus_comms.c 2011-01-31 17:32:16.000000000 +0100
-+++ head/drivers/xen/xenbus/xenbus_comms.c 2011-04-11 14:52:53.000000000 +0200
+--- 12.3.orig/drivers/xen/xenbus/xenbus_comms.c 2011-01-31 17:32:16.000000000 +0100
++++ 12.3/drivers/xen/xenbus/xenbus_comms.c 2011-04-11 14:52:53.000000000 +0200
@@ -34,12 +34,15 @@
#include <linux/interrupt.h>
#include <linux/sched.h>
@@ -3629,8 +3629,8 @@ Acked-by: jbeulich@novell.com
xen_store_evtchn, wake_waiting,
0, "xenbus", &xb_waitq);
if (err <= 0) {
---- head.orig/drivers/xen/xenbus/xenbus_dev.c 2012-10-31 10:29:18.000000000 +0100
-+++ head/drivers/xen/xenbus/xenbus_dev.c 2012-02-16 12:30:22.000000000 +0100
+--- 12.3.orig/drivers/xen/xenbus/xenbus_dev.c 2012-10-31 10:29:18.000000000 +0100
++++ 12.3/drivers/xen/xenbus/xenbus_dev.c 2012-02-16 12:30:22.000000000 +0100
@@ -493,7 +493,13 @@ static const struct file_operations xenb
#endif
};
@@ -3646,8 +3646,8 @@ Acked-by: jbeulich@novell.com
{
xenbus_dev_intf = create_xen_proc_entry("xenbus", 0400);
if (xenbus_dev_intf)
---- head.orig/drivers/xen/xenbus/xenbus_probe.c 2012-03-12 13:31:47.000000000 +0100
-+++ head/drivers/xen/xenbus/xenbus_probe.c 2012-03-12 13:39:04.000000000 +0100
+--- 12.3.orig/drivers/xen/xenbus/xenbus_probe.c 2012-03-12 13:31:47.000000000 +0100
++++ 12.3/drivers/xen/xenbus/xenbus_probe.c 2012-03-12 13:39:04.000000000 +0100
@@ -43,21 +43,26 @@
#include <linux/mm.h>
#include <linux/notifier.h>
@@ -3947,8 +3947,8 @@ Acked-by: jbeulich@novell.com
{
return xenbus_probe_init();
}
---- head.orig/drivers/xen/xenbus/xenbus_probe.h 2011-09-07 15:18:14.000000000 +0200
-+++ head/drivers/xen/xenbus/xenbus_probe.h 2011-12-21 10:50:52.000000000 +0100
+--- 12.3.orig/drivers/xen/xenbus/xenbus_probe.h 2011-09-07 15:18:14.000000000 +0200
++++ 12.3/drivers/xen/xenbus/xenbus_probe.h 2011-12-21 10:50:52.000000000 +0100
@@ -61,7 +61,9 @@ struct xen_bus_type {
int (*get_bus_id)(char bus_id[XEN_BUS_ID_SIZE], const char *nodename);
int (*probe)(const char *type, const char *dir);
@@ -3967,8 +3967,8 @@ Acked-by: jbeulich@novell.com
+extern void xenbus_dev_changed(const char *node, struct xen_bus_type *bus);
#endif
---- head.orig/drivers/xen/xenbus/xenbus_probe_backend.c 2011-09-07 15:18:19.000000000 +0200
-+++ head/drivers/xen/xenbus/xenbus_probe_backend.c 2011-12-21 10:51:23.000000000 +0100
+--- 12.3.orig/drivers/xen/xenbus/xenbus_probe_backend.c 2011-09-07 15:18:19.000000000 +0200
++++ 12.3/drivers/xen/xenbus/xenbus_probe_backend.c 2011-12-21 10:51:23.000000000 +0100
@@ -234,7 +234,7 @@ static void backend_changed(struct xenbu
{
DPRINTK("");
@@ -3978,8 +3978,8 @@ Acked-by: jbeulich@novell.com
}
static struct xenbus_watch be_watch = {
---- head.orig/drivers/xen/xenbus/xenbus_xs.c 2011-06-30 16:06:45.000000000 +0200
-+++ head/drivers/xen/xenbus/xenbus_xs.c 2012-01-20 14:47:34.000000000 +0100
+--- 12.3.orig/drivers/xen/xenbus/xenbus_xs.c 2011-06-30 16:06:45.000000000 +0200
++++ 12.3/drivers/xen/xenbus/xenbus_xs.c 2012-01-20 14:47:34.000000000 +0100
@@ -626,7 +626,7 @@ static struct xenbus_watch *find_watch(c
static void xs_reset_watches(void)
@@ -4064,8 +4064,8 @@ Acked-by: jbeulich@novell.com
}
return 0;
---- head.orig/drivers/xen/xenoprof/xenoprofile.c 2012-02-16 12:29:42.000000000 +0100
-+++ head/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/drivers/xen/xenoprof/xenoprofile.c 2012-02-16 12:29:42.000000000 +0100
++++ 12.3/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 17:49:31.000000000 +0100
@@ -26,7 +26,6 @@
#include <asm/pgtable.h>
#include <xen/evtchn.h>
@@ -4074,8 +4074,8 @@ Acked-by: jbeulich@novell.com
#include <xen/interface/xen.h>
#include <xen/interface/xenoprof.h>
#include "../../../drivers/oprofile/cpu_buffer.h"
---- head.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:49:31.000000000 +0100
@@ -53,6 +53,8 @@ extern unsigned long __FIXADDR_TOP;
enum fixed_addresses {
FIX_HOLE,
@@ -4085,8 +4085,8 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_X86_LOCAL_APIC
FIX_APIC_BASE, /* local (CPU) APIC) -- required for SMP or not */
#endif
---- head.orig/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 17:49:31.000000000 +0100
@@ -75,8 +75,7 @@ struct page *kmap_atomic_to_page(void *p
#define kmap_atomic_pte(page, type) \
@@ -4097,8 +4097,8 @@ Acked-by: jbeulich@novell.com
#define flush_cache_kmaps() do { } while (0)
---- head.orig/arch/x86/include/mach-xen/asm/maddr_32.h 2011-08-08 12:54:10.000000000 +0200
-+++ head/arch/x86/include/mach-xen/asm/maddr_32.h 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/maddr_32.h 2011-08-08 12:54:10.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/maddr_32.h 2011-01-31 17:49:31.000000000 +0100
@@ -155,6 +155,7 @@ static inline paddr_t pte_machine_to_phy
#ifdef CONFIG_X86_PAE
@@ -4107,8 +4107,8 @@ Acked-by: jbeulich@novell.com
static inline pte_t pfn_pte_ma(unsigned long page_nr, pgprot_t pgprot)
{
pte_t pte;
---- head.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:49:31.000000000 +0100
@@ -16,7 +16,7 @@ void mm_pin_all(void);
static inline void xen_activate_mm(struct mm_struct *prev,
struct mm_struct *next)
@@ -4136,8 +4136,8 @@ Acked-by: jbeulich@novell.com
/* stop flush ipis for the previous mm */
cpu_clear(cpu, prev->cpu_vm_mask);
---- head.orig/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 17:49:31.000000000 +0100
@@ -5,7 +5,7 @@
#include <linux/mm.h> /* for struct page */
#include <asm/io.h> /* for phys_to_virt and page_to_pseudophys */
@@ -4166,8 +4166,8 @@ Acked-by: jbeulich@novell.com
if (!PageHighMem(pte)) \
BUG_ON(HYPERVISOR_update_va_mapping( \
(unsigned long)__va(pfn << PAGE_SHIFT), \
---- head.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:38:07.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:38:23.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:38:07.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:38:23.000000000 +0100
@@ -26,9 +26,6 @@
#include <linux/spinlock.h>
#include <linux/sched.h>
@@ -4299,8 +4299,8 @@ Acked-by: jbeulich@novell.com
xen_l1_entry_update(ptep, __pte(0)); \
else \
*(ptep) = __pte(0); \
---- head.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:49:31.000000000 +0100
@@ -23,26 +23,11 @@
#define pud_present(pud) 1
@@ -4329,8 +4329,8 @@ Acked-by: jbeulich@novell.com
}
/* Rules for using set_pte: the pte being assigned *must* be
---- head.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:49:31.000000000 +0100
@@ -89,7 +89,6 @@ struct cpuinfo_x86 {
#define X86_VENDOR_UMC 3
#define X86_VENDOR_NEXGEN 4
@@ -4376,8 +4376,8 @@ Acked-by: jbeulich@novell.com
/*
* Size of io_bitmap.
*/
---- head.orig/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:49:31.000000000 +0100
@@ -91,7 +91,11 @@ struct tlb_state
DECLARE_PER_CPU(struct tlb_state, cpu_tlbstate);
#endif /* SMP */
@@ -4391,8 +4391,8 @@ Acked-by: jbeulich@novell.com
static inline void flush_tlb_pgtables(struct mm_struct *mm,
unsigned long start, unsigned long end)
---- head.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:49:31.000000000 +0100
@@ -23,9 +23,9 @@
* compile time, but to set the physical address only
* in the boot process.
@@ -4424,8 +4424,8 @@ Acked-by: jbeulich@novell.com
}
#endif
---- head.orig/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 17:49:31.000000000 +0100
@@ -76,7 +76,7 @@ static inline void switch_mm(struct mm_s
if (likely(prev != next)) {
@@ -4444,8 +4444,8 @@ Acked-by: jbeulich@novell.com
mm_pin(next);
switch_mm(prev, next, NULL);
}
---- head.orig/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 17:49:31.000000000 +0100
@@ -21,7 +21,7 @@ static inline void pmd_populate_kernel(s
static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, struct page *pte)
@@ -4473,8 +4473,8 @@ Acked-by: jbeulich@novell.com
BUG_ON(HYPERVISOR_update_va_mapping(
(unsigned long)pud,
pfn_pte(virt_to_phys(pud)>>PAGE_SHIFT,
---- head.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-02-07 15:38:08.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-02-07 15:38:18.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-02-07 15:38:08.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-02-07 15:38:18.000000000 +0100
@@ -304,7 +304,7 @@ static inline pte_t ptep_get_and_clear_f
{
if (full) {
@@ -4565,8 +4565,8 @@ Acked-by: jbeulich@novell.com
#define __HAVE_ARCH_PTEP_GET_AND_CLEAR
#define __HAVE_ARCH_PTEP_GET_AND_CLEAR_FULL
#define __HAVE_ARCH_PTEP_CLEAR_FLUSH
---- head.orig/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:49:31.000000000 +0100
@@ -83,7 +83,6 @@ struct cpuinfo_x86 {
#define X86_VENDOR_UMC 3
#define X86_VENDOR_NEXGEN 4
@@ -4615,8 +4615,8 @@ Acked-by: jbeulich@novell.com
static inline void serialize_cpu(void)
{
__asm__ __volatile__ ("cpuid" : : : "ax", "bx", "cx", "dx");
---- head.orig/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:49:31.000000000 +0100
@@ -89,7 +89,11 @@ static inline void flush_tlb_range(struc
#endif
@@ -4630,8 +4630,8 @@ Acked-by: jbeulich@novell.com
static inline void flush_tlb_pgtables(struct mm_struct *mm,
unsigned long start, unsigned long end)
---- head.orig/arch/x86/include/asm/thread_info.h 2012-10-23 14:39:36.000000000 +0200
-+++ head/arch/x86/include/asm/thread_info.h 2012-10-23 14:48:40.000000000 +0200
+--- 12.3.orig/arch/x86/include/asm/thread_info.h 2012-10-23 14:39:36.000000000 +0200
++++ 12.3/arch/x86/include/asm/thread_info.h 2012-10-23 14:48:40.000000000 +0200
@@ -158,7 +158,8 @@ struct thread_info {
#define _TIF_WORK_CTXSW_PREV (_TIF_WORK_CTXSW|_TIF_USER_RETURN_NOTIFY)
#define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW|_TIF_DEBUG)
@@ -4642,8 +4642,8 @@ Acked-by: jbeulich@novell.com
#endif
#define PREEMPT_ACTIVE 0x10000000
---- head.orig/arch/x86/include/asm/xen/interface.h 2012-12-18 11:38:26.000000000 +0100
-+++ head/arch/x86/include/asm/xen/interface.h 2012-10-31 11:04:30.000000000 +0100
+--- 12.3.orig/arch/x86/include/asm/xen/interface.h 2013-02-05 10:40:06.000000000 +0100
++++ 12.3/arch/x86/include/asm/xen/interface.h 2012-10-31 11:04:30.000000000 +0100
@@ -10,17 +10,20 @@
#define _ASM_X86_XEN_INTERFACE_H
@@ -4695,8 +4695,8 @@ Acked-by: jbeulich@novell.com
/*
* SEGMENT DESCRIPTOR TABLES
---- head.orig/include/linux/elfnote.h 2012-12-18 11:38:26.000000000 +0100
-+++ head/include/linux/elfnote.h 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/include/linux/elfnote.h 2013-02-05 10:40:06.000000000 +0100
++++ 12.3/include/linux/elfnote.h 2011-01-31 17:49:31.000000000 +0100
@@ -52,7 +52,7 @@
4484:.balign 4 ; \
.popsection ;
@@ -4706,8 +4706,8 @@ Acked-by: jbeulich@novell.com
ELFNOTE_START(name, type, "") \
desc ; \
ELFNOTE_END
---- head.orig/include/linux/page-flags.h 2012-08-20 10:33:16.000000000 +0200
-+++ head/include/linux/page-flags.h 2012-08-20 10:37:47.000000000 +0200
+--- 12.3.orig/include/linux/page-flags.h 2012-08-20 10:33:16.000000000 +0200
++++ 12.3/include/linux/page-flags.h 2013-01-25 14:06:43.000000000 +0100
@@ -126,8 +126,15 @@ enum pageflags {
PG_fscache = PG_private_2, /* page backed by cache */
@@ -4724,7 +4724,7 @@ Acked-by: jbeulich@novell.com
/* SLOB */
PG_slob_free = PG_private,
-@@ -522,10 +529,8 @@ static inline void ClearPageSlabPfmemall
+@@ -528,10 +535,8 @@ static inline void ClearPageSlabPfmemall
#define __PG_COMPOUND_LOCK 0
#endif
@@ -4736,8 +4736,8 @@ Acked-by: jbeulich@novell.com
#else
# define __PG_XEN (1 << PG_foreign)
#endif
---- head.orig/include/xen/driver_util.h 2007-06-12 13:14:19.000000000 +0200
-+++ head/include/xen/driver_util.h 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/include/xen/driver_util.h 2007-06-12 13:14:19.000000000 +0200
++++ 12.3/include/xen/driver_util.h 2011-01-31 17:49:31.000000000 +0100
@@ -1,14 +1,8 @@
+#ifndef __XEN_DRIVER_UTIL_H__
+#define __XEN_DRIVER_UTIL_H__
@@ -4756,8 +4756,8 @@ Acked-by: jbeulich@novell.com
-#endif /* __ASM_XEN_DRIVER_UTIL_H__ */
+#endif /* __XEN_DRIVER_UTIL_H__ */
---- head.orig/include/xen/features.h 2012-12-18 11:38:26.000000000 +0100
-+++ head/include/xen/features.h 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/include/xen/features.h 2013-02-05 10:40:06.000000000 +0100
++++ 12.3/include/xen/features.h 2011-01-31 17:49:31.000000000 +0100
@@ -10,6 +10,7 @@
#define __XEN_FEATURES_H__
@@ -4772,8 +4772,8 @@ Acked-by: jbeulich@novell.com
-#endif /* __ASM_XEN_FEATURES_H__ */
+#endif /* __XEN_FEATURES_H__ */
---- head.orig/include/xen/interface/arch-x86/xen.h 2012-12-18 10:47:37.000000000 +0100
-+++ head/include/xen/interface/arch-x86/xen.h 2012-12-18 11:59:24.000000000 +0100
+--- 12.3.orig/include/xen/interface/arch-x86/xen.h 2012-12-18 10:47:37.000000000 +0100
++++ 12.3/include/xen/interface/arch-x86/xen.h 2012-12-18 11:59:24.000000000 +0100
@@ -59,6 +59,9 @@
#endif
#define set_xen_guest_handle(hnd, val) set_xen_guest_handle_raw(hnd, val)
@@ -4784,8 +4784,8 @@ Acked-by: jbeulich@novell.com
#if defined(__i386__)
#include "xen-x86_32.h"
#elif defined(__x86_64__)
---- head.orig/include/xen/interface/event_channel.h 2012-04-04 08:57:09.000000000 +0200
-+++ head/include/xen/interface/event_channel.h 2012-04-04 10:14:18.000000000 +0200
+--- 12.3.orig/include/xen/interface/event_channel.h 2012-04-04 08:57:09.000000000 +0200
++++ 12.3/include/xen/interface/event_channel.h 2012-04-04 10:14:18.000000000 +0200
@@ -278,6 +278,7 @@ struct evtchn_op {
struct evtchn_unmask unmask;
} u;
@@ -4794,8 +4794,8 @@ Acked-by: jbeulich@novell.com
typedef struct evtchn_op evtchn_op_t;
DEFINE_XEN_GUEST_HANDLE(evtchn_op_t);
---- head.orig/include/xen/interface/io/netif.h 2011-01-31 15:14:12.000000000 +0100
-+++ head/include/xen/interface/io/netif.h 2011-01-31 17:49:31.000000000 +0100
+--- 12.3.orig/include/xen/interface/io/netif.h 2011-01-31 15:14:12.000000000 +0100
++++ 12.3/include/xen/interface/io/netif.h 2011-01-31 17:49:31.000000000 +0100
@@ -187,8 +187,22 @@ typedef struct netif_rx_response netif_r
* Generate netif ring structures and types.
*/
@@ -4819,8 +4819,8 @@ Acked-by: jbeulich@novell.com
#define NETIF_RSP_DROPPED -2
#define NETIF_RSP_ERROR -1
---- head.orig/include/xen/interface/memory.h 2012-12-18 10:47:37.000000000 +0100
-+++ head/include/xen/interface/memory.h 2012-12-18 12:00:12.000000000 +0100
+--- 12.3.orig/include/xen/interface/memory.h 2012-12-18 10:47:37.000000000 +0100
++++ 12.3/include/xen/interface/memory.h 2012-12-18 12:00:12.000000000 +0100
@@ -94,6 +94,7 @@ struct xen_memory_reservation {
*/
domid_t domid;
@@ -4845,8 +4845,8 @@ Acked-by: jbeulich@novell.com
typedef struct xen_add_to_physmap xen_add_to_physmap_t;
DEFINE_XEN_GUEST_HANDLE(xen_add_to_physmap_t);
---- head.orig/include/xen/interface/sched.h 2012-12-18 10:47:37.000000000 +0100
-+++ head/include/xen/interface/sched.h 2012-12-18 12:00:51.000000000 +0100
+--- 12.3.orig/include/xen/interface/sched.h 2012-12-18 10:47:37.000000000 +0100
++++ 12.3/include/xen/interface/sched.h 2012-12-18 12:00:51.000000000 +0100
@@ -122,6 +122,7 @@
struct sched_shutdown {
unsigned int reason; /* SHUTDOWN_* => enum sched_shutdown_reason */
@@ -4863,8 +4863,8 @@ Acked-by: jbeulich@novell.com
typedef struct sched_poll sched_poll_t;
DEFINE_XEN_GUEST_HANDLE(sched_poll_t);
---- head.orig/include/xen/interface/version.h 2012-12-18 10:47:37.000000000 +0100
-+++ head/include/xen/interface/version.h 2012-12-18 12:00:21.000000000 +0100
+--- 12.3.orig/include/xen/interface/version.h 2012-12-18 10:47:37.000000000 +0100
++++ 12.3/include/xen/interface/version.h 2012-12-18 12:00:21.000000000 +0100
@@ -38,6 +38,9 @@
/* arg == xen_extraversion_t. */
#define XENVER_extraversion 1
@@ -4892,8 +4892,8 @@ Acked-by: jbeulich@novell.com
#define XEN_CHANGESET_INFO_LEN (sizeof(xen_changeset_info_t))
#define XENVER_platform_parameters 5
---- head.orig/include/xen/interface/xen.h 2012-12-18 10:47:37.000000000 +0100
-+++ head/include/xen/interface/xen.h 2012-12-18 12:00:21.000000000 +0100
+--- 12.3.orig/include/xen/interface/xen.h 2012-12-18 10:47:37.000000000 +0100
++++ 12.3/include/xen/interface/xen.h 2012-12-18 12:00:21.000000000 +0100
@@ -32,7 +32,9 @@
#include <asm/pvclock-abi.h>
#endif
@@ -4956,8 +4956,8 @@ Acked-by: jbeulich@novell.com
typedef struct multicall_entry multicall_entry_t;
DEFINE_XEN_GUEST_HANDLE(multicall_entry_t);
---- head.orig/include/xen/xenbus.h 2011-12-21 10:42:02.000000000 +0100
-+++ head/include/xen/xenbus.h 2011-12-21 10:50:40.000000000 +0100
+--- 12.3.orig/include/xen/xenbus.h 2011-12-21 10:42:02.000000000 +0100
++++ 12.3/include/xen/xenbus.h 2011-12-21 10:50:40.000000000 +0100
@@ -58,16 +58,20 @@ struct xenbus_watch
void (*callback)(struct xenbus_watch *,
const char **vec, unsigned int len);
diff --git a/patches.xen/xen3-patch-2.6.24 b/patches.xen/xen3-patch-2.6.24
index 78d2e0b9a0..51bfc5243a 100644
--- a/patches.xen/xen3-patch-2.6.24
+++ b/patches.xen/xen3-patch-2.6.24
@@ -7,8 +7,8 @@ Acked-by: jbeulich@novell.com
2.6.33/kernel/sysctl_check.c (would need to be reverted there)
---- head.orig/arch/x86/Kconfig 2012-10-23 14:42:59.000000000 +0200
-+++ head/arch/x86/Kconfig 2012-10-23 14:53:52.000000000 +0200
+--- 12.3.orig/arch/x86/Kconfig 2012-10-23 14:42:59.000000000 +0200
++++ 12.3/arch/x86/Kconfig 2012-10-23 14:53:52.000000000 +0200
@@ -98,10 +98,10 @@ config X86
select HAVE_ARCH_SECCOMP_FILTER
select BUILDTIME_EXTABLE_SORT
@@ -107,8 +107,8 @@ Acked-by: jbeulich@novell.com
select HOTPLUG
default y
help
---- head.orig/arch/x86/Makefile 2012-09-05 15:40:23.000000000 +0200
-+++ head/arch/x86/Makefile 2012-09-05 15:41:28.000000000 +0200
+--- 12.3.orig/arch/x86/Makefile 2012-09-05 15:40:23.000000000 +0200
++++ 12.3/arch/x86/Makefile 2012-09-05 15:41:28.000000000 +0200
@@ -191,8 +191,8 @@ BOOT_TARGETS = bzlilo bzdisk fdimage fdi
PHONY += bzImage vmlinuz $(BOOT_TARGETS)
@@ -129,8 +129,8 @@ Acked-by: jbeulich@novell.com
else
# Default kernel to build
all: bzImage
---- head.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:49:31.000000000 +0100
-+++ head/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:49:31.000000000 +0100
++++ 12.3/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:56:27.000000000 +0100
@@ -125,20 +125,16 @@ sysenter_do_call:
jmp int_ret_from_sys_call
@@ -179,16 +179,16 @@ Acked-by: jbeulich@novell.com
jmp cstar_do_call
END(ia32_cstar_target)
---- head.orig/arch/x86/kernel/Makefile 2012-10-23 14:42:57.000000000 +0200
-+++ head/arch/x86/kernel/Makefile 2012-10-23 14:53:50.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/Makefile 2012-10-23 14:42:57.000000000 +0200
++++ 12.3/arch/x86/kernel/Makefile 2012-10-23 14:53:50.000000000 +0200
@@ -122,4 +122,4 @@ endif
disabled-obj-$(CONFIG_XEN) := early-quirks.o hpet.o i8237.o i8253.o i8259_$(BITS).o \
reboot.o smpboot_$(BITS).o tsc_$(BITS).o tsc_sync.o
disabled-obj-$(CONFIG_XEN_UNPRIVILEGED_GUEST) += mpparse_64.o
-%/head_64.o %/head_64.s: $(if $(CONFIG_XEN),EXTRA_AFLAGS,dummy) :=
+%/head_64.o %/head_64.s: asflags-$(CONFIG_XEN) :=
---- head.orig/arch/x86/kernel/acpi/processor_extcntl_xen.c 2010-03-22 12:00:53.000000000 +0100
-+++ head/arch/x86/kernel/acpi/processor_extcntl_xen.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/acpi/processor_extcntl_xen.c 2010-03-22 12:00:53.000000000 +0100
++++ 12.3/arch/x86/kernel/acpi/processor_extcntl_xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -68,7 +68,7 @@ static int xen_cx_notifier(struct acpi_p
/* Get dependency relationships */
@@ -207,8 +207,8 @@ Acked-by: jbeulich@novell.com
kfree(buf);
return -EINVAL;
}
---- head.orig/arch/x86/kernel/cpu/Makefile 2012-12-18 11:38:26.000000000 +0100
-+++ head/arch/x86/kernel/cpu/Makefile 2012-08-20 10:38:35.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/cpu/Makefile 2013-02-05 10:40:06.000000000 +0100
++++ 12.3/arch/x86/kernel/cpu/Makefile 2012-08-20 10:38:35.000000000 +0200
@@ -42,6 +42,8 @@ obj-$(CONFIG_MTRR) += mtrr/
obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o perf_event_amd_ibs.o
@@ -218,8 +218,8 @@ Acked-by: jbeulich@novell.com
quiet_cmd_mkcapflags = MKCAP $@
cmd_mkcapflags = $(PERL) $(srctree)/$(src)/mkcapflags.pl $< $@
---- head.orig/arch/x86/kernel/cpu/common-xen.c 2012-07-05 10:49:35.000000000 +0200
-+++ head/arch/x86/kernel/cpu/common-xen.c 2012-07-05 10:50:04.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/cpu/common-xen.c 2012-07-05 10:49:35.000000000 +0200
++++ 12.3/arch/x86/kernel/cpu/common-xen.c 2012-07-05 10:50:04.000000000 +0200
@@ -221,7 +221,7 @@ static void __cpuinit get_cpu_vendor(str
static int __init x86_fxsr_setup(char * s)
@@ -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 2012-12-18 11:38:26.000000000 +0100
-+++ head/arch/x86/kernel/cpu/intel.c 2012-02-08 11:36:23.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/cpu/intel.c 2013-02-05 10:40:06.000000000 +0100
++++ 12.3/arch/x86/kernel/cpu/intel.c 2012-02-08 11:36:23.000000000 +0100
@@ -302,6 +302,7 @@ static void __cpuinit srat_detect_node(s
#endif
}
@@ -273,8 +273,8 @@ Acked-by: jbeulich@novell.com
/* Work around errata */
srat_detect_node(c);
---- head.orig/arch/x86/kernel/cpu/intel_cacheinfo.c 2012-03-12 13:30:38.000000000 +0100
-+++ head/arch/x86/kernel/cpu/intel_cacheinfo.c 2012-06-13 15:18:13.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/cpu/intel_cacheinfo.c 2012-03-12 13:30:38.000000000 +0100
++++ 12.3/arch/x86/kernel/cpu/intel_cacheinfo.c 2012-06-13 15:18:13.000000000 +0200
@@ -279,8 +279,9 @@ amd_cpuid4(int leaf, union _cpuid4_leaf_
eax->split.type = types[leaf];
eax->split.level = levels[leaf];
@@ -317,8 +317,8 @@ Acked-by: jbeulich@novell.com
break;
default:
break;
---- head.orig/arch/x86/kernel/cpu/mcheck/mce_dom0.c 2011-08-15 10:44:20.000000000 +0200
-+++ head/arch/x86/kernel/cpu/mcheck/mce_dom0.c 2011-08-15 10:44:51.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/cpu/mcheck/mce_dom0.c 2011-08-15 10:44:20.000000000 +0200
++++ 12.3/arch/x86/kernel/cpu/mcheck/mce_dom0.c 2011-08-15 10:44:51.000000000 +0200
@@ -17,7 +17,7 @@ static int convert_log(struct mc_info *m
x86_mcinfo_lookup(mic, mi, MC_TYPE_GLOBAL);
if (mic == NULL)
@@ -355,8 +355,8 @@ Acked-by: jbeulich@novell.com
/* Log the machine checks left over from the previous reset. */
mce_dom0_interrupt(VIRQ_MCA, NULL);
---- head.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ 12.3/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -52,6 +52,13 @@ struct resource code_resource = {
.flags = IORESOURCE_BUSY | IORESOURCE_MEM
};
@@ -418,8 +418,8 @@ Acked-by: jbeulich@novell.com
* memory space.
*/
last = 0x100000000ull;
---- head.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ 12.3/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -24,7 +24,7 @@
#include <asm/page.h>
#include <asm/e820.h>
@@ -500,8 +500,8 @@ Acked-by: jbeulich@novell.com
+ max_pfn << PAGE_SHIFT) - *addr;
+ return i + 1;
+}
---- head.orig/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ 12.3/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -6,15 +6,10 @@
#include <asm/io.h>
#include <asm/processor.h>
@@ -535,8 +535,8 @@ Acked-by: jbeulich@novell.com
#endif
early_console = &early_vga_console;
} else if (!strncmp(buf, "simnow", 6)) {
---- head.orig/arch/x86/kernel/entry_32-xen.S 2011-01-31 17:49:31.000000000 +0100
-+++ head/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:10:06.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/entry_32-xen.S 2011-01-31 17:49:31.000000000 +0100
++++ 12.3/arch/x86/kernel/entry_32-xen.S 2013-01-25 14:08:44.000000000 +0100
@@ -254,6 +254,7 @@ check_userspace:
jb resume_kernel # not returning to v8086 or userspace
@@ -578,7 +578,7 @@ Acked-by: jbeulich@novell.com
DISABLE_INTERRUPTS(CLBR_ANY) # make sure we don't miss an interrupt
# setting need_resched or sigpending
# between sampling and the iret
-@@ -1269,6 +1273,6 @@ ENTRY(kernel_thread_helper)
+@@ -1268,6 +1272,6 @@ ENTRY(kernel_thread_helper)
ENDPROC(kernel_thread_helper)
.section .rodata,"a"
@@ -586,8 +586,8 @@ Acked-by: jbeulich@novell.com
+#include "syscall_table_32.S"
syscall_table_size=(.-sys_call_table)
---- head.orig/arch/x86/kernel/entry_64-xen.S 2011-10-07 11:21:43.000000000 +0200
-+++ head/arch/x86/kernel/entry_64-xen.S 2011-10-07 11:28:06.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/entry_64-xen.S 2011-10-07 11:21:43.000000000 +0200
++++ 12.3/arch/x86/kernel/entry_64-xen.S 2011-10-07 11:28:06.000000000 +0200
@@ -57,7 +57,7 @@
#include <xen/interface/arch-x86_64.h>
#include <xen/interface/features.h>
@@ -661,8 +661,8 @@ Acked-by: jbeulich@novell.com
call do_exit
CFI_ENDPROC
ENDPROC(child_rip)
---- head.orig/arch/x86/kernel/fixup.c 2008-01-28 12:24:18.000000000 +0100
-+++ head/arch/x86/kernel/fixup.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/fixup.c 2008-01-28 12:24:18.000000000 +0100
++++ 12.3/arch/x86/kernel/fixup.c 2011-01-31 17:56:27.000000000 +0100
@@ -34,7 +34,7 @@
#include <linux/delay.h>
#include <linux/version.h>
@@ -672,8 +672,8 @@ Acked-by: jbeulich@novell.com
fastcall void do_fixup_4gb_segment(struct pt_regs *regs, long error_code)
{
---- head.orig/arch/x86/kernel/head64-xen.c 2011-08-09 10:41:42.000000000 +0200
-+++ head/arch/x86/kernel/head64-xen.c 2011-08-09 10:44:02.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/head64-xen.c 2011-08-09 10:41:42.000000000 +0200
++++ 12.3/arch/x86/kernel/head64-xen.c 2011-08-09 10:44:02.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * linux/arch/x86_64/kernel/head64.c -- prepare to run common code
@@ -730,8 +730,8 @@ Acked-by: jbeulich@novell.com
#endif
early_printk("Kernel alive\n");
---- head.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ 12.3/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -427,7 +427,7 @@ static struct irq_cpu_info {
#define IRQ_ALLOWED(cpu, allowed_mask) cpu_isset(cpu, allowed_mask)
@@ -922,8 +922,8 @@ Acked-by: jbeulich@novell.com
#endif /* CONFIG_ACPI */
static int __init parse_disable_timer_pin_1(char *arg)
---- head.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ 12.3/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -31,6 +31,7 @@
#include <linux/sysdev.h>
#include <linux/msi.h>
@@ -1167,8 +1167,8 @@ Acked-by: jbeulich@novell.com
#endif
#endif /* !CONFIG_XEN */
+
---- head.orig/arch/x86/kernel/ioport-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/kernel/ioport-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/ioport-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/kernel/ioport-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * linux/arch/x86_64/kernel/ioport.c
@@ -1176,8 +1176,8 @@ Acked-by: jbeulich@novell.com
* This contains the io-permission bitmap code - written by obz, with changes
* by Linus.
*/
---- head.orig/arch/x86/kernel/ldt-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head/arch/x86/kernel/ldt-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/ldt-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ 12.3/arch/x86/kernel/ldt-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * linux/arch/x86_64/kernel/ldt.c
@@ -1256,8 +1256,8 @@ Acked-by: jbeulich@novell.com
out:
return error;
}
---- head.orig/arch/x86/kernel/mpparse-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/kernel/mpparse-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/mpparse-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/kernel/mpparse-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -65,8 +65,10 @@ unsigned long mp_lapic_addr;
unsigned int def_to_bigsmp = 0;
@@ -1307,8 +1307,8 @@ Acked-by: jbeulich@novell.com
*/
for (i = 0; i < 16; i++) {
int idx;
---- head.orig/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head/arch/x86/kernel/pci-dma-xen.c 2012-11-14 12:41:31.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ 12.3/arch/x86/kernel/pci-dma-xen.c 2012-11-14 12:41:31.000000000 +0100
@@ -13,14 +13,13 @@
#include <linux/pci.h>
#include <linux/module.h>
@@ -1401,8 +1401,8 @@ Acked-by: jbeulich@novell.com
if (mem && vaddr >= mem->virt_base && vaddr < (mem->virt_base + (mem->size << PAGE_SHIFT))) {
int page = (vaddr - mem->virt_base) >> PAGE_SHIFT;
---- head.orig/arch/x86/kernel/process_32-xen.c 2012-07-05 10:49:33.000000000 +0200
-+++ head/arch/x86/kernel/process_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/process_32-xen.c 2012-07-05 10:49:33.000000000 +0200
++++ 12.3/arch/x86/kernel/process_32-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * linux/arch/i386/kernel/process.c
@@ -1529,8 +1529,8 @@ Acked-by: jbeulich@novell.com
show_trace(NULL, regs, &regs->esp);
}
---- head.orig/arch/x86/kernel/process_64-xen.c 2011-02-02 08:31:50.000000000 +0100
-+++ head/arch/x86/kernel/process_64-xen.c 2011-02-02 08:32:00.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/process_64-xen.c 2011-02-02 08:31:50.000000000 +0100
++++ 12.3/arch/x86/kernel/process_64-xen.c 2011-02-02 08:32:00.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * linux/arch/x86-64/kernel/process.c
@@ -1597,8 +1597,8 @@ Acked-by: jbeulich@novell.com
__switch_to(struct task_struct *prev_p, struct task_struct *next_p)
{
struct thread_struct *prev = &prev_p->thread,
---- head.orig/arch/x86/kernel/quirks.c 2011-09-07 15:20:23.000000000 +0200
-+++ head/arch/x86/kernel/quirks.c 2011-09-07 15:36:26.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/quirks.c 2011-09-07 15:20:23.000000000 +0200
++++ 12.3/arch/x86/kernel/quirks.c 2011-09-07 15:36:26.000000000 +0200
@@ -4,8 +4,6 @@
#include <linux/pci.h>
#include <linux/irq.h>
@@ -1617,8 +1617,8 @@ Acked-by: jbeulich@novell.com
unsigned long force_hpet_address;
static enum {
---- head.orig/arch/x86/kernel/setup_32-xen.c 2012-06-06 13:52:42.000000000 +0200
-+++ head/arch/x86/kernel/setup_32-xen.c 2012-06-06 13:55:18.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/setup_32-xen.c 2012-06-06 13:52:42.000000000 +0200
++++ 12.3/arch/x86/kernel/setup_32-xen.c 2012-06-06 13:55:18.000000000 +0200
@@ -1,6 +1,4 @@
/*
- * linux/arch/i386/kernel/setup.c
@@ -1875,8 +1875,8 @@ Acked-by: jbeulich@novell.com
#endif
#ifdef CONFIG_ACPI
---- head.orig/arch/x86/kernel/setup_64-xen.c 2012-06-06 13:52:43.000000000 +0200
-+++ head/arch/x86/kernel/setup_64-xen.c 2012-06-06 13:55:19.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/setup_64-xen.c 2012-06-06 13:52:43.000000000 +0200
++++ 12.3/arch/x86/kernel/setup_64-xen.c 2012-06-06 13:55:19.000000000 +0200
@@ -1,10 +1,5 @@
/*
- * linux/arch/x86-64/kernel/setup.c
@@ -2326,8 +2326,8 @@ Acked-by: jbeulich@novell.com
return c_start(m, pos);
}
---- head.orig/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ 12.3/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -72,7 +72,7 @@
*
* B stepping CPUs may hang. There are hardware work arounds
@@ -2379,8 +2379,8 @@ Acked-by: jbeulich@novell.com
irq_exit();
if (wait) {
---- head.orig/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ 12.3/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -167,6 +167,7 @@ asmlinkage void smp_invalidate_interrupt
out:
ack_APIC_irq();
@@ -2587,8 +2587,8 @@ Acked-by: jbeulich@novell.com
irq_exit();
if (wait) {
mb();
---- head.orig/arch/x86/kernel/time-xen.c 2012-02-10 13:26:46.000000000 +0100
-+++ head/arch/x86/kernel/time-xen.c 2012-02-10 13:26:53.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/time-xen.c 2012-02-10 13:26:46.000000000 +0100
++++ 12.3/arch/x86/kernel/time-xen.c 2012-02-10 13:26:53.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * linux/arch/i386/kernel/time.c
@@ -2696,8 +2696,8 @@ Acked-by: jbeulich@novell.com
};
static int __init xen_sysctl_init(void)
{
---- head.orig/arch/x86/kernel/traps_32-xen.c 2012-06-18 09:23:11.000000000 +0200
-+++ head/arch/x86/kernel/traps_32-xen.c 2012-07-05 10:50:00.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/traps_32-xen.c 2012-06-18 09:23:11.000000000 +0200
++++ 12.3/arch/x86/kernel/traps_32-xen.c 2012-07-05 10:50:00.000000000 +0200
@@ -1,6 +1,4 @@
/*
- * linux/arch/i386/traps.c
@@ -2940,8 +2940,8 @@ Acked-by: jbeulich@novell.com
/*
* NB. All these are "trap gates" (i.e. events_mask isn't set) except
---- head.orig/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ 12.3/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * linux/arch/x86-64/traps.c
@@ -3094,8 +3094,8 @@ Acked-by: jbeulich@novell.com
get_debugreg(condition, 6);
if (notify_die(DIE_DEBUG, "debug", regs, condition, error_code,
---- head.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ 12.3/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * linux/arch/x86_64/kernel/vsyscall.c
@@ -3185,8 +3185,8 @@ Acked-by: jbeulich@novell.com
write_rdtscp_aux((node << 12) | cpu);
/* Store cpu number in limit so that it can be loaded quickly
---- head.orig/arch/x86/mm/fault_32-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head/arch/x86/mm/fault_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/mm/fault_32-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ 12.3/arch/x86/mm/fault_32-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -25,6 +25,7 @@
#include <linux/kprobes.h>
#include <linux/uaccess.h>
@@ -3368,8 +3368,8 @@ Acked-by: jbeulich@novell.com
goto no_context;
do_sigbus:
---- head.orig/arch/x86/mm/fault_64-xen.c 2011-08-15 10:44:41.000000000 +0200
-+++ head/arch/x86/mm/fault_64-xen.c 2011-07-26 09:28:01.000000000 +0200
+--- 12.3.orig/arch/x86/mm/fault_64-xen.c 2011-08-15 10:44:41.000000000 +0200
++++ 12.3/arch/x86/mm/fault_64-xen.c 2011-07-26 09:28:01.000000000 +0200
@@ -25,6 +25,7 @@
#include <linux/kprobes.h>
#include <linux/uaccess.h>
@@ -3532,8 +3532,8 @@ Acked-by: jbeulich@novell.com
- return 1;
-}
-__setup("pagefaulttrace", enable_pagefaulttrace);
---- head.orig/arch/x86/mm/hypervisor.c 2012-05-31 14:43:34.000000000 +0200
-+++ head/arch/x86/mm/hypervisor.c 2012-05-31 14:43:47.000000000 +0200
+--- 12.3.orig/arch/x86/mm/hypervisor.c 2012-05-31 14:43:34.000000000 +0200
++++ 12.3/arch/x86/mm/hypervisor.c 2012-05-31 14:43:47.000000000 +0200
@@ -71,8 +71,8 @@ static inline bool use_lazy_mmu_mode(voi
static void multicall_failed(const multicall_entry_t *mc, int rc)
@@ -3636,8 +3636,8 @@ Acked-by: jbeulich@novell.com
cr_mcl[i - 1].args[MULTI_UVMFLAGS_INDEX] = order
? UVMF_TLB_FLUSH|UVMF_ALL
: UVMF_INVLPG|UVMF_ALL;
---- head.orig/arch/x86/mm/init_32-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head/arch/x86/mm/init_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/mm/init_32-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ 12.3/arch/x86/mm/init_32-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -94,7 +94,14 @@ static pte_t * __init one_page_table_ini
#else
if (!(__pmd_val(*pmd) & _PAGE_PRESENT)) {
@@ -3720,8 +3720,8 @@ Acked-by: jbeulich@novell.com
}
/*
---- head.orig/arch/x86/mm/init_64-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head/arch/x86/mm/init_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/mm/init_64-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ 12.3/arch/x86/mm/init_64-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -798,7 +798,7 @@ static void xen_finish_init_mapping(void
/* Setup the direct mapping of the physical memory at PAGE_OFFSET.
This runs before bootmem is initialized and gets pages directly from the
@@ -3808,8 +3808,8 @@ Acked-by: jbeulich@novell.com
+ return 0;
+}
+#endif
---- head.orig/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ 12.3/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -17,9 +17,6 @@
#include <asm/pgalloc.h>
#include <asm/mmu_context.h>
@@ -4031,8 +4031,8 @@ Acked-by: jbeulich@novell.com
flush_map(&l);
---- head.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ 12.3/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -6,6 +6,7 @@
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -4059,8 +4059,8 @@ Acked-by: jbeulich@novell.com
{
memset(pmd, 0, PTRS_PER_PMD*sizeof(pmd_t));
}
---- head.orig/arch/x86/pci/pcifront.c 2009-03-18 10:39:31.000000000 +0100
-+++ head/arch/x86/pci/pcifront.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/pci/pcifront.c 2009-03-18 10:39:31.000000000 +0100
++++ 12.3/arch/x86/pci/pcifront.c 2011-01-31 17:56:27.000000000 +0100
@@ -31,7 +31,7 @@ static int __init pcifront_x86_stub_init
if (raw_pci_ops)
return 0;
@@ -4070,8 +4070,8 @@ Acked-by: jbeulich@novell.com
/* Copied from arch/i386/pci/common.c */
pci_cache_line_size = 32 >> 2;
---- head.orig/drivers/acpi/processor_core.c 2012-12-18 11:38:26.000000000 +0100
-+++ head/drivers/acpi/processor_core.c 2012-07-25 09:16:30.000000000 +0200
+--- 12.3.orig/drivers/acpi/processor_core.c 2013-02-05 10:40:06.000000000 +0100
++++ 12.3/drivers/acpi/processor_core.c 2012-07-25 09:16:30.000000000 +0200
@@ -201,11 +201,21 @@ int acpi_get_cpuid(acpi_handle handle, i
}
@@ -4094,8 +4094,8 @@ Acked-by: jbeulich@novell.com
/* In UP kernel, only processor 0 is valid */
if (apic_id == 0)
return apic_id;
---- head.orig/drivers/acpi/processor_extcntl.c 2011-01-31 17:32:22.000000000 +0100
-+++ head/drivers/acpi/processor_extcntl.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/drivers/acpi/processor_extcntl.c 2011-01-31 17:32:22.000000000 +0100
++++ 12.3/drivers/acpi/processor_extcntl.c 2011-01-31 17:56:27.000000000 +0100
@@ -95,7 +95,7 @@ int processor_notify_external(struct acp
ret = processor_extcntl_ops->hotplug(pr, type);
break;
@@ -4105,9 +4105,9 @@ Acked-by: jbeulich@novell.com
break;
}
---- head.orig/drivers/acpi/processor_idle.c 2012-10-22 17:22:04.000000000 +0200
-+++ head/drivers/acpi/processor_idle.c 2012-10-23 14:53:33.000000000 +0200
-@@ -1154,6 +1154,14 @@ int acpi_processor_hotplug(struct acpi_p
+--- 12.3.orig/drivers/acpi/processor_idle.c 2013-02-05 10:45:47.000000000 +0100
++++ 12.3/drivers/acpi/processor_idle.c 2013-02-05 10:52:00.000000000 +0100
+@@ -1157,6 +1157,14 @@ int acpi_processor_hotplug(struct acpi_p
if (!pr->flags.power_setup_done)
return -ENODEV;
@@ -4122,8 +4122,8 @@ Acked-by: jbeulich@novell.com
dev = per_cpu(acpi_cpuidle_device, pr->id);
cpuidle_pause_and_lock();
cpuidle_disable_device(dev);
---- head.orig/drivers/char/tpm/tpm_xen.c 2012-03-12 13:33:35.000000000 +0100
-+++ head/drivers/char/tpm/tpm_xen.c 2012-03-12 13:40:20.000000000 +0100
+--- 12.3.orig/drivers/char/tpm/tpm_xen.c 2012-03-12 13:33:35.000000000 +0100
++++ 12.3/drivers/char/tpm/tpm_xen.c 2012-03-12 13:40:20.000000000 +0100
@@ -104,9 +104,9 @@ void __exit tpmif_exit(void);
#define DPRINTK(fmt, args...) \
pr_debug("xen_tpm_fr (%s:%d) " fmt, __FUNCTION__, __LINE__, ##args)
@@ -4136,8 +4136,8 @@ Acked-by: jbeulich@novell.com
static inline int
---- head.orig/drivers/cpuidle/Kconfig 2012-12-18 11:38:26.000000000 +0100
-+++ head/drivers/cpuidle/Kconfig 2012-02-29 10:35:17.000000000 +0100
+--- 12.3.orig/drivers/cpuidle/Kconfig 2013-02-05 10:40:06.000000000 +0100
++++ 12.3/drivers/cpuidle/Kconfig 2012-02-29 10:35:17.000000000 +0100
@@ -1,6 +1,7 @@
config CPU_IDLE
@@ -4146,8 +4146,8 @@ Acked-by: jbeulich@novell.com
default y if ACPI || PPC_PSERIES
help
CPU idle is a generic framework for supporting software-controlled
---- head.orig/drivers/dma/Kconfig 2012-12-18 11:38:26.000000000 +0100
-+++ head/drivers/dma/Kconfig 2012-08-20 10:38:08.000000000 +0200
+--- 12.3.orig/drivers/dma/Kconfig 2013-02-05 10:40:06.000000000 +0100
++++ 12.3/drivers/dma/Kconfig 2012-08-20 10:38:08.000000000 +0200
@@ -62,7 +62,7 @@ config INTEL_IOATDMA
tristate "Intel I/OAT DMA support"
depends on PCI && X86
@@ -4157,15 +4157,15 @@ Acked-by: jbeulich@novell.com
select ASYNC_TX_DISABLE_PQ_VAL_DMA
select ASYNC_TX_DISABLE_XOR_VAL_DMA
help
---- head.orig/drivers/dma/ioat/Makefile 2012-12-18 11:38:26.000000000 +0100
-+++ head/drivers/dma/ioat/Makefile 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/drivers/dma/ioat/Makefile 2013-02-05 10:40:06.000000000 +0100
++++ 12.3/drivers/dma/ioat/Makefile 2011-01-31 17:56:27.000000000 +0100
@@ -1,2 +1,3 @@
obj-$(CONFIG_INTEL_IOATDMA) += ioatdma.o
-ioatdma-y := pci.o dma.o dma_v2.o dma_v3.o dca.o
+dca-$(CONFIG_DCA) := dca.o
+ioatdma-y := pci.o dma.o dma_v2.o dma_v3.o $(dca-y) $(dca-m)
---- head.orig/drivers/dma/ioat/dca.c 2012-12-18 11:38:26.000000000 +0100
-+++ head/drivers/dma/ioat/dca.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/drivers/dma/ioat/dca.c 2013-02-05 10:40:06.000000000 +0100
++++ 12.3/drivers/dma/ioat/dca.c 2011-01-31 17:56:27.000000000 +0100
@@ -682,3 +682,15 @@ ioat3_dca_init(struct pci_dev *pdev, voi
return dca;
@@ -4182,8 +4182,8 @@ Acked-by: jbeulich@novell.com
+ free_dca_provider(device->dca);
+ device->dca = NULL;
+}
---- head.orig/drivers/dma/ioat/dma.h 2012-12-18 11:38:26.000000000 +0100
-+++ head/drivers/dma/ioat/dma.h 2012-04-10 16:38:51.000000000 +0200
+--- 12.3.orig/drivers/dma/ioat/dma.h 2013-02-05 10:40:06.000000000 +0100
++++ 12.3/drivers/dma/ioat/dma.h 2012-04-10 16:38:51.000000000 +0200
@@ -324,4 +324,22 @@ void ioat_kobject_del(struct ioatdma_dev
extern const struct sysfs_ops ioat_sysfs_ops;
extern struct ioat_sysfs_entry ioat_version_attr;
@@ -4207,8 +4207,8 @@ Acked-by: jbeulich@novell.com
+#endif
+
#endif /* IOATDMA_H */
---- head.orig/drivers/dma/ioat/pci.c 2012-12-18 11:38:26.000000000 +0100
-+++ head/drivers/dma/ioat/pci.c 2012-10-23 14:53:42.000000000 +0200
+--- 12.3.orig/drivers/dma/ioat/pci.c 2013-02-05 10:40:06.000000000 +0100
++++ 12.3/drivers/dma/ioat/pci.c 2012-10-23 14:53:42.000000000 +0200
@@ -29,7 +29,6 @@
#include <linux/module.h>
#include <linux/pci.h>
@@ -4230,8 +4230,8 @@ Acked-by: jbeulich@novell.com
ioat_dma_remove(device);
}
---- head.orig/drivers/firmware/dell_rbu.c 2011-04-13 11:25:29.000000000 +0200
-+++ head/drivers/firmware/dell_rbu.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/drivers/firmware/dell_rbu.c 2011-04-13 11:25:29.000000000 +0200
++++ 12.3/drivers/firmware/dell_rbu.c 2011-01-31 17:56:27.000000000 +0100
@@ -175,9 +175,8 @@ static int create_packet(void *data, siz
(unsigned long)packet_data_temp_buf, ordernum, 0)) {
free_pages((unsigned long)packet_data_temp_buf,
@@ -4244,8 +4244,8 @@ Acked-by: jbeulich@novell.com
retval = -ENOMEM;
spin_lock(&rbu_data.lock);
goto out_alloc_packet_array;
---- head.orig/drivers/hwmon/coretemp-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head/drivers/hwmon/coretemp-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/drivers/hwmon/coretemp-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/drivers/hwmon/coretemp-xen.c 2011-01-31 17:56:27.000000000 +0100
@@ -49,7 +49,7 @@ static struct coretemp_data *coretemp_up
struct pdev_entry {
struct list_head list;
@@ -4299,8 +4299,8 @@ Acked-by: jbeulich@novell.com
/* supported CPU not found, but report the unknown
family 6 CPU */
---- head.orig/drivers/oprofile/cpu_buffer.c 2011-04-13 12:22:07.000000000 +0200
-+++ head/drivers/oprofile/cpu_buffer.c 2011-04-13 12:44:01.000000000 +0200
+--- 12.3.orig/drivers/oprofile/cpu_buffer.c 2011-04-13 12:22:07.000000000 +0200
++++ 12.3/drivers/oprofile/cpu_buffer.c 2011-04-13 12:44:01.000000000 +0200
@@ -425,6 +425,39 @@ void oprofile_add_pc(unsigned long pc, i
log_sample(cpu_buf, pc, 0, is_kernel, event, NULL);
}
@@ -4341,8 +4341,8 @@ Acked-by: jbeulich@novell.com
void oprofile_add_trace(unsigned long pc)
{
struct oprofile_cpu_buffer *cpu_buf = &__get_cpu_var(op_cpu_buffer);
---- head.orig/drivers/pci/msi-xen.c 2012-10-31 11:01:55.000000000 +0100
-+++ head/drivers/pci/msi-xen.c 2012-10-31 11:11:33.000000000 +0100
+--- 12.3.orig/drivers/pci/msi-xen.c 2012-10-31 11:01:55.000000000 +0100
++++ 12.3/drivers/pci/msi-xen.c 2012-10-31 11:11:33.000000000 +0100
@@ -277,6 +277,12 @@ static int msi_map_vector(struct pci_dev
map_irq.pirq : evtchn_map_pirq(-1, map_irq.pirq));
}
@@ -4401,8 +4401,8 @@ Acked-by: jbeulich@novell.com
}
dev->msix_enabled = 0;
}
---- head.orig/drivers/xen/balloon/balloon.c 2012-06-06 13:52:53.000000000 +0200
-+++ head/drivers/xen/balloon/balloon.c 2012-06-06 13:55:27.000000000 +0200
+--- 12.3.orig/drivers/xen/balloon/balloon.c 2012-06-06 13:52:53.000000000 +0200
++++ 12.3/drivers/xen/balloon/balloon.c 2012-06-06 13:55:27.000000000 +0200
@@ -118,10 +118,8 @@ static DECLARE_WORK(balloon_worker, ball
PAGE_TO_LIST(p)->prev = NULL; \
} while(0)
@@ -4434,8 +4434,8 @@ Acked-by: jbeulich@novell.com
return NOTIFY_DONE;
}
---- head.orig/drivers/xen/blkback/blkback.c 2012-03-26 12:21:55.000000000 +0200
-+++ head/drivers/xen/blkback/blkback.c 2012-04-04 10:20:02.000000000 +0200
+--- 12.3.orig/drivers/xen/blkback/blkback.c 2012-03-26 12:21:55.000000000 +0200
++++ 12.3/drivers/xen/blkback/blkback.c 2013-02-05 10:51:48.000000000 +0100
@@ -278,13 +278,10 @@ static void __end_block_io_op(pending_re
}
}
@@ -4451,7 +4451,7 @@ Acked-by: jbeulich@novell.com
}
-@@ -664,7 +661,7 @@ static int __init blkif_init(void)
+@@ -663,7 +660,7 @@ static int __init blkif_init(void)
kfree(pending_reqs);
kfree(pending_grant_handles);
free_empty_pages_and_pagevec(pending_pages, mmap_pages);
@@ -4460,8 +4460,8 @@ Acked-by: jbeulich@novell.com
return -ENOMEM;
}
---- head.orig/drivers/xen/blkback/blkback-pagemap.c 2009-06-09 15:01:37.000000000 +0200
-+++ head/drivers/xen/blkback/blkback-pagemap.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/drivers/xen/blkback/blkback-pagemap.c 2009-06-09 15:01:37.000000000 +0200
++++ 12.3/drivers/xen/blkback/blkback-pagemap.c 2011-01-31 17:56:27.000000000 +0100
@@ -38,8 +38,8 @@ blkback_pagemap_set(int idx, struct page
entry = blkback_pagemap + idx;
@@ -4491,8 +4491,8 @@ Acked-by: jbeulich@novell.com
BUG();
}
---- head.orig/drivers/xen/blkback/vbd.c 2011-06-30 15:37:44.000000000 +0200
-+++ head/drivers/xen/blkback/vbd.c 2011-06-30 16:32:27.000000000 +0200
+--- 12.3.orig/drivers/xen/blkback/vbd.c 2011-06-30 15:37:44.000000000 +0200
++++ 12.3/drivers/xen/blkback/vbd.c 2011-06-30 16:32:27.000000000 +0200
@@ -133,18 +133,18 @@ void vbd_resize(blkif_t *blkif)
struct xenbus_device *dev = blkif->be->dev;
unsigned long long new_size = vbd_size(vbd);
@@ -4533,8 +4533,8 @@ Acked-by: jbeulich@novell.com
return;
abort:
xenbus_transaction_end(xbt, 1);
---- head.orig/drivers/xen/blkback/xenbus.c 2012-12-18 11:59:09.000000000 +0100
-+++ head/drivers/xen/blkback/xenbus.c 2012-12-18 12:04:14.000000000 +0100
+--- 12.3.orig/drivers/xen/blkback/xenbus.c 2012-12-18 11:59:09.000000000 +0100
++++ 12.3/drivers/xen/blkback/xenbus.c 2012-12-18 12:04:14.000000000 +0100
@@ -293,10 +293,9 @@ static void backend_changed(struct xenbu
if (be->major | be->minor) {
@@ -4574,8 +4574,8 @@ Acked-by: jbeulich@novell.com
kfree(protocol);
/* Map the shared frame, irq etc. */
---- head.orig/drivers/xen/blkfront/blkfront.c 2012-10-04 11:53:51.000000000 +0200
-+++ head/drivers/xen/blkfront/blkfront.c 2012-10-04 11:54:11.000000000 +0200
+--- 12.3.orig/drivers/xen/blkfront/blkfront.c 2012-10-04 11:53:51.000000000 +0200
++++ 12.3/drivers/xen/blkfront/blkfront.c 2012-10-04 11:54:11.000000000 +0200
@@ -233,7 +233,7 @@ static int setup_blkring(struct xenbus_d
SHARED_RING_INIT(sring);
FRONT_RING_INIT(&info->ring, sring, PAGE_SIZE);
@@ -4659,8 +4659,8 @@ Acked-by: jbeulich@novell.com
uptodate = -EOPNOTSUPP;
info->feature_barrier = 0;
xlvbd_barrier(info);
---- head.orig/drivers/xen/blkfront/block.h 2012-06-06 13:53:02.000000000 +0200
-+++ head/drivers/xen/blkfront/block.h 2012-06-06 13:55:33.000000000 +0200
+--- 12.3.orig/drivers/xen/blkfront/block.h 2012-06-06 13:53:02.000000000 +0200
++++ 12.3/drivers/xen/blkfront/block.h 2012-06-06 13:55:33.000000000 +0200
@@ -60,7 +60,7 @@
#define DPRINTK(_f, _a...) pr_debug(_f, ## _a)
@@ -4670,8 +4670,8 @@ Acked-by: jbeulich@novell.com
#else
#define DPRINTK_IOCTL(_f, _a...) ((void)0)
#endif
---- head.orig/drivers/xen/blkfront/vbd.c 2012-03-12 13:38:18.000000000 +0100
-+++ head/drivers/xen/blkfront/vbd.c 2012-03-12 15:33:32.000000000 +0100
+--- 12.3.orig/drivers/xen/blkfront/vbd.c 2012-03-12 13:38:18.000000000 +0100
++++ 12.3/drivers/xen/blkfront/vbd.c 2012-03-12 15:33:32.000000000 +0100
@@ -208,7 +208,8 @@ xlbd_alloc_major_info(int major, int min
return NULL;
}
@@ -4735,8 +4735,8 @@ Acked-by: jbeulich@novell.com
return -ENOSYS;
}
#endif
---- head.orig/drivers/xen/blktap/blktap.c 2011-01-31 17:32:16.000000000 +0100
-+++ head/drivers/xen/blktap/blktap.c 2012-01-06 10:44:12.000000000 +0100
+--- 12.3.orig/drivers/xen/blktap/blktap.c 2011-01-31 17:32:16.000000000 +0100
++++ 12.3/drivers/xen/blktap/blktap.c 2012-01-06 10:44:12.000000000 +0100
@@ -794,8 +794,8 @@ static int blktap_ioctl(struct inode *in
case BLKTAP_IOCTL_PRINT_IDXS:
{
@@ -4748,19 +4748,20 @@ Acked-by: jbeulich@novell.com
"| req_prod: %2d, rsp_prod: %2d\n",
info->ufe_ring.rsp_cons,
info->ufe_ring.req_prod_pvt,
---- head.orig/drivers/xen/blktap/common.h 2012-06-06 13:53:10.000000000 +0200
-+++ head/drivers/xen/blktap/common.h 2012-06-06 13:55:35.000000000 +0200
-@@ -40,7 +40,7 @@
- #define DPRINTK(_f, _a...) pr_debug("(file=%s, line=%d) " _f, \
+--- 12.3.orig/drivers/xen/blktap/common.h 2013-02-05 10:47:33.000000000 +0100
++++ 12.3/drivers/xen/blktap/common.h 2013-02-05 10:51:47.000000000 +0100
+@@ -41,8 +41,7 @@
__FILE__ , __LINE__ , ## _a )
--#define WPRINTK(fmt, args...) printk(KERN_WARNING "blk_tap: " fmt, ##args)
-+#define WPRINTK(fmt, args...) pr_warning("blktap: " fmt, ##args)
+ #define WPRINTK(fmt, args...) \
+- ((void)(printk_ratelimit() && \
+- printk(KERN_WARNING "blktap: " fmt, ##args)))
++ ((void)(printk_ratelimit() && pr_warning("blktap: " fmt, ##args)))
struct backend_info;
---- head.orig/drivers/xen/blktap/xenbus.c 2012-02-16 12:30:42.000000000 +0100
-+++ head/drivers/xen/blktap/xenbus.c 2012-04-04 10:19:53.000000000 +0200
+--- 12.3.orig/drivers/xen/blktap/xenbus.c 2012-02-16 12:30:42.000000000 +0100
++++ 12.3/drivers/xen/blktap/xenbus.c 2012-04-04 10:19:53.000000000 +0200
@@ -354,8 +354,8 @@ static void tap_frontend_changed(struct
switch (frontend_state) {
case XenbusStateInitialising:
@@ -4786,8 +4787,8 @@ Acked-by: jbeulich@novell.com
kfree(protocol);
/* Map the shared frame, irq etc. */
---- head.orig/drivers/xen/blktap2/control.c 2011-01-31 17:49:31.000000000 +0100
-+++ head/drivers/xen/blktap2/control.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/drivers/xen/blktap2/control.c 2011-01-31 17:49:31.000000000 +0100
++++ 12.3/drivers/xen/blktap2/control.c 2011-01-31 17:56:27.000000000 +0100
@@ -18,6 +18,7 @@ blktap_control_initialize_tap(struct blk
memset(tap, 0, sizeof(*tap));
set_bit(BLKTAP_CONTROL, &tap->dev_inuse);
@@ -4796,8 +4797,8 @@ Acked-by: jbeulich@novell.com
init_waitqueue_head(&tap->wq);
atomic_set(&tap->refcnt, 0);
---- head.orig/drivers/xen/blktap2/device.c 2012-02-16 12:30:32.000000000 +0100
-+++ head/drivers/xen/blktap2/device.c 2012-02-16 12:31:22.000000000 +0100
+--- 12.3.orig/drivers/xen/blktap2/device.c 2012-02-16 12:30:32.000000000 +0100
++++ 12.3/drivers/xen/blktap2/device.c 2012-02-16 12:31:22.000000000 +0100
@@ -17,7 +17,7 @@
#include "../blkback/blkback-pagemap.h"
@@ -4851,9 +4852,9 @@ Acked-by: jbeulich@novell.com
goto out;
}
---- head.orig/drivers/xen/console/console.c 2012-03-22 13:43:53.000000000 +0100
-+++ head/drivers/xen/console/console.c 2012-03-22 13:44:18.000000000 +0100
-@@ -708,10 +708,10 @@ static int __init xencons_init(void)
+--- 12.3.orig/drivers/xen/console/console.c 2013-02-05 10:47:19.000000000 +0100
++++ 12.3/drivers/xen/console/console.c 2013-02-05 10:51:54.000000000 +0100
+@@ -704,10 +704,10 @@ static int __init xencons_init(void)
tty_set_operations(xencons_driver, &xencons_ops);
if ((rc = tty_register_driver(DRV(xencons_driver))) != 0) {
@@ -4868,7 +4869,7 @@ Acked-by: jbeulich@novell.com
put_tty_driver(xencons_driver);
xencons_driver = NULL;
return rc;
-@@ -728,8 +728,8 @@ static int __init xencons_init(void)
+@@ -724,8 +724,8 @@ static int __init xencons_init(void)
BUG_ON(xencons_priv_irq < 0);
}
@@ -4879,8 +4880,8 @@ Acked-by: jbeulich@novell.com
return 0;
}
---- head.orig/drivers/xen/console/xencons_ring.c 2012-03-22 13:43:28.000000000 +0100
-+++ head/drivers/xen/console/xencons_ring.c 2012-03-22 13:44:19.000000000 +0100
+--- 12.3.orig/drivers/xen/console/xencons_ring.c 2012-03-22 13:43:28.000000000 +0100
++++ 12.3/drivers/xen/console/xencons_ring.c 2012-03-22 13:44:19.000000000 +0100
@@ -100,7 +100,7 @@ int xencons_ring_init(void)
xen_start_info->console.domU.evtchn,
handle_input, 0, "xencons", NULL);
@@ -4890,11 +4891,11 @@ Acked-by: jbeulich@novell.com
return irq;
}
---- head.orig/drivers/xen/core/cpu_hotplug.c 2011-01-24 12:06:05.000000000 +0100
-+++ head/drivers/xen/core/cpu_hotplug.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/drivers/xen/core/cpu_hotplug.c 2013-01-25 13:04:32.000000000 +0100
++++ 12.3/drivers/xen/core/cpu_hotplug.c 2013-01-25 14:08:38.000000000 +0100
@@ -36,7 +36,7 @@ static void vcpu_hotplug(unsigned int cp
sprintf(dir, "cpu/%u", cpu);
- err = xenbus_scanf(XBT_NIL, dir, "availability", "%s", state);
+ err = xenbus_scanf(XBT_NIL, dir, "availability", "%15s", state);
if (err != 1) {
- printk(KERN_ERR "XENBUS: Unable to read cpu state\n");
+ pr_err("XENBUS: Unable to read cpu state\n");
@@ -4941,8 +4942,8 @@ Acked-by: jbeulich@novell.com
rc = -EBUSY;
}
} else if (!cpu_isset(cpu, local_allowed_cpumask) ||
---- head.orig/drivers/xen/core/evtchn.c 2012-10-04 11:53:07.000000000 +0200
-+++ head/drivers/xen/core/evtchn.c 2012-10-04 11:54:16.000000000 +0200
+--- 12.3.orig/drivers/xen/core/evtchn.c 2012-10-04 11:53:07.000000000 +0200
++++ 12.3/drivers/xen/core/evtchn.c 2012-10-04 11:54:16.000000000 +0200
@@ -361,8 +361,8 @@ static int find_unbound_irq(void)
if (!warned) {
@@ -4975,16 +4976,16 @@ Acked-by: jbeulich@novell.com
irq, type_from_irq(irq), index_from_irq(irq), xen_pirq);
return -EINVAL;
}
---- head.orig/drivers/xen/core/firmware.c 2012-06-12 15:05:58.000000000 +0200
-+++ head/drivers/xen/core/firmware.c 2012-06-12 15:13:59.000000000 +0200
+--- 12.3.orig/drivers/xen/core/firmware.c 2012-06-12 15:05:58.000000000 +0200
++++ 12.3/drivers/xen/core/firmware.c 2012-06-12 15:13:59.000000000 +0200
@@ -1,4 +1,5 @@
#include <linux/kernel.h>
+#include <linux/string.h>
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/edd.h>
---- head.orig/drivers/xen/core/gnttab.c 2012-03-12 13:38:38.000000000 +0100
-+++ head/drivers/xen/core/gnttab.c 2012-11-14 12:41:51.000000000 +0100
+--- 12.3.orig/drivers/xen/core/gnttab.c 2012-03-12 13:38:38.000000000 +0100
++++ 12.3/drivers/xen/core/gnttab.c 2012-11-14 12:41:51.000000000 +0100
@@ -246,8 +246,8 @@ static void gnttab_handle_deferred(unsig
entry = NULL;
} else {
@@ -5005,8 +5006,8 @@ Acked-by: jbeulich@novell.com
return -1;
}
}
---- head.orig/drivers/xen/core/machine_kexec.c 2012-02-17 09:55:35.000000000 +0100
-+++ head/drivers/xen/core/machine_kexec.c 2012-02-17 09:56:45.000000000 +0100
+--- 12.3.orig/drivers/xen/core/machine_kexec.c 2012-02-17 09:55:35.000000000 +0100
++++ 12.3/drivers/xen/core/machine_kexec.c 2012-02-17 09:56:45.000000000 +0100
@@ -31,6 +31,10 @@ void __init xen_machine_kexec_setup_reso
unsigned int k = 0, nr = 0;
int rc;
@@ -5046,8 +5047,8 @@ Acked-by: jbeulich@novell.com
void machine_shutdown(void)
{
/* do nothing */
---- head.orig/drivers/xen/core/machine_reboot.c 2011-01-31 17:32:29.000000000 +0100
-+++ head/drivers/xen/core/machine_reboot.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/drivers/xen/core/machine_reboot.c 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/drivers/xen/core/machine_reboot.c 2011-01-31 17:56:27.000000000 +0100
@@ -204,8 +204,7 @@ int __xen_suspend(int fast_suspend, void
#if defined(__i386__) || defined(__x86_64__)
@@ -5058,8 +5059,8 @@ Acked-by: jbeulich@novell.com
return -EOPNOTSUPP;
}
#endif
---- head.orig/drivers/xen/core/reboot.c 2011-01-31 17:49:31.000000000 +0100
-+++ head/drivers/xen/core/reboot.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/drivers/xen/core/reboot.c 2011-01-31 17:49:31.000000000 +0100
++++ 12.3/drivers/xen/core/reboot.c 2011-01-31 17:56:27.000000000 +0100
@@ -82,14 +82,14 @@ static int xen_suspend(void *__unused)
daemonize("suspend");
err = set_cpus_allowed(current, cpumask_of_cpu(0));
@@ -5142,8 +5143,8 @@ Acked-by: jbeulich@novell.com
return err;
}
---- head.orig/drivers/xen/core/smpboot.c 2012-03-22 16:08:04.000000000 +0100
-+++ head/drivers/xen/core/smpboot.c 2012-04-04 10:19:44.000000000 +0200
+--- 12.3.orig/drivers/xen/core/smpboot.c 2012-03-22 16:08:04.000000000 +0100
++++ 12.3/drivers/xen/core/smpboot.c 2012-04-04 10:19:44.000000000 +0200
@@ -34,31 +34,20 @@ extern void failsafe_callback(void);
extern void system_call(void);
extern void smp_trap_init(trap_info_t *);
@@ -5291,8 +5292,8 @@ Acked-by: jbeulich@novell.com
if (num_online_cpus() == 1)
alternatives_smp_switch(0);
}
---- head.orig/drivers/xen/fbfront/xenfb.c 2011-01-31 17:32:16.000000000 +0100
-+++ head/drivers/xen/fbfront/xenfb.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/drivers/xen/fbfront/xenfb.c 2011-01-31 17:32:16.000000000 +0100
++++ 12.3/drivers/xen/fbfront/xenfb.c 2011-01-31 17:56:27.000000000 +0100
@@ -240,8 +240,8 @@ static void xenfb_update_screen(struct x
mutex_unlock(&info->mm_lock);
@@ -5304,8 +5305,8 @@ Acked-by: jbeulich@novell.com
WARN_ON(1);
}
xenfb_do_update(info, x1, y1, x2 - x1, y2 - y1);
---- head.orig/drivers/xen/fbfront/xenkbd.c 2011-10-04 15:30:07.000000000 +0200
-+++ head/drivers/xen/fbfront/xenkbd.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/drivers/xen/fbfront/xenkbd.c 2011-10-04 15:30:07.000000000 +0200
++++ 12.3/drivers/xen/fbfront/xenkbd.c 2011-01-31 17:56:27.000000000 +0100
@@ -80,8 +80,8 @@ static irqreturn_t input_handler(int rq,
input_report_key(dev, event->key.keycode,
event->key.pressed);
@@ -5317,8 +5318,8 @@ Acked-by: jbeulich@novell.com
break;
case XENKBD_TYPE_POS:
if (event->pos.rel_z)
---- head.orig/drivers/xen/gntdev/gntdev.c 2012-05-23 13:04:13.000000000 +0200
-+++ head/drivers/xen/gntdev/gntdev.c 2012-05-23 13:29:28.000000000 +0200
+--- 12.3.orig/drivers/xen/gntdev/gntdev.c 2012-05-23 13:04:13.000000000 +0200
++++ 12.3/drivers/xen/gntdev/gntdev.c 2012-05-23 13:29:28.000000000 +0200
@@ -365,14 +365,14 @@ static int __init gntdev_init(void)
int err;
@@ -5488,8 +5489,8 @@ Acked-by: jbeulich@novell.com
"IOCTL_GNTDEV_GET_OFFSET_FOR_VADDR must be at "
"the start of the VM area. vma->vm_start = "
"%#lx; vaddr = %#lx\n",
---- head.orig/drivers/xen/netback/common.h 2012-06-06 13:53:20.000000000 +0200
-+++ head/drivers/xen/netback/common.h 2012-06-06 13:55:46.000000000 +0200
+--- 12.3.orig/drivers/xen/netback/common.h 2012-06-06 13:53:20.000000000 +0200
++++ 12.3/drivers/xen/netback/common.h 2012-06-06 13:55:46.000000000 +0200
@@ -45,10 +45,8 @@
#define DPRINTK(_f, _a...) \
pr_debug("(file=%s, line=%d) " _f, \
@@ -5503,8 +5504,8 @@ Acked-by: jbeulich@novell.com
typedef struct netif_st {
/* Unique identifier for this interface. */
---- head.orig/drivers/xen/netback/interface.c 2011-04-11 14:38:22.000000000 +0200
-+++ head/drivers/xen/netback/interface.c 2011-11-03 12:10:16.000000000 +0100
+--- 12.3.orig/drivers/xen/netback/interface.c 2011-04-11 14:38:22.000000000 +0200
++++ 12.3/drivers/xen/netback/interface.c 2011-11-03 12:10:16.000000000 +0100
@@ -176,9 +176,13 @@ static const struct netif_stat {
{ "rx_gso_csum_fixups", offsetof(netif_t, rx_gso_csum_fixups) / sizeof(long) },
};
@@ -5530,8 +5531,8 @@ Acked-by: jbeulich@novell.com
.get_ethtool_stats = netbk_get_ethtool_stats,
.get_strings = netbk_get_strings,
};
---- head.orig/drivers/xen/netback/netback.c 2012-06-06 13:49:44.000000000 +0200
-+++ head/drivers/xen/netback/netback.c 2012-06-06 13:55:49.000000000 +0200
+--- 12.3.orig/drivers/xen/netback/netback.c 2013-01-25 14:06:30.000000000 +0100
++++ 12.3/drivers/xen/netback/netback.c 2013-01-25 14:08:31.000000000 +0100
@@ -364,8 +364,8 @@ static void xen_network_done_notify(void
{
static struct net_device *eth0_dev = NULL;
@@ -5543,7 +5544,7 @@ Acked-by: jbeulich@novell.com
}
/*
* Add following to poll() function in NAPI driver (Tigon3 is example):
-@@ -1599,28 +1599,30 @@ static irqreturn_t netif_be_dbg(int irq,
+@@ -1636,28 +1636,30 @@ static irqreturn_t netif_be_dbg(int irq,
netif_t *netif;
int i = 0;
@@ -5588,7 +5589,7 @@ Acked-by: jbeulich@novell.com
return IRQ_HANDLED;
}
-@@ -1650,7 +1652,7 @@ static int __init netback_init(void)
+@@ -1687,7 +1689,7 @@ static int __init netback_init(void)
mmap_pages = alloc_empty_pages_and_pagevec(MAX_PENDING_REQS);
if (mmap_pages == NULL) {
@@ -5597,8 +5598,8 @@ Acked-by: jbeulich@novell.com
return -ENOMEM;
}
---- head.orig/drivers/xen/netback/xenbus.c 2012-01-03 11:55:56.000000000 +0100
-+++ head/drivers/xen/netback/xenbus.c 2012-01-06 10:44:04.000000000 +0100
+--- 12.3.orig/drivers/xen/netback/xenbus.c 2012-01-03 11:55:56.000000000 +0100
++++ 12.3/drivers/xen/netback/xenbus.c 2012-01-06 10:44:04.000000000 +0100
@@ -167,11 +167,9 @@ fail:
* and vif variables to the environment, for the benefit of the vif-* hotplug
* scripts.
@@ -5649,8 +5650,8 @@ Acked-by: jbeulich@novell.com
xenbus_switch_state(dev, XenbusStateInitWait);
}
break;
---- head.orig/drivers/xen/netfront/accel.c 2011-01-31 17:32:29.000000000 +0100
-+++ head/drivers/xen/netfront/accel.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/drivers/xen/netfront/accel.c 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/drivers/xen/netfront/accel.c 2011-01-31 17:56:27.000000000 +0100
@@ -40,10 +40,8 @@
#define DPRINTK(fmt, args...) \
pr_debug("netfront/accel (%s:%d) " fmt, \
@@ -5700,8 +5701,8 @@ Acked-by: jbeulich@novell.com
}
---- head.orig/drivers/xen/netfront/netfront.c 2012-12-18 11:57:55.000000000 +0100
-+++ head/drivers/xen/netfront/netfront.c 2012-12-18 12:04:18.000000000 +0100
+--- 12.3.orig/drivers/xen/netfront/netfront.c 2012-12-18 11:57:55.000000000 +0100
++++ 12.3/drivers/xen/netfront/netfront.c 2012-12-18 12:04:18.000000000 +0100
@@ -206,10 +206,8 @@ static inline grant_ref_t xennet_get_rx_
#define DPRINTK(fmt, args...) \
pr_debug("netfront (%s:%d) " fmt, \
@@ -5933,8 +5934,8 @@ Acked-by: jbeulich@novell.com
SET_NETDEV_DEV(netdev, &dev->dev);
np->netdev = netdev;
---- head.orig/drivers/xen/netfront/netfront.h 2012-06-06 13:49:51.000000000 +0200
-+++ head/drivers/xen/netfront/netfront.h 2012-06-06 13:55:57.000000000 +0200
+--- 12.3.orig/drivers/xen/netfront/netfront.h 2012-06-06 13:49:51.000000000 +0200
++++ 12.3/drivers/xen/netfront/netfront.h 2012-06-06 13:55:57.000000000 +0200
@@ -156,6 +156,8 @@ struct netfront_info {
spinlock_t tx_lock;
spinlock_t rx_lock;
@@ -5944,8 +5945,8 @@ Acked-by: jbeulich@novell.com
unsigned int irq;
unsigned int copying_receiver;
unsigned int carrier;
---- head.orig/drivers/xen/xen-pciback/slot.c 2009-03-18 10:39:32.000000000 +0100
-+++ head/drivers/xen/xen-pciback/slot.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/drivers/xen/xen-pciback/slot.c 2009-03-18 10:39:32.000000000 +0100
++++ 12.3/drivers/xen/xen-pciback/slot.c 2011-01-31 17:56:27.000000000 +0100
@@ -64,9 +64,9 @@ int pciback_add_pci_dev(struct pciback_d
for (bus = 0; bus < PCI_BUS_NBR; bus++)
for (slot = 0; slot < PCI_SLOT_MAX; slot++) {
@@ -5959,8 +5960,8 @@ Acked-by: jbeulich@novell.com
slot_dev->slots[bus][slot] = dev;
goto unlock;
}
---- head.orig/drivers/xen/pcifront/Makefile 2007-06-12 13:13:45.000000000 +0200
-+++ head/drivers/xen/pcifront/Makefile 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/drivers/xen/pcifront/Makefile 2007-06-12 13:13:45.000000000 +0200
++++ 12.3/drivers/xen/pcifront/Makefile 2011-01-31 17:56:27.000000000 +0100
@@ -2,6 +2,4 @@ obj-y += pcifront.o
pcifront-y := pci_op.o xenbus.o pci.o
@@ -5969,8 +5970,8 @@ Acked-by: jbeulich@novell.com
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_XEN_PCIDEV_FE_DEBUG) += -DDEBUG
---- head.orig/drivers/xen/scsiback/emulate.c 2012-01-09 11:04:26.000000000 +0100
-+++ head/drivers/xen/scsiback/emulate.c 2012-01-09 11:06:45.000000000 +0100
+--- 12.3.orig/drivers/xen/scsiback/emulate.c 2012-01-09 11:04:26.000000000 +0100
++++ 12.3/drivers/xen/scsiback/emulate.c 2012-01-09 11:06:45.000000000 +0100
@@ -114,9 +114,10 @@ static void resp_not_supported_cmd(pendi
}
@@ -6075,8 +6076,8 @@ Acked-by: jbeulich@novell.com
goto fail;
}
---- head.orig/drivers/xen/scsiback/interface.c 2011-04-11 14:52:22.000000000 +0200
-+++ head/drivers/xen/scsiback/interface.c 2011-04-11 15:00:59.000000000 +0200
+--- 12.3.orig/drivers/xen/scsiback/interface.c 2011-04-11 14:52:22.000000000 +0200
++++ 12.3/drivers/xen/scsiback/interface.c 2011-04-11 15:00:59.000000000 +0200
@@ -68,7 +68,7 @@ int scsiback_init_sring(struct vscsibk_i
int err;
@@ -6095,8 +6096,8 @@ Acked-by: jbeulich@novell.com
return -ENOMEM;
}
---- head.orig/drivers/xen/scsiback/scsiback.c 2012-12-06 16:06:32.000000000 +0100
-+++ head/drivers/xen/scsiback/scsiback.c 2012-12-06 16:08:04.000000000 +0100
+--- 12.3.orig/drivers/xen/scsiback/scsiback.c 2013-01-25 14:06:09.000000000 +0100
++++ 12.3/drivers/xen/scsiback/scsiback.c 2013-01-28 15:55:41.000000000 +0100
@@ -194,14 +194,10 @@ static void scsiback_print_status(char *
{
struct scsi_device *sdev = pending_req->sdev;
@@ -6116,7 +6117,7 @@ Acked-by: jbeulich@novell.com
if (CHECK_CONDITION & status_byte(errors))
__scsi_print_sense("scsiback", sense_buffer, SCSI_SENSE_BUFFERSIZE);
-@@ -252,14 +248,18 @@ static int scsiback_gnttab_data_map(vscs
+@@ -250,14 +246,18 @@ static int scsiback_gnttab_data_map(vscs
write = (data_dir == DMA_TO_DEVICE);
if (nr_segments) {
@@ -6136,7 +6137,7 @@ Acked-by: jbeulich@novell.com
flags = GNTMAP_host_map;
if (write)
flags |= GNTMAP_readonly;
-@@ -272,14 +272,14 @@ static int scsiback_gnttab_data_map(vscs
+@@ -270,14 +270,14 @@ static int scsiback_gnttab_data_map(vscs
err = HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, map, nr_segments);
BUG_ON(err);
@@ -6153,7 +6154,7 @@ Acked-by: jbeulich@novell.com
map[i].handle = SCSIBACK_INVALID_HANDLE;
err |= 1;
}
-@@ -294,15 +294,14 @@ static int scsiback_gnttab_data_map(vscs
+@@ -292,15 +292,14 @@ static int scsiback_gnttab_data_map(vscs
set_phys_to_machine(page_to_pfn(pg),
FOREIGN_FRAME(map[i].dev_bus_addr >> PAGE_SHIFT));
@@ -6175,7 +6176,7 @@ Acked-by: jbeulich@novell.com
err |= 1;
}
-@@ -331,27 +330,14 @@ static int scsiback_merge_bio(struct req
+@@ -329,27 +328,14 @@ static int scsiback_merge_bio(struct req
blk_queue_bounce(q, &bio);
@@ -6205,7 +6206,7 @@ Acked-by: jbeulich@novell.com
}
-@@ -362,16 +348,16 @@ static int request_map_sg(struct request
+@@ -360,16 +346,16 @@ static int request_map_sg(struct request
struct request_queue *q = rq->q;
int nr_pages;
unsigned int nsegs = count;
@@ -6227,7 +6228,7 @@ Acked-by: jbeulich@novell.com
data_len += len;
nr_pages = (len + off + PAGE_SIZE - 1) >> PAGE_SHIFT;
-@@ -399,7 +385,7 @@ static int request_map_sg(struct request
+@@ -397,7 +383,7 @@ static int request_map_sg(struct request
if (bio->bi_vcnt >= nr_vecs) {
err = scsiback_merge_bio(rq, bio);
if (err) {
@@ -6236,7 +6237,7 @@ Acked-by: jbeulich@novell.com
goto free_bios;
}
bio = NULL;
-@@ -422,7 +408,7 @@ free_bios:
+@@ -420,7 +406,7 @@ free_bios:
/*
* call endio instead of bio_put incase it was bounced
*/
@@ -6245,7 +6246,7 @@ Acked-by: jbeulich@novell.com
}
return err;
-@@ -465,7 +451,7 @@ void scsiback_cmd_exec(pending_req_t *pe
+@@ -463,7 +449,7 @@ void scsiback_cmd_exec(pending_req_t *pe
if (nr_segments) {
if (request_map_sg(rq, pending_req, nr_segments)) {
@@ -6254,16 +6255,16 @@ Acked-by: jbeulich@novell.com
return;
}
}
-@@ -624,7 +610,7 @@ static int _scsiback_do_cmd_fn(struct vs
- } else if (pending_req->act == VSCSIIF_ACT_SCSI_RESET) {
- scsiback_device_reset_exec(pending_req);
- } else {
-- printk(KERN_ERR "scsiback: invalid parameter for request\n");
-+ pr_err("scsiback: invalid parameter for request\n");
- scsiback_do_resp_with_sense(NULL, (DRIVER_ERROR << 24),
- 0, pending_req);
- continue;
-@@ -723,7 +709,7 @@ out_of_memory:
+@@ -614,7 +600,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");
+ scsiback_do_resp_with_sense(NULL, DRIVER_ERROR << 24,
+ 0, pending_req);
+ break;
+@@ -717,7 +703,7 @@ out_of_memory:
kfree(pending_reqs);
kfree(pending_grant_handles);
free_empty_pages_and_pagevec(pending_pages, mmap_pages);
@@ -6272,8 +6273,8 @@ Acked-by: jbeulich@novell.com
return -ENOMEM;
}
---- head.orig/drivers/xen/scsiback/translate.c 2008-07-21 11:00:33.000000000 +0200
-+++ head/drivers/xen/scsiback/translate.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/drivers/xen/scsiback/translate.c 2008-07-21 11:00:33.000000000 +0200
++++ 12.3/drivers/xen/scsiback/translate.c 2011-01-31 17:56:27.000000000 +0100
@@ -62,8 +62,8 @@ int scsiback_add_translation_entry(struc
if ((entry->v.chn == v->chn) &&
(entry->v.tgt == v->tgt) &&
@@ -6294,8 +6295,8 @@ Acked-by: jbeulich@novell.com
err = -ENOMEM;
goto out;
}
---- head.orig/drivers/xen/scsiback/xenbus.c 2012-01-20 14:18:49.000000000 +0100
-+++ head/drivers/xen/scsiback/xenbus.c 2011-06-30 16:32:56.000000000 +0200
+--- 12.3.orig/drivers/xen/scsiback/xenbus.c 2012-01-20 14:18:49.000000000 +0100
++++ 12.3/drivers/xen/scsiback/xenbus.c 2011-06-30 16:32:56.000000000 +0200
@@ -101,14 +101,13 @@ struct scsi_device *scsiback_get_scsi_de
shost = scsi_host_lookup(phy->hst);
@@ -6353,8 +6354,8 @@ Acked-by: jbeulich@novell.com
scsiback_remove(dev);
return err;
---- head.orig/drivers/xen/scsifront/scsifront.c 2012-12-06 16:07:02.000000000 +0100
-+++ head/drivers/xen/scsifront/scsifront.c 2012-12-04 12:44:59.000000000 +0100
+--- 12.3.orig/drivers/xen/scsifront/scsifront.c 2012-12-06 16:07:02.000000000 +0100
++++ 12.3/drivers/xen/scsifront/scsifront.c 2012-12-04 12:44:59.000000000 +0100
@@ -260,10 +260,9 @@ static int map_data_for_request(struct v
{
grant_ref_t gref_head;
@@ -6416,8 +6417,8 @@ Acked-by: jbeulich@novell.com
off = 0;
ref_cnt++;
}
---- head.orig/drivers/xen/sfc_netback/accel_fwd.c 2011-01-31 17:32:29.000000000 +0100
-+++ head/drivers/xen/sfc_netback/accel_fwd.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/drivers/xen/sfc_netback/accel_fwd.c 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/drivers/xen/sfc_netback/accel_fwd.c 2011-01-31 17:56:27.000000000 +0100
@@ -181,10 +181,11 @@ int netback_accel_fwd_add(const __u8 *ma
unsigned long flags;
cuckoo_hash_mac_key key = cuckoo_mac_to_key(mac);
@@ -6472,8 +6473,8 @@ Acked-by: jbeulich@novell.com
spin_lock_irqsave(&fwd_set->fwd_lock, flags);
/*
---- head.orig/drivers/xen/sfc_netback/accel_msg.c 2008-02-20 09:32:49.000000000 +0100
-+++ head/drivers/xen/sfc_netback/accel_msg.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/drivers/xen/sfc_netback/accel_msg.c 2008-02-20 09:32:49.000000000 +0100
++++ 12.3/drivers/xen/sfc_netback/accel_msg.c 2011-01-31 17:56:27.000000000 +0100
@@ -57,11 +57,11 @@ static void netback_accel_msg_tx_localma
{
unsigned long lock_state;
@@ -6488,8 +6489,8 @@ Acked-by: jbeulich@novell.com
msg = net_accel_msg_start_send(bend->shared_page, &bend->to_domU,
&lock_state);
---- head.orig/drivers/xen/sfc_netfront/accel_msg.c 2011-01-31 17:29:16.000000000 +0100
-+++ head/drivers/xen/sfc_netfront/accel_msg.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/drivers/xen/sfc_netfront/accel_msg.c 2011-01-31 17:29:16.000000000 +0100
++++ 12.3/drivers/xen/sfc_netfront/accel_msg.c 2011-01-31 17:56:27.000000000 +0100
@@ -41,11 +41,13 @@ static void vnic_start_interrupts(netfro
/* Prime our interrupt */
spin_lock_irqsave(&vnic->irq_enabled_lock, flags);
@@ -6570,8 +6571,8 @@ Acked-by: jbeulich@novell.com
}
else {
spin_unlock_irqrestore(&vnic->irq_enabled_lock, flags);
---- head.orig/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 16:06:37.000000000 +0200
-+++ head/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 16:33:02.000000000 +0200
+--- 12.3.orig/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 16:06:37.000000000 +0200
++++ 12.3/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 16:33:02.000000000 +0200
@@ -645,8 +645,10 @@ netfront_accel_vi_tx_post(netfront_accel
(cuckoo_hash_key *)(&key), &value);
@@ -6598,8 +6599,8 @@ Acked-by: jbeulich@novell.com
if (ip->protocol == IPPROTO_TCP) {
struct tcphdr *tcp = (struct tcphdr *)
---- head.orig/drivers/xen/sfc_netutil/accel_msg_iface.c 2008-02-20 09:32:49.000000000 +0100
-+++ head/drivers/xen/sfc_netutil/accel_msg_iface.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/drivers/xen/sfc_netutil/accel_msg_iface.c 2008-02-20 09:32:49.000000000 +0100
++++ 12.3/drivers/xen/sfc_netutil/accel_msg_iface.c 2011-01-31 17:56:27.000000000 +0100
@@ -36,7 +36,7 @@
#else
#define NET_ACCEL_CHECK_MAGIC(_p, _errval) \
@@ -6609,8 +6610,8 @@ Acked-by: jbeulich@novell.com
__FUNCTION__, _p); \
return _errval; \
}
---- head.orig/drivers/xen/sfc_netutil/accel_util.h 2008-02-20 09:32:49.000000000 +0100
-+++ head/drivers/xen/sfc_netutil/accel_util.h 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/drivers/xen/sfc_netutil/accel_util.h 2008-02-20 09:32:49.000000000 +0100
++++ 12.3/drivers/xen/sfc_netutil/accel_util.h 2011-01-31 17:56:27.000000000 +0100
@@ -63,9 +63,6 @@
DPRINTK("%s at %s:%d\n", #exp, __FILE__, __LINE__); \
} while(0)
@@ -6621,8 +6622,8 @@ Acked-by: jbeulich@novell.com
#include <xen/xenbus.h>
/*! Map a set of pages from another domain
---- head.orig/drivers/xen/tpmback/interface.c 2011-04-11 14:52:30.000000000 +0200
-+++ head/drivers/xen/tpmback/interface.c 2011-04-11 15:00:49.000000000 +0200
+--- 12.3.orig/drivers/xen/tpmback/interface.c 2011-04-11 14:52:30.000000000 +0200
++++ 12.3/drivers/xen/tpmback/interface.c 2011-04-11 15:00:49.000000000 +0200
@@ -50,7 +50,7 @@ static tpmif_t *alloc_tpmif(domid_t domi
out_of_memory:
if (tpmif != NULL)
@@ -6632,8 +6633,8 @@ Acked-by: jbeulich@novell.com
return ERR_PTR(-ENOMEM);
}
---- head.orig/drivers/xen/tpmback/tpmback.c 2011-01-31 17:32:22.000000000 +0100
-+++ head/drivers/xen/tpmback/tpmback.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/drivers/xen/tpmback/tpmback.c 2011-01-31 17:32:22.000000000 +0100
++++ 12.3/drivers/xen/tpmback/tpmback.c 2011-01-31 17:56:27.000000000 +0100
@@ -908,8 +908,7 @@ static int __init tpmback_init(void)
int rc;
@@ -6653,8 +6654,8 @@ Acked-by: jbeulich@novell.com
return 0;
}
---- head.orig/drivers/xen/usbback/usbback.c 2011-04-11 14:30:35.000000000 +0200
-+++ head/drivers/xen/usbback/usbback.c 2011-04-11 15:00:38.000000000 +0200
+--- 12.3.orig/drivers/xen/usbback/usbback.c 2011-04-11 14:30:35.000000000 +0200
++++ 12.3/drivers/xen/usbback/usbback.c 2013-01-28 15:55:45.000000000 +0100
@@ -88,6 +88,8 @@ typedef struct {
static pending_req_t *pending_reqs;
static struct list_head pending_free;
@@ -6773,16 +6774,17 @@ Acked-by: jbeulich@novell.com
ret = -ESHUTDOWN;
goto fail_flush_area;
}
-@@ -984,7 +1018,7 @@ static int usbbk_start_submit_urb(usbif_
-
+@@ -985,8 +1019,7 @@ static int usbbk_start_submit_urb(usbif_
while (rc != rp) {
if (RING_REQUEST_CONS_OVERFLOW(urb_ring, rc)) {
-- printk(KERN_WARNING "RING_REQUEST_CONS_OVERFLOW\n");
-+ pr_warning("RING_REQUEST_CONS_OVERFLOW\n");
+ if(printk_ratelimit())
+- printk(KERN_WARNING "usbback: "
+- "RING_REQUEST_CONS_OVERFLOW\n");
++ pr_warning("RING_REQUEST_CONS_OVERFLOW\n");
break;
}
-@@ -1055,8 +1089,11 @@ int usbbk_schedule(void *arg)
+@@ -1057,8 +1090,11 @@ int usbbk_schedule(void *arg)
if (usbbk_start_submit_urb(usbif))
usbif->waiting_reqs = 1;
@@ -6794,8 +6796,8 @@ Acked-by: jbeulich@novell.com
usbif->xenusbd = NULL;
usbif_put(usbif);
---- head.orig/drivers/xen/usbback/usbstub.c 2011-03-11 10:54:35.000000000 +0100
-+++ head/drivers/xen/usbback/usbstub.c 2011-03-11 10:55:46.000000000 +0100
+--- 12.3.orig/drivers/xen/usbback/usbstub.c 2011-03-11 10:54:35.000000000 +0100
++++ 12.3/drivers/xen/usbback/usbstub.c 2011-03-11 10:55:46.000000000 +0100
@@ -150,7 +150,7 @@ static struct usbstub *usbstub_alloc(str
stub = kzalloc(sizeof(*stub), GFP_KERNEL);
@@ -6814,8 +6816,8 @@ Acked-by: jbeulich@novell.com
goto out;
}
---- head.orig/drivers/xen/usbback/xenbus.c 2011-12-21 10:02:58.000000000 +0100
-+++ head/drivers/xen/usbback/xenbus.c 2011-06-30 16:33:08.000000000 +0200
+--- 12.3.orig/drivers/xen/usbback/xenbus.c 2011-12-21 10:02:58.000000000 +0100
++++ 12.3/drivers/xen/usbback/xenbus.c 2011-06-30 16:33:08.000000000 +0200
@@ -240,9 +240,9 @@ static int connect_rings(usbif_t *usbif)
return err;
}
@@ -6840,8 +6842,8 @@ Acked-by: jbeulich@novell.com
xenbus_switch_state(dev, XenbusStateInitWait);
}
break;
---- head.orig/drivers/xen/usbfront/usbfront.h 2012-06-06 13:48:26.000000000 +0200
-+++ head/drivers/xen/usbfront/usbfront.h 2012-06-06 13:56:04.000000000 +0200
+--- 12.3.orig/drivers/xen/usbfront/usbfront.h 2012-06-06 13:48:26.000000000 +0200
++++ 12.3/drivers/xen/usbfront/usbfront.h 2012-06-06 13:56:04.000000000 +0200
@@ -83,6 +83,7 @@ struct urb_priv {
struct urb *urb;
int req_id; /* RING_REQUEST id for submitting */
@@ -6850,8 +6852,8 @@ Acked-by: jbeulich@novell.com
unsigned unlinked:1; /* dequeued marker */
};
---- head.orig/drivers/xen/usbfront/usbfront-dbg.c 2011-01-31 17:29:16.000000000 +0100
-+++ head/drivers/xen/usbfront/usbfront-dbg.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/drivers/xen/usbfront/usbfront-dbg.c 2011-01-31 17:29:16.000000000 +0100
++++ 12.3/drivers/xen/usbfront/usbfront-dbg.c 2011-01-31 17:56:27.000000000 +0100
@@ -91,8 +91,8 @@ static inline void create_debug_file(str
{
struct class_device *cldev = info_to_hcd(info)->self.class_dev;
@@ -6863,8 +6865,8 @@ Acked-by: jbeulich@novell.com
}
static inline void remove_debug_file(struct usbfront_info *info)
---- head.orig/drivers/xen/usbfront/usbfront-hcd.c 2009-10-15 11:45:41.000000000 +0200
-+++ head/drivers/xen/usbfront/usbfront-hcd.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/drivers/xen/usbfront/usbfront-hcd.c 2009-10-15 11:45:41.000000000 +0200
++++ 12.3/drivers/xen/usbfront/usbfront-hcd.c 2011-01-31 17:56:27.000000000 +0100
@@ -114,7 +114,6 @@ static void xenhcd_stop(struct usb_hcd *
* non-error returns are promise to giveback the urb later
*/
@@ -6898,8 +6900,8 @@ Acked-by: jbeulich@novell.com
ret = xenhcd_unlink_urb(info, urbp);
done:
---- head.orig/drivers/xen/usbfront/usbfront-q.c 2011-01-31 17:29:16.000000000 +0100
-+++ head/drivers/xen/usbfront/usbfront-q.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/drivers/xen/usbfront/usbfront-q.c 2011-01-31 17:29:16.000000000 +0100
++++ 12.3/drivers/xen/usbfront/usbfront-q.c 2011-01-31 17:56:27.000000000 +0100
@@ -151,7 +151,7 @@ static int map_urb_for_request(struct us
ret = gnttab_alloc_grant_references(USBIF_MAX_SEGMENTS_PER_REQUEST, &gref_head);
@@ -6919,8 +6921,8 @@ Acked-by: jbeulich@novell.com
spin_lock(&info->lock);
}
---- head.orig/drivers/xen/usbfront/xenbus.c 2012-10-04 11:53:32.000000000 +0200
-+++ head/drivers/xen/usbfront/xenbus.c 2012-10-04 11:54:28.000000000 +0200
+--- 12.3.orig/drivers/xen/usbfront/xenbus.c 2012-10-04 11:53:32.000000000 +0200
++++ 12.3/drivers/xen/usbfront/xenbus.c 2012-10-04 11:54:28.000000000 +0200
@@ -394,7 +394,7 @@ static int __init usbfront_init(void)
xenhcd_urbp_cachep = kmem_cache_create("xenhcd_urb_priv",
sizeof(struct urb_priv), 0, 0, NULL);
@@ -6930,8 +6932,8 @@ Acked-by: jbeulich@novell.com
return -ENOMEM;
}
---- head.orig/drivers/xen/util.c 2011-01-31 17:49:31.000000000 +0100
-+++ head/drivers/xen/util.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/drivers/xen/util.c 2011-01-31 17:49:31.000000000 +0100
++++ 12.3/drivers/xen/util.c 2011-01-31 17:56:27.000000000 +0100
@@ -11,7 +11,7 @@ struct class *get_xen_class(void)
xen_class = class_create(THIS_MODULE, "xen");
@@ -6941,8 +6943,8 @@ Acked-by: jbeulich@novell.com
xen_class = NULL;
}
---- head.orig/drivers/xen/xenbus/xenbus_comms.c 2011-04-11 14:52:53.000000000 +0200
-+++ head/drivers/xen/xenbus/xenbus_comms.c 2011-04-11 15:00:27.000000000 +0200
+--- 12.3.orig/drivers/xen/xenbus/xenbus_comms.c 2011-04-11 14:52:53.000000000 +0200
++++ 12.3/drivers/xen/xenbus/xenbus_comms.c 2011-04-11 15:00:27.000000000 +0200
@@ -238,13 +238,13 @@ int xb_init_comms(void)
int err;
@@ -6970,8 +6972,8 @@ Acked-by: jbeulich@novell.com
return err;
}
---- head.orig/drivers/xen/xenbus/xenbus_probe.c 2012-03-12 13:39:04.000000000 +0100
-+++ head/drivers/xen/xenbus/xenbus_probe.c 2012-03-12 13:39:39.000000000 +0100
+--- 12.3.orig/drivers/xen/xenbus/xenbus_probe.c 2012-03-12 13:39:04.000000000 +0100
++++ 12.3/drivers/xen/xenbus/xenbus_probe.c 2012-03-12 13:39:39.000000000 +0100
@@ -112,13 +112,13 @@ static int frontend_bus_id(char bus_id[X
{
nodename = strchr(nodename, '/');
@@ -7192,8 +7194,8 @@ Acked-by: jbeulich@novell.com
seconds_waited += 5;
printk("%us...", 300 - seconds_waited);
if (seconds_waited == 300)
---- head.orig/drivers/xen/xenbus/xenbus_probe_backend.c 2011-12-21 10:51:23.000000000 +0100
-+++ head/drivers/xen/xenbus/xenbus_probe_backend.c 2011-12-21 10:56:21.000000000 +0100
+--- 12.3.orig/drivers/xen/xenbus/xenbus_probe_backend.c 2011-12-21 10:51:23.000000000 +0100
++++ 12.3/drivers/xen/xenbus/xenbus_probe_backend.c 2011-12-21 10:56:21.000000000 +0100
@@ -60,8 +60,7 @@
#include <xen/platform-compat.h>
#endif
@@ -7275,8 +7277,8 @@ Acked-by: jbeulich@novell.com
}
}
---- head.orig/drivers/xen/xenbus/xenbus_xs.c 2012-01-20 14:47:34.000000000 +0100
-+++ head/drivers/xen/xenbus/xenbus_xs.c 2012-03-12 15:30:16.000000000 +0100
+--- 12.3.orig/drivers/xen/xenbus/xenbus_xs.c 2012-01-20 14:47:34.000000000 +0100
++++ 12.3/drivers/xen/xenbus/xenbus_xs.c 2012-03-12 15:30:16.000000000 +0100
@@ -135,9 +135,8 @@ static int get_error(const char *errorst
for (i = 0; strcmp(errorstring, xsd_errors[i].errstring) != 0; i++) {
@@ -7334,8 +7336,8 @@ Acked-by: jbeulich@novell.com
if (kthread_should_stop())
break;
}
---- head.orig/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 17:49:31.000000000 +0100
-+++ head/drivers/xen/xenoprof/xenoprofile.c 2012-02-16 12:31:04.000000000 +0100
+--- 12.3.orig/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 17:49:31.000000000 +0100
++++ 12.3/drivers/xen/xenoprof/xenoprofile.c 2012-02-16 12:31:04.000000000 +0100
@@ -28,7 +28,6 @@
#include <xen/xenoprof.h>
#include <xen/interface/xen.h>
@@ -7365,8 +7367,8 @@ Acked-by: jbeulich@novell.com
return ret;
}
---- head.orig/arch/x86/include/asm/acpi.h 2012-06-13 13:55:22.000000000 +0200
-+++ head/arch/x86/include/asm/acpi.h 2012-06-13 15:18:32.000000000 +0200
+--- 12.3.orig/arch/x86/include/asm/acpi.h 2012-06-13 13:55:22.000000000 +0200
++++ 12.3/arch/x86/include/asm/acpi.h 2012-06-13 15:18:32.000000000 +0200
@@ -31,7 +31,7 @@
#include <asm/mpspec.h>
#include <asm/realmode.h>
@@ -7409,8 +7411,8 @@ Acked-by: jbeulich@novell.com
return max_cstate;
}
---- head.orig/arch/x86/include/mach-xen/asm/agp.h 2007-06-22 09:08:06.000000000 +0200
-+++ head/arch/x86/include/mach-xen/asm/agp.h 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/agp.h 2007-06-22 09:08:06.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/agp.h 2011-01-31 17:56:27.000000000 +0100
@@ -1,20 +1,22 @@
-#ifndef AGP_H
-#define AGP_H 1
@@ -7459,8 +7461,8 @@ Acked-by: jbeulich@novell.com
#define flush_agp_cache() wbinvd()
/* Convert a physical address to an address suitable for the GART. */
---- head.orig/arch/x86/include/mach-xen/asm/cmpxchg_32.h 2011-12-23 11:18:49.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/cmpxchg_32.h 2011-12-23 11:19:52.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/cmpxchg_32.h 2011-12-23 11:18:49.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/cmpxchg_32.h 2011-12-23 11:19:52.000000000 +0100
@@ -1,8 +1,6 @@
#ifndef _ASM_X86_XEN_CMPXCHG_32_H
#define _ASM_X86_XEN_CMPXCHG_32_H
@@ -7470,8 +7472,8 @@ Acked-by: jbeulich@novell.com
static inline u64 get_64bit(const volatile u64 *ptr)
{
u64 res;
---- head.orig/arch/x86/include/mach-xen/asm/cmpxchg_64.h 2011-12-23 11:18:57.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/cmpxchg_64.h 2011-12-23 11:19:55.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/cmpxchg_64.h 2011-12-23 11:18:57.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/cmpxchg_64.h 2011-12-23 11:19:55.000000000 +0100
@@ -1,8 +1,6 @@
#ifndef _ASM_X86_XEN_CMPXCHG_64_H
#define _ASM_X86_XEN_CMPXCHG_64_H
@@ -7482,15 +7484,15 @@ Acked-by: jbeulich@novell.com
{
return *ptr;
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/desc.h 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/desc.h 2011-01-31 17:56:27.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "desc_32.h"
+#else
+# include "desc_64.h"
+#endif
---- head.orig/arch/x86/include/mach-xen/asm/desc_64.h 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/desc_64.h 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/desc_64.h 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/desc_64.h 2011-01-31 17:56:27.000000000 +0100
@@ -34,6 +34,18 @@ static inline void clear_LDT(void)
put_cpu();
}
@@ -7547,7 +7549,7 @@ Acked-by: jbeulich@novell.com
static inline void set_tssldt_descriptor(void *ptr, unsigned long tss, unsigned type,
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/dma-mapping.h 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/dma-mapping.h 2011-01-31 17:56:27.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "dma-mapping_32.h"
@@ -7555,7 +7557,7 @@ Acked-by: jbeulich@novell.com
+# include "dma-mapping_64.h"
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/fixmap.h 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/fixmap.h 2011-01-31 17:56:27.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "fixmap_32.h"
@@ -7563,7 +7565,7 @@ Acked-by: jbeulich@novell.com
+# include "fixmap_64.h"
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/hypercall.h 2012-10-31 11:11:46.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/hypercall.h 2012-10-31 11:11:46.000000000 +0100
@@ -0,0 +1,424 @@
+/******************************************************************************
+ * hypercall.h
@@ -7989,8 +7991,8 @@ Acked-by: jbeulich@novell.com
+}
+
+#endif /* __HYPERCALL_H__ */
---- head.orig/arch/x86/include/mach-xen/asm/hypercall_32.h 2012-10-31 10:58:57.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/hypercall_32.h 2012-10-31 11:11:48.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/hypercall_32.h 2012-10-31 10:58:57.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/hypercall_32.h 2012-10-31 11:11:48.000000000 +0100
@@ -1,195 +1,10 @@
-/******************************************************************************
- * hypercall.h
@@ -8425,8 +8427,8 @@ Acked-by: jbeulich@novell.com
-
-
-#endif /* __HYPERCALL_H__ */
---- head.orig/arch/x86/include/mach-xen/asm/hypercall_64.h 2012-10-31 10:59:05.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/hypercall_64.h 2012-10-31 11:11:50.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/hypercall_64.h 2012-10-31 10:59:05.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/hypercall_64.h 2012-10-31 11:11:50.000000000 +0100
@@ -1,202 +1,10 @@
-/******************************************************************************
- * hypercall.h
@@ -8871,8 +8873,8 @@ Acked-by: jbeulich@novell.com
-}
-
-#endif /* __HYPERCALL_H__ */
---- head.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2012-10-31 11:01:51.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/hypervisor.h 2012-10-31 11:11:51.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2012-10-31 11:01:51.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/hypervisor.h 2012-10-31 11:11:51.000000000 +0100
@@ -38,10 +38,7 @@
#include <linux/version.h>
#include <linux/errno.h>
@@ -8893,7 +8895,7 @@ Acked-by: jbeulich@novell.com
#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/io.h 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/io.h 2011-01-31 17:56:27.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "io_32.h"
@@ -8901,15 +8903,15 @@ Acked-by: jbeulich@novell.com
+# include "io_64.h"
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/irqflags.h 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/irqflags.h 2011-01-31 17:56:27.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "irqflags_32.h"
+#else
+# include "irqflags_64.h"
+#endif
---- head.orig/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:56:27.000000000 +0100
@@ -150,6 +150,23 @@ static inline int raw_irqs_disabled_flag
\
raw_irqs_disabled_flags(flags); \
@@ -8952,8 +8954,8 @@ Acked-by: jbeulich@novell.com
+#endif
+
#endif
---- head.orig/arch/x86/include/mach-xen/asm/irqflags_64.h 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/irqflags_64.h 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/irqflags_64.h 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/irqflags_64.h 2011-01-31 17:56:27.000000000 +0100
@@ -116,6 +116,22 @@ static inline int raw_irqs_disabled_flag
})
@@ -8999,7 +9001,7 @@ Acked-by: jbeulich@novell.com
#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/maddr.h 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/maddr.h 2011-01-31 17:56:27.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "maddr_32.h"
@@ -9007,7 +9009,7 @@ Acked-by: jbeulich@novell.com
+# include "maddr_64.h"
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/mmu_context.h 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/mmu_context.h 2011-01-31 17:56:27.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "mmu_context_32.h"
@@ -9015,7 +9017,7 @@ Acked-by: jbeulich@novell.com
+# include "mmu_context_64.h"
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/pci.h 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/pci.h 2011-01-31 17:56:27.000000000 +0100
@@ -0,0 +1,100 @@
+#ifndef __x86_PCI_H
+#define __x86_PCI_H
@@ -9118,15 +9120,15 @@ Acked-by: jbeulich@novell.com
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/pgalloc.h 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/pgalloc.h 2011-01-31 17:56:27.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "pgalloc_32.h"
+#else
+# include "pgalloc_64.h"
+#endif
---- head.orig/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 17:49:31.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 17:49:31.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 17:56:27.000000000 +0100
@@ -115,6 +115,8 @@ static inline void pgd_list_del(pgd_t *p
spin_unlock(&pgd_lock);
}
@@ -9176,15 +9178,15 @@ Acked-by: jbeulich@novell.com
}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/pgtable.h 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/pgtable.h 2011-01-31 17:56:27.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "pgtable_32.h"
+#else
+# include "pgtable_64.h"
+#endif
---- head.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:38:23.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:38:23.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-01-31 17:56:27.000000000 +0100
@@ -17,10 +17,7 @@
#include <asm/fixmap.h>
#include <linux/threads.h>
@@ -9206,8 +9208,8 @@ Acked-by: jbeulich@novell.com
void pgtable_cache_init(void);
void paging_init(void);
---- head.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-02-07 15:38:18.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-02-07 15:38:18.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-01-31 17:56:27.000000000 +0100
@@ -9,7 +9,7 @@
* the x86-64 page table tree.
*/
@@ -9226,15 +9228,15 @@ Acked-by: jbeulich@novell.com
#define MODULES_END _AC(0xffffffffff000000, UL)
#define MODULES_LEN (MODULES_END - MODULES_VADDR)
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/processor.h 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/processor.h 2011-01-31 17:56:27.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "processor_32.h"
+#else
+# include "processor_64.h"
+#endif
---- head.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:49:31.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:49:31.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:56:27.000000000 +0100
@@ -70,17 +70,22 @@ struct cpuinfo_x86 {
char pad0;
int x86_power;
@@ -9343,8 +9345,8 @@ Acked-by: jbeulich@novell.com
#else
#define ASM_NOP1 GENERIC_NOP1
#define ASM_NOP2 GENERIC_NOP2
---- head.orig/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:49:31.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:49:31.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:56:27.000000000 +0100
@@ -62,19 +62,26 @@ struct cpuinfo_x86 {
int x86_cache_alignment;
int x86_tlbsize; /* number of 4K pages in DTLB/ITLB combined(in pages)*/
@@ -9460,15 +9462,15 @@ Acked-by: jbeulich@novell.com
unsigned long edx)
{
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/smp.h 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/smp.h 2011-01-31 17:56:27.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "smp_32.h"
+#else
+# include "smp_64.h"
+#endif
---- head.orig/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:56:27.000000000 +0100
@@ -11,7 +11,7 @@
#endif
@@ -9513,8 +9515,8 @@ Acked-by: jbeulich@novell.com
#define NO_PROC_ID 0xFF /* No processor magic marker */
---- head.orig/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:56:27.000000000 +0100
@@ -38,12 +38,11 @@ extern void smp_alloc_memory(void);
extern volatile unsigned long smp_invalidate_needed;
extern void lock_ipi_call_lock(void);
@@ -9574,7 +9576,7 @@ Acked-by: jbeulich@novell.com
#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/swiotlb.h 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/swiotlb.h 2011-01-31 17:56:27.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "swiotlb_32.h"
@@ -9582,15 +9584,15 @@ Acked-by: jbeulich@novell.com
+# include_next <asm/swiotlb.h>
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/tlbflush.h 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/tlbflush.h 2011-01-31 17:56:27.000000000 +0100
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "tlbflush_32.h"
+#else
+# include "tlbflush_64.h"
+#endif
---- head.orig/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:49:31.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:49:31.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:56:27.000000000 +0100
@@ -23,7 +23,6 @@
* - flush_tlb_page(vma, vmaddr) flushes one page
* - flush_tlb_range(vma, start, end) flushes a range of pages
@@ -9610,8 +9612,8 @@ Acked-by: jbeulich@novell.com
-}
-
#endif /* _I386_TLBFLUSH_H */
---- head.orig/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:49:31.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:49:31.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:56:27.000000000 +0100
@@ -28,7 +28,6 @@
* - flush_tlb_page(vma, vmaddr) flushes one page
* - flush_tlb_range(vma, start, end) flushes a range of pages
@@ -9634,7 +9636,7 @@ Acked-by: jbeulich@novell.com
-
#endif /* _X8664_TLBFLUSH_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/xor.h 2012-07-05 10:56:25.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/xor.h 2012-07-05 10:56:25.000000000 +0200
@@ -0,0 +1,21 @@
+#include_next <asm/xor.h>
+
@@ -9657,8 +9659,8 @@ Acked-by: jbeulich@novell.com
+} while (0)
+
+#endif
---- head.orig/arch/x86/include/asm/mmu.h 2012-12-18 11:38:26.000000000 +0100
-+++ head/arch/x86/include/asm/mmu.h 2011-06-30 16:30:20.000000000 +0200
+--- 12.3.orig/arch/x86/include/asm/mmu.h 2013-02-05 10:40:06.000000000 +0100
++++ 12.3/arch/x86/include/asm/mmu.h 2011-06-30 16:30:20.000000000 +0200
@@ -16,6 +16,9 @@ typedef struct {
/* True if mm supports a task running in 32 bit compatibility mode. */
unsigned short ia32_compat;
@@ -9669,8 +9671,8 @@ Acked-by: jbeulich@novell.com
struct mutex lock;
void *vdso;
---- head.orig/include/linux/kexec.h 2012-10-22 17:19:14.000000000 +0200
-+++ head/include/linux/kexec.h 2012-10-23 14:53:19.000000000 +0200
+--- 12.3.orig/include/linux/kexec.h 2012-10-22 17:19:14.000000000 +0200
++++ 12.3/include/linux/kexec.h 2012-10-23 14:53:19.000000000 +0200
@@ -198,8 +198,15 @@ extern struct kimage *kexec_crash_image;
#define VMCOREINFO_BYTES (4096)
#define VMCOREINFO_NOTE_NAME "VMCOREINFO"
@@ -9687,8 +9689,8 @@ Acked-by: jbeulich@novell.com
/* Location of a reserved region to hold the crash kernel.
*/
---- head.orig/include/linux/oprofile.h 2011-09-07 15:19:35.000000000 +0200
-+++ head/include/linux/oprofile.h 2011-04-13 12:44:12.000000000 +0200
+--- 12.3.orig/include/linux/oprofile.h 2011-09-07 15:19:35.000000000 +0200
++++ 12.3/include/linux/oprofile.h 2011-04-13 12:44:12.000000000 +0200
@@ -130,6 +130,8 @@ void oprofile_add_ext_hw_sample(unsigned
* backtrace. */
void oprofile_add_pc(unsigned long pc, int is_kernel, unsigned long event);
@@ -9698,8 +9700,8 @@ Acked-by: jbeulich@novell.com
/* add a backtrace entry, to be called from the ->backtrace callback */
void oprofile_add_trace(unsigned long eip);
---- head.orig/include/uapi/linux/sysctl.h 2012-12-18 11:38:26.000000000 +0100
-+++ head/include/uapi/linux/sysctl.h 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/include/uapi/linux/sysctl.h 2013-02-05 10:40:06.000000000 +0100
++++ 12.3/include/uapi/linux/sysctl.h 2011-01-31 17:56:27.000000000 +0100
@@ -59,6 +59,7 @@ enum
CTL_BUS=8, /* Busses */
CTL_ABI=9, /* Binary emulation */
@@ -9708,8 +9710,8 @@ Acked-by: jbeulich@novell.com
CTL_ARLAN=254, /* arlan wireless driver */
CTL_S390DBF=5677, /* s390 debug */
CTL_SUNRPC=7249, /* sunrpc debug */
---- head.orig/include/xen/cpu_hotplug.h 2007-08-16 18:07:01.000000000 +0200
-+++ head/include/xen/cpu_hotplug.h 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/include/xen/cpu_hotplug.h 2007-08-16 18:07:01.000000000 +0200
++++ 12.3/include/xen/cpu_hotplug.h 2011-01-31 17:56:27.000000000 +0100
@@ -25,8 +25,8 @@ void cpu_bringup(void);
static inline int smp_suspend(void)
{
@@ -9721,8 +9723,8 @@ Acked-by: jbeulich@novell.com
return -EOPNOTSUPP;
}
return 0;
---- head.orig/include/xen/gnttab.h 2012-03-12 12:51:05.000000000 +0100
-+++ head/include/xen/gnttab.h 2012-03-12 13:39:32.000000000 +0100
+--- 12.3.orig/include/xen/gnttab.h 2012-03-12 12:51:05.000000000 +0100
++++ 12.3/include/xen/gnttab.h 2012-03-12 13:39:32.000000000 +0100
@@ -174,11 +174,11 @@ gnttab_set_replace_op(struct gnttab_unma
BUG_ON(__ret); \
} \
@@ -9751,8 +9753,8 @@ Acked-by: jbeulich@novell.com
__func__, current->comm, (__HCarg_p)->status); \
}
---- head.orig/include/xen/hvm.h 2011-01-31 15:14:12.000000000 +0100
-+++ head/include/xen/hvm.h 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/include/xen/hvm.h 2011-01-31 15:14:12.000000000 +0100
++++ 12.3/include/xen/hvm.h 2011-01-31 17:56:27.000000000 +0100
@@ -13,8 +13,7 @@ static inline unsigned long hvm_get_para
xhv.index = idx;
r = HYPERVISOR_hvm_op(HVMOP_get_param, &xhv);
@@ -9763,8 +9765,8 @@ Acked-by: jbeulich@novell.com
return 0;
}
return xhv.value;
---- head.orig/include/xen/net-util.h 2011-02-09 15:53:07.000000000 +0100
-+++ head/include/xen/net-util.h 2011-02-09 15:55:10.000000000 +0100
+--- 12.3.orig/include/xen/net-util.h 2011-02-09 15:53:07.000000000 +0100
++++ 12.3/include/xen/net-util.h 2011-02-09 15:55:10.000000000 +0100
@@ -51,7 +51,7 @@ static inline int skb_checksum_setup(str
break;
default:
@@ -9774,8 +9776,8 @@ Acked-by: jbeulich@novell.com
"TCP/UDP packet, dropping a protocol"
" %d packet\n", iph->protocol);
goto out;
---- head.orig/include/xen/pcifront.h 2012-04-04 08:57:09.000000000 +0200
-+++ head/include/xen/pcifront.h 2012-04-04 10:19:31.000000000 +0200
+--- 12.3.orig/include/xen/pcifront.h 2012-04-04 08:57:09.000000000 +0200
++++ 12.3/include/xen/pcifront.h 2012-04-04 10:19:31.000000000 +0200
@@ -12,13 +12,11 @@
#ifndef __ia64__
@@ -9813,7 +9815,7 @@ Acked-by: jbeulich@novell.com
struct pcifront_sd *sd)
{
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/include/xen/sysctl.h 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/include/xen/sysctl.h 2011-01-31 17:56:27.000000000 +0100
@@ -0,0 +1,11 @@
+#ifndef _XEN_SYSCTL_H
+#define _XEN_SYSCTL_H
@@ -9826,8 +9828,8 @@ Acked-by: jbeulich@novell.com
+};
+
+#endif /* _XEN_SYSCTL_H */
---- head.orig/include/xen/xenbus.h 2011-12-21 10:50:40.000000000 +0100
-+++ head/include/xen/xenbus.h 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/include/xen/xenbus.h 2011-12-21 10:50:40.000000000 +0100
++++ 12.3/include/xen/xenbus.h 2011-01-31 17:56:27.000000000 +0100
@@ -107,7 +107,7 @@ struct xenbus_driver {
int (*suspend)(struct xenbus_device *dev);
int (*suspend_cancel)(struct xenbus_device *dev);
@@ -9837,8 +9839,8 @@ Acked-by: jbeulich@novell.com
struct device_driver driver;
int (*read_otherend_details)(struct xenbus_device *dev);
int (*is_ready)(struct xenbus_device *dev);
---- head.orig/kernel/kexec.c 2012-10-23 14:41:40.000000000 +0200
-+++ head/kernel/kexec.c 2012-10-23 14:53:25.000000000 +0200
+--- 12.3.orig/kernel/kexec.c 2012-10-23 14:41:40.000000000 +0200
++++ 12.3/kernel/kexec.c 2012-10-23 14:53:25.000000000 +0200
@@ -45,7 +45,11 @@ note_buf_t __percpu *crash_notes;
/* vmcoreinfo stuff */
@@ -9888,8 +9890,8 @@ Acked-by: jbeulich@novell.com
#endif
VMCOREINFO_SYMBOL(_stext);
VMCOREINFO_SYMBOL(vmlist);
---- head.orig/kernel/sysctl_binary.c 2012-12-18 11:38:26.000000000 +0100
-+++ head/kernel/sysctl_binary.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/kernel/sysctl_binary.c 2013-02-05 10:40:06.000000000 +0100
++++ 12.3/kernel/sysctl_binary.c 2011-01-31 17:56:27.000000000 +0100
@@ -873,6 +873,14 @@ static const struct bin_table bin_bus_ta
};
@@ -9915,8 +9917,8 @@ Acked-by: jbeulich@novell.com
/* CTL_ARLAN "arlan" no longer used */
{ CTL_DIR, CTL_S390DBF, "s390dbf", bin_s390dbf_table },
{ CTL_DIR, CTL_SUNRPC, "sunrpc", bin_sunrpc_table },
---- head.orig/lib/swiotlb-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head/lib/swiotlb-xen.c 2012-11-14 12:41:36.000000000 +0100
+--- 12.3.orig/lib/swiotlb-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/lib/swiotlb-xen.c 2012-11-14 12:41:36.000000000 +0100
@@ -27,7 +27,7 @@
#include <asm/uaccess.h>
#include <xen/gnttab.h>
diff --git a/patches.xen/xen3-patch-2.6.25 b/patches.xen/xen3-patch-2.6.25
index 80e230508e..9df80a90d3 100644
--- a/patches.xen/xen3-patch-2.6.25
+++ b/patches.xen/xen3-patch-2.6.25
@@ -7,8 +7,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
2.6.32/arch/x86/kernel/rtc.c (hooks in {update,read}_persistent_clock() removed)
---- head.orig/arch/x86/Kconfig 2012-10-23 14:53:52.000000000 +0200
-+++ head/arch/x86/Kconfig 2012-10-23 14:57:00.000000000 +0200
+--- 12.3.orig/arch/x86/Kconfig 2012-10-23 14:53:52.000000000 +0200
++++ 12.3/arch/x86/Kconfig 2012-10-23 14:57:00.000000000 +0200
@@ -48,7 +48,7 @@ config X86
select HAVE_FUNCTION_TRACE_MCOUNT_TEST
select HAVE_SYSCALL_TRACEPOINTS
@@ -76,8 +76,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
help
Enables some debug statements within the PCI Frontend.
---- head.orig/arch/x86/Kconfig.debug 2012-02-08 10:28:21.000000000 +0100
-+++ head/arch/x86/Kconfig.debug 2012-08-20 10:39:20.000000000 +0200
+--- 12.3.orig/arch/x86/Kconfig.debug 2012-02-08 10:28:21.000000000 +0100
++++ 12.3/arch/x86/Kconfig.debug 2012-08-20 10:39:20.000000000 +0200
@@ -269,6 +269,7 @@ config DEBUG_BOOT_PARAMS
bool "Debug boot parameters"
depends on DEBUG_KERNEL
@@ -86,8 +86,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
---help---
This option will cause struct boot_params to be exported via debugfs.
---- head.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:56:27.000000000 +0100
-+++ head/arch/x86/ia32/ia32entry-xen.S 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/ia32/ia32entry-xen.S 2011-01-31 18:01:51.000000000 +0100
@@ -12,7 +12,6 @@
#include <asm/ia32_unistd.h>
#include <asm/thread_info.h>
@@ -131,8 +131,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+ .quad compat_sys_timerfd_settime /* 325 */
+ .quad compat_sys_timerfd_gettime
ia32_syscall_end:
---- head.orig/arch/x86/kernel/Makefile 2012-10-23 14:53:50.000000000 +0200
-+++ head/arch/x86/kernel/Makefile 2012-10-23 14:57:08.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/Makefile 2012-10-23 14:53:50.000000000 +0200
++++ 12.3/arch/x86/kernel/Makefile 2012-10-23 14:57:08.000000000 +0200
@@ -115,11 +115,10 @@ ifeq ($(CONFIG_X86_64),y)
obj-$(CONFIG_PCI_MMCONFIG) += mmconf-fam10h_64.o
obj-y += vsmp_64.o
@@ -146,8 +146,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
reboot.o smpboot_$(BITS).o tsc_$(BITS).o tsc_sync.o
-disabled-obj-$(CONFIG_XEN_UNPRIVILEGED_GUEST) += mpparse_64.o
-%/head_64.o %/head_64.s: asflags-$(CONFIG_XEN) :=
---- head.orig/arch/x86/kernel/acpi/boot.c 2012-07-05 10:35:17.000000000 +0200
-+++ head/arch/x86/kernel/acpi/boot.c 2011-03-11 10:56:21.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/acpi/boot.c 2012-07-05 10:35:17.000000000 +0200
++++ 12.3/arch/x86/kernel/acpi/boot.c 2011-03-11 10:56:21.000000000 +0100
@@ -162,6 +162,11 @@ char *__init __acpi_map_table(unsigned l
if (!phys || !size)
return NULL;
@@ -160,8 +160,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
return early_ioremap(phys, size);
}
void __init __acpi_unmap_table(char *map, unsigned long size)
---- head.orig/arch/x86/kernel/apic/apic-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ head/arch/x86/kernel/apic/apic-xen.c 2011-02-24 15:45:13.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/apic/apic-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ 12.3/arch/x86/kernel/apic/apic-xen.c 2011-02-24 15:45:13.000000000 +0100
@@ -82,11 +82,12 @@ int setup_profiling_timer(unsigned int m
return -EINVAL;
}
@@ -181,8 +181,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
return 0;
}
+#endif
---- head.orig/arch/x86/kernel/asm-offsets_32.c 2012-02-08 11:31:30.000000000 +0100
-+++ head/arch/x86/kernel/asm-offsets_32.c 2012-02-08 11:41:08.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/asm-offsets_32.c 2012-02-08 11:31:30.000000000 +0100
++++ 12.3/arch/x86/kernel/asm-offsets_32.c 2012-02-08 11:41:08.000000000 +0100
@@ -1,7 +1,9 @@
#include <asm/ucontext.h>
@@ -193,8 +193,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
#define __SYSCALL_I386(nr, sym, compat) [nr] = 1,
static char syscalls[] = {
---- head.orig/arch/x86/kernel/cpu/common-xen.c 2012-07-05 10:50:04.000000000 +0200
-+++ head/arch/x86/kernel/cpu/common-xen.c 2012-07-05 15:17:21.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/cpu/common-xen.c 2012-07-05 10:50:04.000000000 +0200
++++ 12.3/arch/x86/kernel/cpu/common-xen.c 2012-07-05 15:17:21.000000000 +0200
@@ -27,52 +27,57 @@
#include "cpu.h"
@@ -605,8 +605,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
load_LDT(&init_mm.context);
---- head.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ 12.3/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -33,7 +33,7 @@ struct mtrr_ops generic_mtrr_ops = {
struct mtrr_ops *mtrr_if = &generic_mtrr_ops;
@@ -668,8 +668,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
op.cmd = XENPF_del_memtype;
op.u.del_memtype.handle = 0;
op.u.del_memtype.reg = reg;
---- head.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head/arch/x86/kernel/e820_32-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/kernel/e820_32-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -7,7 +7,6 @@
#include <linux/kexec.h>
#include <linux/module.h>
@@ -1040,8 +1040,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+ print_memory_map("modified");
+}
+#endif
---- head.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head/arch/x86/kernel/e820_64-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/kernel/e820_64-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -1,4 +1,4 @@
-/*
+/*
@@ -1840,8 +1840,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
}
int __init arch_get_ram_range(int slot, u64 *addr, u64 *size)
---- head.orig/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head/arch/x86/kernel/early_printk-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/kernel/early_printk-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -222,7 +222,7 @@ static struct console simnow_console = {
};
@@ -1851,8 +1851,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
static int early_console_initialized = 0;
void early_printk(const char *fmt, ...)
---- head.orig/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:10:06.000000000 +0200
-+++ head/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:10:15.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/entry_32-xen.S 2013-01-25 14:08:44.000000000 +0100
++++ 12.3/arch/x86/kernel/entry_32-xen.S 2013-01-25 14:09:05.000000000 +0100
@@ -59,7 +59,7 @@
* for paravirtualization. The following will never clobber any registers:
* INTERRUPT_RETURN (aka. "iret")
@@ -1967,7 +1967,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
ENTRY(interrupt)
.text
-@@ -963,7 +965,7 @@ END(device_not_available)
+@@ -962,7 +964,7 @@ END(device_not_available)
* that sets up the real kernel stack. Check here, since we can't
* allow the wrong stack to be used.
*
@@ -1976,7 +1976,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
* already pushed 3 words if it hits on the sysenter instruction:
* eflags, cs and eip.
*
-@@ -975,7 +977,7 @@ END(device_not_available)
+@@ -974,7 +976,7 @@ END(device_not_available)
cmpw $__KERNEL_CS,4(%esp); \
jne ok; \
label: \
@@ -1985,7 +1985,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
CFI_DEF_CFA esp, 0; \
CFI_UNDEFINED eip; \
pushfl; \
-@@ -990,7 +992,7 @@ label: \
+@@ -989,7 +991,7 @@ label: \
KPROBE_ENTRY(debug)
RING0_INT_FRAME
#ifndef CONFIG_XEN
@@ -1994,7 +1994,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
jne debug_stack_correct
FIX_STACK(12, debug_stack_correct, debug_esp_fix_insn)
debug_stack_correct:
-@@ -1023,7 +1025,7 @@ KPROBE_ENTRY(nmi)
+@@ -1022,7 +1024,7 @@ KPROBE_ENTRY(nmi)
popl %eax
CFI_ADJUST_CFA_OFFSET -4
je nmi_espfix_stack
@@ -2003,7 +2003,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
je nmi_stack_fixup
pushl %eax
CFI_ADJUST_CFA_OFFSET 4
-@@ -1036,7 +1038,7 @@ KPROBE_ENTRY(nmi)
+@@ -1035,7 +1037,7 @@ KPROBE_ENTRY(nmi)
popl %eax
CFI_ADJUST_CFA_OFFSET -4
jae nmi_stack_correct
@@ -2012,7 +2012,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
je nmi_debug_stack_check
nmi_stack_correct:
/* We have a RING0_INT_FRAME here */
-@@ -1089,12 +1091,8 @@ nmi_espfix_stack:
+@@ -1088,12 +1090,8 @@ nmi_espfix_stack:
RESTORE_REGS
lss 12+4(%esp), %esp # back to espfix stack
CFI_ADJUST_CFA_OFFSET -24
@@ -2026,7 +2026,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
#else
KPROBE_ENTRY(nmi)
RING0_INT_FRAME
-@@ -1112,17 +1110,17 @@ KPROBE_END(nmi)
+@@ -1111,17 +1109,17 @@ KPROBE_END(nmi)
#ifdef CONFIG_PARAVIRT
ENTRY(native_iret)
@@ -2048,7 +2048,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
#endif
KPROBE_ENTRY(int3)
-@@ -1272,7 +1270,144 @@ ENTRY(kernel_thread_helper)
+@@ -1271,7 +1269,144 @@ ENTRY(kernel_thread_helper)
CFI_ENDPROC
ENDPROC(kernel_thread_helper)
@@ -2193,8 +2193,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+#undef sys_fork
+#undef sys_clone
+#undef sys_vfork
---- head.orig/arch/x86/kernel/entry_64-xen.S 2011-10-07 11:28:06.000000000 +0200
-+++ head/arch/x86/kernel/entry_64-xen.S 2011-10-07 11:31:12.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/entry_64-xen.S 2011-10-07 11:28:06.000000000 +0200
++++ 12.3/arch/x86/kernel/entry_64-xen.S 2011-10-07 11:31:12.000000000 +0200
@@ -54,11 +54,9 @@
#include <asm/page.h>
#include <asm/irqflags.h>
@@ -2486,8 +2486,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
TRACE_IRQS_OFF
GET_THREAD_INFO(%rcx)
jmp retint_restore_args
---- head.orig/arch/x86/kernel/fixup.c 2011-01-31 17:56:27.000000000 +0100
-+++ head/arch/x86/kernel/fixup.c 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/fixup.c 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/kernel/fixup.c 2011-01-31 18:01:51.000000000 +0100
@@ -36,7 +36,7 @@
#define DP(_f, _args...) pr_alert(" " _f "\n" , ## _args )
@@ -2497,8 +2497,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
{
static unsigned long printed = 0;
char info[100];
---- head.orig/arch/x86/kernel/head64-xen.c 2011-08-09 10:44:02.000000000 +0200
-+++ head/arch/x86/kernel/head64-xen.c 2012-07-05 11:14:59.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/head64-xen.c 2011-08-09 10:44:02.000000000 +0200
++++ 12.3/arch/x86/kernel/head64-xen.c 2012-07-05 11:14:59.000000000 +0200
@@ -16,6 +16,7 @@
#include <linux/kernel.h>
#include <linux/string.h>
@@ -2610,8 +2610,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+
start_kernel();
}
---- head.orig/arch/x86/kernel/head_32-xen.S 2012-12-06 16:07:12.000000000 +0100
-+++ head/arch/x86/kernel/head_32-xen.S 2012-12-06 16:09:14.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/head_32-xen.S 2012-12-06 16:07:12.000000000 +0100
++++ 12.3/arch/x86/kernel/head_32-xen.S 2012-12-06 16:09:14.000000000 +0100
@@ -3,6 +3,7 @@
.text
#include <linux/elfnote.h>
@@ -2629,8 +2629,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
.fill 1024,4,0
ENTRY(empty_zero_page)
.fill 4096,1,0
---- head.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -35,6 +35,7 @@
#include <linux/htirq.h>
#include <linux/freezer.h>
@@ -2702,8 +2702,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
.suspend = ioapic_suspend,
.resume = ioapic_resume,
};
---- head.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -32,9 +32,11 @@
#include <linux/msi.h>
#include <linux/htirq.h>
@@ -2892,8 +2892,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+ * IO APICS that are mapped in on a BAR in PCI space. */
+late_initcall(ioapic_insert_resources);
+#endif /* !CONFIG_XEN */
---- head.orig/arch/x86/kernel/ioport-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head/arch/x86/kernel/ioport-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/ioport-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/kernel/ioport-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -1,6 +1,6 @@
/*
* This contains the io-permission bitmap code - written by obz, with changes
@@ -3011,8 +3011,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+out:
+ return rc;
+}
---- head.orig/arch/x86/kernel/ldt-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head/arch/x86/kernel/ldt-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/ldt-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/kernel/ldt-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -2,7 +2,7 @@
* Copyright (C) 1992 Krishna Balasubramanian and Linus Torvalds
* Copyright (C) 1999 Ingo Molnar <mingo@redhat.com>
@@ -3317,8 +3317,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
{
int ret = -ENOSYS;
---- head.orig/arch/x86/kernel/machine_kexec_64.c 2010-04-15 09:44:51.000000000 +0200
-+++ head/arch/x86/kernel/machine_kexec_64.c 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/machine_kexec_64.c 2010-04-15 09:44:51.000000000 +0200
++++ 12.3/arch/x86/kernel/machine_kexec_64.c 2011-01-31 18:01:51.000000000 +0100
@@ -407,7 +407,9 @@ void machine_kexec(struct kimage *image)
void arch_crash_save_vmcoreinfo(void)
@@ -3329,8 +3329,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
VMCOREINFO_SYMBOL(init_level4_pgt);
#ifdef CONFIG_NUMA
---- head.orig/arch/x86/kernel/microcode_core-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head/arch/x86/kernel/microcode_core-xen.c 2011-12-01 15:01:28.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/microcode_core-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ 12.3/arch/x86/kernel/microcode_core-xen.c 2011-12-01 15:01:28.000000000 +0100
@@ -170,7 +170,7 @@ static int request_microcode(void)
}
@@ -3340,8 +3340,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
op.u.microcode.length = firmware->size;
error = HYPERVISOR_platform_op(&op);
---- head.orig/arch/x86/kernel/mpparse-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head/arch/x86/kernel/mpparse-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/mpparse-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/kernel/mpparse-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -70,7 +70,7 @@ unsigned int def_to_bigsmp = 0;
unsigned int boot_cpu_physical_apicid = -1U;
#endif
@@ -3470,8 +3470,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
/*
* For PCI devices assign IRQs in order, avoiding gaps
* due to unused I/O APIC pins.
---- head.orig/arch/x86/kernel/pci-dma-xen.c 2012-11-14 12:41:31.000000000 +0100
-+++ head/arch/x86/kernel/pci-dma-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/pci-dma-xen.c 2012-11-14 12:41:31.000000000 +0100
++++ 12.3/arch/x86/kernel/pci-dma-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -431,3 +431,23 @@ dma_sync_single_for_device(struct device
swiotlb_sync_single_for_device(dev, dma_handle, size, direction);
}
@@ -3496,8 +3496,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+ flush_write_buffers();
+}
+EXPORT_SYMBOL(dma_sync_sg_for_device);
---- head.orig/arch/x86/kernel/process_32-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head/arch/x86/kernel/process_32-xen.c 2012-08-10 10:30:55.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/process_32-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/kernel/process_32-xen.c 2012-08-10 10:30:55.000000000 +0200
@@ -23,7 +23,6 @@
#include <linux/slab.h>
#include <linux/vmalloc.h>
@@ -4193,8 +4193,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+ unsigned long range_end = mm->brk + 0x02000000;
+ return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
+}
---- head.orig/arch/x86/kernel/process_64-xen.c 2011-02-02 08:32:00.000000000 +0100
-+++ head/arch/x86/kernel/process_64-xen.c 2012-08-10 10:30:53.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/process_64-xen.c 2011-02-02 08:32:00.000000000 +0100
++++ 12.3/arch/x86/kernel/process_64-xen.c 2012-08-10 10:30:53.000000000 +0200
@@ -3,7 +3,7 @@
*
* Pentium III FXSR, SSE support
@@ -4847,8 +4847,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+ unsigned long range_end = mm->brk + 0x02000000;
+ return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
+}
---- head.orig/arch/x86/kernel/rtc.c 2012-12-06 15:58:42.000000000 +0100
-+++ head/arch/x86/kernel/rtc.c 2011-12-21 10:59:00.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/rtc.c 2013-01-25 13:57:39.000000000 +0100
++++ 12.3/arch/x86/kernel/rtc.c 2011-12-21 10:59:00.000000000 +0100
@@ -30,6 +30,7 @@ EXPORT_SYMBOL(cmos_lock);
DEFINE_SPINLOCK(rtc_lock);
EXPORT_SYMBOL(rtc_lock);
@@ -4865,8 +4865,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
/* Routines for accessing the CMOS RAM/RTC. */
unsigned char rtc_cmos_read(unsigned char addr)
---- head.orig/arch/x86/kernel/setup_32-xen.c 2012-06-06 13:55:18.000000000 +0200
-+++ head/arch/x86/kernel/setup_32-xen.c 2012-06-06 13:57:25.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/setup_32-xen.c 2012-06-06 13:55:18.000000000 +0200
++++ 12.3/arch/x86/kernel/setup_32-xen.c 2012-06-06 13:57:25.000000000 +0200
@@ -47,9 +47,12 @@
#include <linux/crash_dump.h>
#include <linux/dmi.h>
@@ -5361,8 +5361,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+}
+
+subsys_initcall(request_standard_resources);
---- head.orig/arch/x86/kernel/setup_64-xen.c 2012-06-06 13:55:19.000000000 +0200
-+++ head/arch/x86/kernel/setup_64-xen.c 2012-06-06 13:57:26.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/setup_64-xen.c 2012-06-06 13:55:19.000000000 +0200
++++ 12.3/arch/x86/kernel/setup_64-xen.c 2012-06-06 13:57:26.000000000 +0200
@@ -15,7 +15,6 @@
#include <linux/ptrace.h>
#include <linux/slab.h>
@@ -6602,8 +6602,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
.next = c_next,
.stop = c_stop,
.show = show_cpuinfo,
---- head.orig/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head/arch/x86/kernel/smp_32-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/kernel/smp_32-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -168,7 +168,7 @@ void __send_IPI_shortcut(unsigned int sh
}
}
@@ -6629,8 +6629,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
/*
*
---- head.orig/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head/arch/x86/kernel/smp_64-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/kernel/smp_64-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -33,7 +33,7 @@
#ifndef CONFIG_XEN
@@ -6883,8 +6883,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
void smp_send_stop(void)
{
---- head.orig/arch/x86/kernel/time-xen.c 2012-02-10 13:26:53.000000000 +0100
-+++ head/arch/x86/kernel/time-xen.c 2012-02-10 13:27:37.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/time-xen.c 2012-02-10 13:26:53.000000000 +0100
++++ 12.3/arch/x86/kernel/time-xen.c 2012-02-10 13:27:37.000000000 +0100
@@ -28,20 +28,9 @@
* serialize accesses to xtime/lost_ticks).
*/
@@ -7137,8 +7137,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
extern void (*late_time_init)(void);
/* Dynamically-mapped IRQ. */
---- head.orig/arch/x86/kernel/traps_32-xen.c 2012-07-05 10:50:00.000000000 +0200
-+++ head/arch/x86/kernel/traps_32-xen.c 2012-07-05 11:14:48.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/traps_32-xen.c 2012-07-05 10:50:00.000000000 +0200
++++ 12.3/arch/x86/kernel/traps_32-xen.c 2012-07-05 11:14:48.000000000 +0200
@@ -79,7 +79,8 @@ char ignore_fpu_irq = 0;
* F0 0F bug workaround.. We have a special link segment
* for this.
@@ -7823,8 +7823,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
printk(KERN_INFO "Enabling fast FPU save and restore... ");
set_in_cr4(X86_CR4_OSFXSR);
printk("done.\n");
---- head.orig/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head/arch/x86/kernel/traps_64-xen.c 2012-07-05 11:14:49.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/kernel/traps_64-xen.c 2012-07-05 11:14:49.000000000 +0200
@@ -74,38 +74,41 @@ asmlinkage void alignment_check(void);
asmlinkage void machine_check(void);
asmlinkage void spurious_interrupt_bug(void);
@@ -8553,8 +8553,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+ return 1;
+}
+__setup("code_bytes=", code_bytes_setup);
---- head.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -43,12 +43,7 @@
#include <asm/vgtod.h>
@@ -8686,8 +8686,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
#ifdef CONFIG_XEN
vsyscall_gtod_data.sysctl_enabled = 0; /* disable vgettimeofday() */
if (boot_cpu_has(X86_FEATURE_RDTSCP))
---- head.orig/arch/x86/mach-xen/setup.c 2011-09-07 15:28:26.000000000 +0200
-+++ head/arch/x86/mach-xen/setup.c 2012-07-05 11:13:59.000000000 +0200
+--- 12.3.orig/arch/x86/mach-xen/setup.c 2011-09-07 15:28:26.000000000 +0200
++++ 12.3/arch/x86/mach-xen/setup.c 2012-07-05 11:13:59.000000000 +0200
@@ -89,7 +89,7 @@ extern void hypervisor_callback(void);
extern void failsafe_callback(void);
extern void nmi(void);
@@ -8718,7 +8718,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
}
}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/mm/fault-xen.c 2011-08-15 10:46:15.000000000 +0200
++++ 12.3/arch/x86/mm/fault-xen.c 2011-08-15 10:46:15.000000000 +0200
@@ -0,0 +1,1037 @@
+/*
+ * Copyright (C) 1995 Linus Torvalds
@@ -9757,7 +9757,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+ (__START_KERNEL & PGDIR_MASK)));
+#endif
+}
---- head.orig/arch/x86/mm/fault_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/mm/fault_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,770 +0,0 @@
-/*
@@ -10530,7 +10530,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
- start = address + (1UL << PMD_SHIFT);
- }
-}
---- head.orig/arch/x86/mm/fault_64-xen.c 2011-07-26 09:28:01.000000000 +0200
+--- 12.3.orig/arch/x86/mm/fault_64-xen.c 2011-07-26 09:28:01.000000000 +0200
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,693 +0,0 @@
-/*
@@ -11226,8 +11226,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
- BUILD_BUG_ON(!(((MODULES_END - 1) & PGDIR_MASK) ==
- (__START_KERNEL & PGDIR_MASK)));
-}
---- head.orig/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ head/arch/x86/mm/highmem_32-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ 12.3/arch/x86/mm/highmem_32-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -18,6 +18,49 @@ void kunmap(struct page *page)
kunmap_high(page);
}
@@ -11287,8 +11287,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
idx = type + KM_TYPE_NR*smp_processor_id();
vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
BUG_ON(!pte_none(*(kmap_pte-idx)));
---- head.orig/arch/x86/mm/hypervisor.c 2012-05-31 14:43:47.000000000 +0200
-+++ head/arch/x86/mm/hypervisor.c 2012-05-31 14:43:59.000000000 +0200
+--- 12.3.orig/arch/x86/mm/hypervisor.c 2012-05-31 14:43:47.000000000 +0200
++++ 12.3/arch/x86/mm/hypervisor.c 2012-05-31 14:43:59.000000000 +0200
@@ -483,9 +483,9 @@ void xen_set_ldt(const void *ptr, unsign
#define INIT_CONTIG_ORDER 6 /* 256kB */
static unsigned int __read_mostly max_contig_order = INIT_CONTIG_ORDER;
@@ -11326,8 +11326,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
#define MAX_BATCHED_FULL_PTES 32
---- head.orig/arch/x86/mm/init_32-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head/arch/x86/mm/init_32-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/arch/x86/mm/init_32-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/mm/init_32-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -27,13 +27,13 @@
#include <linux/bootmem.h>
#include <linux/slab.h>
@@ -12213,8 +12213,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
}
#endif
-
---- head.orig/arch/x86/mm/init_64-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head/arch/x86/mm/init_64-xen.c 2011-11-03 12:12:23.000000000 +0100
+--- 12.3.orig/arch/x86/mm/init_64-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/mm/init_64-xen.c 2011-11-03 12:12:23.000000000 +0100
@@ -46,14 +46,13 @@
#include <asm/proto.h>
#include <asm/smp.h>
@@ -13204,8 +13204,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
return 0;
}
#endif
---- head.orig/arch/x86/mm/ioremap-xen.c 2011-02-07 15:38:30.000000000 +0100
-+++ head/arch/x86/mm/ioremap-xen.c 2012-11-26 14:16:49.000000000 +0100
+--- 12.3.orig/arch/x86/mm/ioremap-xen.c 2011-02-07 15:38:30.000000000 +0100
++++ 12.3/arch/x86/mm/ioremap-xen.c 2012-11-26 14:16:49.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * arch/i386/mm/ioremap.c
@@ -13902,7 +13902,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+ WARN_ON(1);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/mm/pageattr-xen.c 2011-03-23 09:46:36.000000000 +0100
++++ 12.3/arch/x86/mm/pageattr-xen.c 2011-03-23 09:46:36.000000000 +0100
@@ -0,0 +1,1436 @@
+/*
+ * Copyright 2002 Andi Kleen, SuSE Labs.
@@ -15340,7 +15340,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+#ifdef CONFIG_CPA_DEBUG
+#include "pageattr-test.c"
+#endif
---- head.orig/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,542 +0,0 @@
-/*
@@ -15885,8 +15885,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-
-EXPORT_SYMBOL(change_page_attr);
-EXPORT_SYMBOL(global_flush_tlb);
---- head.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head/arch/x86/mm/pgtable_32-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/mm/pgtable_32-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -29,8 +29,6 @@
#include <xen/features.h>
#include <asm/hypervisor.h>
@@ -16687,8 +16687,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
- !mm->context.has_foreign_mappings)
- mm_unpin(mm);
-}
---- head.orig/arch/x86/vdso/Makefile 2012-04-10 15:45:54.000000000 +0200
-+++ head/arch/x86/vdso/Makefile 2012-04-10 16:43:22.000000000 +0200
+--- 12.3.orig/arch/x86/vdso/Makefile 2012-04-10 15:45:54.000000000 +0200
++++ 12.3/arch/x86/vdso/Makefile 2012-04-10 16:43:22.000000000 +0200
@@ -124,6 +124,7 @@ vdso32.so-$(VDSO32-y) += int80
vdso32.so-$(CONFIG_COMPAT) += syscall
vdso32.so-$(VDSO32-y) += sysenter
@@ -16697,8 +16697,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
vdso32.so-$(CONFIG_XEN) += $(xen-vdso32-y)
vdso32-images = $(vdso32.so-y:%=vdso32-%.so)
---- head.orig/arch/x86/vdso/vdso32/syscall.S 2012-12-06 15:58:42.000000000 +0100
-+++ head/arch/x86/vdso/vdso32/syscall.S 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/arch/x86/vdso/vdso32/syscall.S 2013-01-25 13:57:39.000000000 +0100
++++ 12.3/arch/x86/vdso/vdso32/syscall.S 2011-01-31 18:01:51.000000000 +0100
@@ -19,8 +19,10 @@ __kernel_vsyscall:
.Lpush_ebp:
movl %ecx, %ebp
@@ -16710,8 +16710,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
movl %ebp, %ecx
popl %ebp
.Lpop_ebp:
---- head.orig/arch/x86/vdso/vdso32.S 2012-12-06 15:58:42.000000000 +0100
-+++ head/arch/x86/vdso/vdso32.S 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/arch/x86/vdso/vdso32.S 2013-01-25 13:57:39.000000000 +0100
++++ 12.3/arch/x86/vdso/vdso32.S 2011-01-31 18:01:51.000000000 +0100
@@ -19,4 +19,16 @@ vdso32_sysenter_start:
.incbin "arch/x86/vdso/vdso32-sysenter.so"
vdso32_sysenter_end:
@@ -16729,8 +16729,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+#endif
+
__FINIT
---- head.orig/arch/x86/vdso/vdso32-setup.c 2011-04-13 11:31:41.000000000 +0200
-+++ head/arch/x86/vdso/vdso32-setup.c 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/arch/x86/vdso/vdso32-setup.c 2011-04-13 11:31:41.000000000 +0200
++++ 12.3/arch/x86/vdso/vdso32-setup.c 2011-01-31 18:01:51.000000000 +0100
@@ -26,10 +26,6 @@
#include <asm/vdso.h>
#include <asm/proto.h>
@@ -16787,7 +16787,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
static struct vm_area_struct gate_vma;
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/vdso/vdso32-setup-xen.c 2011-01-31 18:01:51.000000000 +0100
++++ 12.3/arch/x86/vdso/vdso32-setup-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -0,0 +1,506 @@
+/*
+ * (C) Copyright 2002 Linus Torvalds
@@ -17295,8 +17295,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+}
+
+#endif /* CONFIG_X86_64 */
---- head.orig/drivers/hwmon/coretemp-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ head/drivers/hwmon/coretemp-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/drivers/hwmon/coretemp-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/drivers/hwmon/coretemp-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -38,7 +38,8 @@
#define DRVNAME "coretemp"
#define coretemp_data pdev_entry
@@ -17487,8 +17487,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
/* supported CPU not found, but report the unknown
family 6 CPU */
---- head.orig/drivers/pci/msi-xen.c 2012-10-31 11:11:33.000000000 +0100
-+++ head/drivers/pci/msi-xen.c 2012-10-31 11:12:08.000000000 +0100
+--- 12.3.orig/drivers/pci/msi-xen.c 2012-10-31 11:11:33.000000000 +0100
++++ 12.3/drivers/pci/msi-xen.c 2012-10-31 11:12:08.000000000 +0100
@@ -50,6 +50,14 @@ struct msi_pirq_entry {
int entry_nr;
};
@@ -17534,8 +17534,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-{
- return 0;
-}
---- head.orig/drivers/pci/pci.c 2012-11-14 12:06:10.000000000 +0100
-+++ head/drivers/pci/pci.c 2012-10-23 14:57:20.000000000 +0200
+--- 12.3.orig/drivers/pci/pci.c 2013-01-25 14:01:49.000000000 +0100
++++ 12.3/drivers/pci/pci.c 2012-10-23 14:57:20.000000000 +0200
@@ -436,7 +436,12 @@ pci_find_parent_resource(const struct pc
* Restore the BAR values for a given device, so as to make it
* accessible by its driver.
@@ -17549,8 +17549,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
pci_restore_bars(struct pci_dev *dev)
{
int i;
---- head.orig/drivers/xen/Kconfig 2011-01-31 17:49:31.000000000 +0100
-+++ head/drivers/xen/Kconfig 2012-10-04 11:54:47.000000000 +0200
+--- 12.3.orig/drivers/xen/Kconfig 2011-01-31 17:49:31.000000000 +0100
++++ 12.3/drivers/xen/Kconfig 2012-10-04 11:54:47.000000000 +0200
@@ -382,6 +382,18 @@ config XEN_SMPBOOT
def_bool y
depends on SMP && !PPC_XEN
@@ -17570,8 +17570,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
config XEN_XENCOMM
bool
---- head.orig/drivers/xen/balloon/sysfs.c 2011-01-31 17:32:22.000000000 +0100
-+++ head/drivers/xen/balloon/sysfs.c 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/drivers/xen/balloon/sysfs.c 2011-01-31 17:32:22.000000000 +0100
++++ 12.3/drivers/xen/balloon/sysfs.c 2011-01-31 18:01:51.000000000 +0100
@@ -104,7 +104,7 @@ static const struct attribute_group ball
};
@@ -17581,8 +17581,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
};
static struct sys_device balloon_sysdev;
---- head.orig/drivers/xen/blkback/blkback.c 2012-04-04 10:20:02.000000000 +0200
-+++ head/drivers/xen/blkback/blkback.c 2012-03-26 12:22:21.000000000 +0200
+--- 12.3.orig/drivers/xen/blkback/blkback.c 2012-04-04 10:20:02.000000000 +0200
++++ 12.3/drivers/xen/blkback/blkback.c 2012-03-26 12:22:21.000000000 +0200
@@ -151,7 +151,7 @@ static void unplug_queue(blkif_t *blkif)
return;
if (blkif->plug->unplug_fn)
@@ -17602,8 +17602,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
blkif->plug = q;
}
---- head.orig/drivers/xen/blkfront/blkfront.c 2012-10-04 11:54:11.000000000 +0200
-+++ head/drivers/xen/blkfront/blkfront.c 2012-10-04 11:55:00.000000000 +0200
+--- 12.3.orig/drivers/xen/blkfront/blkfront.c 2012-10-04 11:54:11.000000000 +0200
++++ 12.3/drivers/xen/blkfront/blkfront.c 2012-10-04 11:55:00.000000000 +0200
@@ -787,7 +787,6 @@ static irqreturn_t blkif_int(int irq, vo
RING_IDX i, rp;
unsigned long flags;
@@ -17641,8 +17641,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
break;
default:
BUG();
---- head.orig/drivers/xen/blktap/blktap.c 2012-01-06 10:44:12.000000000 +0100
-+++ head/drivers/xen/blktap/blktap.c 2012-01-02 14:26:06.000000000 +0100
+--- 12.3.orig/drivers/xen/blktap/blktap.c 2012-01-06 10:44:12.000000000 +0100
++++ 12.3/drivers/xen/blktap/blktap.c 2012-01-02 14:26:06.000000000 +0100
@@ -309,8 +309,8 @@ static pte_t blktap_clear_pte(struct vm_
if (vma->vm_file != NULL)
info = vma->vm_file->private_data;
@@ -17676,8 +17676,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
}
if (count) {
---- head.orig/drivers/xen/blktap2/device.c 2012-02-16 12:31:22.000000000 +0100
-+++ head/drivers/xen/blktap2/device.c 2012-02-16 12:33:41.000000000 +0100
+--- 12.3.orig/drivers/xen/blktap2/device.c 2012-02-16 12:31:22.000000000 +0100
++++ 12.3/drivers/xen/blktap2/device.c 2012-02-16 12:33:41.000000000 +0100
@@ -139,9 +139,9 @@ blktap_map_uaddr_fn(pte_t *ptep, struct
}
@@ -17813,8 +17813,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
blktap_request_free(tap, request);
}
---- head.orig/drivers/xen/blktap2/ring.c 2011-04-11 13:43:15.000000000 +0200
-+++ head/drivers/xen/blktap2/ring.c 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/drivers/xen/blktap2/ring.c 2011-04-11 13:43:15.000000000 +0200
++++ 12.3/drivers/xen/blktap2/ring.c 2011-01-31 18:01:51.000000000 +0100
@@ -103,8 +103,8 @@ blktap_ring_clear_pte(struct vm_area_str
* mapped region.
*/
@@ -17837,8 +17837,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
if (count)
if (HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref,
---- head.orig/drivers/xen/core/Makefile 2012-10-31 10:29:18.000000000 +0100
-+++ head/drivers/xen/core/Makefile 2011-11-03 12:12:01.000000000 +0100
+--- 12.3.orig/drivers/xen/core/Makefile 2012-10-31 10:29:18.000000000 +0100
++++ 12.3/drivers/xen/core/Makefile 2011-11-03 12:12:01.000000000 +0100
@@ -11,5 +11,6 @@ obj-$(CONFIG_SYS_HYPERVISOR) += hypervis
obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o
obj-$(CONFIG_XEN_SYSFS) += xen_sysfs.o
@@ -17846,8 +17846,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+obj-$(CONFIG_X86_SMP) += spinlock.o
obj-$(CONFIG_KEXEC) += machine_kexec.o
obj-$(CONFIG_XEN_XENCOMM) += xencomm.o
---- head.orig/drivers/xen/core/evtchn.c 2012-10-04 11:54:16.000000000 +0200
-+++ head/drivers/xen/core/evtchn.c 2012-10-04 11:55:04.000000000 +0200
+--- 12.3.orig/drivers/xen/core/evtchn.c 2012-10-04 11:54:16.000000000 +0200
++++ 12.3/drivers/xen/core/evtchn.c 2012-10-04 11:55:04.000000000 +0200
@@ -208,7 +208,7 @@ static inline unsigned int cpu_from_evtc
/* Upcall to generic IRQ layer. */
@@ -17938,8 +17938,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
}
}
---- head.orig/drivers/xen/core/machine_reboot.c 2011-01-31 17:56:27.000000000 +0100
-+++ head/drivers/xen/core/machine_reboot.c 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/drivers/xen/core/machine_reboot.c 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/drivers/xen/core/machine_reboot.c 2011-01-31 18:01:51.000000000 +0100
@@ -174,6 +174,9 @@ static int take_machine_down(void *_susp
post_suspend(suspend_cancelled);
gnttab_resume();
@@ -17950,8 +17950,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
irq_resume();
#ifdef __x86_64__
/*
---- head.orig/drivers/xen/core/smpboot.c 2012-04-04 10:19:44.000000000 +0200
-+++ head/drivers/xen/core/smpboot.c 2012-03-22 16:09:23.000000000 +0100
+--- 12.3.orig/drivers/xen/core/smpboot.c 2012-04-04 10:19:44.000000000 +0200
++++ 12.3/drivers/xen/core/smpboot.c 2012-03-22 16:09:23.000000000 +0100
@@ -57,6 +57,10 @@ void __init prefill_possible_map(void)
return;
@@ -18034,7 +18034,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
ctxt.ctrlreg[3] = xen_pfn_to_cr3(virt_to_mfn(init_level4_pgt));
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/xen/core/spinlock.c 2012-07-26 14:09:46.000000000 +0200
++++ 12.3/drivers/xen/core/spinlock.c 2012-07-26 14:09:46.000000000 +0200
@@ -0,0 +1,389 @@
+/*
+ * Xen spinlock functions
@@ -18425,8 +18425,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+ }
+}
+EXPORT_SYMBOL(xen_spin_kick);
---- head.orig/drivers/xen/gntdev/gntdev.c 2012-05-23 13:29:28.000000000 +0200
-+++ head/drivers/xen/gntdev/gntdev.c 2012-05-23 13:33:01.000000000 +0200
+--- 12.3.orig/drivers/xen/gntdev/gntdev.c 2012-05-23 13:29:28.000000000 +0200
++++ 12.3/drivers/xen/gntdev/gntdev.c 2012-05-23 13:33:01.000000000 +0200
@@ -691,7 +691,7 @@ static pte_t gntdev_clear_pte(struct vm_
* called from a failing mmap().
*/
@@ -18445,8 +18445,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
nr = 0;
}
---- head.orig/drivers/xen/scsifront/scsifront.c 2012-12-04 12:44:59.000000000 +0100
-+++ head/drivers/xen/scsifront/scsifront.c 2012-12-04 13:22:39.000000000 +0100
+--- 12.3.orig/drivers/xen/scsifront/scsifront.c 2012-12-04 12:44:59.000000000 +0100
++++ 12.3/drivers/xen/scsifront/scsifront.c 2012-12-04 13:22:39.000000000 +0100
@@ -29,6 +29,7 @@
*/
@@ -18544,8 +18544,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
gnttab_free_grant_references(gref_head);
return ref_cnt;
---- head.orig/drivers/xen/usbfront/usbfront-dbg.c 2011-01-31 17:56:27.000000000 +0100
-+++ head/drivers/xen/usbfront/usbfront-dbg.c 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/drivers/xen/usbfront/usbfront-dbg.c 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/drivers/xen/usbfront/usbfront-dbg.c 2011-01-31 18:01:51.000000000 +0100
@@ -43,17 +43,16 @@
* DEALINGS IN THE SOFTWARE.
*/
@@ -18591,8 +18591,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+ struct device *dev = info_to_hcd(info)->self.controller;
+ device_remove_file(dev, &dev_attr_statistics);
}
---- head.orig/drivers/xen/xenoprof/xenoprofile.c 2012-02-16 12:31:04.000000000 +0100
-+++ head/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/drivers/xen/xenoprof/xenoprofile.c 2012-02-16 12:31:04.000000000 +0100
++++ 12.3/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 18:01:51.000000000 +0100
@@ -77,7 +77,7 @@ static int xenoprof_resume(struct sys_de
@@ -18602,8 +18602,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
.resume = xenoprof_resume,
.suspend = xenoprof_suspend
};
---- head.orig/arch/x86/include/asm/e820.h 2012-12-06 15:58:42.000000000 +0100
-+++ head/arch/x86/include/asm/e820.h 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/arch/x86/include/asm/e820.h 2013-01-25 13:57:39.000000000 +0100
++++ 12.3/arch/x86/include/asm/e820.h 2011-01-31 18:01:51.000000000 +0100
@@ -66,7 +66,11 @@ struct e820map {
struct e820entry map[E820_X_MAX];
};
@@ -18616,8 +18616,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
#define ISA_END_ADDRESS 0x100000
#define BIOS_BEGIN 0x000a0000
---- head.orig/arch/x86/include/asm/hardirq.h 2012-12-06 15:58:42.000000000 +0100
-+++ head/arch/x86/include/asm/hardirq.h 2012-04-10 16:43:33.000000000 +0200
+--- 12.3.orig/arch/x86/include/asm/hardirq.h 2013-01-25 13:57:39.000000000 +0100
++++ 12.3/arch/x86/include/asm/hardirq.h 2012-04-10 16:43:33.000000000 +0200
@@ -18,11 +18,15 @@ typedef struct {
#ifdef CONFIG_SMP
unsigned int irq_resched_count;
@@ -18634,8 +18634,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
#endif
#ifdef CONFIG_X86_THERMAL_VECTOR
unsigned int irq_thermal_count;
---- head.orig/arch/x86/include/mach-xen/asm/agp.h 2011-01-31 17:56:27.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/agp.h 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/agp.h 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/agp.h 2011-01-31 18:01:51.000000000 +0100
@@ -13,18 +13,13 @@
* page. This avoids data corruption on some CPUs.
*/
@@ -18657,8 +18657,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
/*
* Could use CLFLUSH here if the cpu supports it. But then it would
---- head.orig/arch/x86/include/mach-xen/asm/cmpxchg_64.h 2011-12-23 11:19:55.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/cmpxchg_64.h 2011-12-23 11:21:03.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/cmpxchg_64.h 2011-12-23 11:19:55.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/cmpxchg_64.h 2011-12-23 11:21:03.000000000 +0100
@@ -8,7 +8,4 @@ static inline u64 get_64bit(const volati
#define get_64bit_local get_64bit
@@ -18667,8 +18667,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-#define cmpxchg64_local cmpxchg_local
-
#endif /* _ASM_X86_XEN_CMPXCHG_64_H */
---- head.orig/arch/x86/include/mach-xen/asm/desc.h 2011-01-31 17:56:27.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/desc.h 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/desc.h 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/desc.h 2011-01-31 18:01:51.000000000 +0100
@@ -1,5 +1,404 @@
+#ifndef _ASM_DESC_H_
+#define _ASM_DESC_H_
@@ -19076,7 +19076,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+#endif /* __ASSEMBLY__ */
+
#endif
---- head.orig/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:32:29.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:32:29.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,262 +0,0 @@
-#ifndef __ARCH_DESC_H
@@ -19341,7 +19341,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-#endif /* !__ASSEMBLY__ */
-
-#endif
---- head.orig/arch/x86/include/mach-xen/asm/desc_64.h 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/desc_64.h 2011-01-31 17:56:27.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,228 +0,0 @@
-/* Written 2000 by Andi Kleen */
@@ -19572,8 +19572,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-#endif /* !__ASSEMBLY__ */
-
-#endif
---- head.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:49:31.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:49:31.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 18:01:51.000000000 +0100
@@ -64,7 +64,7 @@ enum fixed_addresses {
#endif
#ifdef CONFIG_X86_VISWS_APIC
@@ -19620,8 +19620,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
__end_of_fixed_addresses
};
---- head.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:49:31.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:49:31.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 18:01:51.000000000 +0100
@@ -15,6 +15,7 @@
#include <asm/apicdef.h>
#include <asm/page.h>
@@ -19668,8 +19668,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
__end_of_fixed_addresses
};
---- head.orig/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 17:49:31.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 17:49:31.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 18:01:51.000000000 +0100
@@ -37,11 +37,6 @@ extern pte_t *pkmap_page_table;
* easily, subsequent pte tables have to be allocated in one physical
* chunk of RAM.
@@ -19698,8 +19698,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
void *kmap(struct page *page);
void kunmap(struct page *page);
---- head.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2012-10-31 11:11:51.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/hypervisor.h 2012-06-06 13:56:31.000000000 +0200
+--- 12.3.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2012-10-31 11:11:51.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/hypervisor.h 2012-06-06 13:56:31.000000000 +0200
@@ -64,7 +64,9 @@ extern start_info_t *xen_start_info;
#define is_initial_xendomain() 0
#endif
@@ -19752,8 +19752,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+#define uvm_multi(cpumask) ((unsigned long)cpus_addr(cpumask) | UVMF_MULTI)
+
#endif /* __HYPERVISOR_H__ */
---- head.orig/arch/x86/include/mach-xen/asm/irqflags.h 2011-01-31 17:56:27.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/irqflags.h 2012-05-24 09:50:06.000000000 +0200
+--- 12.3.orig/arch/x86/include/mach-xen/asm/irqflags.h 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/irqflags.h 2012-05-24 09:50:06.000000000 +0200
@@ -1,5 +1,238 @@
-#ifdef CONFIG_X86_32
-# include "irqflags_32.h"
@@ -19996,7 +19996,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+
+#endif /* __ASSEMBLY__ */
#endif
---- head.orig/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:56:27.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,214 +0,0 @@
-/*
@@ -20213,7 +20213,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-#endif
-
-#endif
---- head.orig/arch/x86/include/mach-xen/asm/irqflags_64.h 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/irqflags_64.h 2011-01-31 17:56:27.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,178 +0,0 @@
-/*
@@ -20394,8 +20394,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-#endif
-
-#endif
---- head.orig/arch/x86/include/mach-xen/asm/maddr.h 2011-01-31 17:56:27.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/maddr.h 2011-08-09 10:52:22.000000000 +0200
+--- 12.3.orig/arch/x86/include/mach-xen/asm/maddr.h 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/maddr.h 2011-08-09 10:52:22.000000000 +0200
@@ -1,5 +1,155 @@
+#ifndef _X86_MADDR_H
+#define _X86_MADDR_H
@@ -20552,8 +20552,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+#define mfn_to_virt(m) __va(mfn_to_pfn(m) << PAGE_SHIFT)
+
+#endif /* _X86_MADDR_H */
---- head.orig/arch/x86/include/mach-xen/asm/maddr_32.h 2011-01-31 17:49:31.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/maddr_32.h 2011-08-09 10:48:33.000000000 +0200
+--- 12.3.orig/arch/x86/include/mach-xen/asm/maddr_32.h 2011-01-31 17:49:31.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/maddr_32.h 2011-08-09 10:48:33.000000000 +0200
@@ -1,130 +1,6 @@
#ifndef _I386_MADDR_H
#define _I386_MADDR_H
@@ -20732,8 +20732,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-#define mfn_to_virt(m) (__va(mfn_to_pfn(m) << PAGE_SHIFT))
-
#endif /* _I386_MADDR_H */
---- head.orig/arch/x86/include/mach-xen/asm/maddr_64.h 2011-08-08 12:54:10.000000000 +0200
-+++ head/arch/x86/include/mach-xen/asm/maddr_64.h 2011-08-09 10:48:35.000000000 +0200
+--- 12.3.orig/arch/x86/include/mach-xen/asm/maddr_64.h 2011-08-08 12:54:10.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/maddr_64.h 2011-08-09 10:48:35.000000000 +0200
@@ -1,124 +1,6 @@
#ifndef _X86_64_MADDR_H
#define _X86_64_MADDR_H
@@ -20887,8 +20887,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-
#endif /* _X86_64_MADDR_H */
---- head.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:49:31.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:49:31.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 18:01:51.000000000 +0100
@@ -51,8 +51,6 @@ static inline void __prepare_arch_switch
: : "r" (0) );
}
@@ -20898,8 +20898,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
static inline void switch_mm(struct mm_struct *prev,
struct mm_struct *next,
struct task_struct *tsk)
---- head.orig/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 17:49:31.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 17:49:31.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 18:01:51.000000000 +0100
@@ -62,12 +62,6 @@ extern void mm_pin(struct mm_struct *mm)
extern void mm_unpin(struct mm_struct *mm);
void mm_pin_all(void);
@@ -20940,8 +20940,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
}
}
#endif
---- head.orig/arch/x86/include/mach-xen/asm/pci.h 2011-01-31 17:56:27.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/pci.h 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/pci.h 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/pci.h 2011-01-31 18:01:51.000000000 +0100
@@ -71,6 +71,7 @@ extern int pci_mmap_page_range(struct pc
@@ -20982,8 +20982,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+#endif
#endif
---- head.orig/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 17:49:31.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 17:49:31.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 18:01:51.000000000 +0100
@@ -3,69 +3,109 @@
#include <linux/threads.h>
@@ -21132,8 +21132,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+#endif /* CONFIG_X86_PAE */
#endif /* _I386_PGALLOC_H */
---- head.orig/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 17:56:27.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 18:01:51.000000000 +0100
@@ -6,30 +6,13 @@
#include <linux/mm.h>
#include <asm/io.h> /* for phys_to_virt and page_to_pseudophys */
@@ -21292,8 +21292,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
#define __pmd_free_tlb(tlb,x) tlb_remove_page((tlb),virt_to_page(x))
#define __pud_free_tlb(tlb,x) tlb_remove_page((tlb),virt_to_page(x))
---- head.orig/arch/x86/include/mach-xen/asm/pgtable.h 2011-01-31 17:56:27.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/pgtable.h 2012-11-26 14:10:51.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/pgtable.h 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/pgtable.h 2012-11-26 14:10:51.000000000 +0100
@@ -1,5 +1,461 @@
+#ifndef _ASM_X86_PGTABLE_H
+#define _ASM_X86_PGTABLE_H
@@ -21756,8 +21756,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+#endif /* __ASSEMBLY__ */
+
+#endif /* _ASM_X86_PGTABLE_H */
---- head.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:49:31.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-03-23 09:14:16.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:49:31.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-03-23 09:14:16.000000000 +0100
@@ -18,16 +18,18 @@
printk("%s:%d: bad pgd %p(%016Lx pfn %08Lx).\n", __FILE__, __LINE__, \
&(e), __pgd_val(e), (pgd_val(e) & PTE_MASK) >> PAGE_SHIFT)
@@ -21926,8 +21926,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+#define __swp_entry_to_pte(x) ((pte_t){ { .pte_high = (x).val } })
#endif /* _I386_PGTABLE_3LEVEL_H */
---- head.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-01-31 17:56:27.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:38:52.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:38:52.000000000 +0100
@@ -1,8 +1,6 @@
#ifndef _I386_PGTABLE_H
#define _I386_PGTABLE_H
@@ -22388,8 +22388,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-#include <asm-generic/pgtable.h>
-
#endif /* _I386_PGTABLE_H */
---- head.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-01-31 17:56:27.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 09:14:24.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 09:14:24.000000000 +0100
@@ -13,49 +13,26 @@
#include <linux/threads.h>
#include <linux/sched.h>
@@ -22925,8 +22925,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
#endif /* !__ASSEMBLY__ */
#endif /* _X86_64_PGTABLE_H */
---- head.orig/arch/x86/include/mach-xen/asm/processor.h 2011-01-31 17:56:27.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/processor.h 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/processor.h 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/processor.h 2011-01-31 18:01:51.000000000 +0100
@@ -1,5 +1,795 @@
+#ifndef __ASM_X86_PROCESSOR_H
+#define __ASM_X86_PROCESSOR_H
@@ -23725,7 +23725,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+#define KSTK_ESP(task) (task_pt_regs(task)->sp)
+
#endif
---- head.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:56:27.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,755 +0,0 @@
-/*
@@ -24483,7 +24483,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-extern int force_mwait;
-
-#endif /* __ASM_I386_PROCESSOR_H */
---- head.orig/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:56:27.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,467 +0,0 @@
-/*
@@ -24953,8 +24953,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-#define HAVE_ARCH_PICK_MMAP_LAYOUT 1
-
-#endif /* __ASM_X86_64_PROCESSOR_H */
---- head.orig/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:56:27.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 18:01:51.000000000 +0100
@@ -1,55 +1,50 @@
#ifndef __ASM_SMP_H
#define __ASM_SMP_H
@@ -25145,8 +25145,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-
+#endif /* !ASSEMBLY */
#endif
---- head.orig/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:56:27.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 18:01:51.000000000 +0100
@@ -1,130 +1,101 @@
#ifndef __ASM_SMP_H
#define __ASM_SMP_H
@@ -25330,7 +25330,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/spinlock.h 2012-04-03 08:23:24.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/spinlock.h 2012-04-03 08:23:24.000000000 +0200
@@ -0,0 +1,354 @@
+#ifndef _X86_SPINLOCK_H_
+#define _X86_SPINLOCK_H_
@@ -25687,7 +25687,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/include/mach-xen/asm/spinlock_types.h 2012-01-10 11:47:24.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/spinlock_types.h 2012-01-10 11:47:24.000000000 +0100
@@ -0,0 +1,38 @@
+#ifndef __ASM_SPINLOCK_TYPES_H
+#define __ASM_SPINLOCK_TYPES_H
@@ -25727,8 +25727,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+#define __RAW_RW_LOCK_UNLOCKED { RW_LOCK_BIAS }
+
+#endif
---- head.orig/arch/x86/include/mach-xen/asm/time.h 2011-07-11 10:35:24.000000000 +0200
-+++ head/arch/x86/include/mach-xen/asm/time.h 2011-07-11 11:48:04.000000000 +0200
+--- 12.3.orig/arch/x86/include/mach-xen/asm/time.h 2011-07-11 10:35:24.000000000 +0200
++++ 12.3/arch/x86/include/mach-xen/asm/time.h 2011-07-11 11:48:04.000000000 +0200
@@ -1,6 +1,17 @@
-#ifdef CONFIG_XEN_PRIVILEGED_GUEST
+#ifndef _XEN_ASM_TIME_H
@@ -25748,8 +25748,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+#endif /* _XEN_ASM_TIME_H */
+
#include_next <asm/time.h>
---- head.orig/arch/x86/include/mach-xen/asm/tlbflush.h 2011-01-31 17:56:27.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/tlbflush.h 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/tlbflush.h 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/arch/x86/include/mach-xen/asm/tlbflush.h 2011-01-31 18:01:51.000000000 +0100
@@ -1,5 +1,106 @@
+#ifndef _ASM_X86_TLBFLUSH_H
+#define _ASM_X86_TLBFLUSH_H
@@ -25859,7 +25859,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+}
+
+#endif /* _ASM_X86_TLBFLUSH_H */
---- head.orig/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:56:27.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,99 +0,0 @@
-#ifndef _I386_TLBFLUSH_H
@@ -25961,7 +25961,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-}
-
-#endif /* _I386_TLBFLUSH_H */
---- head.orig/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:56:27.000000000 +0100
+--- 12.3.orig/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:56:27.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,97 +0,0 @@
-#ifndef _X8664_TLBFLUSH_H
@@ -26061,8 +26061,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-}
-
-#endif /* _X8664_TLBFLUSH_H */
---- head.orig/arch/x86/include/asm/mmu.h 2011-06-30 16:30:20.000000000 +0200
-+++ head/arch/x86/include/asm/mmu.h 2011-06-30 16:34:46.000000000 +0200
+--- 12.3.orig/arch/x86/include/asm/mmu.h 2011-06-30 16:30:20.000000000 +0200
++++ 12.3/arch/x86/include/asm/mmu.h 2011-06-30 16:34:46.000000000 +0200
@@ -24,7 +24,7 @@ typedef struct {
void *vdso;
} mm_context_t;
@@ -26072,8 +26072,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
void leave_mm(int cpu);
#else
static inline void leave_mm(int cpu)
---- head.orig/arch/x86/include/asm/ptrace.h 2012-12-06 15:58:42.000000000 +0100
-+++ head/arch/x86/include/asm/ptrace.h 2012-12-06 16:09:05.000000000 +0100
+--- 12.3.orig/arch/x86/include/asm/ptrace.h 2013-01-25 13:57:39.000000000 +0100
++++ 12.3/arch/x86/include/asm/ptrace.h 2012-12-06 16:09:05.000000000 +0100
@@ -278,7 +278,9 @@ static inline unsigned long regs_get_ker
}
@@ -26085,8 +26085,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
#define arch_has_block_step() (1)
#else
#define arch_has_block_step() (boot_cpu_data.x86 >= 6)
---- head.orig/arch/x86/include/asm/thread_info.h 2012-10-23 14:48:40.000000000 +0200
-+++ head/arch/x86/include/asm/thread_info.h 2012-10-23 14:57:29.000000000 +0200
+--- 12.3.orig/arch/x86/include/asm/thread_info.h 2012-10-23 14:48:40.000000000 +0200
++++ 12.3/arch/x86/include/asm/thread_info.h 2012-10-23 14:57:29.000000000 +0200
@@ -98,6 +98,9 @@ struct thread_info {
#define TIF_SYSCALL_TRACEPOINT 28 /* syscall tracepoint instrumentation */
#define TIF_ADDR32 29 /* 32-bit address space on 64 bits */
@@ -26122,8 +26122,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
#define PREEMPT_ACTIVE 0x10000000
---- head.orig/include/linux/page-flags.h 2012-08-20 10:37:47.000000000 +0200
-+++ head/include/linux/page-flags.h 2012-08-20 10:38:52.000000000 +0200
+--- 12.3.orig/include/linux/page-flags.h 2013-01-25 14:06:43.000000000 +0100
++++ 12.3/include/linux/page-flags.h 2012-08-20 10:38:52.000000000 +0200
@@ -129,8 +129,8 @@ enum pageflags {
#ifdef CONFIG_XEN
PG_pinned = PG_locked, /* Cannot alias with PG_owner_priv_1 since
@@ -26135,8 +26135,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
#else
PG_pinned = PG_owner_priv_1,
PG_savepinned = PG_dirty,
---- head.orig/include/linux/pci.h 2012-10-22 17:19:10.000000000 +0200
-+++ head/include/linux/pci.h 2012-10-23 14:57:36.000000000 +0200
+--- 12.3.orig/include/linux/pci.h 2012-10-22 17:19:10.000000000 +0200
++++ 12.3/include/linux/pci.h 2012-10-23 14:57:36.000000000 +0200
@@ -883,6 +883,9 @@ void pci_update_resource(struct pci_dev
int __must_check pci_assign_resource(struct pci_dev *dev, int i);
int __must_check pci_reassign_resource(struct pci_dev *dev, int i, resource_size_t add_size, resource_size_t align);
@@ -26147,8 +26147,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
/* ROM control related routines */
int pci_enable_rom(struct pci_dev *pdev);
---- head.orig/include/xen/evtchn.h 2012-10-23 14:41:34.000000000 +0200
-+++ head/include/xen/evtchn.h 2012-10-23 14:57:49.000000000 +0200
+--- 12.3.orig/include/xen/evtchn.h 2012-10-23 14:41:34.000000000 +0200
++++ 12.3/include/xen/evtchn.h 2012-10-23 14:57:49.000000000 +0200
@@ -130,6 +130,18 @@ static inline void clear_evtchn(int port
sync_clear_bit(port, s->evtchn_pending);
}
@@ -26182,8 +26182,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+#endif
+
#endif /* __ASM_EVTCHN_H__ */
---- head.orig/kernel/sysctl_binary.c 2011-01-31 17:56:27.000000000 +0100
-+++ head/kernel/sysctl_binary.c 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/kernel/sysctl_binary.c 2011-01-31 17:56:27.000000000 +0100
++++ 12.3/kernel/sysctl_binary.c 2011-01-31 18:01:51.000000000 +0100
@@ -874,7 +874,7 @@ static const struct bin_table bin_bus_ta
@@ -26193,8 +26193,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
{ CTL_XEN_INDEPENDENT_WALLCLOCK, "independent_wallclock" },
{ CTL_XEN_PERMITTED_CLOCK_JITTER, "permitted_clock_jitter" },
{}
---- head.orig/lib/swiotlb-xen.c 2012-11-14 12:41:36.000000000 +0100
-+++ head/lib/swiotlb-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- 12.3.orig/lib/swiotlb-xen.c 2012-11-14 12:41:36.000000000 +0100
++++ 12.3/lib/swiotlb-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -30,7 +30,6 @@
#include <asm/gnttab_dma.h>
@@ -26268,9 +26268,9 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
spin_unlock_irqrestore(&io_tlb_lock, flags);
return NULL;
}
---- head.orig/mm/memory.c 2012-10-22 17:19:52.000000000 +0200
-+++ head/mm/memory.c 2012-10-23 14:57:55.000000000 +0200
-@@ -2473,6 +2473,10 @@ int apply_to_page_range(struct mm_struct
+--- 12.3.orig/mm/memory.c 2013-01-25 14:03:53.000000000 +0100
++++ 12.3/mm/memory.c 2013-01-25 14:08:58.000000000 +0100
+@@ -2478,6 +2478,10 @@ int apply_to_page_range(struct mm_struct
unsigned long end = addr + size;
int err;
diff --git a/patches.xen/xen3-patch-2.6.26 b/patches.xen/xen3-patch-2.6.26
index 7ffecbe43e..f0acd18e71 100644
--- a/patches.xen/xen3-patch-2.6.26
+++ b/patches.xen/xen3-patch-2.6.26
@@ -8,8 +8,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
2.6.35/arch/x86/include/asm/scatterlist.h (would need to be reverted there)
3.1/init/Kconfig (done differently)
---- head.orig/arch/x86/Kconfig 2012-10-23 14:57:00.000000000 +0200
-+++ head/arch/x86/Kconfig 2012-10-23 14:58:22.000000000 +0200
+--- 12.3.orig/arch/x86/Kconfig 2012-10-23 14:57:00.000000000 +0200
++++ 12.3/arch/x86/Kconfig 2012-10-23 14:58:22.000000000 +0200
@@ -49,7 +49,7 @@ config X86
select HAVE_SYSCALL_TRACEPOINTS
select SYSCTL_EXCEPTION_TRACE
@@ -43,8 +43,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
-source "drivers/xen/Kconfig"
-
source "lib/Kconfig"
---- head.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 18:01:51.000000000 +0100
-+++ head/arch/x86/ia32/ia32entry-xen.S 2011-01-31 18:07:35.000000000 +0100
+--- 12.3.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 18:01:51.000000000 +0100
++++ 12.3/arch/x86/ia32/ia32entry-xen.S 2011-01-31 18:07:35.000000000 +0100
@@ -129,12 +129,14 @@ sysenter_tracesys:
SAVE_REST
CLEAR_RREGS
@@ -105,8 +105,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
.quad sys_alarm
.quad sys_fstat /* (old)fstat */
.quad sys_pause
---- head.orig/arch/x86/kernel/Makefile 2012-10-23 14:57:08.000000000 +0200
-+++ head/arch/x86/kernel/Makefile 2012-10-23 14:58:12.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/Makefile 2012-10-23 14:57:08.000000000 +0200
++++ 12.3/arch/x86/kernel/Makefile 2012-10-23 14:58:12.000000000 +0200
@@ -117,8 +117,7 @@ ifeq ($(CONFIG_X86_64),y)
obj-$(CONFIG_XEN) += nmi_64.o
@@ -118,8 +118,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
- reboot.o smpboot_$(BITS).o tsc_$(BITS).o tsc_sync.o
+disabled-obj-$(CONFIG_XEN) := crash.o early-quirks.o hpet.o i8237.o i8253.o i8259_$(BITS).o \
+ pci-swiotlb_64.o reboot.o smpboot.o tlb_$(BITS).o tsc_$(BITS).o tsc_sync.o vsmp_64.o
---- head.orig/arch/x86/kernel/acpi/boot.c 2011-03-11 10:56:21.000000000 +0100
-+++ head/arch/x86/kernel/acpi/boot.c 2011-03-11 10:59:02.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/acpi/boot.c 2011-03-11 10:56:21.000000000 +0100
++++ 12.3/arch/x86/kernel/acpi/boot.c 2011-03-11 10:59:02.000000000 +0100
@@ -206,6 +206,7 @@ static int __init acpi_parse_madt(struct
static void __cpuinit acpi_register_lapic(int id, u8 enabled)
@@ -136,8 +136,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
}
static int __init
---- head.orig/arch/x86/kernel/cpu/common-xen.c 2012-07-05 15:17:21.000000000 +0200
-+++ head/arch/x86/kernel/cpu/common-xen.c 2012-07-05 11:22:48.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/cpu/common-xen.c 2012-07-05 15:17:21.000000000 +0200
++++ 12.3/arch/x86/kernel/cpu/common-xen.c 2012-07-05 11:22:48.000000000 +0200
@@ -5,7 +5,6 @@
#include <linux/module.h>
#include <linux/percpu.h>
@@ -531,8 +531,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
void __cpuinit cpu_uninit(void)
{
int cpu = raw_smp_processor_id();
---- head.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 18:01:51.000000000 +0100
-+++ head/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 18:07:35.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 18:01:51.000000000 +0100
++++ 12.3/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 18:07:35.000000000 +0100
@@ -35,6 +35,8 @@ struct mtrr_ops *mtrr_if = &generic_mtrr
unsigned int num_var_ranges;
unsigned int mtrr_usage_table[MAX_VAR_RANGES];
@@ -689,8 +689,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
}
void mtrr_ap_init(void)
---- head.orig/arch/x86/kernel/cpu/bugs.c 2012-12-18 11:38:25.000000000 +0100
-+++ head/arch/x86/kernel/cpu/bugs.c 2012-08-20 10:41:38.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/cpu/bugs.c 2013-02-05 10:40:06.000000000 +0100
++++ 12.3/arch/x86/kernel/cpu/bugs.c 2012-08-20 10:41:38.000000000 +0200
@@ -17,6 +17,7 @@
#include <asm/paravirt.h>
#include <asm/alternative.h>
@@ -732,8 +732,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
}
/*
---- head.orig/arch/x86/kernel/cpu/proc.c 2012-12-18 11:38:25.000000000 +0100
-+++ head/arch/x86/kernel/cpu/proc.c 2011-03-03 16:38:42.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/cpu/proc.c 2013-02-05 10:40:06.000000000 +0100
++++ 12.3/arch/x86/kernel/cpu/proc.c 2011-03-03 16:38:42.000000000 +0100
@@ -10,7 +10,7 @@
static void show_cpuinfo_core(struct seq_file *m, struct cpuinfo_x86 *c,
unsigned int cpu)
@@ -766,8 +766,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
c->hard_math ? "yes" : "no",
fpu_exception ? "yes" : "no",
c->cpuid_level,
---- head.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 18:01:51.000000000 +0100
-+++ head/arch/x86/kernel/e820_32-xen.c 2011-01-31 18:07:35.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 18:01:51.000000000 +0100
++++ 12.3/arch/x86/kernel/e820_32-xen.c 2011-01-31 18:07:35.000000000 +0100
@@ -469,7 +469,7 @@ int __init sanitize_e820_map(struct e820
* thinkpad 560x, for example, does not cooperate with the memory
* detection code.)
@@ -834,8 +834,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
saved_max_pfn = max_pfn;
#endif
e820.nr_map = 0;
---- head.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 18:01:51.000000000 +0100
-+++ head/arch/x86/kernel/e820_64-xen.c 2011-01-31 18:07:35.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 18:01:51.000000000 +0100
++++ 12.3/arch/x86/kernel/e820_64-xen.c 2011-01-31 18:07:35.000000000 +0100
@@ -41,11 +41,11 @@ unsigned long end_pfn;
#ifndef CONFIG_XEN
@@ -1164,8 +1164,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
e820.nr_map = 0;
userdef = 1;
return 0;
---- head.orig/arch/x86/kernel/early_printk-xen.c 2011-01-31 18:01:51.000000000 +0100
-+++ head/arch/x86/kernel/early_printk-xen.c 2011-01-31 18:07:35.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/early_printk-xen.c 2011-01-31 18:01:51.000000000 +0100
++++ 12.3/arch/x86/kernel/early_printk-xen.c 2011-01-31 18:07:35.000000000 +0100
@@ -13,7 +13,7 @@
#define VGABASE (__ISA_IO_base + 0xb8000)
@@ -1234,8 +1234,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
#ifdef CONFIG_XEN
} else if (!strncmp(buf, "xen", 3)) {
early_console = &xenboot_console;
---- head.orig/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:10:15.000000000 +0200
-+++ head/arch/x86/kernel/entry_32-xen.S 2011-01-31 18:07:35.000000000 +0100
+--- 12.3.orig/arch/x86/kernel/entry_32-xen.S 2013-01-25 14:09:05.000000000 +0100
++++ 12.3/arch/x86/kernel/entry_32-xen.S 2011-01-31 18:07:35.000000000 +0100
@@ -1,5 +1,4 @@
/*
- * linux/arch/i386/entry.S
@@ -1403,8 +1403,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
GET_THREAD_INFO(%ebp)
movl $-EFAULT,PT_EAX(%esp)
jmp resume_userspace
---- head.orig/arch/x86/kernel/entry_64-xen.S 2011-10-07 11:31:12.000000000 +0200
-+++ head/arch/x86/kernel/entry_64-xen.S 2011-10-07 11:33:31.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/entry_64-xen.S 2011-10-07 11:31:12.000000000 +0200
++++ 12.3/arch/x86/kernel/entry_64-xen.S 2011-10-07 11:33:31.000000000 +0200
@@ -334,19 +334,17 @@ badsys:
/* Do syscall tracing */
tracesys:
@@ -1428,8 +1428,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
/* Use IRET because user could have changed frame */
/*
---- head.orig/arch/x86/kernel/head64-xen.c 2012-07-05 11:14:59.000000000 +0200
-+++ head/arch/x86/kernel/head64-xen.c 2011-08-09 10:53:20.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/head64-xen.c 2012-07-05 11:14:59.000000000 +0200
++++ 12.3/arch/x86/kernel/head64-xen.c 2011-08-09 10:53:20.000000000 +0200
@@ -17,6 +17,7 @@
#include <linux/string.h>
#include <linux/percpu.h>
@@ -1581,8 +1581,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
/*
* At this point everything still needed from the boot loader
---- head.orig/arch/x86/kernel/head_32-xen.S 2012-12-06 16:09:14.000000000 +0100
-+++ head/arch/x86/kernel/head_32-xen.S 2011-08-09 10:53:18.000000000 +0200
+--- 12.3.orig/arch/x86/kernel/head_32-xen.S 2012-12-06 16:09:14.000000000 +0100
++++ 12.3/arch/x86/kernel/head_32-xen.S 2011-08-09 10:53:18.000000000 +0200
@@ -70,7 +70,7 @@ ENTRY(startup_32)
cld # gcc2 wants the direction flag cleared at all times
@@ -1592,8 +1592,8 @@ Automatically create