Home Home > GIT Browse > SLE12-SP4-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Renninger <trenn@suse.de>2012-05-22 14:21:24 +0200
committerThomas Renninger <trenn@suse.de>2012-05-22 14:21:24 +0200
commitcaf270e04273aee3752f0e9cefc308172d893240 (patch)
treefe9d483a2459284e05d4c82b6f0451b2f090a0b1
parent91b2c6e7dedeaf80ebee53861f8eaadf972c40fe (diff)
- X86 acpi_cpufreq: Do not use request_module for autoloading
(bnc#756085). - Refresh patches.xen/xen3-auto-common.diff. - patches.xen/xen3-patch-3.3:
-rw-r--r--patches.drivers/x86_acpi_cpufreq_autoload.patch81
-rw-r--r--patches.xen/xen3-auto-common.diff373
-rw-r--r--patches.xen/xen3-patch-3.3599
-rw-r--r--series.conf1
4 files changed, 758 insertions, 296 deletions
diff --git a/patches.drivers/x86_acpi_cpufreq_autoload.patch b/patches.drivers/x86_acpi_cpufreq_autoload.patch
new file mode 100644
index 0000000000..a1cf58217f
--- /dev/null
+++ b/patches.drivers/x86_acpi_cpufreq_autoload.patch
@@ -0,0 +1,81 @@
+From: Thomas Renninger <trenn@suse.de>
+Subject: X86 acpi_cpufreq: Do not use request_module for autoloading
+Patch-Mainline: not yet, submitted
+References: bnc#756085
+
+The idea to check for needed cpufreq functions in ACPI processor object is
+a good (perfect) one, but using request_module in processor.ko
+has bad side-effects:
+It opens a hidden dependency: acpi-cpufreq.ko must be accessable when
+processor.ko is loaded (which is not the case if the latter gets loaded
+in initrd where the other one might not be present).
+Also I guess calling modprobe userspace from inside the kernel
+(comments indicate that is what happens), is considered an ugly workaround
+if nothing else works.
+
+Therefore try to load acpi-cpufreq on all CPUs with EST (Enhanced Speed Step)
+cpu feature flag.
+This may result in trying to load acpi-cpufreq on some machines which do
+not have cpufreq ACPI functions (which should be a BIOS bug then), but this
+does not hurt. acpi-cpufreq should always be the preferred cpufreq driver
+for EST capable CPUs.
+I am not 100% sure about VIA machines also exposing ACPI cpufreq functions.
+I could imagine they also have this CPU id feature set and everything is fine.
+In fact I have such a CPU at home, but trying it out is time intensive.
+As autoloading is a new feature, there cannot be regressions and if a non
+Intel CPU shows up that needs this driver as well, it can easily be added by
+another matching X86 model/family/feature line.
+
+References: https://bugzilla.novell.com/show_bug.cgi?id=756085
+
+Signed-off-by: Thomas Renninger <trenn@suse.de>
+Tested-by: tittiatcoke@gmail.com
+
+---
+ drivers/acpi/processor_driver.c | 1 -
+ drivers/cpufreq/acpi-cpufreq.c | 7 +++++++
+ include/acpi/processor.h | 1 -
+ 3 files changed, 7 insertions(+), 2 deletions(-)
+
+Index: linux-3.4-rc6-master/drivers/acpi/processor_driver.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/acpi/processor_driver.c
++++ linux-3.4-rc6-master/drivers/acpi/processor_driver.c
+@@ -474,7 +474,6 @@ static __ref int acpi_processor_start(st
+
+ #ifdef CONFIG_CPU_FREQ
+ acpi_processor_ppc_has_changed(pr, 0);
+- acpi_processor_load_module(pr);
+ #endif
+ acpi_processor_get_throttling_info(pr);
+ acpi_processor_get_limit_info(pr);
+Index: linux-3.4-rc6-master/include/acpi/processor.h
+===================================================================
+--- linux-3.4-rc6-master.orig/include/acpi/processor.h
++++ linux-3.4-rc6-master/include/acpi/processor.h
+@@ -225,7 +225,6 @@ struct acpi_processor_errata {
+ } piix4;
+ };
+
+-extern void acpi_processor_load_module(struct acpi_processor *pr);
+ extern int acpi_processor_preregister_performance(struct
+ acpi_processor_performance
+ __percpu *performance);
+Index: linux-3.4-rc6-master/drivers/cpufreq/acpi-cpufreq.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/cpufreq/acpi-cpufreq.c
++++ linux-3.4-rc6-master/drivers/cpufreq/acpi-cpufreq.c
+@@ -66,6 +66,13 @@ struct acpi_cpufreq_data {
+ unsigned int cpu_feature;
+ };
+
++static const struct x86_cpu_id acpi_cpufreq_ids[] = {
++ /* Enhanced Speed Step */
++ X86_FEATURE_MATCH(X86_FEATURE_EST),
++ {}
++};
++MODULE_DEVICE_TABLE(x86cpu, acpi_cpufreq_ids);
++
+ static DEFINE_PER_CPU(struct acpi_cpufreq_data *, acfreq_data);
+
+ /* acpi_perf_data is a pointer to percpu data. */
diff --git a/patches.xen/xen3-auto-common.diff b/patches.xen/xen3-auto-common.diff
index dd28ec9284..a720927dcd 100644
--- a/patches.xen/xen3-auto-common.diff
+++ b/patches.xen/xen3-auto-common.diff
@@ -21,8 +21,60 @@ take the forward porting patches:
2.6.35/kernel/time.c
3.4/drivers/acpi/acpica/hwsleep.c
---- head.orig/drivers/Makefile 2012-05-08 10:45:52.000000000 +0200
-+++ head/drivers/Makefile 2011-11-16 17:01:23.000000000 +0100
+---
+ drivers/Makefile | 1
+ drivers/acpi/Makefile | 3
+ drivers/acpi/processor_driver.c | 116 +++++-
+ drivers/acpi/processor_extcntl.c | 241 ++++++++++++
+ drivers/acpi/processor_idle.c | 16
+ drivers/acpi/processor_perflib.c | 21 +
+ drivers/acpi/sleep.c | 2
+ drivers/block/floppy.c | 2
+ drivers/char/agp/intel-gtt.c | 14
+ drivers/char/mem.c | 16
+ drivers/char/tpm/Makefile | 2
+ drivers/char/tpm/tpm.h | 15
+ drivers/char/tpm/tpm_vtpm.c | 542 ++++++++++++++++++++++++++++
+ drivers/char/tpm/tpm_vtpm.h | 55 ++
+ drivers/char/tpm/tpm_xen.c | 718 ++++++++++++++++++++++++++++++++++++++
+ drivers/edac/edac_mc.c | 4
+ drivers/firmware/dell_rbu.c | 46 ++
+ drivers/ide/ide-lib.c | 8
+ drivers/oprofile/buffer_sync.c | 88 ++++
+ drivers/oprofile/cpu_buffer.c | 58 ++-
+ drivers/oprofile/cpu_buffer.h | 12
+ drivers/oprofile/event_buffer.h | 3
+ drivers/oprofile/oprof.c | 32 +
+ drivers/oprofile/oprof.h | 3
+ drivers/oprofile/oprofile_files.c | 142 +++++++
+ fs/aio.c | 117 +++++-
+ fs/compat_ioctl.c | 20 +
+ include/acpi/processor.h | 137 +++++++
+ include/asm-generic/pgtable.h | 4
+ include/linux/aio.h | 6
+ include/linux/highmem.h | 6
+ include/linux/interrupt.h | 5
+ include/linux/kexec.h | 13
+ include/linux/mm.h | 20 +
+ include/linux/oprofile.h | 18
+ include/linux/page-flags.h | 36 +
+ include/linux/pci.h | 4
+ include/linux/vermagic.h | 7
+ kernel/irq/spurious.c | 2
+ kernel/kexec.c | 68 ++-
+ kernel/sysctl.c | 2
+ mm/memory.c | 40 ++
+ mm/mmap.c | 10
+ mm/mprotect.c | 2
+ mm/page_alloc.c | 7
+ scripts/Makefile.build | 15
+ scripts/Makefile.lib | 6
+ 47 files changed, 2627 insertions(+), 78 deletions(-)
+
+Index: linux-3.4-rc6-master/drivers/Makefile
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/Makefile
++++ linux-3.4-rc6-master/drivers/Makefile
@@ -47,6 +47,7 @@ obj-$(CONFIG_PARPORT) += parport/
obj-y += base/ block/ misc/ mfd/ nfc/
obj-$(CONFIG_NUBUS) += nubus/
@@ -31,8 +83,10 @@ take the forward porting patches:
obj-$(CONFIG_IDE) += ide/
obj-$(CONFIG_SCSI) += scsi/
obj-$(CONFIG_ATA) += ata/
---- head.orig/drivers/acpi/Makefile 2012-05-08 10:45:52.000000000 +0200
-+++ head/drivers/acpi/Makefile 2012-04-10 15:41:46.000000000 +0200
+Index: linux-3.4-rc6-master/drivers/acpi/Makefile
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/acpi/Makefile
++++ linux-3.4-rc6-master/drivers/acpi/Makefile
@@ -68,6 +68,9 @@ obj-$(CONFIG_ACPI_BGRT) += bgrt.o
processor-y := processor_driver.o processor_throttling.o
processor-y += processor_idle.o processor_thermal.o
@@ -43,8 +97,10 @@ take the forward porting patches:
obj-$(CONFIG_ACPI_PROCESSOR_AGGREGATOR) += acpi_pad.o
obj-$(CONFIG_ACPI_IPMI) += acpi_ipmi.o
---- head.orig/drivers/acpi/processor_driver.c 2012-05-08 10:45:52.000000000 +0200
-+++ head/drivers/acpi/processor_driver.c 2012-04-10 15:42:44.000000000 +0200
+Index: linux-3.4-rc6-master/drivers/acpi/processor_driver.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/acpi/processor_driver.c
++++ linux-3.4-rc6-master/drivers/acpi/processor_driver.c
@@ -324,7 +324,8 @@ static int acpi_processor_get_info(struc
* they are physically not present.
*/
@@ -70,14 +126,13 @@ take the forward porting patches:
static void acpi_processor_notify(struct acpi_device *device, u32 event)
{
-@@ -472,16 +480,28 @@ static __ref int acpi_processor_start(st
+@@ -472,15 +480,27 @@ static __ref int acpi_processor_start(st
struct acpi_device *device = per_cpu(processor_device_array, pr->id);
int result = 0;
-#ifdef CONFIG_CPU_FREQ
+#if defined(CONFIG_CPU_FREQ) || defined(CONFIG_PROCESSOR_EXTERNAL_CONTROL)
acpi_processor_ppc_has_changed(pr, 0);
- acpi_processor_load_module(pr);
#endif
- acpi_processor_get_throttling_info(pr);
- acpi_processor_get_limit_info(pr);
@@ -102,7 +157,7 @@ take the forward porting patches:
pr->cdev = thermal_cooling_device_register("Processor", device,
&processor_cooling_ops);
if (IS_ERR(pr->cdev)) {
-@@ -545,8 +565,11 @@ static int __cpuinit acpi_processor_add(
+@@ -544,8 +564,11 @@ static int __cpuinit acpi_processor_add(
strcpy(acpi_device_class(device), ACPI_PROCESSOR_CLASS);
device->driver_data = pr;
@@ -115,7 +170,7 @@ take the forward porting patches:
/* Processor is physically not present */
return 0;
}
-@@ -556,22 +579,43 @@ static int __cpuinit acpi_processor_add(
+@@ -555,22 +578,43 @@ static int __cpuinit acpi_processor_add(
return 0;
#endif
@@ -161,7 +216,7 @@ take the forward porting patches:
per_cpu(processors, pr->id) = pr;
dev = get_cpu_device(pr->id);
-@@ -601,6 +645,14 @@ err_clear_processor:
+@@ -600,6 +644,14 @@ err_clear_processor:
*/
per_cpu(processors, pr->id) = NULL;
err_free_cpumask:
@@ -176,7 +231,7 @@ take the forward porting patches:
free_cpumask_var(pr->throttling.shared_cpu_map);
err_free_pr:
kfree(pr);
-@@ -617,7 +669,7 @@ static int acpi_processor_remove(struct
+@@ -616,7 +668,7 @@ static int acpi_processor_remove(struct
pr = acpi_driver_data(device);
@@ -185,7 +240,7 @@ take the forward porting patches:
goto free;
if (type == ACPI_BUS_REMOVAL_EJECT) {
-@@ -636,8 +688,16 @@ static int acpi_processor_remove(struct
+@@ -635,8 +687,16 @@ static int acpi_processor_remove(struct
pr->cdev = NULL;
}
@@ -202,7 +257,7 @@ take the forward porting patches:
free:
free_cpumask_var(pr->throttling.shared_cpu_map);
-@@ -693,6 +753,10 @@ int acpi_processor_device_add(acpi_handl
+@@ -692,6 +752,10 @@ int acpi_processor_device_add(acpi_handl
return -ENODEV;
}
@@ -213,7 +268,7 @@ take the forward porting patches:
return 0;
}
-@@ -722,6 +786,10 @@ static void acpi_processor_hotplug_notif
+@@ -721,6 +785,10 @@ static void acpi_processor_hotplug_notif
"Unable to add the device\n");
break;
}
@@ -224,7 +279,7 @@ take the forward porting patches:
break;
case ACPI_NOTIFY_EJECT_REQUEST:
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-@@ -738,6 +806,9 @@ static void acpi_processor_hotplug_notif
+@@ -737,6 +805,9 @@ static void acpi_processor_hotplug_notif
"Driver data is NULL, dropping EJECT\n");
return;
}
@@ -234,7 +289,7 @@ take the forward porting patches:
break;
default:
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-@@ -841,6 +912,11 @@ static acpi_status acpi_processor_hotadd
+@@ -840,6 +911,11 @@ static acpi_status acpi_processor_hotadd
static int acpi_processor_handle_eject(struct acpi_processor *pr)
{
@@ -246,7 +301,7 @@ take the forward porting patches:
if (cpu_online(pr->id))
cpu_down(pr->id);
-@@ -928,6 +1004,30 @@ static void __exit acpi_processor_exit(v
+@@ -927,6 +1003,30 @@ static void __exit acpi_processor_exit(v
acpi_bus_unregister_driver(&acpi_processor_driver);
@@ -277,8 +332,10 @@ take the forward porting patches:
return;
}
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/drivers/acpi/processor_extcntl.c 2011-01-31 14:53:38.000000000 +0100
+Index: linux-3.4-rc6-master/drivers/acpi/processor_extcntl.c
+===================================================================
+--- /dev/null
++++ linux-3.4-rc6-master/drivers/acpi/processor_extcntl.c
@@ -0,0 +1,241 @@
+/*
+ * processor_extcntl.c - channel to external control logic
@@ -521,8 +578,10 @@ take the forward porting patches:
+ kfree(perf);
+ return ret;
+}
---- head.orig/drivers/acpi/processor_idle.c 2012-05-08 10:45:52.000000000 +0200
-+++ head/drivers/acpi/processor_idle.c 2011-11-16 17:01:10.000000000 +0100
+Index: linux-3.4-rc6-master/drivers/acpi/processor_idle.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/acpi/processor_idle.c
++++ linux-3.4-rc6-master/drivers/acpi/processor_idle.c
@@ -449,7 +449,8 @@ static int acpi_processor_get_power_info
*/
cx.entry_method = ACPI_CSTATE_HALT;
@@ -567,8 +626,10 @@ take the forward porting patches:
return 0;
}
---- head.orig/drivers/acpi/processor_perflib.c 2012-05-08 10:45:52.000000000 +0200
-+++ head/drivers/acpi/processor_perflib.c 2012-02-16 11:43:50.000000000 +0100
+Index: linux-3.4-rc6-master/drivers/acpi/processor_perflib.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/acpi/processor_perflib.c
++++ linux-3.4-rc6-master/drivers/acpi/processor_perflib.c
@@ -75,6 +75,7 @@ MODULE_PARM_DESC(ignore_ppc, "If the fre
static int acpi_processor_ppc_status;
@@ -648,8 +709,10 @@ take the forward porting patches:
{
int result = 0;
acpi_status status = AE_OK;
---- head.orig/drivers/acpi/sleep.c 2012-05-08 10:45:52.000000000 +0200
-+++ head/drivers/acpi/sleep.c 2012-05-08 10:47:59.000000000 +0200
+Index: linux-3.4-rc6-master/drivers/acpi/sleep.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/acpi/sleep.c
++++ linux-3.4-rc6-master/drivers/acpi/sleep.c
@@ -91,6 +91,7 @@ static struct notifier_block tts_notifie
static int acpi_sleep_prepare(u32 acpi_state)
{
@@ -666,8 +729,10 @@ 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-05-08 10:45:52.000000000 +0200
-+++ head/drivers/block/floppy.c 2012-04-10 15:43:06.000000000 +0200
+Index: linux-3.4-rc6-master/drivers/block/floppy.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/block/floppy.c
++++ linux-3.4-rc6-master/drivers/block/floppy.c
@@ -146,7 +146,9 @@
#undef FLOPPY_SILENT_DCL_CLEAR
@@ -678,8 +743,10 @@ take the forward porting patches:
#define DEBUGT 2
---- head.orig/drivers/char/agp/intel-gtt.c 2012-05-08 10:45:52.000000000 +0200
-+++ head/drivers/char/agp/intel-gtt.c 2012-04-10 15:43:16.000000000 +0200
+Index: linux-3.4-rc6-master/drivers/char/agp/intel-gtt.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/char/agp/intel-gtt.c
++++ linux-3.4-rc6-master/drivers/char/agp/intel-gtt.c
@@ -146,8 +146,19 @@ static struct page *i8xx_alloc_pages(voi
if (page == NULL)
return NULL;
@@ -710,8 +777,10 @@ 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-05-08 10:45:52.000000000 +0200
-+++ head/drivers/char/mem.c 2011-11-16 17:01:34.000000000 +0100
+Index: linux-3.4-rc6-master/drivers/char/mem.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/char/mem.c
++++ linux-3.4-rc6-master/drivers/char/mem.c
@@ -87,6 +87,7 @@ void __weak unxlate_dev_mem_ptr(unsigned
{
}
@@ -738,7 +807,7 @@ take the forward porting patches:
/* Turn a kernel-virtual address into a physical page frame */
pfn = __pa((u64)vma->vm_pgoff << PAGE_SHIFT) >> PAGE_SHIFT;
-@@ -349,6 +354,13 @@ static int mmap_kmem(struct file *file,
+@@ -349,6 +354,13 @@ static int mmap_kmem(struct file *file,
if (!pfn_valid(pfn))
return -EIO;
@@ -770,16 +839,20 @@ take the forward porting patches:
#ifdef CONFIG_DEVKMEM
static const struct file_operations kmem_fops = {
---- head.orig/drivers/char/tpm/Makefile 2012-05-08 10:45:52.000000000 +0200
-+++ head/drivers/char/tpm/Makefile 2011-04-13 11:25:29.000000000 +0200
+Index: linux-3.4-rc6-master/drivers/char/tpm/Makefile
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/char/tpm/Makefile
++++ linux-3.4-rc6-master/drivers/char/tpm/Makefile
@@ -9,3 +9,5 @@ obj-$(CONFIG_TCG_TIS) += tpm_tis.o
obj-$(CONFIG_TCG_NSC) += tpm_nsc.o
obj-$(CONFIG_TCG_ATMEL) += tpm_atmel.o
obj-$(CONFIG_TCG_INFINEON) += tpm_infineon.o
+obj-$(CONFIG_TCG_XEN) += tpm_xenu.o
+tpm_xenu-y = tpm_xen.o tpm_vtpm.o
---- head.orig/drivers/char/tpm/tpm.h 2012-05-08 10:45:52.000000000 +0200
-+++ head/drivers/char/tpm/tpm.h 2012-04-10 15:43:23.000000000 +0200
+Index: linux-3.4-rc6-master/drivers/char/tpm/tpm.h
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/char/tpm/tpm.h
++++ linux-3.4-rc6-master/drivers/char/tpm/tpm.h
@@ -122,6 +122,9 @@ struct tpm_chip {
struct dentry **bios_dir;
@@ -809,8 +882,10 @@ take the forward porting patches:
extern int tpm_get_timeouts(struct tpm_chip *);
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
+Index: linux-3.4-rc6-master/drivers/char/tpm/tpm_vtpm.c
+===================================================================
+--- /dev/null
++++ linux-3.4-rc6-master/drivers/char/tpm/tpm_vtpm.c
@@ -0,0 +1,542 @@
+/*
+ * Copyright (C) 2006 IBM Corporation
@@ -1354,8 +1429,10 @@ take the forward porting patches:
+ tpm_remove_hardware(dev);
+ 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
+Index: linux-3.4-rc6-master/drivers/char/tpm/tpm_vtpm.h
+===================================================================
+--- /dev/null
++++ linux-3.4-rc6-master/drivers/char/tpm/tpm_vtpm.h
@@ -0,0 +1,55 @@
+#ifndef TPM_VTPM_H
+#define TPM_VTPM_H
@@ -1412,8 +1489,10 @@ 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
+Index: linux-3.4-rc6-master/drivers/char/tpm/tpm_xen.c
+===================================================================
+--- /dev/null
++++ linux-3.4-rc6-master/drivers/char/tpm/tpm_xen.c
@@ -0,0 +1,718 @@
+/*
+ * Copyright (c) 2005, IBM Corporation
@@ -2133,8 +2212,10 @@ take the forward porting patches:
+module_init(tpmif_init);
+
+MODULE_LICENSE("Dual BSD/GPL");
---- head.orig/drivers/edac/edac_mc.c 2012-05-08 10:45:52.000000000 +0200
-+++ head/drivers/edac/edac_mc.c 2012-02-08 10:51:42.000000000 +0100
+Index: linux-3.4-rc6-master/drivers/edac/edac_mc.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/edac/edac_mc.c
++++ linux-3.4-rc6-master/drivers/edac/edac_mc.c
@@ -610,6 +610,10 @@ static void edac_mc_scrub_block(unsigned
debugf3("%s()\n", __func__);
@@ -2146,8 +2227,10 @@ 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-05-08 10:45:52.000000000 +0200
-+++ head/drivers/firmware/dell_rbu.c 2011-04-13 11:25:29.000000000 +0200
+Index: linux-3.4-rc6-master/drivers/firmware/dell_rbu.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/firmware/dell_rbu.c
++++ linux-3.4-rc6-master/drivers/firmware/dell_rbu.c
@@ -170,9 +170,28 @@ static int create_packet(void *data, siz
spin_lock(&rbu_data.lock);
goto out_alloc_packet_array;
@@ -2254,8 +2337,10 @@ take the forward porting patches:
spin_lock_init(&rbu_data.lock);
init_packet_head();
---- head.orig/drivers/ide/ide-lib.c 2012-05-08 10:45:52.000000000 +0200
-+++ head/drivers/ide/ide-lib.c 2011-11-16 17:01:48.000000000 +0100
+Index: linux-3.4-rc6-master/drivers/ide/ide-lib.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/ide/ide-lib.c
++++ linux-3.4-rc6-master/drivers/ide/ide-lib.c
@@ -19,12 +19,12 @@ void ide_toggle_bounce(ide_drive_t *driv
{
u64 addr = BLK_BOUNCE_HIGH; /* dma64_addr_t */
@@ -2273,8 +2358,10 @@ take the forward porting patches:
addr = *dev->dma_mask;
}
---- head.orig/drivers/oprofile/buffer_sync.c 2012-05-08 10:45:52.000000000 +0200
-+++ head/drivers/oprofile/buffer_sync.c 2012-02-16 11:09:01.000000000 +0100
+Index: linux-3.4-rc6-master/drivers/oprofile/buffer_sync.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/oprofile/buffer_sync.c
++++ linux-3.4-rc6-master/drivers/oprofile/buffer_sync.c
@@ -8,6 +8,10 @@
* @author Barry Kasindorf
* @author Robert Richter <robert.richter@amd.com>
@@ -2468,8 +2555,10 @@ take the forward porting patches:
mark_done(cpu);
mutex_unlock(&buffer_mutex);
---- head.orig/drivers/oprofile/cpu_buffer.c 2012-05-08 10:45:52.000000000 +0200
-+++ head/drivers/oprofile/cpu_buffer.c 2011-04-13 12:22:07.000000000 +0200
+Index: linux-3.4-rc6-master/drivers/oprofile/cpu_buffer.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/oprofile/cpu_buffer.c
++++ linux-3.4-rc6-master/drivers/oprofile/cpu_buffer.c
@@ -8,6 +8,10 @@
* @author Barry Kasindorf <barry.kasindorf@amd.com>
* @author Robert Richter <robert.richter@amd.com>
@@ -2503,7 +2592,7 @@ take the forward porting patches:
b->tracing = 0;
b->buffer_size = buffer_size;
b->sample_received = 0;
-@@ -180,7 +190,7 @@ unsigned long op_cpu_buffer_entries(int
+@@ -180,7 +190,7 @@ unsigned long op_cpu_buffer_entries(int
static int
op_add_code(struct oprofile_cpu_buffer *cpu_buf, unsigned long backtrace,
@@ -2591,8 +2680,10 @@ 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-05-08 10:45:52.000000000 +0200
-+++ head/drivers/oprofile/cpu_buffer.h 2011-04-13 11:25:29.000000000 +0200
+Index: linux-3.4-rc6-master/drivers/oprofile/cpu_buffer.h
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/oprofile/cpu_buffer.h
++++ linux-3.4-rc6-master/drivers/oprofile/cpu_buffer.h
@@ -41,7 +41,7 @@ struct op_entry;
struct oprofile_cpu_buffer {
unsigned long buffer_size;
@@ -2627,8 +2718,10 @@ take the forward porting patches:
+#define DOMAIN_SWITCH (1UL << 5)
#endif /* OPROFILE_CPU_BUFFER_H */
---- head.orig/drivers/oprofile/event_buffer.h 2012-05-08 10:45:52.000000000 +0200
-+++ head/drivers/oprofile/event_buffer.h 2011-04-13 11:25:29.000000000 +0200
+Index: linux-3.4-rc6-master/drivers/oprofile/event_buffer.h
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/oprofile/event_buffer.h
++++ linux-3.4-rc6-master/drivers/oprofile/event_buffer.h
@@ -30,6 +30,9 @@ void wake_up_buffer_waiter(void);
#define INVALID_COOKIE ~0UL
#define NO_COOKIE 0UL
@@ -2639,8 +2732,10 @@ 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-05-08 10:45:52.000000000 +0200
-+++ head/drivers/oprofile/oprof.c 2011-01-31 17:01:49.000000000 +0100
+Index: linux-3.4-rc6-master/drivers/oprofile/oprof.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/oprofile/oprof.c
++++ linux-3.4-rc6-master/drivers/oprofile/oprof.c
@@ -5,6 +5,10 @@
* @remark Read the file COPYING
*
@@ -2687,8 +2782,10 @@ take the forward porting patches:
int oprofile_setup(void)
{
int err;
---- head.orig/drivers/oprofile/oprof.h 2012-05-08 10:45:52.000000000 +0200
-+++ head/drivers/oprofile/oprof.h 2012-02-08 10:51:51.000000000 +0100
+Index: linux-3.4-rc6-master/drivers/oprofile/oprof.h
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/oprofile/oprof.h
++++ linux-3.4-rc6-master/drivers/oprofile/oprof.h
@@ -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);
@@ -2697,8 +2794,10 @@ 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-05-08 10:45:52.000000000 +0200
-+++ head/drivers/oprofile/oprofile_files.c 2012-02-16 11:09:01.000000000 +0100
+Index: linux-3.4-rc6-master/drivers/oprofile/oprofile_files.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/oprofile/oprofile_files.c
++++ linux-3.4-rc6-master/drivers/oprofile/oprofile_files.c
@@ -5,11 +5,17 @@
* @remark Read the file COPYING
*
@@ -2867,8 +2966,10 @@ 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-05-08 10:45:52.000000000 +0200
-+++ head/fs/aio.c 2012-05-08 10:48:08.000000000 +0200
+Index: linux-3.4-rc6-master/fs/aio.c
+===================================================================
+--- linux-3.4-rc6-master.orig/fs/aio.c
++++ linux-3.4-rc6-master/fs/aio.c
@@ -39,6 +39,11 @@
#include <asm/kmap_types.h>
#include <asm/uaccess.h>
@@ -3054,8 +3155,10 @@ take the forward porting patches:
io_destroy(ioctx);
put_ioctx(ioctx);
}
---- head.orig/fs/compat_ioctl.c 2012-05-08 10:45:52.000000000 +0200
-+++ head/fs/compat_ioctl.c 2012-04-10 15:41:34.000000000 +0200
+Index: linux-3.4-rc6-master/fs/compat_ioctl.c
+===================================================================
+--- linux-3.4-rc6-master.orig/fs/compat_ioctl.c
++++ linux-3.4-rc6-master/fs/compat_ioctl.c
@@ -116,6 +116,13 @@
#include <asm/fbio.h>
#endif
@@ -3090,8 +3193,10 @@ take the forward porting patches:
};
/*
---- head.orig/include/acpi/processor.h 2012-05-08 10:45:52.000000000 +0200
-+++ head/include/acpi/processor.h 2012-02-16 11:44:13.000000000 +0100
+Index: linux-3.4-rc6-master/include/acpi/processor.h
+===================================================================
+--- linux-3.4-rc6-master.orig/include/acpi/processor.h
++++ linux-3.4-rc6-master/include/acpi/processor.h
@@ -42,6 +42,17 @@
struct acpi_processor_cx;
@@ -3123,7 +3228,7 @@ take the forward porting patches:
char desc[ACPI_CX_DESC_LEN];
};
-@@ -290,6 +307,9 @@ static inline void acpi_processor_ppc_ex
+@@ -289,6 +306,9 @@ static inline void acpi_processor_ppc_ex
{
return;
}
@@ -3133,7 +3238,7 @@ take the forward porting patches:
static inline int acpi_processor_ppc_has_changed(struct acpi_processor *pr,
int event_flag)
{
-@@ -303,6 +323,7 @@ static inline int acpi_processor_ppc_has
+@@ -302,6 +322,7 @@ static inline int acpi_processor_ppc_has
}
return 0;
}
@@ -3141,7 +3246,7 @@ take the forward porting patches:
static inline int acpi_processor_get_bios_limit(int cpu, unsigned int *limit)
{
return -ENODEV;
-@@ -355,4 +376,120 @@ static inline void acpi_thermal_cpufreq_
+@@ -354,4 +375,120 @@ static inline void acpi_thermal_cpufreq_
}
#endif
@@ -3262,8 +3367,10 @@ take the forward porting patches:
+#endif /* CONFIG_XEN */
+
#endif
---- head.orig/include/asm-generic/pgtable.h 2012-05-08 10:45:52.000000000 +0200
-+++ head/include/asm-generic/pgtable.h 2012-04-10 15:40:47.000000000 +0200
+Index: linux-3.4-rc6-master/include/asm-generic/pgtable.h
+===================================================================
+--- linux-3.4-rc6-master.orig/include/asm-generic/pgtable.h
++++ linux-3.4-rc6-master/include/asm-generic/pgtable.h
@@ -157,6 +157,10 @@ static inline void pmdp_set_wrprotect(st
#endif /* CONFIG_TRANSPARENT_HUGEPAGE */
#endif
@@ -3275,8 +3382,10 @@ take the forward porting patches:
#ifndef __HAVE_ARCH_PMDP_SPLITTING_FLUSH
extern pmd_t pmdp_splitting_flush(struct vm_area_struct *vma,
unsigned long address,
---- head.orig/include/linux/aio.h 2012-05-08 10:45:52.000000000 +0200
-+++ head/include/linux/aio.h 2011-11-16 17:02:20.000000000 +0100
+Index: linux-3.4-rc6-master/include/linux/aio.h
+===================================================================
+--- linux-3.4-rc6-master.orig/include/linux/aio.h
++++ linux-3.4-rc6-master/include/linux/aio.h
@@ -200,6 +200,12 @@ struct kioctx {
struct delayed_work wq;
@@ -3290,8 +3399,10 @@ take the forward porting patches:
struct rcu_head rcu_head;
};
---- head.orig/include/linux/highmem.h 2012-05-08 10:45:52.000000000 +0200
-+++ head/include/linux/highmem.h 2012-04-10 15:40:55.000000000 +0200
+Index: linux-3.4-rc6-master/include/linux/highmem.h
+===================================================================
+--- linux-3.4-rc6-master.orig/include/linux/highmem.h
++++ linux-3.4-rc6-master/include/linux/highmem.h
@@ -214,12 +214,14 @@ alloc_zeroed_user_highpage_movable(struc
return __alloc_zeroed_user_highpage(__GFP_MOVABLE, vma, vaddr);
}
@@ -3316,15 +3427,17 @@ take the forward porting patches:
static inline void copy_highpage(struct page *to, struct page *from)
{
char *vfrom, *vto;
-@@ -284,4 +288,6 @@ static inline void copy_highpage(struct
+@@ -284,4 +288,6 @@ static inline void copy_highpage(struct
kunmap_atomic(vfrom);
}
+#endif
+
#endif /* _LINUX_HIGHMEM_H */
---- head.orig/include/linux/interrupt.h 2012-05-08 10:45:52.000000000 +0200
-+++ head/include/linux/interrupt.h 2012-04-10 15:41:02.000000000 +0200
+Index: linux-3.4-rc6-master/include/linux/interrupt.h
+===================================================================
+--- linux-3.4-rc6-master.orig/include/linux/interrupt.h
++++ linux-3.4-rc6-master/include/linux/interrupt.h
@@ -392,6 +392,11 @@ static inline int disable_irq_wake(unsig
}
#endif /* CONFIG_GENERIC_HARDIRQS */
@@ -3337,8 +3450,10 @@ take the forward porting patches:
#ifdef CONFIG_IRQ_FORCED_THREADING
extern bool force_irqthreads;
---- head.orig/include/linux/kexec.h 2012-05-08 10:45:52.000000000 +0200
-+++ head/include/linux/kexec.h 2012-02-08 10:52:29.000000000 +0100
+Index: linux-3.4-rc6-master/include/linux/kexec.h
+===================================================================
+--- linux-3.4-rc6-master.orig/include/linux/kexec.h
++++ linux-3.4-rc6-master/include/linux/kexec.h
@@ -56,6 +56,13 @@
KEXEC_CORE_NOTE_DESC_BYTES )
#endif
@@ -3366,9 +3481,11 @@ 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-05-08 10:45:52.000000000 +0200
-+++ head/include/linux/mm.h 2012-04-10 15:41:09.000000000 +0200
-@@ -116,7 +116,12 @@ extern unsigned int kobjsize(const void
+Index: linux-3.4-rc6-master/include/linux/mm.h
+===================================================================
+--- linux-3.4-rc6-master.orig/include/linux/mm.h
++++ linux-3.4-rc6-master/include/linux/mm.h
+@@ -116,7 +116,12 @@ extern unsigned int kobjsize(const void
#define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */
#define VM_MIXEDMAP 0x10000000 /* Can contain "struct page" and pure PFN pages */
@@ -3381,7 +3498,7 @@ take the forward porting patches:
#define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */
#define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */
-@@ -145,6 +150,12 @@ extern unsigned int kobjsize(const void
+@@ -145,6 +150,12 @@ extern unsigned int kobjsize(const void
*/
#define VM_SPECIAL (VM_IO | VM_DONTEXPAND | VM_RESERVED | VM_PFNMAP)
@@ -3410,8 +3527,10 @@ 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-05-08 10:45:52.000000000 +0200
-+++ head/include/linux/oprofile.h 2011-09-07 15:19:35.000000000 +0200
+Index: linux-3.4-rc6-master/include/linux/oprofile.h
+===================================================================
+--- linux-3.4-rc6-master.orig/include/linux/oprofile.h
++++ linux-3.4-rc6-master/include/linux/oprofile.h
@@ -19,6 +19,9 @@
#include <linux/errno.h>
#include <linux/printk.h>
@@ -3465,8 +3584,10 @@ 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-05-08 10:45:52.000000000 +0200
-+++ head/include/linux/page-flags.h 2012-04-10 15:41:11.000000000 +0200
+Index: linux-3.4-rc6-master/include/linux/page-flags.h
+===================================================================
+--- linux-3.4-rc6-master.orig/include/linux/page-flags.h
++++ linux-3.4-rc6-master/include/linux/page-flags.h
@@ -108,6 +108,11 @@ enum pageflags {
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
PG_compound_lock,
@@ -3531,8 +3652,10 @@ 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-04-10 15:11:52.000000000 +0200
-+++ head/include/linux/pci.h 2012-04-10 15:41:17.000000000 +0200
+Index: linux-3.4-rc6-master/include/linux/pci.h
+===================================================================
+--- linux-3.4-rc6-master.orig/include/linux/pci.h
++++ linux-3.4-rc6-master/include/linux/pci.h
@@ -1058,6 +1058,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);
@@ -3544,8 +3667,10 @@ take the forward porting patches:
#endif
#ifdef CONFIG_PCIEPORTBUS
---- head.orig/include/linux/vermagic.h 2012-05-08 10:45:52.000000000 +0200
-+++ head/include/linux/vermagic.h 2011-11-16 17:02:46.000000000 +0100
+Index: linux-3.4-rc6-master/include/linux/vermagic.h
+===================================================================
+--- linux-3.4-rc6-master.orig/include/linux/vermagic.h
++++ linux-3.4-rc6-master/include/linux/vermagic.h
@@ -21,6 +21,11 @@
#else
#define MODULE_VERMAGIC_MODVERSIONS ""
@@ -3565,8 +3690,10 @@ take the forward porting patches:
- MODULE_ARCH_VERMAGIC
+ MODULE_VERMAGIC_XEN MODULE_ARCH_VERMAGIC
---- head.orig/kernel/irq/spurious.c 2012-05-08 10:45:52.000000000 +0200
-+++ head/kernel/irq/spurious.c 2011-12-21 10:08:43.000000000 +0100
+Index: linux-3.4-rc6-master/kernel/irq/spurious.c
+===================================================================
+--- linux-3.4-rc6-master.orig/kernel/irq/spurious.c
++++ linux-3.4-rc6-master/kernel/irq/spurious.c
@@ -290,7 +290,7 @@ void note_interrupt(unsigned int irq, st
*/
if (time_after(jiffies, desc->last_unhandled + HZ/10))
@@ -3576,8 +3703,10 @@ take the forward porting patches:
desc->irqs_unhandled++;
desc->last_unhandled = jiffies;
}
---- head.orig/kernel/kexec.c 2012-05-08 10:45:52.000000000 +0200
-+++ head/kernel/kexec.c 2012-04-10 15:40:13.000000000 +0200
+Index: linux-3.4-rc6-master/kernel/kexec.c
+===================================================================
+--- linux-3.4-rc6-master.orig/kernel/kexec.c
++++ linux-3.4-rc6-master/kernel/kexec.c
@@ -355,13 +355,26 @@ static int kimage_is_destination_range(s
return 0;
}
@@ -3778,8 +3907,10 @@ take the forward porting patches:
/* Install the new kernel, and Uninstall the old */
image = xchg(dest_image, image);
---- head.orig/kernel/sysctl.c 2012-05-08 10:45:52.000000000 +0200
-+++ head/kernel/sysctl.c 2012-04-10 15:40:18.000000000 +0200
+Index: linux-3.4-rc6-master/kernel/sysctl.c
+===================================================================
+--- linux-3.4-rc6-master.orig/kernel/sysctl.c
++++ linux-3.4-rc6-master/kernel/sysctl.c
@@ -865,7 +865,7 @@ static struct ctl_table kern_table[] = {
.proc_handler = proc_dointvec,
},
@@ -3789,8 +3920,10 @@ take the forward porting patches:
{
.procname = "acpi_video_flags",
.data = &acpi_realmode_flags,
---- head.orig/mm/memory.c 2012-05-08 10:45:52.000000000 +0200
-+++ head/mm/memory.c 2012-04-10 15:39:45.000000000 +0200
+Index: linux-3.4-rc6-master/mm/memory.c
+===================================================================
+--- linux-3.4-rc6-master.orig/mm/memory.c
++++ linux-3.4-rc6-master/mm/memory.c
@@ -779,6 +779,12 @@ struct page *vm_normal_page(struct vm_ar
{
unsigned long pfn = pte_pfn(pte);
@@ -3837,7 +3970,7 @@ take the forward porting patches:
/**
* zap_page_range_single - remove user pages in a given range
-@@ -1726,6 +1740,28 @@ int __get_user_pages(struct task_struct
+@@ -1726,6 +1740,28 @@ int __get_user_pages(struct task_struct
goto next_page;
}
@@ -3866,8 +3999,10 @@ 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-05-08 10:45:52.000000000 +0200
-+++ head/mm/mmap.c 2012-05-08 10:48:15.000000000 +0200
+Index: linux-3.4-rc6-master/mm/mmap.c
+===================================================================
+--- linux-3.4-rc6-master.orig/mm/mmap.c
++++ linux-3.4-rc6-master/mm/mmap.c
@@ -1924,6 +1924,12 @@ static void unmap_region(struct mm_struc
tlb_finish_mmu(&tlb, start, end);
}
@@ -3899,8 +4034,10 @@ 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-05-08 10:45:52.000000000 +0200
-+++ head/mm/mprotect.c 2011-06-30 15:38:52.000000000 +0200
+Index: linux-3.4-rc6-master/mm/mprotect.c
+===================================================================
+--- linux-3.4-rc6-master.orig/mm/mprotect.c
++++ linux-3.4-rc6-master/mm/mprotect.c
@@ -97,6 +97,8 @@ static inline void change_pmd_range(stru
}
if (pmd_none_or_clear_bad(pmd))
@@ -3910,8 +4047,10 @@ 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-05-08 10:45:52.000000000 +0200
-+++ head/mm/page_alloc.c 2012-02-08 10:53:13.000000000 +0100
+Index: linux-3.4-rc6-master/mm/page_alloc.c
+===================================================================
+--- linux-3.4-rc6-master.orig/mm/page_alloc.c
++++ linux-3.4-rc6-master/mm/page_alloc.c
@@ -692,6 +692,13 @@ static bool free_pages_prepare(struct pa
int i;
int bad = 0;
@@ -3926,8 +4065,10 @@ take the forward porting patches:
trace_mm_page_free(page, order);
kmemcheck_free_shadow(page, order);
---- head.orig/scripts/Makefile.build 2012-05-08 10:45:52.000000000 +0200
-+++ head/scripts/Makefile.build 2011-06-30 15:39:08.000000000 +0200
+Index: linux-3.4-rc6-master/scripts/Makefile.build
+===================================================================
+--- linux-3.4-rc6-master.orig/scripts/Makefile.build
++++ linux-3.4-rc6-master/scripts/Makefile.build
@@ -128,6 +128,21 @@ ifndef obj
$(warning kbuild: Makefile.build is included improperly)
endif
@@ -3950,8 +4091,10 @@ take the forward porting patches:
# ===========================================================================
ifneq ($(strip $(lib-y) $(lib-m) $(lib-n) $(lib-)),)
---- head.orig/scripts/Makefile.lib 2012-05-08 10:45:52.000000000 +0200
-+++ head/scripts/Makefile.lib 2012-04-10 15:40:06.000000000 +0200
+Index: linux-3.4-rc6-master/scripts/Makefile.lib
+===================================================================
+--- linux-3.4-rc6-master.orig/scripts/Makefile.lib
++++ linux-3.4-rc6-master/scripts/Makefile.lib
@@ -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-patch-3.3 b/patches.xen/xen3-patch-3.3
index 70fc258620..bed63b4cf1 100644
--- a/patches.xen/xen3-patch-3.3
+++ b/patches.xen/xen3-patch-3.3
@@ -10,8 +10,93 @@ Acked-by: jbeulich@suse.com
3.4/arch/x86/include/mach-xen/asm/i387.h (moved to fpu-internal.h)
---- head.orig/arch/x86/ia32/ia32entry-xen.S 2011-11-17 15:56:06.000000000 +0100
-+++ head/arch/x86/ia32/ia32entry-xen.S 2012-02-09 12:46:23.000000000 +0100
+---
+ arch/x86/ia32/ia32entry-xen.S | 390 +-----------------------------
+ arch/x86/include/asm/debugreg.h | 2
+ arch/x86/include/mach-xen/asm/desc.h | 12
+ arch/x86/include/mach-xen/asm/fixmap.h | 2
+ arch/x86/include/mach-xen/asm/pci.h | 9
+ arch/x86/include/mach-xen/asm/pgtable.h | 2
+ arch/x86/include/mach-xen/asm/processor.h | 6
+ arch/x86/include/mach-xen/asm/smp.h | 6
+ arch/x86/include/mach-xen/asm/spinlock.h | 13 -
+ arch/x86/include/mach-xen/asm/xor_64.h | 6
+ arch/x86/kernel/apic/io_apic-xen.c | 6
+ arch/x86/kernel/cpu/common-xen.c | 49 +++
+ arch/x86/kernel/cpu/mcheck/mce-inject.c | 2
+ arch/x86/kernel/e820-xen.c | 137 ++++------
+ arch/x86/kernel/early_printk-xen.c | 4
+ arch/x86/kernel/entry_32-xen.S | 77 ++---
+ arch/x86/kernel/entry_64-xen.S | 66 +++--
+ arch/x86/kernel/head-xen.c | 11
+ arch/x86/kernel/head32-xen.c | 7
+ arch/x86/kernel/head64-xen.c | 5
+ arch/x86/kernel/irq-xen.c | 13 -
+ arch/x86/kernel/microcode_core-xen.c | 13 -
+ arch/x86/kernel/mpparse-xen.c | 12
+ arch/x86/kernel/pci-dma-xen.c | 11
+ arch/x86/kernel/process-xen.c | 2
+ arch/x86/kernel/process_32-xen.c | 50 ---
+ arch/x86/kernel/process_64-xen.c | 62 +---
+ arch/x86/kernel/setup-xen.c | 28 --
+ arch/x86/kernel/smp-xen.c | 45 +++
+ arch/x86/kernel/syscall_32-xen.c | 20 +
+ arch/x86/kernel/traps-xen.c | 65 ++---
+ arch/x86/kernel/vsyscall_64-xen.c | 77 +++++
+ arch/x86/mm/fault-xen.c | 26 +-
+ arch/x86/mm/init-xen.c | 29 ++
+ arch/x86/mm/init_32-xen.c | 74 ++---
+ arch/x86/mm/init_64-xen.c | 18 -
+ arch/x86/mm/pageattr-xen.c | 8
+ drivers/acpi/osl.c | 4
+ drivers/acpi/processor_core.c | 2
+ drivers/acpi/processor_driver.c | 4
+ drivers/acpi/processor_perflib.c | 2
+ drivers/pci/msi-xen.c | 261 +++++++++++++++++---
+ drivers/xen/Kconfig | 7
+ drivers/xen/Makefile | 5
+ drivers/xen/balloon/balloon.c | 29 --
+ drivers/xen/balloon/sysfs.c | 86 +++---
+ drivers/xen/blkback/blkback.c | 13 -
+ drivers/xen/blkback/common.h | 7
+ drivers/xen/blkback/vbd.c | 3
+ drivers/xen/blkback/xenbus.c | 55 +---
+ drivers/xen/blkfront/blkfront.c | 20 +
+ drivers/xen/blkfront/block.h | 3
+ drivers/xen/blkfront/vbd.c | 4
+ drivers/xen/blktap/blktap.c | 2
+ drivers/xen/blktap2-new/device.c | 2
+ drivers/xen/blktap2-new/sysfs.c | 2
+ drivers/xen/blktap2/device.c | 2
+ drivers/xen/blktap2/sysfs.c | 2
+ drivers/xen/console/console.c | 2
+ drivers/xen/core/cpu_hotplug.c | 6
+ drivers/xen/core/evtchn.c | 2
+ drivers/xen/core/smpboot.c | 1
+ drivers/xen/core/spinlock.c | 4
+ drivers/xen/netback/interface.c | 3
+ drivers/xen/netback/netback.c | 4
+ drivers/xen/netfront/netfront.c | 18 -
+ drivers/xen/pcifront/xenbus.c | 4
+ drivers/xen/xen-pciback/pci_stub.c | 2
+ drivers/xen/xenbus/Makefile | 7
+ drivers/xen/xenbus/xenbus_client.c | 197 ++++++++++++---
+ drivers/xen/xenbus/xenbus_comms.h | 4
+ drivers/xen/xenbus/xenbus_dev_backend.c | 4
+ drivers/xen/xenbus/xenbus_probe.c | 6
+ drivers/xen/xenbus/xenbus_probe.h | 2
+ include/xen/balloon.h | 6
+ include/xen/blkif.h | 8
+ include/xen/evtchn.h | 1
+ include/xen/interface/grant_table.h | 12
+ include/xen/interface/io/blkif.h | 25 +
+ lib/swiotlb-xen.c | 4
+ 80 files changed, 1155 insertions(+), 1047 deletions(-)
+
+Index: linux-3.4-rc6-master/arch/x86/ia32/ia32entry-xen.S
+===================================================================
+--- linux-3.4-rc6-master.orig/arch/x86/ia32/ia32entry-xen.S
++++ linux-3.4-rc6-master/arch/x86/ia32/ia32entry-xen.S
@@ -14,6 +14,7 @@
#include <asm/segment.h>
#include <asm/irqflags.h>
@@ -486,8 +571,10 @@ Acked-by: jbeulich@suse.com
- .quad compat_sys_process_vm_readv
- .quad compat_sys_process_vm_writev
-ia32_syscall_end:
---- head.orig/arch/x86/include/asm/debugreg.h 2012-04-10 14:24:22.000000000 +0200
-+++ head/arch/x86/include/asm/debugreg.h 2012-04-10 17:25:00.000000000 +0200
+Index: linux-3.4-rc6-master/arch/x86/include/asm/debugreg.h
+===================================================================
+--- linux-3.4-rc6-master.orig/arch/x86/include/asm/debugreg.h
++++ linux-3.4-rc6-master/arch/x86/include/asm/debugreg.h
@@ -168,7 +168,7 @@ extern void aout_dump_debugregs(struct u
extern void hw_breakpoint_restore(void);
@@ -497,8 +584,10 @@ Acked-by: jbeulich@suse.com
DECLARE_PER_CPU(int, debug_stack_usage);
static inline void debug_stack_usage_inc(void)
{
---- head.orig/arch/x86/include/mach-xen/asm/desc.h 2011-09-08 16:54:08.000000000 +0200
-+++ head/arch/x86/include/mach-xen/asm/desc.h 2012-02-09 12:32:50.000000000 +0100
+Index: linux-3.4-rc6-master/arch/x86/include/mach-xen/asm/desc.h
+===================================================================
+--- linux-3.4-rc6-master.orig/arch/x86/include/mach-xen/asm/desc.h
++++ linux-3.4-rc6-master/arch/x86/include/mach-xen/asm/desc.h
@@ -36,6 +36,8 @@ static inline void fill_ldt(struct desc_
#ifndef CONFIG_X86_NO_IDT
extern struct desc_ptr idt_descr;
@@ -525,8 +614,10 @@ Acked-by: jbeulich@suse.com
static inline void _set_gate(int gate, unsigned type, void *addr,
unsigned dpl, unsigned ist, unsigned seg)
{
---- head.orig/arch/x86/include/mach-xen/asm/fixmap.h 2011-09-08 16:54:08.000000000 +0200
-+++ head/arch/x86/include/mach-xen/asm/fixmap.h 2012-02-09 12:32:50.000000000 +0100
+Index: linux-3.4-rc6-master/arch/x86/include/mach-xen/asm/fixmap.h
+===================================================================
+--- linux-3.4-rc6-master.orig/arch/x86/include/mach-xen/asm/fixmap.h
++++ linux-3.4-rc6-master/arch/x86/include/mach-xen/asm/fixmap.h
@@ -124,7 +124,7 @@ enum fixed_addresses {
#endif
FIX_TEXT_POKE1, /* reserve 2 pages for text_poke() */
@@ -536,8 +627,10 @@ Acked-by: jbeulich@suse.com
FIX_LNW_VRTC,
#endif
__end_of_permanent_fixed_addresses,
---- head.orig/arch/x86/include/mach-xen/asm/pci.h 2011-07-01 15:19:34.000000000 +0200
-+++ head/arch/x86/include/mach-xen/asm/pci.h 2012-02-09 12:32:50.000000000 +0100
+Index: linux-3.4-rc6-master/arch/x86/include/mach-xen/asm/pci.h
+===================================================================
+--- linux-3.4-rc6-master.orig/arch/x86/include/mach-xen/asm/pci.h
++++ linux-3.4-rc6-master/arch/x86/include/mach-xen/asm/pci.h
@@ -118,19 +118,28 @@ static inline void x86_teardown_msi_irq(
{
x86_msi.teardown_msi_irq(irq);
@@ -567,8 +660,10 @@ Acked-by: jbeulich@suse.com
#endif
#define PCI_DMA_BUS_IS_PHYS 0
---- head.orig/arch/x86/include/mach-xen/asm/pgtable.h 2011-03-23 10:10:00.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/pgtable.h 2012-02-09 12:32:50.000000000 +0100
+Index: linux-3.4-rc6-master/arch/x86/include/mach-xen/asm/pgtable.h
+===================================================================
+--- linux-3.4-rc6-master.orig/arch/x86/include/mach-xen/asm/pgtable.h
++++ linux-3.4-rc6-master/arch/x86/include/mach-xen/asm/pgtable.h
@@ -738,7 +738,7 @@ static inline void ptep_set_wrprotect(st
set_pte_at(mm, addr, ptep, pte_wrprotect(pte));
}
@@ -578,8 +673,10 @@ Acked-by: jbeulich@suse.com
#define mk_pmd(page, pgprot) pfn_pmd(page_to_pfn(page), (pgprot))
---- head.orig/arch/x86/include/mach-xen/asm/processor.h 2011-11-17 16:53:30.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/processor.h 2012-02-29 10:59:05.000000000 +0100
+Index: linux-3.4-rc6-master/arch/x86/include/mach-xen/asm/processor.h
+===================================================================
+--- linux-3.4-rc6-master.orig/arch/x86/include/mach-xen/asm/processor.h
++++ linux-3.4-rc6-master/arch/x86/include/mach-xen/asm/processor.h
@@ -109,7 +109,7 @@ struct cpuinfo_x86 {
u16 initial_apicid;
#endif
@@ -609,8 +706,10 @@ Acked-by: jbeulich@suse.com
union thread_xstate *state;
};
---- head.orig/arch/x86/include/mach-xen/asm/smp.h 2011-04-13 17:01:31.000000000 +0200
-+++ head/arch/x86/include/mach-xen/asm/smp.h 2012-02-09 12:32:50.000000000 +0100
+Index: linux-3.4-rc6-master/arch/x86/include/mach-xen/asm/smp.h
+===================================================================
+--- linux-3.4-rc6-master.orig/arch/x86/include/mach-xen/asm/smp.h
++++ linux-3.4-rc6-master/arch/x86/include/mach-xen/asm/smp.h
@@ -231,5 +231,11 @@ extern int hard_smp_processor_id(void);
#endif /* CONFIG_X86_LOCAL_APIC */
@@ -623,8 +722,10 @@ Acked-by: jbeulich@suse.com
+
#endif /* __ASSEMBLY__ */
#endif /* _ASM_X86_SMP_H */
---- head.orig/arch/x86/include/mach-xen/asm/spinlock.h 2012-02-01 09:13:39.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/spinlock.h 2012-02-09 12:49:39.000000000 +0100
+Index: linux-3.4-rc6-master/arch/x86/include/mach-xen/asm/spinlock.h
+===================================================================
+--- linux-3.4-rc6-master.orig/arch/x86/include/mach-xen/asm/spinlock.h
++++ linux-3.4-rc6-master/arch/x86/include/mach-xen/asm/spinlock.h
@@ -137,19 +137,8 @@ static __always_inline void __ticket_spi
{
register struct __raw_tickets new;
@@ -646,8 +747,10 @@ Acked-by: jbeulich@suse.com
# undef UNLOCK_LOCK_PREFIX
#endif
new = ACCESS_ONCE(lock->tickets);
---- head.orig/arch/x86/include/mach-xen/asm/xor_64.h 2011-02-01 14:39:24.000000000 +0100
-+++ head/arch/x86/include/mach-xen/asm/xor_64.h 2012-02-21 13:49:31.000000000 +0100
+Index: linux-3.4-rc6-master/arch/x86/include/mach-xen/asm/xor_64.h
+===================================================================
+--- linux-3.4-rc6-master.orig/arch/x86/include/mach-xen/asm/xor_64.h
++++ linux-3.4-rc6-master/arch/x86/include/mach-xen/asm/xor_64.h
@@ -1,6 +1,8 @@
#ifndef _ASM_X86_XOR_64_H
#define _ASM_X86_XOR_64_H
@@ -675,8 +778,10 @@ Acked-by: jbeulich@suse.com
stts(); \
preempt_enable(); \
} while (0)
---- head.orig/arch/x86/kernel/apic/io_apic-xen.c 2011-11-28 10:08:44.000000000 +0100
-+++ head/arch/x86/kernel/apic/io_apic-xen.c 2012-02-09 12:32:50.000000000 +0100
+Index: linux-3.4-rc6-master/arch/x86/kernel/apic/io_apic-xen.c
+===================================================================
+--- linux-3.4-rc6-master.orig/arch/x86/kernel/apic/io_apic-xen.c
++++ linux-3.4-rc6-master/arch/x86/kernel/apic/io_apic-xen.c
@@ -2502,8 +2502,8 @@ asmlinkage void smp_irq_move_cleanup_int
unsigned vector, me;
@@ -698,8 +803,10 @@ Acked-by: jbeulich@suse.com
panic("IO-APIC + timer doesn't work! Boot with apic=debug and send a "
"report. Then try booting with the 'noapic' option.\n");
out:
---- head.orig/arch/x86/kernel/cpu/common-xen.c 2011-11-17 15:56:06.000000000 +0100
-+++ head/arch/x86/kernel/cpu/common-xen.c 2012-04-20 15:15:12.000000000 +0200
+Index: linux-3.4-rc6-master/arch/x86/kernel/cpu/common-xen.c
+===================================================================
+--- linux-3.4-rc6-master.orig/arch/x86/kernel/cpu/common-xen.c
++++ linux-3.4-rc6-master/arch/x86/kernel/cpu/common-xen.c
@@ -711,9 +711,7 @@ static void __init early_identify_cpu(st
if (this_cpu->c_early_init)
this_cpu->c_early_init(c);
@@ -804,8 +911,10 @@ Acked-by: jbeulich@suse.com
}
}
---- head.orig/arch/x86/kernel/cpu/mcheck/mce-inject.c 2012-02-08 12:15:59.000000000 +0100
-+++ head/arch/x86/kernel/cpu/mcheck/mce-inject.c 2012-02-16 17:51:33.000000000 +0100
+Index: linux-3.4-rc6-master/arch/x86/kernel/cpu/mcheck/mce-inject.c
+===================================================================
+--- linux-3.4-rc6-master.orig/arch/x86/kernel/cpu/mcheck/mce-inject.c
++++ linux-3.4-rc6-master/arch/x86/kernel/cpu/mcheck/mce-inject.c
@@ -93,6 +93,7 @@ static int mce_raise_notify(unsigned int
return NMI_HANDLED;
}
@@ -822,8 +931,10 @@ Acked-by: jbeulich@suse.com
/* Inject mce on current CPU */
static int raise_local(void)
---- head.orig/arch/x86/kernel/e820-xen.c 2011-12-21 12:00:26.000000000 +0100
-+++ head/arch/x86/kernel/e820-xen.c 2012-02-16 17:12:00.000000000 +0100
+Index: linux-3.4-rc6-master/arch/x86/kernel/e820-xen.c
+===================================================================
+--- linux-3.4-rc6-master.orig/arch/x86/kernel/e820-xen.c
++++ linux-3.4-rc6-master/arch/x86/kernel/e820-xen.c
@@ -19,6 +19,7 @@
#include <linux/acpi.h>
#include <linux/firmware-map.h>
@@ -1058,8 +1169,10 @@ Acked-by: jbeulich@suse.com
+ set_dma_reserve(nr_pages - nr_free_pages);
#endif
}
---- head.orig/arch/x86/kernel/early_printk-xen.c 2011-02-01 15:41:35.000000000 +0100
-+++ head/arch/x86/kernel/early_printk-xen.c 2012-02-09 12:32:50.000000000 +0100
+Index: linux-3.4-rc6-master/arch/x86/kernel/early_printk-xen.c
+===================================================================
+--- linux-3.4-rc6-master.orig/arch/x86/kernel/early_printk-xen.c
++++ linux-3.4-rc6-master/arch/x86/kernel/early_printk-xen.c
@@ -272,14 +272,14 @@ static int __init setup_early_printk(cha
if (!strncmp(buf, "xen", 3))
early_console_register(&xenboot_console, keep);
@@ -1077,8 +1190,10 @@ Acked-by: jbeulich@suse.com
early_console_register(&early_hsu_console, keep);
}
#endif
---- head.orig/arch/x86/kernel/entry_32-xen.S 2012-02-29 14:20:19.000000000 +0100
-+++ head/arch/x86/kernel/entry_32-xen.S 2012-02-29 14:23:02.000000000 +0100
+Index: linux-3.4-rc6-master/arch/x86/kernel/entry_32-xen.S
+===================================================================
+--- linux-3.4-rc6-master.orig/arch/x86/kernel/entry_32-xen.S
++++ linux-3.4-rc6-master/arch/x86/kernel/entry_32-xen.S
@@ -42,6 +42,7 @@
*/
@@ -1300,8 +1415,10 @@ Acked-by: jbeulich@suse.com
#endif /* TIF_CSTAR */
/*
---- head.orig/arch/x86/kernel/entry_64-xen.S 2011-11-17 15:56:06.000000000 +0100
-+++ head/arch/x86/kernel/entry_64-xen.S 2012-02-10 08:50:41.000000000 +0100
+Index: linux-3.4-rc6-master/arch/x86/kernel/entry_64-xen.S
+===================================================================
+--- linux-3.4-rc6-master.orig/arch/x86/kernel/entry_64-xen.S
++++ linux-3.4-rc6-master/arch/x86/kernel/entry_64-xen.S
@@ -58,6 +58,7 @@
#include <asm/processor-flags.h>
#include <asm/ftrace.h>
@@ -1468,8 +1585,10 @@ Acked-by: jbeulich@suse.com
RESTORE_REST
DISABLE_INTERRUPTS(CLBR_NONE)
TRACE_IRQS_OFF
---- head.orig/arch/x86/kernel/head-xen.c 2012-02-08 16:16:55.000000000 +0100
-+++ head/arch/x86/kernel/head-xen.c 2012-02-09 17:46:13.000000000 +0100
+Index: linux-3.4-rc6-master/arch/x86/kernel/head-xen.c
+===================================================================
+--- linux-3.4-rc6-master.orig/arch/x86/kernel/head-xen.c
++++ linux-3.4-rc6-master/arch/x86/kernel/head-xen.c
@@ -54,7 +54,7 @@ void __init reserve_ebda_region(void)
lowmem = 0x9f000;
@@ -1495,8 +1614,10 @@ Acked-by: jbeulich@suse.com
#ifdef CONFIG_X86_32
{
---- head.orig/arch/x86/kernel/head32-xen.c 2011-07-01 15:19:34.000000000 +0200
-+++ head/arch/x86/kernel/head32-xen.c 2012-02-09 12:32:50.000000000 +0100
+Index: linux-3.4-rc6-master/arch/x86/kernel/head32-xen.c
+===================================================================
+--- linux-3.4-rc6-master.orig/arch/x86/kernel/head32-xen.c
++++ linux-3.4-rc6-master/arch/x86/kernel/head32-xen.c
@@ -47,9 +47,8 @@ void __init i386_start_kernel(void)
BUG_ON(pte_index(hypervisor_virt_start));
#endif
@@ -1518,8 +1639,10 @@ Acked-by: jbeulich@suse.com
}
#endif
---- head.orig/arch/x86/kernel/head64-xen.c 2011-04-12 15:59:10.000000000 +0200
-+++ head/arch/x86/kernel/head64-xen.c 2012-02-09 12:32:50.000000000 +0100
+Index: linux-3.4-rc6-master/arch/x86/kernel/head64-xen.c
+===================================================================
+--- linux-3.4-rc6-master.orig/arch/x86/kernel/head64-xen.c
++++ linux-3.4-rc6-master/arch/x86/kernel/head64-xen.c
@@ -117,9 +117,8 @@ void __init x86_64_start_reservations(ch
{
copy_bootdata(__va(real_mode_data));
@@ -1532,8 +1655,10 @@ Acked-by: jbeulich@suse.com
/*
* At this point everything still needed from the boot loader
---- head.orig/arch/x86/kernel/irq-xen.c 2011-11-17 15:56:06.000000000 +0100
-+++ head/arch/x86/kernel/irq-xen.c 2012-02-09 12:32:50.000000000 +0100
+Index: linux-3.4-rc6-master/arch/x86/kernel/irq-xen.c
+===================================================================
+--- linux-3.4-rc6-master.orig/arch/x86/kernel/irq-xen.c
++++ linux-3.4-rc6-master/arch/x86/kernel/irq-xen.c
@@ -78,6 +78,12 @@ int arch_show_interrupts(struct seq_file
for_each_online_cpu(j)
seq_printf(p, "%10u ", irq_stats(j)->apic_irq_work_irqs);
@@ -1578,9 +1703,11 @@ Acked-by: jbeulich@suse.com
inc_irq_stat(x86_platform_ipis);
if (x86_platform_ipi_callback)
---- head.orig/arch/x86/kernel/microcode_core-xen.c 2011-12-01 15:28:13.000000000 +0100
-+++ head/arch/x86/kernel/microcode_core-xen.c 2012-02-09 14:22:00.000000000 +0100
-@@ -186,16 +186,21 @@ static int request_microcode(const char
+Index: linux-3.4-rc6-master/arch/x86/kernel/microcode_core-xen.c
+===================================================================
+--- linux-3.4-rc6-master.orig/arch/x86/kernel/microcode_core-xen.c
++++ linux-3.4-rc6-master/arch/x86/kernel/microcode_core-xen.c
+@@ -186,16 +186,21 @@ static int request_microcode(const char
static int __init microcode_init(void)
{
const struct cpuinfo_x86 *c = &boot_cpu_data;
@@ -1606,8 +1733,10 @@ Acked-by: jbeulich@suse.com
pr_err("no support for this CPU vendor\n");
return -ENODEV;
}
---- head.orig/arch/x86/kernel/mpparse-xen.c 2011-12-21 11:56:23.000000000 +0100
-+++ head/arch/x86/kernel/mpparse-xen.c 2012-02-09 12:32:50.000000000 +0100
+Index: linux-3.4-rc6-master/arch/x86/kernel/mpparse-xen.c
+===================================================================
+--- linux-3.4-rc6-master.orig/arch/x86/kernel/mpparse-xen.c
++++ linux-3.4-rc6-master/arch/x86/kernel/mpparse-xen.c
@@ -591,9 +591,7 @@ void __init default_get_smp_config(unsig
#ifndef CONFIG_XEN
static void __init smp_reserve_memory(struct mpf_intel *mpf)
@@ -1641,8 +1770,10 @@ Acked-by: jbeulich@suse.com
}
static int __init update_mp_table(void)
---- head.orig/arch/x86/kernel/pci-dma-xen.c 2012-04-04 14:32:31.000000000 +0200
-+++ head/arch/x86/kernel/pci-dma-xen.c 2012-04-04 14:32:53.000000000 +0200
+Index: linux-3.4-rc6-master/arch/x86/kernel/pci-dma-xen.c
+===================================================================
+--- linux-3.4-rc6-master.orig/arch/x86/kernel/pci-dma-xen.c
++++ linux-3.4-rc6-master/arch/x86/kernel/pci-dma-xen.c
@@ -42,6 +42,15 @@ int iommu_detected __read_mostly = 0;
* guests and not for driver dma translation.
*/
@@ -1668,8 +1799,10 @@ Acked-by: jbeulich@suse.com
gart_parse_options(p);
#endif
---- head.orig/arch/x86/kernel/process-xen.c 2011-12-21 11:59:08.000000000 +0100
-+++ head/arch/x86/kernel/process-xen.c 2012-02-09 12:32:50.000000000 +0100
+Index: linux-3.4-rc6-master/arch/x86/kernel/process-xen.c
+===================================================================
+--- linux-3.4-rc6-master.orig/arch/x86/kernel/process-xen.c
++++ linux-3.4-rc6-master/arch/x86/kernel/process-xen.c
@@ -280,7 +280,7 @@ int kernel_thread(int (*fn)(void *), voi
regs.orig_ax = -1;
regs.ip = (unsigned long) kernel_thread_helper;
@@ -1679,8 +1812,10 @@ Acked-by: jbeulich@suse.com
/* Ok, create the new process.. */
return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, &regs, 0, NULL, NULL);
---- head.orig/arch/x86/kernel/process_32-xen.c 2012-02-29 14:20:36.000000000 +0100
-+++ head/arch/x86/kernel/process_32-xen.c 2012-02-29 14:23:23.000000000 +0100
+Index: linux-3.4-rc6-master/arch/x86/kernel/process_32-xen.c
+===================================================================
+--- linux-3.4-rc6-master.orig/arch/x86/kernel/process_32-xen.c
++++ linux-3.4-rc6-master/arch/x86/kernel/process_32-xen.c
@@ -102,7 +102,8 @@ void cpu_idle(void)
/* endless idle loop with no priority at all */
@@ -1709,7 +1844,7 @@ Acked-by: jbeulich@suse.com
p->thread.io_bitmap_ptr = NULL;
tsk = current;
err = -ENOMEM;
-@@ -307,7 +310,7 @@ __switch_to(struct task_struct *prev_p,
+@@ -307,7 +310,7 @@ __switch_to(struct task_struct *prev_p,
#ifndef CONFIG_X86_NO_TSS
struct tss_struct *tss = &per_cpu(init_tss, cpu);
#endif
@@ -1718,7 +1853,7 @@ Acked-by: jbeulich@suse.com
#if CONFIG_XEN_COMPAT > 0x030002
struct physdev_set_iopl iopl_op;
struct physdev_set_iobitmap iobmp_op;
-@@ -320,29 +323,7 @@ __switch_to(struct task_struct *prev_p,
+@@ -320,29 +323,7 @@ __switch_to(struct task_struct *prev_p,
/* XEN NOTE: FS/GS saved in switch_mm(), not here. */
@@ -1749,7 +1884,7 @@ Acked-by: jbeulich@suse.com
/*
* Reload sp0.
-@@ -384,14 +365,6 @@ __switch_to(struct task_struct *prev_p,
+@@ -384,14 +365,6 @@ __switch_to(struct task_struct *prev_p,
mcl++;
}
@@ -1764,7 +1899,7 @@ Acked-by: jbeulich@suse.com
if (unlikely(prev->io_bitmap_ptr || next->io_bitmap_ptr)) {
set_xen_guest_handle(iobmp_op.bitmap,
(char *)next->io_bitmap_ptr);
-@@ -415,10 +388,6 @@ __switch_to(struct task_struct *prev_p,
+@@ -415,10 +388,6 @@ __switch_to(struct task_struct *prev_p,
if (unlikely(HYPERVISOR_multicall_check(_mcl, mcl - _mcl, NULL)))
BUG();
@@ -1775,7 +1910,7 @@ Acked-by: jbeulich@suse.com
/*
* Now maybe handle debug registers
*/
-@@ -435,15 +404,14 @@ __switch_to(struct task_struct *prev_p,
+@@ -435,15 +404,14 @@ __switch_to(struct task_struct *prev_p,
*/
arch_end_context_switch(next_p);
@@ -1793,8 +1928,10 @@ Acked-by: jbeulich@suse.com
percpu_write(current_task, next_p);
return prev_p;
---- head.orig/arch/x86/kernel/process_64-xen.c 2011-11-17 15:56:06.000000000 +0100
-+++ head/arch/x86/kernel/process_64-xen.c 2012-02-29 10:59:05.000000000 +0100
+Index: linux-3.4-rc6-master/arch/x86/kernel/process_64-xen.c
+===================================================================
+--- linux-3.4-rc6-master.orig/arch/x86/kernel/process_64-xen.c
++++ linux-3.4-rc6-master/arch/x86/kernel/process_64-xen.c
@@ -126,7 +126,7 @@ void cpu_idle(void)
/* endless idle loop with no priority at all */
@@ -1852,7 +1989,7 @@ Acked-by: jbeulich@suse.com
set_tsk_thread_flag(p, TIF_IO_BITMAP);
}
-@@ -392,7 +398,7 @@ __switch_to(struct task_struct *prev_p,
+@@ -392,7 +398,7 @@ __switch_to(struct task_struct *prev_p,
#ifndef CONFIG_X86_NO_TSS
struct tss_struct *tss = &per_cpu(init_tss, cpu);
#endif
@@ -1861,7 +1998,7 @@ Acked-by: jbeulich@suse.com
#if CONFIG_XEN_COMPAT > 0x030002
struct physdev_set_iopl iopl_op;
struct physdev_set_iobitmap iobmp_op;
-@@ -403,40 +409,7 @@ __switch_to(struct task_struct *prev_p,
+@@ -403,40 +409,7 @@ __switch_to(struct task_struct *prev_p,
#endif
multicall_entry_t _mcl[8], *mcl = _mcl;
@@ -1903,7 +2040,7 @@ Acked-by: jbeulich@suse.com
/*
* Reload sp0.
-@@ -539,6 +512,8 @@ __switch_to(struct task_struct *prev_p,
+@@ -539,6 +512,8 @@ __switch_to(struct task_struct *prev_p,
if (next->gs)
WARN_ON(HYPERVISOR_set_segment_base(SEGBASE_GS_USER, next->gs));
@@ -1912,7 +2049,7 @@ Acked-by: jbeulich@suse.com
/*
* Switch the PDA context.
*/
-@@ -555,13 +530,6 @@ __switch_to(struct task_struct *prev_p,
+@@ -555,13 +530,6 @@ __switch_to(struct task_struct *prev_p,
task_thread_info(prev_p)->flags & _TIF_WORK_CTXSW_PREV))
__switch_to_xtra(prev_p, next_p);
@@ -1926,8 +2063,10 @@ Acked-by: jbeulich@suse.com
return prev_p;
}
---- head.orig/arch/x86/kernel/setup-xen.c 2012-01-25 16:28:51.000000000 +0100
-+++ head/arch/x86/kernel/setup-xen.c 2012-02-09 12:32:50.000000000 +0100
+Index: linux-3.4-rc6-master/arch/x86/kernel/setup-xen.c
+===================================================================
+--- linux-3.4-rc6-master.orig/arch/x86/kernel/setup-xen.c
++++ linux-3.4-rc6-master/arch/x86/kernel/setup-xen.c
@@ -341,7 +341,8 @@ static void __init cleanup_highmap(void)
static void __init reserve_brk(void)
{
@@ -2030,8 +2169,10 @@ Acked-by: jbeulich@suse.com
efi_enabled = 1;
efi_memblock_x86_reserve_range();
}
---- head.orig/arch/x86/kernel/smp-xen.c 2011-07-01 15:47:44.000000000 +0200
-+++ head/arch/x86/kernel/smp-xen.c 2012-02-16 17:53:11.000000000 +0100
+Index: linux-3.4-rc6-master/arch/x86/kernel/smp-xen.c
+===================================================================
+--- linux-3.4-rc6-master.orig/arch/x86/kernel/smp-xen.c
++++ linux-3.4-rc6-master/arch/x86/kernel/smp-xen.c
@@ -28,6 +28,7 @@
#include <asm/mmu_context.h>
#include <asm/proto.h>
@@ -2102,8 +2243,10 @@ Acked-by: jbeulich@suse.com
+}
+
+__setup("nonmi_ipi", nonmi_ipi_setup);
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head/arch/x86/kernel/syscall_32-xen.c 2012-02-29 14:36:52.000000000 +0100
+Index: linux-3.4-rc6-master/arch/x86/kernel/syscall_32-xen.c
+===================================================================
+--- /dev/null
++++ linux-3.4-rc6-master/arch/x86/kernel/syscall_32-xen.c
@@ -0,0 +1,20 @@
+#include "syscall_32.c"
+
@@ -2125,8 +2268,10 @@ Acked-by: jbeulich@suse.com
+#include <asm/syscalls_32.h>
+};
+#endif /* TIF_CSTAR */
---- head.orig/arch/x86/kernel/traps-xen.c 2011-11-17 16:50:15.000000000 +0100
-+++ head/arch/x86/kernel/traps-xen.c 2012-04-11 08:29:03.000000000 +0200
+Index: linux-3.4-rc6-master/arch/x86/kernel/traps-xen.c
+===================================================================
+--- linux-3.4-rc6-master.orig/arch/x86/kernel/traps-xen.c
++++ linux-3.4-rc6-master/arch/x86/kernel/traps-xen.c
@@ -310,19 +310,20 @@ dotraplinkage void __kprobes do_int3(str
== NOTIFY_STOP)
return;
@@ -2249,8 +2394,10 @@ Acked-by: jbeulich@suse.com
}
EXPORT_SYMBOL_GPL(math_state_restore);
---- head.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-11-17 15:56:06.000000000 +0100
-+++ head/arch/x86/kernel/vsyscall_64-xen.c 2012-02-09 12:32:50.000000000 +0100
+Index: linux-3.4-rc6-master/arch/x86/kernel/vsyscall_64-xen.c
+===================================================================
+--- linux-3.4-rc6-master.orig/arch/x86/kernel/vsyscall_64-xen.c
++++ linux-3.4-rc6-master/arch/x86/kernel/vsyscall_64-xen.c
@@ -57,7 +57,7 @@ DEFINE_VVAR(struct vsyscall_gtod_data, v
.lock = __SEQLOCK_UNLOCKED(__vsyscall_gtod_data.lock),
};
@@ -2260,7 +2407,7 @@ Acked-by: jbeulich@suse.com
static int __init vsyscall_setup(char *str)
{
-@@ -142,11 +142,40 @@ static int addr_to_vsyscall_nr(unsigned
+@@ -142,11 +142,40 @@ static int addr_to_vsyscall_nr(unsigned
return nr;
}
@@ -2376,8 +2523,10 @@ Acked-by: jbeulich@suse.com
}
regs->ax = ret;
---- head.orig/arch/x86/mm/fault-xen.c 2011-11-17 15:56:06.000000000 +0100
-+++ head/arch/x86/mm/fault-xen.c 2012-02-16 13:54:07.000000000 +0100
+Index: linux-3.4-rc6-master/arch/x86/mm/fault-xen.c
+===================================================================
+--- linux-3.4-rc6-master.orig/arch/x86/mm/fault-xen.c
++++ linux-3.4-rc6-master/arch/x86/mm/fault-xen.c
@@ -635,7 +635,7 @@ pgtable_bad(struct pt_regs *regs, unsign
static noinline void
@@ -2461,8 +2610,10 @@ Acked-by: jbeulich@suse.com
return 1;
}
---- head.orig/arch/x86/mm/init-xen.c 2011-07-01 15:48:40.000000000 +0200
-+++ head/arch/x86/mm/init-xen.c 2012-02-21 14:29:17.000000000 +0100
+Index: linux-3.4-rc6-master/arch/x86/mm/init-xen.c
+===================================================================
+--- linux-3.4-rc6-master.orig/arch/x86/mm/init-xen.c
++++ linux-3.4-rc6-master/arch/x86/mm/init-xen.c
@@ -16,6 +16,7 @@
#include <asm/tlbflush.h>
#include <asm/tlb.h>
@@ -2517,8 +2668,10 @@ Acked-by: jbeulich@suse.com
+ free_area_init_nodes(max_zone_pfns);
+}
+
---- head.orig/arch/x86/mm/init_32-xen.c 2011-07-01 15:19:35.000000000 +0200
-+++ head/arch/x86/mm/init_32-xen.c 2012-02-09 15:46:24.000000000 +0100
+Index: linux-3.4-rc6-master/arch/x86/mm/init_32-xen.c
+===================================================================
+--- linux-3.4-rc6-master.orig/arch/x86/mm/init_32-xen.c
++++ linux-3.4-rc6-master/arch/x86/mm/init_32-xen.c
@@ -463,23 +463,17 @@ static void __init add_one_highpage_init
void __init add_highpages_with_active_regions(int nid,
unsigned long start_pfn, unsigned long end_pfn)
@@ -2645,8 +2798,10 @@ Acked-by: jbeulich@suse.com
codesize = (unsigned long) &_etext - (unsigned long) &_text;
datasize = (unsigned long) &_edata - (unsigned long) &_etext;
initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin;
---- head.orig/arch/x86/mm/init_64-xen.c 2011-09-12 13:55:43.000000000 +0200
-+++ head/arch/x86/mm/init_64-xen.c 2012-02-09 15:47:16.000000000 +0100
+Index: linux-3.4-rc6-master/arch/x86/mm/init_64-xen.c
+===================================================================
+--- linux-3.4-rc6-master.orig/arch/x86/mm/init_64-xen.c
++++ linux-3.4-rc6-master/arch/x86/mm/init_64-xen.c
@@ -862,26 +862,12 @@ kernel_physical_mapping_init(unsigned lo
#ifndef CONFIG_NUMA
void __init initmem_init(void)
@@ -2684,8 +2839,10 @@ Acked-by: jbeulich@suse.com
SetPagePinned(virt_to_page(init_mm.pgd));
}
---- head.orig/arch/x86/mm/pageattr-xen.c 2011-04-13 17:01:32.000000000 +0200
-+++ head/arch/x86/mm/pageattr-xen.c 2012-02-09 12:32:50.000000000 +0100
+Index: linux-3.4-rc6-master/arch/x86/mm/pageattr-xen.c
+===================================================================
+--- linux-3.4-rc6-master.orig/arch/x86/mm/pageattr-xen.c
++++ linux-3.4-rc6-master/arch/x86/mm/pageattr-xen.c
@@ -1083,7 +1083,7 @@ out_err:
}
EXPORT_SYMBOL(set_memory_uc);
@@ -2708,8 +2865,10 @@ Acked-by: jbeulich@suse.com
* The return value is ignored as the calls cannot fail.
* Large pages for identity mappings are not used at boot time
* and hence no memory allocations during large page split.
---- head.orig/drivers/acpi/osl.c 2012-04-10 14:24:22.000000000 +0200
-+++ head/drivers/acpi/osl.c 2012-04-10 17:24:36.000000000 +0200
+Index: linux-3.4-rc6-master/drivers/acpi/osl.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/acpi/osl.c
++++ linux-3.4-rc6-master/drivers/acpi/osl.c
@@ -326,8 +326,12 @@ acpi_map_lookup_virt(void __iomem *virt,
}
@@ -2723,8 +2882,10 @@ Acked-by: jbeulich@suse.com
/* ioremap will take care of cache attributes */
#define should_use_kmap(pfn) 0
#endif
---- head.orig/drivers/acpi/processor_core.c 2012-02-08 12:25:09.000000000 +0100
-+++ head/drivers/acpi/processor_core.c 2012-02-09 14:24:29.000000000 +0100
+Index: linux-3.4-rc6-master/drivers/acpi/processor_core.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/acpi/processor_core.c
++++ linux-3.4-rc6-master/drivers/acpi/processor_core.c
@@ -205,7 +205,7 @@ int acpi_get_cpuid(acpi_handle handle, i
* Ignores apic_id and always return 0 for CPU0's handle.
* Return -1 for other CPU's handle.
@@ -2734,9 +2895,11 @@ Acked-by: jbeulich@suse.com
return acpi_id;
else
return apic_id;
---- head.orig/drivers/acpi/processor_driver.c 2012-02-16 13:33:43.000000000 +0100
-+++ head/drivers/acpi/processor_driver.c 2012-02-16 17:16:09.000000000 +0100
-@@ -492,11 +492,17 @@ static struct notifier_block acpi_cpu_no
+Index: linux-3.4-rc6-master/drivers/acpi/processor_driver.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/acpi/processor_driver.c
++++ linux-3.4-rc6-master/drivers/acpi/processor_driver.c
+@@ -492,7 +492,11 @@ static struct notifier_block acpi_cpu_no
*/
static __ref int acpi_processor_start(struct acpi_processor *pr)
{
@@ -2748,14 +2911,10 @@ Acked-by: jbeulich@suse.com
int result = 0;
#if defined(CONFIG_CPU_FREQ) || defined(CONFIG_PROCESSOR_EXTERNAL_CONTROL)
- acpi_processor_ppc_has_changed(pr, 0);
-+#endif
-+#ifdef CONFIG_CPU_FREQ
- acpi_processor_load_module(pr);
- #endif
- /*
---- head.orig/drivers/acpi/processor_perflib.c 2011-06-30 16:41:01.000000000 +0200
-+++ head/drivers/acpi/processor_perflib.c 2012-02-16 13:47:34.000000000 +0100
+Index: linux-3.4-rc6-master/drivers/acpi/processor_perflib.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/acpi/processor_perflib.c
++++ linux-3.4-rc6-master/drivers/acpi/processor_perflib.c
@@ -253,7 +253,6 @@ void acpi_processor_ppc_exit(void)
acpi_processor_ppc_status &= ~PPC_REGISTERED;
@@ -2772,8 +2931,10 @@ Acked-by: jbeulich@suse.com
static int acpi_processor_get_performance_control(struct acpi_processor *pr)
{
---- head.orig/drivers/pci/msi-xen.c 2011-11-17 15:56:06.000000000 +0100
-+++ head/drivers/pci/msi-xen.c 2012-04-10 10:37:46.000000000 +0200
+Index: linux-3.4-rc6-master/drivers/pci/msi-xen.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/pci/msi-xen.c
++++ linux-3.4-rc6-master/drivers/pci/msi-xen.c
@@ -36,18 +36,21 @@ static int pci_seg_supported = 1;
static LIST_HEAD(msi_dev_head);
DEFINE_SPINLOCK(msi_dev_lock);
@@ -3141,7 +3302,7 @@ Acked-by: jbeulich@suse.com
control &= ~PCI_MSIX_FLAGS_MASKALL;
pci_write_config_word(dev, pos + PCI_MSIX_FLAGS, control);
-@@ -553,7 +719,7 @@ int pci_enable_msi_block(struct pci_dev
+@@ -553,7 +719,7 @@ int pci_enable_msi_block(struct pci_dev
dev->irq = evtchn_map_pirq(-1, dev->irq);
dev->msi_enabled = 1;
msi_dev_entry->default_irq = temp;
@@ -3222,8 +3383,10 @@ Acked-by: jbeulich@suse.com
+ msi_set_enable(dev, pos, 0);
+ msix_set_enable(dev, 0);
}
---- head.orig/drivers/xen/Kconfig 2012-04-03 13:16:00.000000000 +0200
-+++ head/drivers/xen/Kconfig 2012-04-10 17:24:48.000000000 +0200
+Index: linux-3.4-rc6-master/drivers/xen/Kconfig
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/xen/Kconfig
++++ linux-3.4-rc6-master/drivers/xen/Kconfig
@@ -22,10 +22,6 @@ config XEN_UNPRIVILEGED_GUEST
select PM
select SUSPEND
@@ -3245,8 +3408,10 @@ Acked-by: jbeulich@suse.com
default m
config XEN_ACPI_PROCESSOR
---- head.orig/drivers/xen/Makefile 2011-11-17 16:59:30.000000000 +0100
-+++ head/drivers/xen/Makefile 2012-02-09 13:41:36.000000000 +0100
+Index: linux-3.4-rc6-master/drivers/xen/Makefile
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/xen/Makefile
++++ linux-3.4-rc6-master/drivers/xen/Makefile
@@ -3,8 +3,10 @@ xen-biomerge-$(CONFIG_PARAVIRT_XEN) := b
xen-hotplug-$(CONFIG_PARAVIRT_XEN) := cpu_hotplug.o
xen-balloon_$(CONFIG_PARAVIRT_XEN) := xen-balloon.o
@@ -3279,8 +3444,10 @@ Acked-by: jbeulich@suse.com
obj-$(CONFIG_XEN_GRANT_DEV) += gntdev/
obj-$(CONFIG_XEN_NETDEV_ACCEL_SFC_UTIL) += sfc_netutil/
obj-$(CONFIG_XEN_NETDEV_ACCEL_SFC_FRONTEND) += sfc_netfront/
---- head.orig/drivers/xen/balloon/balloon.c 2012-01-20 15:03:03.000000000 +0100
-+++ head/drivers/xen/balloon/balloon.c 2012-02-16 17:09:41.000000000 +0100
+Index: linux-3.4-rc6-master/drivers/xen/balloon/balloon.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/xen/balloon/balloon.c
++++ linux-3.4-rc6-master/drivers/xen/balloon/balloon.c
@@ -73,11 +73,6 @@ static DEFINE_MUTEX(balloon_mutex);
*/
DEFINE_SPINLOCK(balloon_lock);
@@ -3350,8 +3517,10 @@ Acked-by: jbeulich@suse.com
goto err;
}
---- head.orig/drivers/xen/balloon/sysfs.c 2012-02-03 13:51:27.000000000 +0100
-+++ head/drivers/xen/balloon/sysfs.c 2012-02-16 17:19:42.000000000 +0100
+Index: linux-3.4-rc6-master/drivers/xen/balloon/sysfs.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/xen/balloon/sysfs.c
++++ linux-3.4-rc6-master/drivers/xen/balloon/sysfs.c
@@ -29,12 +29,11 @@
*/
@@ -3547,8 +3716,10 @@ Acked-by: jbeulich@suse.com
- unregister_balloon(&balloon_sysdev);
+ unregister_balloon(&balloon_dev);
}
---- head.orig/drivers/xen/blkback/blkback.c 2012-04-04 10:26:46.000000000 +0200
-+++ head/drivers/xen/blkback/blkback.c 2012-03-26 13:37:56.000000000 +0200
+Index: linux-3.4-rc6-master/drivers/xen/blkback/blkback.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/xen/blkback/blkback.c
++++ linux-3.4-rc6-master/drivers/xen/blkback/blkback.c
@@ -341,8 +341,11 @@ irqreturn_t blkif_be_int(int irq, void *
static void dispatch_discard(blkif_t *blkif, struct blkif_request_discard *req)
@@ -3577,8 +3748,10 @@ Acked-by: jbeulich@suse.com
case 0:
status = BLKIF_RSP_OKAY;
break;
---- head.orig/drivers/xen/blkback/common.h 2012-03-14 11:24:09.000000000 +0100
-+++ head/drivers/xen/blkback/common.h 2012-03-14 11:25:53.000000000 +0100
+Index: linux-3.4-rc6-master/drivers/xen/blkback/common.h
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/xen/blkback/common.h
++++ linux-3.4-rc6-master/drivers/xen/blkback/common.h
@@ -42,16 +42,12 @@
pr_debug("(file=%s, line=%d) " _f, \
__FILE__ , __LINE__ , ## _a )
@@ -3605,8 +3778,10 @@ Acked-by: jbeulich@suse.com
blkif_back_rings_t blk_rings;
struct vm_struct *blk_ring_area;
/* The VBD attached to this interface. */
---- head.orig/drivers/xen/blkback/vbd.c 2012-02-24 15:15:19.000000000 +0100
-+++ head/drivers/xen/blkback/vbd.c 2012-02-27 10:22:57.000000000 +0100
+Index: linux-3.4-rc6-master/drivers/xen/blkback/vbd.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/xen/blkback/vbd.c
++++ linux-3.4-rc6-master/drivers/xen/blkback/vbd.c
@@ -92,6 +92,9 @@ int vbd_create(blkif_t *blkif, blkif_vde
if (q && q->flush_flags)
vbd->flush_support = true;
@@ -3617,8 +3792,10 @@ Acked-by: jbeulich@suse.com
DPRINTK("Successful creation of handle=%04x (dom=%u)\n",
handle, blkif->domid);
return 0;
---- head.orig/drivers/xen/blkback/xenbus.c 2012-03-22 14:25:55.000000000 +0100
-+++ head/drivers/xen/blkback/xenbus.c 2012-03-22 14:26:51.000000000 +0100
+Index: linux-3.4-rc6-master/drivers/xen/blkback/xenbus.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/xen/blkback/xenbus.c
++++ linux-3.4-rc6-master/drivers/xen/blkback/xenbus.c
@@ -227,43 +227,34 @@ static void blkback_discard(struct xenbu
struct backend_info *be)
{
@@ -3686,8 +3863,10 @@ Acked-by: jbeulich@suse.com
err = xenbus_printf(xbt, dev->nodename, "feature-discard",
"%d", state);
---- head.orig/drivers/xen/blkfront/blkfront.c 2012-03-12 13:55:05.000000000 +0100
-+++ head/drivers/xen/blkfront/blkfront.c 2012-03-12 13:55:34.000000000 +0100
+Index: linux-3.4-rc6-master/drivers/xen/blkfront/blkfront.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/xen/blkfront/blkfront.c
++++ linux-3.4-rc6-master/drivers/xen/blkfront/blkfront.c
@@ -331,11 +331,13 @@ static void blkfront_setup_discard(struc
char *type;
unsigned int discard_granularity;
@@ -3765,8 +3944,10 @@ Acked-by: jbeulich@suse.com
for (i = 0; i < s->req.nr_segments; i++)
gnttab_end_foreign_access(s->req.seg[i].gref, 0UL);
}
---- head.orig/drivers/xen/blkfront/block.h 2012-03-12 13:55:08.000000000 +0100
-+++ head/drivers/xen/blkfront/block.h 2012-03-12 13:55:33.000000000 +0100
+Index: linux-3.4-rc6-master/drivers/xen/blkfront/block.h
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/xen/blkfront/block.h
++++ linux-3.4-rc6-master/drivers/xen/blkfront/block.h
@@ -108,7 +108,8 @@ struct blkfront_info
unsigned long shadow_free;
unsigned int feature_flush;
@@ -3777,8 +3958,10 @@ Acked-by: jbeulich@suse.com
unsigned int discard_granularity;
unsigned int discard_alignment;
int is_ready;
---- head.orig/drivers/xen/blkfront/vbd.c 2012-03-12 16:18:35.000000000 +0100
-+++ head/drivers/xen/blkfront/vbd.c 2012-03-12 16:19:08.000000000 +0100
+Index: linux-3.4-rc6-master/drivers/xen/blkfront/vbd.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/xen/blkfront/vbd.c
++++ linux-3.4-rc6-master/drivers/xen/blkfront/vbd.c
@@ -302,7 +302,7 @@ xlbd_reserve_minors(struct xlbd_major_in
if (end > ms->nr) {
unsigned long *bitmap, *old;
@@ -3797,8 +3980,10 @@ Acked-by: jbeulich@suse.com
}
/* Hard sector size and max sectors impersonate the equiv. hardware. */
---- head.orig/drivers/xen/blktap/blktap.c 2011-11-18 15:35:59.000000000 +0100
-+++ head/drivers/xen/blktap/blktap.c 2012-02-17 11:29:03.000000000 +0100
+Index: linux-3.4-rc6-master/drivers/xen/blktap/blktap.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/xen/blktap/blktap.c
++++ linux-3.4-rc6-master/drivers/xen/blktap/blktap.c
@@ -277,7 +277,7 @@ static inline unsigned int OFFSET_TO_SEG
} while(0)
@@ -3808,8 +3993,10 @@ Acked-by: jbeulich@suse.com
{
return kasprintf(GFP_KERNEL, "xen/blktap%u", MINOR(dev->devt));
}
---- head.orig/drivers/xen/blktap2-new/device.c 2011-11-21 15:50:27.000000000 +0100
-+++ head/drivers/xen/blktap2-new/device.c 2012-02-17 11:29:41.000000000 +0100
+Index: linux-3.4-rc6-master/drivers/xen/blktap2-new/device.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/xen/blktap2-new/device.c
++++ linux-3.4-rc6-master/drivers/xen/blktap2-new/device.c
@@ -425,7 +425,7 @@ blktap_device_destroy_sync(struct blktap
!blktap_device_try_destroy(tap));
}
@@ -3819,8 +4006,10 @@ Acked-by: jbeulich@suse.com
{
return kasprintf(GFP_KERNEL, BLKTAP2_DEV_DIR "tapdev%u",
gd->first_minor);
---- head.orig/drivers/xen/blktap2-new/sysfs.c 2011-02-24 15:02:50.000000000 +0100
-+++ head/drivers/xen/blktap2-new/sysfs.c 2012-02-17 11:29:46.000000000 +0100
+Index: linux-3.4-rc6-master/drivers/xen/blktap2-new/sysfs.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/xen/blktap2-new/sysfs.c
++++ linux-3.4-rc6-master/drivers/xen/blktap2-new/sysfs.c
@@ -262,7 +262,7 @@ blktap_sysfs_show_devices(struct class *
}
static CLASS_ATTR(devices, S_IRUGO, blktap_sysfs_show_devices, NULL);
@@ -3830,8 +4019,10 @@ Acked-by: jbeulich@suse.com
{
return kasprintf(GFP_KERNEL, BLKTAP2_DEV_DIR "blktap%u",
MINOR(dev->devt));
---- head.orig/drivers/xen/blktap2/device.c 2012-02-16 13:44:17.000000000 +0100
-+++ head/drivers/xen/blktap2/device.c 2012-02-17 11:29:27.000000000 +0100
+Index: linux-3.4-rc6-master/drivers/xen/blktap2/device.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/xen/blktap2/device.c
++++ linux-3.4-rc6-master/drivers/xen/blktap2/device.c
@@ -1068,7 +1068,7 @@ blktap_device_destroy(struct blktap *tap
return 0;
}
@@ -3841,8 +4032,10 @@ Acked-by: jbeulich@suse.com
{
return kasprintf(GFP_KERNEL, BLKTAP2_DEV_DIR "tapdev%u",
gd->first_minor);
---- head.orig/drivers/xen/blktap2/sysfs.c 2011-02-24 14:59:15.000000000 +0100
-+++ head/drivers/xen/blktap2/sysfs.c 2012-02-17 11:29:32.000000000 +0100
+Index: linux-3.4-rc6-master/drivers/xen/blktap2/sysfs.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/xen/blktap2/sysfs.c
++++ linux-3.4-rc6-master/drivers/xen/blktap2/sysfs.c
@@ -439,7 +439,7 @@ blktap_sysfs_free(void)
class_destroy(class);
}
@@ -3852,9 +4045,11 @@ Acked-by: jbeulich@suse.com
{
return kasprintf(GFP_KERNEL, BLKTAP2_DEV_DIR "blktap%u",
MINOR(dev->devt));
---- head.orig/drivers/xen/console/console.c 2012-03-22 14:10:10.000000000 +0100
-+++ head/drivers/xen/console/console.c 2012-03-22 14:26:59.000000000 +0100
-@@ -341,7 +341,6 @@ void __init dom0_init_screen_info(const
+Index: linux-3.4-rc6-master/drivers/xen/console/console.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/xen/console/console.c
++++ linux-3.4-rc6-master/drivers/xen/console/console.c
+@@ -341,7 +341,6 @@ void __init dom0_init_screen_info(const
((_tty)->index != (xc_num - 1)))
static struct ktermios *xencons_termios[MAX_NR_CONSOLES];
@@ -3870,8 +4065,10 @@ Acked-by: jbeulich@suse.com
switch (xc_mode) {
case XC_XVC:
---- head.orig/drivers/xen/core/cpu_hotplug.c 2011-02-01 14:42:26.000000000 +0100
-+++ head/drivers/xen/core/cpu_hotplug.c 2012-02-10 09:47:12.000000000 +0100
+Index: linux-3.4-rc6-master/drivers/xen/core/cpu_hotplug.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/xen/core/cpu_hotplug.c
++++ linux-3.4-rc6-master/drivers/xen/core/cpu_hotplug.c
@@ -25,7 +25,7 @@ static int local_cpu_hotplug_request(voi
return (current->mm != NULL);
}
@@ -3899,8 +4096,10 @@ Acked-by: jbeulich@suse.com
pr_info("Brought up %ld CPUs\n", (long)num_online_cpus());
}
---- head.orig/drivers/xen/core/evtchn.c 2011-11-21 15:49:38.000000000 +0100
-+++ head/drivers/xen/core/evtchn.c 2012-04-03 17:08:41.000000000 +0200
+Index: linux-3.4-rc6-master/drivers/xen/core/evtchn.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/xen/core/evtchn.c
++++ linux-3.4-rc6-master/drivers/xen/core/evtchn.c
@@ -311,8 +311,8 @@ asmlinkage void __irq_entry evtchn_do_up
old_regs = set_irq_regs(regs);
@@ -3911,8 +4110,10 @@ Acked-by: jbeulich@suse.com
do {
vcpu_info->evtchn_upcall_pending = 0;
---- head.orig/drivers/xen/core/smpboot.c 2011-11-18 15:44:14.000000000 +0100
-+++ head/drivers/xen/core/smpboot.c 2012-03-22 16:22:50.000000000 +0100
+Index: linux-3.4-rc6-master/drivers/xen/core/smpboot.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/xen/core/smpboot.c
++++ linux-3.4-rc6-master/drivers/xen/core/smpboot.c
@@ -443,6 +443,7 @@ void __ref play_dead(void)
void __init smp_cpus_done(unsigned int max_cpus)
@@ -3921,8 +4122,10 @@ Acked-by: jbeulich@suse.com
}
#ifndef CONFIG_X86_LOCAL_APIC
---- head.orig/drivers/xen/core/spinlock.c 2012-02-07 11:59:21.000000000 +0100
-+++ head/drivers/xen/core/spinlock.c 2012-02-09 12:50:33.000000000 +0100
+Index: linux-3.4-rc6-master/drivers/xen/core/spinlock.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/xen/core/spinlock.c
++++ linux-3.4-rc6-master/drivers/xen/core/spinlock.c
@@ -132,9 +132,7 @@ static unsigned int ticket_drop(struct s
if (cmpxchg(&spinning->ticket, ticket, -1) != ticket)
@@ -3934,8 +4137,10 @@ Acked-by: jbeulich@suse.com
ticket = (__ticket_t)(ticket + 1);
return ticket != lock->tickets.tail ? ticket : -1;
}
---- head.orig/drivers/xen/netback/interface.c 2012-01-24 14:12:08.000000000 +0100
-+++ head/drivers/xen/netback/interface.c 2012-02-10 08:56:24.000000000 +0100
+Index: linux-3.4-rc6-master/drivers/xen/netback/interface.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/xen/netback/interface.c
++++ linux-3.4-rc6-master/drivers/xen/netback/interface.c
@@ -95,7 +95,8 @@ static int netbk_change_mtu(struct net_d
return 0;
}
@@ -3946,8 +4151,10 @@ Acked-by: jbeulich@suse.com
{
netif_t *netif = netdev_priv(dev);
---- head.orig/drivers/xen/netback/netback.c 2011-11-21 16:36:45.000000000 +0100
-+++ head/drivers/xen/netback/netback.c 2012-02-17 09:00:33.000000000 +0100
+Index: linux-3.4-rc6-master/drivers/xen/netback/netback.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/xen/netback/netback.c
++++ linux-3.4-rc6-master/drivers/xen/netback/netback.c
@@ -164,10 +164,10 @@ static unsigned long mfn_list[MAX_MFN_AL
static unsigned int alloc_index = 0;
@@ -3961,8 +4168,10 @@ Acked-by: jbeulich@suse.com
module_param_named(permute_returns, MODPARM_permute_returns, bool, S_IRUSR|S_IWUSR);
MODULE_PARM_DESC(permute_returns, "Randomly permute the order in which TX responses are sent to the frontend");
---- head.orig/drivers/xen/netfront/netfront.c 2012-03-12 13:54:37.000000000 +0100
-+++ head/drivers/xen/netfront/netfront.c 2012-03-12 13:55:40.000000000 +0100
+Index: linux-3.4-rc6-master/drivers/xen/netfront/netfront.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/xen/netfront/netfront.c
++++ linux-3.4-rc6-master/drivers/xen/netfront/netfront.c
@@ -81,15 +81,15 @@ struct netfront_cb {
* For paravirtualised guests, flipping is the default.
*/
@@ -4021,8 +4230,10 @@ Acked-by: jbeulich@suse.com
#endif
netif_init_accel();
---- head.orig/drivers/xen/pcifront/xenbus.c 2012-03-12 13:53:21.000000000 +0100
-+++ head/drivers/xen/pcifront/xenbus.c 2012-03-12 13:55:45.000000000 +0100
+Index: linux-3.4-rc6-master/drivers/xen/pcifront/xenbus.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/xen/pcifront/xenbus.c
++++ linux-3.4-rc6-master/drivers/xen/pcifront/xenbus.c
@@ -371,7 +371,7 @@ static int pcifront_detach_devices(struc
pci_dev = pci_get_slot(pci_bus, PCI_DEVFN(slot, func));
if(!pci_dev) {
@@ -4041,9 +4252,11 @@ Acked-by: jbeulich@suse.com
domain, bus, slot, func);
}
---- head.orig/drivers/xen/xen-pciback/pci_stub.c 2012-04-10 17:21:31.000000000 +0200
-+++ head/drivers/xen/xen-pciback/pci_stub.c 2012-04-10 17:24:42.000000000 +0200
-@@ -267,7 +267,9 @@ void pcistub_put_pci_dev(struct pci_dev
+Index: linux-3.4-rc6-master/drivers/xen/xen-pciback/pci_stub.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/xen/xen-pciback/pci_stub.c
++++ linux-3.4-rc6-master/drivers/xen/xen-pciback/pci_stub.c
+@@ -267,7 +267,9 @@ void pcistub_put_pci_dev(struct pci_dev
xen_pcibk_config_free_dyn_fields(found_psdev->dev);
xen_pcibk_config_reset_dev(found_psdev->dev);
@@ -4053,8 +4266,10 @@ Acked-by: jbeulich@suse.com
spin_lock_irqsave(&found_psdev->lock, flags);
found_psdev->pdev = NULL;
---- head.orig/drivers/xen/xenbus/Makefile 2011-02-02 17:08:58.000000000 +0100
-+++ head/drivers/xen/xenbus/Makefile 2012-02-09 13:58:18.000000000 +0100
+Index: linux-3.4-rc6-master/drivers/xen/xenbus/Makefile
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/xen/xenbus/Makefile
++++ linux-3.4-rc6-master/drivers/xen/xenbus/Makefile
@@ -1,12 +1,17 @@
obj-y += xenbus_client.o xenbus_comms.o xenbus_xs.o xenbus_probe.o
-obj-$(CONFIG_XEN_BACKEND) += xenbus_be.o
@@ -4074,8 +4289,10 @@ Acked-by: jbeulich@suse.com
obj-$(CONFIG_XEN_XENBUS_FRONTEND) += xenbus_probe_frontend.o
+
+obj-$(CONFIG_XEN_BACKEND) += $(backend-standalone-y)
---- head.orig/drivers/xen/xenbus/xenbus_client.c 2011-11-28 10:14:06.000000000 +0100
-+++ head/drivers/xen/xenbus/xenbus_client.c 2012-02-17 09:16:09.000000000 +0100
+Index: linux-3.4-rc6-master/drivers/xen/xenbus/xenbus_client.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/xen/xenbus/xenbus_client.c
++++ linux-3.4-rc6-master/drivers/xen/xenbus/xenbus_client.c
@@ -36,18 +36,42 @@
#include <xen/gnttab.h>
#else
@@ -4378,8 +4595,10 @@ Acked-by: jbeulich@suse.com
+ ring_ops = &ring_ops_hvm;
+}
+#endif
---- head.orig/drivers/xen/xenbus/xenbus_comms.h 2011-04-11 13:43:15.000000000 +0200
-+++ head/drivers/xen/xenbus/xenbus_comms.h 2012-02-09 12:32:50.000000000 +0100
+Index: linux-3.4-rc6-master/drivers/xen/xenbus/xenbus_comms.h
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/xen/xenbus/xenbus_comms.h
++++ linux-3.4-rc6-master/drivers/xen/xenbus/xenbus_comms.h
@@ -31,6 +31,8 @@
#ifndef _XENBUS_COMMS_H
#define _XENBUS_COMMS_H
@@ -4398,8 +4617,10 @@ Acked-by: jbeulich@suse.com
/* For xenbus internal use. */
enum {
XENBUS_XSD_UNCOMMITTED = 0,
---- head.orig/drivers/xen/xenbus/xenbus_dev_backend.c 2012-03-19 00:15:34.000000000 +0100
-+++ head/drivers/xen/xenbus/xenbus_dev_backend.c 2012-02-17 09:50:33.000000000 +0100
+Index: linux-3.4-rc6-master/drivers/xen/xenbus/xenbus_dev_backend.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/xen/xenbus/xenbus_dev_backend.c
++++ linux-3.4-rc6-master/drivers/xen/xenbus/xenbus_dev_backend.c
@@ -7,7 +7,9 @@
#include <linux/capability.h>
@@ -4419,8 +4640,10 @@ Acked-by: jbeulich@suse.com
size, vma->vm_page_prot))
return -EAGAIN;
---- head.orig/drivers/xen/xenbus/xenbus_probe.c 2012-03-12 13:54:30.000000000 +0100
-+++ head/drivers/xen/xenbus/xenbus_probe.c 2012-03-12 13:55:51.000000000 +0100
+Index: linux-3.4-rc6-master/drivers/xen/xenbus/xenbus_probe.c
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/xen/xenbus/xenbus_probe.c
++++ linux-3.4-rc6-master/drivers/xen/xenbus/xenbus_probe.c
@@ -84,10 +84,10 @@
#endif
@@ -4443,8 +4666,10 @@ Acked-by: jbeulich@suse.com
if (xen_hvm_domain()) {
uint64_t v = 0;
err = hvm_get_parameter(HVM_PARAM_STORE_EVTCHN, &v);
---- head.orig/drivers/xen/xenbus/xenbus_probe.h 2011-11-17 13:56:01.000000000 +0100
-+++ head/drivers/xen/xenbus/xenbus_probe.h 2012-02-09 14:03:26.000000000 +0100
+Index: linux-3.4-rc6-master/drivers/xen/xenbus/xenbus_probe.h
+===================================================================
+--- linux-3.4-rc6-master.orig/drivers/xen/xenbus/xenbus_probe.h
++++ linux-3.4-rc6-master/drivers/xen/xenbus/xenbus_probe.h
@@ -104,4 +104,6 @@ extern void xenbus_otherend_changed(stru
extern int xenbus_read_otherend_details(struct xenbus_device *xendev,
char *id_node, char *path_node);
@@ -4452,8 +4677,10 @@ Acked-by: jbeulich@suse.com
+void xenbus_ring_ops_init(void);
+
#endif
---- head.orig/include/xen/balloon.h 2012-02-03 13:44:44.000000000 +0100
-+++ head/include/xen/balloon.h 2012-02-09 12:32:50.000000000 +0100
+Index: linux-3.4-rc6-master/include/xen/balloon.h
+===================================================================
+--- linux-3.4-rc6-master.orig/include/xen/balloon.h
++++ linux-3.4-rc6-master/include/xen/balloon.h
@@ -88,11 +88,11 @@ void free_xenballooned_pages(int nr_page
#endif /* CONFIG_PARAVIRT_XEN */
@@ -4469,8 +4696,10 @@ Acked-by: jbeulich@suse.com
{
return -ENOSYS;
}
---- head.orig/include/xen/blkif.h 2012-04-04 10:27:25.000000000 +0200
-+++ head/include/xen/blkif.h 2012-04-04 10:31:24.000000000 +0200
+Index: linux-3.4-rc6-master/include/xen/blkif.h
+===================================================================
+--- linux-3.4-rc6-master.orig/include/xen/blkif.h
++++ linux-3.4-rc6-master/include/xen/blkif.h
@@ -48,7 +48,7 @@ struct blkif_x86_32_request {
};
struct blkif_x86_32_discard {
@@ -4507,8 +4736,10 @@ Acked-by: jbeulich@suse.com
d->nr_sectors = s->nr_sectors;
return;
}
---- head.orig/include/xen/evtchn.h 2011-02-01 15:09:47.000000000 +0100
-+++ head/include/xen/evtchn.h 2012-02-10 09:14:30.000000000 +0100
+Index: linux-3.4-rc6-master/include/xen/evtchn.h
+===================================================================
+--- linux-3.4-rc6-master.orig/include/xen/evtchn.h
++++ linux-3.4-rc6-master/include/xen/evtchn.h
@@ -59,6 +59,7 @@ struct irq_cfg {
};
};
@@ -4517,8 +4748,10 @@ Acked-by: jbeulich@suse.com
#endif
/*
---- head.orig/include/xen/interface/grant_table.h 2012-02-16 12:34:07.000000000 +0100
-+++ head/include/xen/interface/grant_table.h 2012-02-16 13:45:23.000000000 +0100
+Index: linux-3.4-rc6-master/include/xen/interface/grant_table.h
+===================================================================
+--- linux-3.4-rc6-master.orig/include/xen/interface/grant_table.h
++++ linux-3.4-rc6-master/include/xen/interface/grant_table.h
@@ -100,7 +100,9 @@ typedef uint32_t grant_ref_t;
* Version 1 of the grant table entry structure is maintained purely
* for backwards compatibility. New guests should use version 2.
@@ -4576,8 +4809,10 @@ Acked-by: jbeulich@suse.com
typedef struct gnttab_get_version gnttab_get_version_t;
DEFINE_XEN_GUEST_HANDLE(gnttab_get_version_t);
---- head.orig/include/xen/interface/io/blkif.h 2012-04-04 10:28:27.000000000 +0200
-+++ head/include/xen/interface/io/blkif.h 2012-04-04 10:31:20.000000000 +0200
+Index: linux-3.4-rc6-master/include/xen/interface/io/blkif.h
+===================================================================
+--- linux-3.4-rc6-master.orig/include/xen/interface/io/blkif.h
++++ linux-3.4-rc6-master/include/xen/interface/io/blkif.h
@@ -428,25 +428,40 @@ struct blkif_request_segment {
*/
struct blkif_request {
@@ -4624,8 +4859,10 @@ Acked-by: jbeulich@suse.com
typedef struct blkif_request blkif_request_t;
#if !defined(CONFIG_PARAVIRT_XEN) || defined(HAVE_XEN_PLATFORM_COMPAT_H)
---- head.orig/lib/swiotlb-xen.c 2011-07-01 15:19:35.000000000 +0200
-+++ head/lib/swiotlb-xen.c 2012-02-09 12:32:50.000000000 +0100
+Index: linux-3.4-rc6-master/lib/swiotlb-xen.c
+===================================================================
+--- linux-3.4-rc6-master.orig/lib/swiotlb-xen.c
++++ linux-3.4-rc6-master/lib/swiotlb-xen.c
@@ -114,11 +114,11 @@ setup_io_tlb_npages(char *str)
__setup("swiotlb=", setup_io_tlb_npages);
/* make io_tlb_overflow tunable too? */
diff --git a/series.conf b/series.conf
index c256f61c85..a33d047d27 100644
--- a/series.conf
+++ b/series.conf
@@ -228,6 +228,7 @@
## cpuidle perf events cleanups and related
patches.arch/perf_timechart_fix_zero_timestamps.patch
+ patches.drivers/x86_acpi_cpufreq_autoload.patch
########################################################
# AGP, graphics related stuff