Home Home > GIT Browse > openSUSE-15.0
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@suse.com>2014-01-15 09:23:07 +0100
committerJiri Kosina <jkosina@suse.cz>2014-01-15 23:13:35 +0100
commit0e621ee15ce901d8e5ec1dc2fc3f097576fad251 (patch)
tree03afc07886d7b84bc74ad5211e7b390136836598
parent0bdb320eb01777fe1baa3997d183c065ad331107 (diff)
-rw-r--r--kernel-source.changes5
-rw-r--r--patches.xen/xen-pcpu-hotplug4
-rw-r--r--patches.xen/xen-spinlock-poll-early12
-rw-r--r--patches.xen/xen-sys-suspend10
-rw-r--r--patches.xen/xen-x86_64-dump-user-pgt6
-rw-r--r--patches.xen/xen3-patch-2.6.194
-rw-r--r--patches.xen/xen3-patch-2.6.2539
-rw-r--r--patches.xen/xen3-patch-2.6.2612
-rw-r--r--patches.xen/xen3-patch-2.6.2776
-rw-r--r--patches.xen/xen3-patch-2.6.2918
-rw-r--r--patches.xen/xen3-patch-2.6.3050
-rw-r--r--patches.xen/xen3-patch-2.6.3340
-rw-r--r--patches.xen/xen3-patch-2.6.3614
-rw-r--r--patches.xen/xen3-patch-2.6.3738
-rw-r--r--patches.xen/xen3-patch-2.6.3813
-rw-r--r--patches.xen/xen3-x86-dumpstack-Fix-printk_address-for-direct-addresse.patch18
-rw-r--r--series.conf2
17 files changed, 183 insertions, 178 deletions
diff --git a/kernel-source.changes b/kernel-source.changes
index 76e1bf3101..1e6d0e7fd8 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Wed Jan 15 09:22:49 CET 2014 - jbeulich@novell.com
+
+- Refresh Xen patches (bnc#807434, bnc#848652, bnc#852624).
+
+-------------------------------------------------------------------
Thu Jan 9 16:02:34 CET 2014 - hare@suse.de
- patches.drivers/0030-scsi-Added-support-for-adapter-and-firmware-reset.patch:
diff --git a/patches.xen/xen-pcpu-hotplug b/patches.xen/xen-pcpu-hotplug
index 3de76b1a7d..d26e6ff7ae 100644
--- a/patches.xen/xen-pcpu-hotplug
+++ b/patches.xen/xen-pcpu-hotplug
@@ -30,7 +30,7 @@ jb: ported over glue logic; retry loops around XENPF_get_cpuinfo;
Acked-by: jbeulich@novell.com
--- sle11sp2.orig/arch/x86/kernel/acpi/processor_extcntl_xen.c 2011-02-01 15:03:10.000000000 +0100
-+++ sle11sp2/arch/x86/kernel/acpi/processor_extcntl_xen.c 2011-02-02 15:09:57.000000000 +0100
++++ sle11sp2/arch/x86/kernel/acpi/processor_extcntl_xen.c 2013-12-11 11:03:42.000000000 +0100
@@ -181,9 +181,65 @@ static int xen_tx_notifier(struct acpi_p
{
return -EINVAL;
@@ -68,7 +68,7 @@ Acked-by: jbeulich@novell.com
+ }
+
+ apic_id = acpi_get_cpuid(pr->handle, ~device_decl, pr->acpi_id);
-+ if (apic_id < 0) {
++ if (apic_id == -1) {
+ pr_warn("can't get apic_id for acpi_id %#x\n", pr->acpi_id);
+ return -ENODATA;
+ }
diff --git a/patches.xen/xen-spinlock-poll-early b/patches.xen/xen-spinlock-poll-early
index 29af53b738..5da38f09cd 100644
--- a/patches.xen/xen-spinlock-poll-early
+++ b/patches.xen/xen-spinlock-poll-early
@@ -161,8 +161,8 @@ only gets introduced in the 2.6.32 merge.
/*
* This differs from the pre-2.6.24 spinlock by always using xchgb
--- sle11sp2.orig/drivers/xen/core/spinlock.c 2012-06-21 13:49:49.000000000 +0200
-+++ sle11sp2/drivers/xen/core/spinlock.c 2013-10-22 15:17:59.000000000 +0200
-@@ -46,6 +46,8 @@ int __cpuinit xen_spinlock_init(unsigned
++++ sle11sp2/drivers/xen/core/spinlock.c 2014-01-13 14:53:38.000000000 +0100
+@@ -45,6 +45,8 @@ int __cpuinit xen_spinlock_init(unsigned
struct evtchn_bind_ipi bind_ipi;
int rc;
@@ -171,7 +171,7 @@ only gets introduced in the 2.6.32 merge.
if (nopoll)
return 0;
-@@ -156,6 +158,7 @@ static unsigned int ticket_drop(struct s
+@@ -154,6 +156,7 @@ static unsigned int ticket_drop(struct s
if (cmpxchg(&spinning->ticket, ticket, -1) != ticket)
return -1;
@@ -179,7 +179,7 @@ only gets introduced in the 2.6.32 merge.
__ticket_spin_unlock_body;
return kick ? (ticket + 1) & ((1 << TICKET_SHIFT) - 1) : -1;
}
-@@ -235,21 +238,24 @@ void xen_spin_irq_exit(void)
+@@ -233,21 +236,24 @@ void xen_spin_irq_exit(void)
if (spinning->ticket + 1)
continue;
spinning->ticket = ticket_get(lock, spinning->prev);
@@ -209,8 +209,8 @@ only gets introduced in the 2.6.32 merge.
/* announce we're spinning */
spinning.ticket = *ptok >> TICKET_SHIFT;
-@@ -326,12 +332,14 @@ bool xen_spin_wait(arch_spinlock_t *lock
- sequence(SEQ_REMOVE_BIAS);
+@@ -324,12 +330,14 @@ bool xen_spin_wait(arch_spinlock_t *lock
+ sequence();
arch_local_irq_restore(upcall_mask);
smp_rmb();
- if (lock->cur == spinning.ticket)
diff --git a/patches.xen/xen-sys-suspend b/patches.xen/xen-sys-suspend
index 7c2eea6878..c7b37e59ef 100644
--- a/patches.xen/xen-sys-suspend
+++ b/patches.xen/xen-sys-suspend
@@ -442,9 +442,9 @@ Patch-mainline: n/a
+ return err;
}
#endif
---- sle11sp2.orig/drivers/xen/core/spinlock.c 2012-07-30 12:34:47.000000000 +0200
-+++ sle11sp2/drivers/xen/core/spinlock.c 2012-07-30 12:44:41.000000000 +0200
-@@ -72,7 +72,9 @@ void __cpuinit xen_spinlock_cleanup(unsi
+--- sle11sp2.orig/drivers/xen/core/spinlock.c 2014-01-10 14:03:51.000000000 +0100
++++ sle11sp2/drivers/xen/core/spinlock.c 2014-01-13 14:53:28.000000000 +0100
+@@ -71,7 +71,9 @@ void __cpuinit xen_spinlock_cleanup(unsi
}
#ifdef CONFIG_PM_SLEEP
@@ -455,7 +455,7 @@ Patch-mainline: n/a
{
unsigned int cpu;
-@@ -81,6 +83,18 @@ void __cpuinit spinlock_resume(void)
+@@ -80,6 +82,18 @@ void __cpuinit spinlock_resume(void)
xen_spinlock_init(cpu);
}
}
@@ -473,7 +473,7 @@ Patch-mainline: n/a
+core_initcall(spinlock_register);
#endif
- static inline void sequence(unsigned int bias)
+ static inline void sequence(void)
--- sle11sp2.orig/include/xen/evtchn.h 2011-02-01 15:09:47.000000000 +0100
+++ sle11sp2/include/xen/evtchn.h 2010-11-23 15:07:01.000000000 +0100
@@ -109,7 +109,9 @@ int bind_ipi_to_irqhandler(
diff --git a/patches.xen/xen-x86_64-dump-user-pgt b/patches.xen/xen-x86_64-dump-user-pgt
index de8fac82ee..b7c57f9769 100644
--- a/patches.xen/xen-x86_64-dump-user-pgt
+++ b/patches.xen/xen-x86_64-dump-user-pgt
@@ -2,8 +2,8 @@ From: jbeulich@novell.com
Subject: dump the correct page tables for user mode faults
Patch-mainline: obsolete
---- sle11sp2.orig/arch/x86/mm/fault-xen.c 2013-04-18 14:03:29.000000000 +0200
-+++ sle11sp2/arch/x86/mm/fault-xen.c 2013-04-18 14:05:07.000000000 +0200
+--- sle11sp2.orig/arch/x86/mm/fault-xen.c 2014-01-13 14:53:07.000000000 +0100
++++ sle11sp2/arch/x86/mm/fault-xen.c 2014-01-13 14:54:12.000000000 +0100
@@ -347,6 +347,7 @@ static void dump_pagetable(unsigned long
out:
printk(KERN_CONT "\n");
@@ -33,7 +33,7 @@ Patch-mainline: obsolete
@@ -600,7 +604,7 @@ show_fault_oops(struct pt_regs *regs, un
printk(KERN_ALERT "IP:");
- printk_address(regs->ip, 1);
+ printk_address(regs->ip);
- dump_pagetable(address);
+ dump_pagetable(address, !(error_code & PF_USER));
diff --git a/patches.xen/xen3-patch-2.6.19 b/patches.xen/xen3-patch-2.6.19
index 77c8c164b3..ca186e7031 100644
--- a/patches.xen/xen3-patch-2.6.19
+++ b/patches.xen/xen3-patch-2.6.19
@@ -12685,7 +12685,7 @@ Acked-by: jbeulich@novell.com
const char *devname,
void *dev_id);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2/include/xen/net-util.h 2011-02-09 15:49:42.000000000 +0100
++++ sle11sp2/include/xen/net-util.h 2013-12-10 17:42:32.000000000 +0100
@@ -0,0 +1,74 @@
+#ifndef __XEN_NETUTIL_H__
+#define __XEN_NETUTIL_H__
@@ -12751,7 +12751,7 @@ Acked-by: jbeulich@novell.com
+ if (csum) {
+ *csum = ~csum_tcpudp_magic(iph->saddr, iph->daddr,
+ skb->len - iph->ihl*4,
-+ IPPROTO_TCP, 0);
++ iph->protocol, 0);
+ skb->ip_summed = CHECKSUM_PARTIAL;
+ }
+
diff --git a/patches.xen/xen3-patch-2.6.25 b/patches.xen/xen3-patch-2.6.25
index cd233fd81d..f6da532a32 100644
--- a/patches.xen/xen3-patch-2.6.25
+++ b/patches.xen/xen3-patch-2.6.25
@@ -5634,7 +5634,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+ unsigned long range_end = mm->brk + 0x02000000;
+ return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
+}
---- sle11sp2.orig/arch/x86/kernel/rtc.c 2013-10-22 15:07:16.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/rtc.c 2014-01-13 14:44:04.000000000 +0100
+++ sle11sp2/arch/x86/kernel/rtc.c 2011-07-11 12:50:41.000000000 +0200
@@ -28,6 +28,7 @@ EXPORT_SYMBOL(cmos_lock);
DEFINE_SPINLOCK(rtc_lock);
@@ -17624,7 +17624,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
vdso32.so-$(CONFIG_XEN) += $(xen-vdso32-y)
vdso32-images = $(vdso32.so-y:%=vdso32-%.so)
---- sle11sp2.orig/arch/x86/vdso/vdso32/syscall.S 2013-10-22 15:07:16.000000000 +0200
+--- sle11sp2.orig/arch/x86/vdso/vdso32/syscall.S 2014-01-13 14:44:04.000000000 +0100
+++ sle11sp2/arch/x86/vdso/vdso32/syscall.S 2011-01-31 18:01:51.000000000 +0100
@@ -19,8 +19,10 @@ __kernel_vsyscall:
.Lpush_ebp:
@@ -17637,7 +17637,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
movl %ebp, %ecx
popl %ebp
.Lpop_ebp:
---- sle11sp2.orig/arch/x86/vdso/vdso32.S 2013-10-22 15:07:16.000000000 +0200
+--- sle11sp2.orig/arch/x86/vdso/vdso32.S 2014-01-13 14:44:04.000000000 +0100
+++ sle11sp2/arch/x86/vdso/vdso32.S 2011-01-31 18:01:51.000000000 +0100
@@ -19,4 +19,16 @@ vdso32_sysenter_start:
.incbin "arch/x86/vdso/vdso32-sysenter.so"
@@ -18461,7 +18461,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-{
- return 0;
-}
---- sle11sp2.orig/drivers/pci/pci.c 2013-10-22 15:07:16.000000000 +0200
+--- sle11sp2.orig/drivers/pci/pci.c 2014-01-13 14:44:04.000000000 +0100
+++ sle11sp2/drivers/pci/pci.c 2012-03-19 11:35:22.000000000 +0100
@@ -476,7 +476,12 @@ pci_find_parent_resource(const struct pc
* Restore the BAR values for a given device, so as to make it
@@ -18739,7 +18739,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
blktap_request_free(tap, request);
}
---- sle11sp2.orig/drivers/xen/blktap2/ring.c 2013-10-22 15:07:16.000000000 +0200
+--- sle11sp2.orig/drivers/xen/blktap2/ring.c 2014-01-13 14:44:04.000000000 +0100
+++ sle11sp2/drivers/xen/blktap2/ring.c 2011-01-31 18:01:51.000000000 +0100
@@ -103,8 +103,8 @@ blktap_ring_clear_pte(struct vm_area_str
* mapped region.
@@ -18763,7 +18763,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
if (count)
if (HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref,
---- sle11sp2.orig/drivers/xen/core/Makefile 2013-10-22 15:07:16.000000000 +0200
+--- sle11sp2.orig/drivers/xen/core/Makefile 2014-01-13 14:44:04.000000000 +0100
+++ sle11sp2/drivers/xen/core/Makefile 2011-10-17 11:37:22.000000000 +0200
@@ -11,5 +11,6 @@ obj-$(CONFIG_SYS_HYPERVISOR) += hypervis
obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o
@@ -18971,8 +18971,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
ctxt.ctrlreg[3] = xen_pfn_to_cr3(virt_to_mfn(init_level4_pgt));
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2/drivers/xen/core/spinlock.c 2013-10-14 13:07:06.000000000 +0200
-@@ -0,0 +1,405 @@
++++ sle11sp2/drivers/xen/core/spinlock.c 2014-01-07 17:08:42.000000000 +0100
+@@ -0,0 +1,402 @@
+/*
+ * Xen spinlock functions
+ *
@@ -19003,7 +19003,6 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+ */
+struct rm_seq {
+ unsigned int idx;
-+#define SEQ_REMOVE_BIAS (1 << !!CONFIG_XEN_SPINLOCK_ACQUIRE_NESTING)
+ atomic_t ctr[2];
+};
+static DEFINE_PER_CPU(struct rm_seq, rm_seq);
@@ -19052,14 +19051,13 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+ }
+}
+
-+static inline void sequence(unsigned int bias)
++static inline void sequence(void)
+{
-+ unsigned int rm_idx = __get_cpu_var(rm_seq.idx);
++ unsigned int rm_idx;
+
+ smp_wmb();
-+ __get_cpu_var(rm_seq.idx) = (rm_idx + bias) ^ (SEQ_REMOVE_BIAS / 2);
++ rm_idx = __get_cpu_var(rm_seq.idx)++ & 1;
+ smp_mb();
-+ rm_idx &= 1;
+ while (__get_cpu_var(rm_seq.ctr[rm_idx].counter))
+ cpu_relax();
+}
@@ -19174,7 +19172,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+ * to re-obtain a ticket if ticket_drop() completes only after our
+ * ticket check below).
+ */
-+ sequence(0);
++ sequence();
+
+ /*
+ * Obtain new tickets for (or acquire) all those locks at the IRQ
@@ -19277,7 +19275,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+ __get_cpu_var(_spinning) = spinning.prev;
+ if (!CONFIG_XEN_SPINLOCK_ACQUIRE_NESTING)
+ raw_local_irq_disable();
-+ sequence(SEQ_REMOVE_BIAS);
++ sequence();
+ raw_local_irq_restore(upcall_mask);
+ smp_rmb();
+ if (lock->cur == spinning.ticket)
@@ -19337,8 +19335,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+#endif
+ spinning = per_cpu(_spinning, cpu);
+ smp_rmb();
-+ if ((rm_idx ^ per_cpu(rm_seq.idx, cpu))
-+ < SEQ_REMOVE_BIAS)
++ if (rm_idx == per_cpu(rm_seq.idx, cpu))
+ break;
+ atomic_dec(rm_ctr);
+ if (!vcpu_running(cpu))
@@ -19638,7 +19635,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
.resume = xenoprof_resume,
.suspend = xenoprof_suspend
};
---- sle11sp2.orig/arch/x86/include/asm/e820.h 2013-10-22 15:07:16.000000000 +0200
+--- sle11sp2.orig/arch/x86/include/asm/e820.h 2014-01-13 14:44:04.000000000 +0100
+++ sle11sp2/arch/x86/include/asm/e820.h 2011-01-31 18:01:51.000000000 +0100
@@ -66,7 +66,11 @@ struct e820map {
struct e820entry map[E820_X_MAX];
@@ -19652,7 +19649,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
#define ISA_END_ADDRESS 0x100000
#define BIOS_BEGIN 0x000a0000
---- sle11sp2.orig/arch/x86/include/asm/hardirq.h 2013-10-22 15:07:16.000000000 +0200
+--- sle11sp2.orig/arch/x86/include/asm/hardirq.h 2014-01-13 14:44:04.000000000 +0100
+++ sle11sp2/arch/x86/include/asm/hardirq.h 2011-01-31 18:01:51.000000000 +0100
@@ -18,7 +18,11 @@ typedef struct {
#ifdef CONFIG_SMP
@@ -21755,7 +21752,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-#define mfn_to_virt(m) (__va(mfn_to_pfn(m) << PAGE_SHIFT))
-
#endif /* _I386_MADDR_H */
---- sle11sp2.orig/arch/x86/include/mach-xen/asm/maddr_64.h 2013-10-22 15:07:16.000000000 +0200
+--- sle11sp2.orig/arch/x86/include/mach-xen/asm/maddr_64.h 2014-01-13 14:44:04.000000000 +0100
+++ sle11sp2/arch/x86/include/mach-xen/asm/maddr_64.h 2011-08-09 10:48:35.000000000 +0200
@@ -1,124 +1,6 @@
#ifndef _X86_64_MADDR_H
@@ -27990,7 +27987,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
void leave_mm(int cpu);
#else
static inline void leave_mm(int cpu)
---- sle11sp2.orig/arch/x86/include/asm/ptrace.h 2013-10-22 15:07:16.000000000 +0200
+--- sle11sp2.orig/arch/x86/include/asm/ptrace.h 2014-01-13 14:44:04.000000000 +0100
+++ sle11sp2/arch/x86/include/asm/ptrace.h 2013-01-04 11:35:41.000000000 +0100
@@ -283,7 +283,9 @@ static inline unsigned long regs_get_ker
}
diff --git a/patches.xen/xen3-patch-2.6.26 b/patches.xen/xen3-patch-2.6.26
index c872d30b35..8de415aaea 100644
--- a/patches.xen/xen3-patch-2.6.26
+++ b/patches.xen/xen3-patch-2.6.26
@@ -15967,6 +15967,18 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
};
static int privcmd_mmap(struct file * file, struct vm_area_struct * vma)
+--- sle11sp3.orig/drivers/xen/usbfront/usbfront-hcd.c 2011-02-01 15:04:27.000000000 +0100
++++ sle11sp3/drivers/xen/usbfront/usbfront-hcd.c 2013-12-16 14:47:16.000000000 +0100
+@@ -77,6 +77,9 @@ static int xenhcd_setup(struct usb_hcd *
+ init_timer(&info->watchdog);
+ info->watchdog.function = xenhcd_watchdog;
+ info->watchdog.data = (unsigned long) info;
++
++ hcd->has_tt = hcd->driver != &xen_usb11_hc_driver;
++
+ return 0;
+ }
+
--- sle11sp2.orig/drivers/xen/xenbus/xenbus_client.c 2011-06-30 16:10:27.000000000 +0200
+++ sle11sp2/drivers/xen/xenbus/xenbus_client.c 2011-01-31 18:07:35.000000000 +0100
@@ -437,7 +437,7 @@ int xenbus_map_ring_valloc(struct xenbus
diff --git a/patches.xen/xen3-patch-2.6.27 b/patches.xen/xen3-patch-2.6.27
index ca86b600ce..73b329367f 100644
--- a/patches.xen/xen3-patch-2.6.27
+++ b/patches.xen/xen3-patch-2.6.27
@@ -367,7 +367,7 @@ have been needed - see SLE11 SPn).
/*
* If acpi_disabled, bail out
---- sle11sp2.orig/arch/x86/kernel/amd_nb.c 2013-12-03 16:29:42.000000000 +0100
+--- sle11sp2.orig/arch/x86/kernel/amd_nb.c 2014-01-13 14:44:04.000000000 +0100
+++ sle11sp2/arch/x86/kernel/amd_nb.c 2011-04-13 13:47:56.000000000 +0200
@@ -15,6 +15,10 @@ static u32 *flush_words;
const struct pci_device_id amd_nb_misc_ids[] = {
@@ -394,7 +394,7 @@ have been needed - see SLE11 SPn).
#ifndef CONFIG_XEN
static int modern_apic(void)
---- sle11sp2.orig/arch/x86/kernel/cpu/amd.c 2013-12-03 16:29:42.000000000 +0100
+--- sle11sp2.orig/arch/x86/kernel/cpu/amd.c 2014-01-13 14:44:04.000000000 +0100
+++ sle11sp2/arch/x86/kernel/cpu/amd.c 2013-05-23 14:05:37.000000000 +0200
@@ -615,6 +615,7 @@ static void __cpuinit init_amd(struct cp
fam10h_check_enable_mmcfg();
@@ -412,7 +412,7 @@ have been needed - see SLE11 SPn).
/*
* Family 0x12 and above processors have APIC timer
---- sle11sp2.orig/arch/x86/kernel/cpu/bugs_64.c 2013-12-03 16:29:42.000000000 +0100
+--- sle11sp2.orig/arch/x86/kernel/cpu/bugs_64.c 2014-01-13 14:44:04.000000000 +0100
+++ sle11sp2/arch/x86/kernel/cpu/bugs_64.c 2011-02-01 14:38:38.000000000 +0100
@@ -20,6 +20,7 @@ void __init check_bugs(void)
#endif
@@ -5062,7 +5062,7 @@ have been needed - see SLE11 SPn).
cmpl $nr_syscalls,%eax
jb syscall_call
jmp syscall_exit
---- sle11sp2.orig/arch/x86/kernel/entry_64.S 2013-12-03 16:29:42.000000000 +0100
+--- sle11sp2.orig/arch/x86/kernel/entry_64.S 2014-01-13 14:44:04.000000000 +0100
+++ sle11sp2/arch/x86/kernel/entry_64.S 2011-10-04 15:45:58.000000000 +0200
@@ -1258,7 +1258,7 @@ ENTRY(arch_unwind_init_running)
END(arch_unwind_init_running)
@@ -9981,7 +9981,7 @@ have been needed - see SLE11 SPn).
};
void __init no_iommu_init(void)
---- sle11sp2.orig/arch/x86/kernel/probe_roms.c 2013-12-03 16:29:42.000000000 +0100
+--- sle11sp2.orig/arch/x86/kernel/probe_roms.c 2014-01-13 14:44:04.000000000 +0100
+++ sle11sp2/arch/x86/kernel/probe_roms.c 2011-06-30 16:40:28.000000000 +0200
@@ -232,7 +232,7 @@ void __init probe_roms(void)
upper = system_rom_resource.start;
@@ -20959,7 +20959,7 @@ have been needed - see SLE11 SPn).
void make_lowmem_page_readonly(void *va, unsigned int feature)
{
pte_t *pte;
---- sle11sp2.orig/arch/x86/pci/amd_bus.c 2013-12-03 16:29:42.000000000 +0100
+--- sle11sp2.orig/arch/x86/pci/amd_bus.c 2014-01-13 14:44:04.000000000 +0100
+++ sle11sp2/arch/x86/pci/amd_bus.c 2012-05-15 11:23:34.000000000 +0200
@@ -330,6 +330,7 @@ static int __init early_fill_mp_bus_info
@@ -21008,7 +21008,7 @@ have been needed - see SLE11 SPn).
if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD)
return 0;
---- sle11sp2.orig/arch/x86/pci/mmconfig-shared.c 2013-12-03 16:29:42.000000000 +0100
+--- sle11sp2.orig/arch/x86/pci/mmconfig-shared.c 2014-01-13 14:44:04.000000000 +0100
+++ sle11sp2/arch/x86/pci/mmconfig-shared.c 2011-07-06 12:20:45.000000000 +0200
@@ -21,6 +21,10 @@
#include <asm/pci_x86.h>
@@ -22171,8 +22171,8 @@ have been needed - see SLE11 SPn).
prefill_possible_map();
}
---- sle11sp2.orig/drivers/xen/core/spinlock.c 2013-10-14 13:07:06.000000000 +0200
-+++ sle11sp2/drivers/xen/core/spinlock.c 2013-10-22 15:14:06.000000000 +0200
+--- sle11sp2.orig/drivers/xen/core/spinlock.c 2014-01-07 17:08:42.000000000 +0100
++++ sle11sp2/drivers/xen/core/spinlock.c 2014-01-13 14:47:19.000000000 +0100
@@ -5,6 +5,10 @@
* portions of this file.
*/
@@ -22184,7 +22184,7 @@ have been needed - see SLE11 SPn).
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
-@@ -67,6 +71,7 @@ void __cpuinit xen_spinlock_cleanup(unsi
+@@ -66,6 +70,7 @@ void __cpuinit xen_spinlock_cleanup(unsi
WARN_ON(HYPERVISOR_event_channel_op(EVTCHNOP_close, &close));
}
@@ -22192,28 +22192,24 @@ have been needed - see SLE11 SPn).
void __cpuinit spinlock_resume(void)
{
unsigned int cpu;
-@@ -76,16 +81,17 @@ void __cpuinit spinlock_resume(void)
+@@ -75,6 +80,7 @@ void __cpuinit spinlock_resume(void)
xen_spinlock_init(cpu);
}
}
+#endif
- static inline void sequence(unsigned int bias)
+ static inline void sequence(void)
{
-- unsigned int rm_idx = __get_cpu_var(rm_seq.idx);
-+ unsigned int rm_idx = x86_read_percpu(rm_seq.idx);
-
+@@ -83,7 +89,7 @@ static inline void sequence(void)
smp_wmb();
-- __get_cpu_var(rm_seq.idx) = (rm_idx + bias) ^ (SEQ_REMOVE_BIAS / 2);
-+ x86_write_percpu(rm_seq.idx, (rm_idx + bias) ^ (SEQ_REMOVE_BIAS / 2));
+ rm_idx = __get_cpu_var(rm_seq.idx)++ & 1;
smp_mb();
- rm_idx &= 1;
- while (__get_cpu_var(rm_seq.ctr[rm_idx].counter))
+ while (x86_read_percpu(rm_seq.ctr[rm_idx].counter))
cpu_relax();
}
-@@ -121,7 +127,7 @@ static unsigned int spin_adjust(struct s
+@@ -119,7 +125,7 @@ static unsigned int spin_adjust(struct s
unsigned int xen_spin_adjust(const raw_spinlock_t *lock, unsigned int token)
{
@@ -22222,7 +22218,7 @@ have been needed - see SLE11 SPn).
token >> TICKET_SHIFT);
return (token << TICKET_SHIFT) | lock->cur;
}
-@@ -135,7 +141,7 @@ static unsigned int ticket_drop(struct s
+@@ -133,7 +139,7 @@ static unsigned int ticket_drop(struct s
if (cmpxchg(&spinning->ticket, ticket, -1) != ticket)
return -1;
@@ -22231,7 +22227,7 @@ have been needed - see SLE11 SPn).
return kick ? (ticket + 1) & ((1 << TICKET_SHIFT) - 1) : -1;
}
-@@ -151,10 +157,10 @@ static unsigned int ticket_get(raw_spinl
+@@ -149,10 +155,10 @@ static unsigned int ticket_get(raw_spinl
void xen_spin_irq_enter(void)
{
@@ -22244,7 +22240,7 @@ have been needed - see SLE11 SPn).
smp_mb();
for (; spinning; spinning = spinning->prev) {
raw_spinlock_t *lock = spinning->lock;
-@@ -183,7 +189,7 @@ void xen_spin_irq_enter(void)
+@@ -181,7 +187,7 @@ void xen_spin_irq_enter(void)
void xen_spin_irq_exit(void)
{
@@ -22253,7 +22249,7 @@ have been needed - see SLE11 SPn).
/*
* Despite its counterpart being first in xen_spin_irq_enter() (to make
* xen_spin_kick() properly handle locks that get owned after their
-@@ -227,13 +233,13 @@ bool xen_spin_wait(raw_spinlock_t *lock,
+@@ -225,13 +231,13 @@ bool xen_spin_wait(raw_spinlock_t *lock,
/* If kicker interrupt not initialized yet, just spin. */
if (unlikely(!cpu_online(raw_smp_processor_id()))
@@ -22269,7 +22265,7 @@ have been needed - see SLE11 SPn).
#if CONFIG_XEN_SPINLOCK_ACQUIRE_NESTING
spinning.irq_count = UINT_MAX;
if (upcall_mask > flags) {
-@@ -249,10 +255,10 @@ bool xen_spin_wait(raw_spinlock_t *lock,
+@@ -247,10 +253,10 @@ bool xen_spin_wait(raw_spinlock_t *lock,
raw_local_irq_disable();
#endif
smp_wmb();
@@ -22282,7 +22278,7 @@ have been needed - see SLE11 SPn).
/*
* Check again to make sure it didn't become free while
-@@ -265,19 +271,19 @@ bool xen_spin_wait(raw_spinlock_t *lock,
+@@ -263,19 +269,19 @@ bool xen_spin_wait(raw_spinlock_t *lock,
* without rechecking the lock.
*/
if (spinning.prev)
@@ -22305,7 +22301,7 @@ have been needed - see SLE11 SPn).
HYPERVISOR_poll_no_timeout(&__get_cpu_var(poll_evtchn), 1))
BUG();
-@@ -287,7 +293,7 @@ bool xen_spin_wait(raw_spinlock_t *lock,
+@@ -285,7 +291,7 @@ bool xen_spin_wait(raw_spinlock_t *lock,
spinning.irq_count = UINT_MAX;
#endif
@@ -22314,7 +22310,7 @@ have been needed - see SLE11 SPn).
inc_irq_stat(irq_lock_count);
break;
}
-@@ -299,7 +305,7 @@ bool xen_spin_wait(raw_spinlock_t *lock,
+@@ -297,7 +303,7 @@ bool xen_spin_wait(raw_spinlock_t *lock,
*/
/* announce we're done */
@@ -22322,8 +22318,8 @@ have been needed - see SLE11 SPn).
+ x86_write_percpu(_spinning, spinning.prev);
if (!CONFIG_XEN_SPINLOCK_ACQUIRE_NESTING)
raw_local_irq_disable();
- sequence(SEQ_REMOVE_BIAS);
-@@ -332,7 +338,7 @@ void xen_spin_kick(raw_spinlock_t *lock,
+ sequence();
+@@ -330,7 +336,7 @@ void xen_spin_kick(raw_spinlock_t *lock,
if (unlikely(!cpu_online(local)))
stop = start = cpus_cycle(local, cpu_online_map);
#if CONFIG_XEN_SPINLOCK_ACQUIRE_NESTING
@@ -22332,7 +22328,7 @@ have been needed - see SLE11 SPn).
start = local;
#endif
else {
-@@ -349,7 +355,7 @@ void xen_spin_kick(raw_spinlock_t *lock,
+@@ -347,7 +353,7 @@ void xen_spin_kick(raw_spinlock_t *lock,
flags = __raw_local_irq_save();
if (cpu == local)
@@ -22341,7 +22337,7 @@ have been needed - see SLE11 SPn).
else for (;;) {
unsigned int rm_idx = per_cpu(rm_seq.idx, cpu);
-@@ -403,3 +409,5 @@ void xen_spin_kick(raw_spinlock_t *lock,
+@@ -400,3 +406,5 @@ void xen_spin_kick(raw_spinlock_t *lock,
}
}
EXPORT_SYMBOL(xen_spin_kick);
@@ -22471,7 +22467,7 @@ have been needed - see SLE11 SPn).
}
static void *bar_init(struct pci_dev *dev, int offset)
---- sle11sp2.orig/drivers/xen/sfc_netback/accel.h 2013-12-03 16:29:42.000000000 +0100
+--- sle11sp2.orig/drivers/xen/sfc_netback/accel.h 2014-01-13 14:44:04.000000000 +0100
+++ sle11sp2/drivers/xen/sfc_netback/accel.h 2011-02-01 14:38:38.000000000 +0100
@@ -25,6 +25,7 @@
#ifndef NETBACK_ACCEL_H
@@ -22574,7 +22570,7 @@ have been needed - see SLE11 SPn).
if (fd < 0)
return fd;
---- sle11sp2.orig/include/Kbuild 2013-12-03 16:29:42.000000000 +0100
+--- sle11sp2.orig/include/Kbuild 2014-01-13 14:44:04.000000000 +0100
+++ sle11sp2/include/Kbuild 2011-02-01 14:38:38.000000000 +0100
@@ -8,5 +8,6 @@ header-y += mtd/
header-y += rdma/
@@ -24661,7 +24657,7 @@ have been needed - see SLE11 SPn).
#define XOR_SELECT_TEMPLATE(FASTEST) (&xor_block_sse)
+
+#endif /* ASM_X86__XOR_64_H */
---- sle11sp2.orig/arch/x86/include/mach-xen/irq_vectors.h 2013-12-03 16:29:42.000000000 +0100
+--- sle11sp2.orig/arch/x86/include/mach-xen/irq_vectors.h 2014-01-13 14:44:04.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,125 +0,0 @@
-/*
@@ -24789,7 +24785,7 @@ have been needed - see SLE11 SPn).
-#define NR_IRQ_VECTORS NR_IRQS
-
-#endif /* _ASM_IRQ_VECTORS_H */
---- sle11sp2.orig/arch/x86/include/mach-xen/setup_arch_post.h 2013-12-03 16:29:42.000000000 +0100
+--- sle11sp2.orig/arch/x86/include/mach-xen/setup_arch_post.h 2014-01-13 14:44:04.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-/**
@@ -24855,7 +24851,7 @@ have been needed - see SLE11 SPn).
-#endif
-#endif
-}
---- sle11sp2.orig/arch/x86/include/mach-xen/setup_arch_pre.h 2013-12-03 16:29:42.000000000 +0100
+--- sle11sp2.orig/arch/x86/include/mach-xen/setup_arch_pre.h 2014-01-13 14:44:04.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-/* Hook to call BIOS initialisation function */
@@ -24863,7 +24859,7 @@ have been needed - see SLE11 SPn).
-#define ARCH_SETUP machine_specific_arch_setup();
-
-static void __init machine_specific_arch_setup(void);
---- sle11sp2.orig/arch/x86/include/asm/traps.h 2013-12-03 16:29:42.000000000 +0100
+--- sle11sp2.orig/arch/x86/include/asm/traps.h 2014-01-13 14:44:04.000000000 +0100
+++ sle11sp2/arch/x86/include/asm/traps.h 2013-02-15 13:25:54.000000000 +0100
@@ -39,6 +39,9 @@ asmlinkage void alignment_check(void);
asmlinkage void machine_check(void);
@@ -24953,7 +24949,7 @@ have been needed - see SLE11 SPn).
typedef struct xen_add_to_physmap xen_add_to_physmap_t;
DEFINE_XEN_GUEST_HANDLE(xen_add_to_physmap_t);
---- sle11sp2.orig/include/xen/public/Kbuild 2013-12-03 16:29:42.000000000 +0100
+--- sle11sp2.orig/include/xen/public/Kbuild 2014-01-13 14:44:04.000000000 +0100
+++ sle11sp2/include/xen/public/Kbuild 2011-02-01 14:38:38.000000000 +0100
@@ -1 +1,5 @@
+header-y += evtchn.h
@@ -24961,7 +24957,7 @@ have been needed - see SLE11 SPn).
header-y += iomulti.h
+header-y += privcmd.h
+header-y += xenbus.h
---- sle11sp2.orig/include/xen/public/privcmd.h 2013-12-03 16:29:42.000000000 +0100
+--- sle11sp2.orig/include/xen/public/privcmd.h 2014-01-13 14:44:04.000000000 +0100
+++ sle11sp2/include/xen/public/privcmd.h 2011-02-01 14:38:38.000000000 +0100
@@ -35,10 +35,6 @@
@@ -24974,7 +24970,7 @@ have been needed - see SLE11 SPn).
typedef struct privcmd_hypercall
{
__u64 op;
---- sle11sp2.orig/include/xen/public/xenbus.h 2013-12-03 16:29:42.000000000 +0100
+--- sle11sp2.orig/include/xen/public/xenbus.h 2014-01-13 14:44:04.000000000 +0100
+++ sle11sp2/include/xen/public/xenbus.h 2011-02-01 14:38:38.000000000 +0100
@@ -35,10 +35,6 @@
diff --git a/patches.xen/xen3-patch-2.6.29 b/patches.xen/xen3-patch-2.6.29
index 35c04f5fdc..57c22507e0 100644
--- a/patches.xen/xen3-patch-2.6.29
+++ b/patches.xen/xen3-patch-2.6.29
@@ -93,7 +93,7 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
typedef int vector_irq_t[NR_VECTORS];
DECLARE_PER_CPU(vector_irq_t, vector_irq);
---- sle11sp2.orig/arch/x86/include/asm/hypervisor.h 2013-12-03 16:29:41.000000000 +0100
+--- sle11sp2.orig/arch/x86/include/asm/hypervisor.h 2014-01-13 14:44:04.000000000 +0100
+++ sle11sp2/arch/x86/include/asm/hypervisor.h 2011-04-13 13:52:09.000000000 +0200
@@ -60,3 +60,7 @@ static inline bool hypervisor_x2apic_ava
}
@@ -8892,7 +8892,7 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
int acpi_processor_cst_has_changed(struct acpi_processor *pr)
{
int ret = 0;
---- sle11sp2.orig/drivers/gpu/drm/i915/i915_drv.c 2013-12-03 16:29:42.000000000 +0100
+--- sle11sp2.orig/drivers/gpu/drm/i915/i915_drv.c 2014-01-13 14:44:04.000000000 +0100
+++ sle11sp2/drivers/gpu/drm/i915/i915_drv.c 2013-01-04 11:36:25.000000000 +0100
@@ -866,7 +866,7 @@ static struct drm_driver driver = {
.open = drm_open,
@@ -8903,7 +8903,7 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
.poll = drm_poll,
.fasync = drm_fasync,
.read = drm_read,
---- sle11sp2.orig/drivers/gpu/drm/i915/i915_drv.h 2013-12-03 16:29:42.000000000 +0100
+--- sle11sp2.orig/drivers/gpu/drm/i915/i915_drv.h 2014-01-13 14:44:04.000000000 +0100
+++ sle11sp2/drivers/gpu/drm/i915/i915_drv.h 2013-04-18 13:58:14.000000000 +0200
@@ -1227,6 +1227,11 @@ int __must_check i915_add_request(struct
struct drm_i915_gem_request *request);
@@ -8917,7 +8917,7 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf);
int __must_check
i915_gem_object_set_to_gtt_domain(struct drm_i915_gem_object *obj,
---- sle11sp2.orig/drivers/gpu/drm/i915/i915_gem.c 2013-12-03 16:29:42.000000000 +0100
+--- sle11sp2.orig/drivers/gpu/drm/i915/i915_gem.c 2014-01-13 14:44:04.000000000 +0100
+++ sle11sp2/drivers/gpu/drm/i915/i915_gem.c 2013-01-04 11:36:25.000000000 +0100
@@ -1181,6 +1181,17 @@ i915_gem_mmap_ioctl(struct drm_device *d
return 0;
@@ -9909,9 +9909,9 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
preempt_enable_no_resched();
VOID(HYPERVISOR_vcpu_op(VCPUOP_down, smp_processor_id(), NULL));
cpu_bringup();
---- sle11sp2.orig/drivers/xen/core/spinlock.c 2013-10-22 15:14:06.000000000 +0200
-+++ sle11sp2/drivers/xen/core/spinlock.c 2013-10-14 13:14:13.000000000 +0200
-@@ -319,12 +319,12 @@ bool xen_spin_wait(raw_spinlock_t *lock,
+--- sle11sp2.orig/drivers/xen/core/spinlock.c 2014-01-13 14:47:19.000000000 +0100
++++ sle11sp2/drivers/xen/core/spinlock.c 2014-01-13 14:47:39.000000000 +0100
+@@ -317,12 +317,12 @@ bool xen_spin_wait(raw_spinlock_t *lock,
return false;
}
@@ -9928,7 +9928,7 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
return nxt;
}
-@@ -336,13 +336,13 @@ void xen_spin_kick(raw_spinlock_t *lock,
+@@ -334,13 +334,13 @@ void xen_spin_kick(raw_spinlock_t *lock,
return;
if (unlikely(!cpu_online(local)))
@@ -9944,7 +9944,7 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
if (start == stop)
return;
}
-@@ -403,7 +403,7 @@ void xen_spin_kick(raw_spinlock_t *lock,
+@@ -400,7 +400,7 @@ void xen_spin_kick(raw_spinlock_t *lock,
notify_remote_via_evtchn(per_cpu(poll_evtchn, cpu));
return;
}
diff --git a/patches.xen/xen3-patch-2.6.30 b/patches.xen/xen3-patch-2.6.30
index d64ac136f1..8d4b1c209d 100644
--- a/patches.xen/xen3-patch-2.6.30
+++ b/patches.xen/xen3-patch-2.6.30
@@ -24,7 +24,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
extern struct shared_info *HYPERVISOR_shared_info;
extern struct start_info *xen_start_info;
---- sle11sp2.orig/arch/ia64/kernel/vmlinux.lds.S 2013-12-03 16:29:41.000000000 +0100
+--- sle11sp2.orig/arch/ia64/kernel/vmlinux.lds.S 2014-01-13 14:44:04.000000000 +0100
+++ sle11sp2/arch/ia64/kernel/vmlinux.lds.S 2011-04-13 13:53:28.000000000 +0200
@@ -183,7 +183,7 @@ SECTIONS {
__start_gate_section = .;
@@ -167,7 +167,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
#endif
# define KEXEC_CONTROL_CODE_MAX_SIZE 2048
---- sle11sp2.orig/arch/x86/include/asm/page_64_types.h 2013-12-03 16:29:41.000000000 +0100
+--- sle11sp2.orig/arch/x86/include/asm/page_64_types.h 2014-01-13 14:44:04.000000000 +0100
+++ sle11sp2/arch/x86/include/asm/page_64_types.h 2011-04-13 13:53:28.000000000 +0200
@@ -69,7 +69,15 @@ extern void init_extra_mapping_wb(unsign
#endif /* !__ASSEMBLY__ */
@@ -3683,7 +3683,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
printk(KERN_WARNING PREFIX "x2apic entry ignored\n");
#endif
---- sle11sp2.orig/arch/x86/kernel/apic/Makefile 2013-12-03 16:29:41.000000000 +0100
+--- sle11sp2.orig/arch/x86/kernel/apic/Makefile 2014-01-13 14:44:04.000000000 +0100
+++ sle11sp2/arch/x86/kernel/apic/Makefile 2011-06-30 17:03:37.000000000 +0200
@@ -24,3 +24,9 @@ obj-$(CONFIG_X86_ES7000) += es7000_32.o
@@ -11285,7 +11285,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
#ifdef CONFIG_XEN
static int
xen_panic_event(struct notifier_block *this, unsigned long event, void *ptr)
---- sle11sp2.orig/arch/x86/kernel/setup_percpu.c 2013-12-03 16:29:41.000000000 +0100
+--- sle11sp2.orig/arch/x86/kernel/setup_percpu.c 2014-01-13 14:44:04.000000000 +0100
+++ sle11sp2/arch/x86/kernel/setup_percpu.c 2012-06-08 14:42:57.000000000 +0200
@@ -231,7 +231,7 @@ void __init setup_per_cpu_areas(void)
* are zeroed indicating that the static arrays are
@@ -11506,7 +11506,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
#endif
#include <asm-generic/vmlinux.lds.h>
---- sle11sp2.orig/arch/x86/mach-xen/Makefile 2013-12-03 16:29:41.000000000 +0100
+--- sle11sp2.orig/arch/x86/mach-xen/Makefile 2014-01-13 14:44:04.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-#
@@ -17794,26 +17794,18 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
prefill_possible_map();
}
---- sle11sp2.orig/drivers/xen/core/spinlock.c 2013-10-14 13:14:13.000000000 +0200
-+++ sle11sp2/drivers/xen/core/spinlock.c 2012-07-30 12:31:26.000000000 +0200
-@@ -85,13 +85,13 @@ void __cpuinit spinlock_resume(void)
-
- static inline void sequence(unsigned int bias)
- {
-- unsigned int rm_idx = x86_read_percpu(rm_seq.idx);
-+ unsigned int rm_idx = percpu_read(rm_seq.idx);
-
+--- sle11sp2.orig/drivers/xen/core/spinlock.c 2014-01-13 14:47:39.000000000 +0100
++++ sle11sp2/drivers/xen/core/spinlock.c 2014-01-13 14:49:01.000000000 +0100
+@@ -89,7 +89,7 @@ static inline void sequence(void)
smp_wmb();
-- x86_write_percpu(rm_seq.idx, (rm_idx + bias) ^ (SEQ_REMOVE_BIAS / 2));
-+ percpu_write(rm_seq.idx, (rm_idx + bias) ^ (SEQ_REMOVE_BIAS / 2));
+ rm_idx = __get_cpu_var(rm_seq.idx)++ & 1;
smp_mb();
- rm_idx &= 1;
- while (x86_read_percpu(rm_seq.ctr[rm_idx].counter))
+ while (percpu_read(rm_seq.ctr[rm_idx].counter))
cpu_relax();
}
-@@ -127,7 +127,7 @@ static unsigned int spin_adjust(struct s
+@@ -125,7 +125,7 @@ static unsigned int spin_adjust(struct s
unsigned int xen_spin_adjust(const raw_spinlock_t *lock, unsigned int token)
{
@@ -17822,7 +17814,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
token >> TICKET_SHIFT);
return (token << TICKET_SHIFT) | lock->cur;
}
-@@ -157,10 +157,10 @@ static unsigned int ticket_get(raw_spinl
+@@ -155,10 +155,10 @@ static unsigned int ticket_get(raw_spinl
void xen_spin_irq_enter(void)
{
@@ -17835,7 +17827,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
smp_mb();
for (; spinning; spinning = spinning->prev) {
raw_spinlock_t *lock = spinning->lock;
-@@ -189,7 +189,7 @@ void xen_spin_irq_enter(void)
+@@ -187,7 +187,7 @@ void xen_spin_irq_enter(void)
void xen_spin_irq_exit(void)
{
@@ -17844,7 +17836,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
/*
* Despite its counterpart being first in xen_spin_irq_enter() (to make
* xen_spin_kick() properly handle locks that get owned after their
-@@ -233,13 +233,13 @@ bool xen_spin_wait(raw_spinlock_t *lock,
+@@ -231,13 +231,13 @@ bool xen_spin_wait(raw_spinlock_t *lock,
/* If kicker interrupt not initialized yet, just spin. */
if (unlikely(!cpu_online(raw_smp_processor_id()))
@@ -17860,7 +17852,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
#if CONFIG_XEN_SPINLOCK_ACQUIRE_NESTING
spinning.irq_count = UINT_MAX;
if (upcall_mask > flags) {
-@@ -255,10 +255,10 @@ bool xen_spin_wait(raw_spinlock_t *lock,
+@@ -253,10 +253,10 @@ bool xen_spin_wait(raw_spinlock_t *lock,
raw_local_irq_disable();
#endif
smp_wmb();
@@ -17873,7 +17865,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
/*
* Check again to make sure it didn't become free while
-@@ -271,19 +271,19 @@ bool xen_spin_wait(raw_spinlock_t *lock,
+@@ -269,19 +269,19 @@ bool xen_spin_wait(raw_spinlock_t *lock,
* without rechecking the lock.
*/
if (spinning.prev)
@@ -17896,7 +17888,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
HYPERVISOR_poll_no_timeout(&__get_cpu_var(poll_evtchn), 1))
BUG();
-@@ -293,7 +293,7 @@ bool xen_spin_wait(raw_spinlock_t *lock,
+@@ -291,7 +291,7 @@ bool xen_spin_wait(raw_spinlock_t *lock,
spinning.irq_count = UINT_MAX;
#endif
@@ -17905,7 +17897,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
inc_irq_stat(irq_lock_count);
break;
}
-@@ -305,7 +305,7 @@ bool xen_spin_wait(raw_spinlock_t *lock,
+@@ -303,7 +303,7 @@ bool xen_spin_wait(raw_spinlock_t *lock,
*/
/* announce we're done */
@@ -17913,8 +17905,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
+ percpu_write(_spinning, spinning.prev);
if (!CONFIG_XEN_SPINLOCK_ACQUIRE_NESTING)
raw_local_irq_disable();
- sequence(SEQ_REMOVE_BIAS);
-@@ -338,7 +338,7 @@ void xen_spin_kick(raw_spinlock_t *lock,
+ sequence();
+@@ -336,7 +336,7 @@ void xen_spin_kick(raw_spinlock_t *lock,
if (unlikely(!cpu_online(local)))
stop = start = cpumask_cycle(local, cpu_online_mask);
#if CONFIG_XEN_SPINLOCK_ACQUIRE_NESTING
@@ -17923,7 +17915,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
start = local;
#endif
else {
-@@ -355,7 +355,7 @@ void xen_spin_kick(raw_spinlock_t *lock,
+@@ -353,7 +353,7 @@ void xen_spin_kick(raw_spinlock_t *lock,
flags = __raw_local_irq_save();
if (cpu == local)
@@ -18138,7 +18130,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
},
};
---- sle11sp2.orig/kernel/sched.c 2013-12-03 16:29:41.000000000 +0100
+--- sle11sp2.orig/kernel/sched.c 2014-01-13 14:44:04.000000000 +0100
+++ sle11sp2/kernel/sched.c 2013-12-03 16:31:38.000000000 +0100
@@ -4559,6 +4559,11 @@ asmlinkage void __sched schedule(void)
EXPORT_SYMBOL(schedule);
diff --git a/patches.xen/xen3-patch-2.6.33 b/patches.xen/xen3-patch-2.6.33
index d73180d810..56312788ea 100644
--- a/patches.xen/xen3-patch-2.6.33
+++ b/patches.xen/xen3-patch-2.6.33
@@ -22,7 +22,7 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
#include <asm/xen/hypercall.h>
extern struct shared_info *HYPERVISOR_shared_info;
---- sle11sp2.orig/arch/x86/Kconfig 2012-06-21 13:38:01.000000000 +0200
+--- sle11sp2.orig/arch/x86/Kconfig 2013-04-18 13:58:34.000000000 +0200
+++ sle11sp2/arch/x86/Kconfig 2011-06-30 17:10:29.000000000 +0200
@@ -20,7 +20,7 @@ config X86
select HAVE_UNSTABLE_SCHED_CLOCK
@@ -1926,7 +1926,7 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
#endif
END(error_entry)
---- sle11sp2.orig/arch/x86/kernel/head-xen.c 2011-08-22 10:37:35.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/head-xen.c 2013-05-13 14:00:16.000000000 +0200
+++ sle11sp2/arch/x86/kernel/head-xen.c 2013-05-13 14:02:23.000000000 +0200
@@ -1,5 +1,6 @@
#include <linux/kernel.h>
@@ -3442,7 +3442,7 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
.procname = "xen",
.mode = 0555,
.child = xen_subtable
---- sle11sp2.orig/arch/x86/kernel/traps-xen.c 2012-07-30 12:33:50.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/traps-xen.c 2013-12-03 16:31:58.000000000 +0100
+++ sle11sp2/arch/x86/kernel/traps-xen.c 2011-02-01 14:55:46.000000000 +0100
@@ -522,77 +522,56 @@ asmlinkage __kprobes struct pt_regs *syn
dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
@@ -3590,7 +3590,7 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
.child = kernel_table2 },
{}
};
---- sle11sp2.orig/arch/x86/kernel/x8664_ksyms_64.c 2012-11-19 12:05:19.000000000 +0100
+--- sle11sp2.orig/arch/x86/kernel/x8664_ksyms_64.c 2014-01-13 14:44:04.000000000 +0100
+++ sle11sp2/arch/x86/kernel/x8664_ksyms_64.c 2011-04-13 13:57:11.000000000 +0200
@@ -55,6 +55,6 @@ EXPORT_SYMBOL(__memcpy);
EXPORT_SYMBOL(memmove);
@@ -4059,7 +4059,7 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
.procname = "abi",
.mode = 0555,
.child = abi_table2
---- sle11sp2.orig/drivers/gpu/drm/vmwgfx/Kconfig 2012-11-19 12:05:19.000000000 +0100
+--- sle11sp2.orig/drivers/gpu/drm/vmwgfx/Kconfig 2014-01-13 14:44:04.000000000 +0100
+++ sle11sp2/drivers/gpu/drm/vmwgfx/Kconfig 2011-02-01 14:55:46.000000000 +0100
@@ -1,6 +1,6 @@
config DRM_VMWGFX
@@ -4501,7 +4501,7 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
depends on ACPI
depends on HOTPLUG
default y
---- sle11sp2.orig/drivers/scsi/Kconfig 2012-11-19 12:05:19.000000000 +0100
+--- sle11sp2.orig/drivers/scsi/Kconfig 2014-01-13 14:44:04.000000000 +0100
+++ sle11sp2/drivers/scsi/Kconfig 2011-10-17 11:51:54.000000000 +0200
@@ -661,7 +661,7 @@ config SCSI_FLASHPOINT
@@ -4651,8 +4651,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
#ifdef CONFIG_PM_SLEEP
static void restore_cpu_virqs(unsigned int cpu)
{
---- sle11sp2.orig/drivers/xen/core/spinlock.c 2012-07-30 12:31:26.000000000 +0200
-+++ sle11sp2/drivers/xen/core/spinlock.c 2012-07-30 12:33:57.000000000 +0200
+--- sle11sp2.orig/drivers/xen/core/spinlock.c 2014-01-13 14:49:01.000000000 +0100
++++ sle11sp2/drivers/xen/core/spinlock.c 2014-01-13 14:49:18.000000000 +0100
@@ -16,7 +16,7 @@
#include <xen/evtchn.h>
@@ -4662,7 +4662,7 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
unsigned int ticket;
#if CONFIG_XEN_SPINLOCK_ACQUIRE_NESTING
unsigned int irq_count;
-@@ -99,7 +99,7 @@ static inline void sequence(unsigned int
+@@ -97,7 +97,7 @@ static inline void sequence(void)
static DEFINE_PER_CPU(unsigned int, _irq_count);
static unsigned int spin_adjust(struct spinning *spinning,
@@ -4671,7 +4671,7 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
unsigned int ticket)
{
for (; spinning; spinning = spinning->prev) {
-@@ -125,7 +125,7 @@ static unsigned int spin_adjust(struct s
+@@ -123,7 +123,7 @@ static unsigned int spin_adjust(struct s
return ticket;
}
@@ -4680,7 +4680,7 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
{
token = spin_adjust(percpu_read(_spinning), lock,
token >> TICKET_SHIFT);
-@@ -135,7 +135,7 @@ unsigned int xen_spin_adjust(const raw_s
+@@ -133,7 +133,7 @@ unsigned int xen_spin_adjust(const raw_s
static unsigned int ticket_drop(struct spinning *spinning,
unsigned int ticket, unsigned int cpu)
{
@@ -4689,7 +4689,7 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
unsigned int token;
bool kick;
-@@ -145,7 +145,7 @@ static unsigned int ticket_drop(struct s
+@@ -143,7 +143,7 @@ static unsigned int ticket_drop(struct s
return kick ? (ticket + 1) & ((1 << TICKET_SHIFT) - 1) : -1;
}
@@ -4698,7 +4698,7 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
{
unsigned int token;
bool free;
-@@ -163,7 +163,7 @@ void xen_spin_irq_enter(void)
+@@ -161,7 +161,7 @@ void xen_spin_irq_enter(void)
percpu_add(_irq_count, 1);
smp_mb();
for (; spinning; spinning = spinning->prev) {
@@ -4707,7 +4707,7 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
/*
* Return the ticket if we now own the lock. While just being
-@@ -213,7 +213,7 @@ void xen_spin_irq_exit(void)
+@@ -211,7 +211,7 @@ void xen_spin_irq_exit(void)
* acquiring them.
*/
for (; spinning; spinning = spinning->prev) {
@@ -4716,7 +4716,7 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
if (spinning->irq_count < irq_count)
break;
-@@ -224,7 +224,7 @@ void xen_spin_irq_exit(void)
+@@ -222,7 +222,7 @@ void xen_spin_irq_exit(void)
}
#endif
@@ -4725,7 +4725,7 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
unsigned int flags)
{
typeof(vcpu_info(0)->evtchn_upcall_mask) upcall_mask
-@@ -328,7 +328,7 @@ static inline unsigned int cpumask_cycle
+@@ -326,7 +326,7 @@ static inline unsigned int cpumask_cycle
return nxt;
}
@@ -4734,7 +4734,7 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
{
unsigned int local = raw_smp_processor_id(), start, stop = local, cpu;
---- sle11sp2.orig/drivers/xen/evtchn.c 2011-02-01 14:54:13.000000000 +0100
+--- sle11sp2.orig/drivers/xen/evtchn.c 2013-09-12 13:56:35.000000000 +0200
+++ sle11sp2/drivers/xen/evtchn.c 2011-02-01 14:55:46.000000000 +0100
@@ -48,15 +48,14 @@
#include <linux/mutex.h>
@@ -4874,7 +4874,7 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
#endif /* CONFIG_CPU_FREQ */
---- sle11sp2.orig/include/xen/compat_ioctl.h 2012-11-19 12:05:19.000000000 +0100
+--- sle11sp2.orig/include/xen/compat_ioctl.h 2014-01-13 14:44:04.000000000 +0100
+++ sle11sp2/include/xen/compat_ioctl.h 2011-02-01 14:55:46.000000000 +0100
@@ -29,7 +29,7 @@
#define xen_pfn32_t __u32
@@ -4915,7 +4915,7 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
/*
* Use these to access the event channel underlying the IRQ handle returned
* by bind_*_to_irqhandler().
---- sle11sp2.orig/include/xen/xen.h 2012-11-19 12:05:19.000000000 +0100
+--- sle11sp2.orig/include/xen/xen.h 2014-01-13 14:44:04.000000000 +0100
+++ sle11sp2/include/xen/xen.h 2011-02-01 14:55:46.000000000 +0100
@@ -7,8 +7,10 @@ enum xen_domain_type {
XEN_HVM_DOMAIN, /* running in a Xen hvm domain */
@@ -4956,7 +4956,7 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
static u32 *append_elf_note(u32 *buf, char *name, unsigned type, void *data,
size_t data_len)
---- sle11sp2.orig/kernel/ksysfs.c 2012-11-19 12:05:19.000000000 +0100
+--- sle11sp2.orig/kernel/ksysfs.c 2014-01-13 14:44:04.000000000 +0100
+++ sle11sp2/kernel/ksysfs.c 2011-12-07 12:36:34.000000000 +0100
@@ -106,6 +106,7 @@ static ssize_t kexec_crash_size_show(str
{
diff --git a/patches.xen/xen3-patch-2.6.36 b/patches.xen/xen3-patch-2.6.36
index 48775e45f6..a78b38f391 100644
--- a/patches.xen/xen3-patch-2.6.36
+++ b/patches.xen/xen3-patch-2.6.36
@@ -442,7 +442,7 @@ Automatically created from "patches.kernel.org/patch-2.6.36" by xen-port-patches
/*
* Initialize MSR_IA32_ENERGY_PERF_BIAS if BIOS did not.
---- sle11sp2.orig/arch/x86/kernel/cpu/scattered.c 2013-06-14 14:47:03.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/cpu/scattered.c 2014-01-13 14:44:03.000000000 +0100
+++ sle11sp2/arch/x86/kernel/cpu/scattered.c 2011-02-01 15:04:27.000000000 +0100
@@ -40,6 +40,7 @@ void __cpuinit init_scattered_cpuid_feat
{ X86_FEATURE_EPB, CR_ECX, 3, 0x00000006, 0 },
@@ -808,7 +808,7 @@ Automatically created from "patches.kernel.org/patch-2.6.36" by xen-port-patches
tboot_probe();
#ifdef CONFIG_X86_64
---- sle11sp2.orig/arch/x86/kernel/traps-xen.c 2012-07-30 12:34:20.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/traps-xen.c 2013-12-03 16:32:11.000000000 +0100
+++ sle11sp2/arch/x86/kernel/traps-xen.c 2011-02-01 15:04:27.000000000 +0100
@@ -385,7 +385,13 @@ static notrace __kprobes void default_do
if (notify_die(DIE_NMI_IPI, "nmi_ipi", regs, reason, 2, SIGINT)
@@ -1066,7 +1066,7 @@ Automatically created from "patches.kernel.org/patch-2.6.36" by xen-port-patches
depends on X86_LOCAL_APIC
config XEN_MAX_DOMAIN_MEMORY
---- sle11sp2.orig/arch/x86/xen/enlighten.c 2013-06-14 14:47:03.000000000 +0200
+--- sle11sp2.orig/arch/x86/xen/enlighten.c 2014-01-13 14:44:03.000000000 +0100
+++ sle11sp2/arch/x86/xen/enlighten.c 2013-06-14 15:00:45.000000000 +0200
@@ -116,8 +116,8 @@ static int have_vcpu_info_placement = 1;
static void clamp_max_cpus(void)
@@ -1667,9 +1667,9 @@ Automatically created from "patches.kernel.org/patch-2.6.36" by xen-port-patches
bio = NULL;
}
---- sle11sp2.orig/drivers/xen/usbfront/usbfront-hcd.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2/drivers/xen/usbfront/usbfront-hcd.c 2011-02-01 15:04:27.000000000 +0100
-@@ -86,7 +86,7 @@ static int xenhcd_setup(struct usb_hcd *
+--- sle11sp2.orig/drivers/xen/usbfront/usbfront-hcd.c 2013-12-16 14:47:16.000000000 +0100
++++ sle11sp2/drivers/xen/usbfront/usbfront-hcd.c 2014-01-13 14:49:34.000000000 +0100
+@@ -89,7 +89,7 @@ static int xenhcd_setup(struct usb_hcd *
static int xenhcd_run(struct usb_hcd *hcd)
{
hcd->uses_new_polling = 1;
@@ -2354,7 +2354,7 @@ Automatically created from "patches.kernel.org/patch-2.6.36" by xen-port-patches
{
struct scatterlist *sg;
int i;
---- sle11sp2.orig/lib/vsprintf.c 2013-06-14 14:47:03.000000000 +0200
+--- sle11sp2.orig/lib/vsprintf.c 2014-01-13 14:44:03.000000000 +0100
+++ sle11sp2/lib/vsprintf.c 2012-03-19 11:39:30.000000000 +0100
@@ -900,9 +900,15 @@ char *pointer(const char *fmt, char *buf
case 'U':
diff --git a/patches.xen/xen3-patch-2.6.37 b/patches.xen/xen3-patch-2.6.37
index 7fa8d02c8a..d24553a0c0 100644
--- a/patches.xen/xen3-patch-2.6.37
+++ b/patches.xen/xen3-patch-2.6.37
@@ -92,7 +92,7 @@ Automatically created from "patches.kernel.org/patch-2.6.37" by xen-port-patches
#endif
#endif
---- sle11sp2.orig/arch/x86/include/asm/io.h 2013-12-03 16:29:41.000000000 +0100
+--- sle11sp2.orig/arch/x86/include/asm/io.h 2014-01-13 14:44:03.000000000 +0100
+++ sle11sp2/arch/x86/include/asm/io.h 2011-08-22 10:40:08.000000000 +0200
@@ -344,7 +344,7 @@ extern void early_iounmap(void __iomem *
extern void fixup_early_ioremap(void);
@@ -4005,7 +4005,7 @@ Automatically created from "patches.kernel.org/patch-2.6.37" by xen-port-patches
return 0;
}
---- sle11sp2.orig/arch/x86/kernel/resource.c 2013-12-03 16:29:41.000000000 +0100
+--- sle11sp2.orig/arch/x86/kernel/resource.c 2014-01-13 14:44:03.000000000 +0100
+++ sle11sp2/arch/x86/kernel/resource.c 2011-09-23 14:48:43.000000000 +0200
@@ -1,3 +1,7 @@
+#ifdef CONFIG_XEN
@@ -5596,7 +5596,7 @@ Automatically created from "patches.kernel.org/patch-2.6.37" by xen-port-patches
static unsigned long slot_virt[FIX_BTMAPS_SLOTS] __initdata;
void __init early_ioremap_init(void)
---- sle11sp2.orig/arch/x86/mm/memblock.c 2013-12-03 16:29:41.000000000 +0100
+--- sle11sp2.orig/arch/x86/mm/memblock.c 2014-01-13 14:44:03.000000000 +0100
+++ sle11sp2/arch/x86/mm/memblock.c 2011-04-13 14:05:37.000000000 +0200
@@ -293,6 +293,11 @@ static int __init memblock_x86_find_acti
{
@@ -5767,7 +5767,7 @@ Automatically created from "patches.kernel.org/patch-2.6.37" by xen-port-patches
help
Say Y here if you want the Xen PCI frontend to produce a bunch of debug
messages to the system log. Select this if you are having a
---- sle11sp2.orig/drivers/pci/Makefile 2013-12-03 16:29:41.000000000 +0100
+--- sle11sp2.orig/drivers/pci/Makefile 2014-01-13 14:44:03.000000000 +0100
+++ sle11sp2/drivers/pci/Makefile 2013-10-22 15:15:22.000000000 +0200
@@ -75,6 +75,6 @@ obj-$(CONFIG_PCI_SYSCALL) += syscall.o
@@ -5777,7 +5777,7 @@ Automatically created from "patches.kernel.org/patch-2.6.37" by xen-port-patches
+obj-$(CONFIG_PARAVIRT_XEN_PCIDEV_FRONTEND) += xen-pcifront.o
ccflags-$(CONFIG_PCI_DEBUG) := -DDEBUG
---- sle11sp2.orig/drivers/pci/xen-pcifront.c 2013-12-03 16:29:41.000000000 +0100
+--- sle11sp2.orig/drivers/pci/xen-pcifront.c 2014-01-13 14:44:03.000000000 +0100
+++ sle11sp2/drivers/pci/xen-pcifront.c 2011-11-04 14:58:32.000000000 +0100
@@ -1128,7 +1128,6 @@ static const struct xenbus_device_id xen
@@ -7210,8 +7210,8 @@ Automatically created from "patches.kernel.org/patch-2.6.37" by xen-port-patches
xen_spinlock_cleanup(cpu);
}
---- sle11sp2.orig/drivers/xen/core/spinlock.c 2012-07-30 12:33:57.000000000 +0200
-+++ sle11sp2/drivers/xen/core/spinlock.c 2012-07-30 12:34:31.000000000 +0200
+--- sle11sp2.orig/drivers/xen/core/spinlock.c 2014-01-13 14:49:18.000000000 +0100
++++ sle11sp2/drivers/xen/core/spinlock.c 2014-01-13 14:50:10.000000000 +0100
@@ -24,7 +24,7 @@ struct spinning {
struct spinning *prev;
};
@@ -7221,7 +7221,7 @@ Automatically created from "patches.kernel.org/patch-2.6.37" by xen-port-patches
/*
* Protect removal of objects: Addition can be done lockless, and even
* removal itself doesn't need protection - what needs to be prevented is
-@@ -228,7 +228,7 @@ bool xen_spin_wait(arch_spinlock_t *lock
+@@ -226,7 +226,7 @@ bool xen_spin_wait(arch_spinlock_t *lock
unsigned int flags)
{
typeof(vcpu_info(0)->evtchn_upcall_mask) upcall_mask
@@ -7230,7 +7230,7 @@ Automatically created from "patches.kernel.org/patch-2.6.37" by xen-port-patches
struct spinning spinning;
/* If kicker interrupt not initialized yet, just spin. */
-@@ -252,7 +252,7 @@ bool xen_spin_wait(arch_spinlock_t *lock
+@@ -250,7 +250,7 @@ bool xen_spin_wait(arch_spinlock_t *lock
break;
}
}
@@ -7239,7 +7239,7 @@ Automatically created from "patches.kernel.org/patch-2.6.37" by xen-port-patches
#endif
smp_wmb();
percpu_write(_spinning, &spinning);
-@@ -279,7 +279,7 @@ bool xen_spin_wait(arch_spinlock_t *lock
+@@ -277,7 +277,7 @@ bool xen_spin_wait(arch_spinlock_t *lock
if (upcall_mask > flags) {
spinning.irq_count = percpu_read(_irq_count);
smp_wmb();
@@ -7248,7 +7248,7 @@ Automatically created from "patches.kernel.org/patch-2.6.37" by xen-port-patches
}
#endif
-@@ -288,7 +288,7 @@ bool xen_spin_wait(arch_spinlock_t *lock
+@@ -286,7 +286,7 @@ bool xen_spin_wait(arch_spinlock_t *lock
BUG();
#if CONFIG_XEN_SPINLOCK_ACQUIRE_NESTING
@@ -7257,19 +7257,19 @@ Automatically created from "patches.kernel.org/patch-2.6.37" by xen-port-patches
smp_wmb();
spinning.irq_count = UINT_MAX;
#endif
-@@ -307,9 +307,9 @@ bool xen_spin_wait(arch_spinlock_t *lock
+@@ -305,9 +305,9 @@ bool xen_spin_wait(arch_spinlock_t *lock
/* announce we're done */
percpu_write(_spinning, spinning.prev);
if (!CONFIG_XEN_SPINLOCK_ACQUIRE_NESTING)
- raw_local_irq_disable();
+ arch_local_irq_disable();
- sequence(SEQ_REMOVE_BIAS);
+ sequence();
- raw_local_irq_restore(upcall_mask);
+ arch_local_irq_restore(upcall_mask);
smp_rmb();
if (lock->cur == spinning.ticket)
return true;
-@@ -353,7 +353,7 @@ void xen_spin_kick(arch_spinlock_t *lock
+@@ -351,7 +351,7 @@ void xen_spin_kick(arch_spinlock_t *lock
atomic_t *rm_ctr = NULL;
struct spinning *spinning;
@@ -7278,7 +7278,7 @@ Automatically created from "patches.kernel.org/patch-2.6.37" by xen-port-patches
if (cpu == local)
spinning = percpu_read(_spinning);
else for (;;) {
-@@ -389,7 +389,7 @@ void xen_spin_kick(arch_spinlock_t *lock
+@@ -386,7 +386,7 @@ void xen_spin_kick(arch_spinlock_t *lock
if (rm_ctr)
atomic_dec(rm_ctr);
@@ -7334,7 +7334,7 @@ Automatically created from "patches.kernel.org/patch-2.6.37" by xen-port-patches
try_module_get(THIS_MODULE);
/* Allocate space for the per-instance private data. */
---- sle11sp2.orig/drivers/xen/pci.c 2013-12-03 16:29:41.000000000 +0100
+--- sle11sp2.orig/drivers/xen/pci.c 2014-01-13 14:44:03.000000000 +0100
+++ sle11sp2/drivers/xen/pci.c 2012-05-22 11:51:14.000000000 +0200
@@ -18,34 +18,105 @@
*/
@@ -7606,7 +7606,7 @@ Automatically created from "patches.kernel.org/patch-2.6.37" by xen-port-patches
}
---- sle11sp2.orig/drivers/xen/sfc_netback/ci/tools/platform/linux_kernel.h 2013-12-03 16:29:41.000000000 +0100
+--- sle11sp2.orig/drivers/xen/sfc_netback/ci/tools/platform/linux_kernel.h 2014-01-13 14:44:03.000000000 +0100
+++ sle11sp2/drivers/xen/sfc_netback/ci/tools/platform/linux_kernel.h 2011-02-01 15:09:47.000000000 +0100
@@ -54,7 +54,6 @@
#include <linux/in6.h>
@@ -7732,7 +7732,7 @@ Automatically created from "patches.kernel.org/patch-2.6.37" by xen-port-patches
typedef struct xen_memory_map xen_memory_map_t;
DEFINE_XEN_GUEST_HANDLE(xen_memory_map_t);
---- sle11sp2.orig/include/xen/privcmd.h 2013-12-03 16:29:41.000000000 +0100
+--- sle11sp2.orig/include/xen/privcmd.h 2014-01-13 14:44:03.000000000 +0100
+++ sle11sp2/include/xen/privcmd.h 2011-04-13 14:05:37.000000000 +0200
@@ -1,77 +1,3 @@
-/******************************************************************************
@@ -7825,7 +7825,7 @@ Automatically created from "patches.kernel.org/patch-2.6.37" by xen-port-patches
typedef struct privcmd_hypercall
{
---- sle11sp2.orig/kernel/power/Kconfig 2013-12-03 16:29:41.000000000 +0100
+--- sle11sp2.orig/kernel/power/Kconfig 2014-01-13 14:44:03.000000000 +0100
+++ sle11sp2/kernel/power/Kconfig 2011-06-30 17:18:03.000000000 +0200
@@ -135,7 +135,7 @@ config PM_ADVANCED_DEBUG
diff --git a/patches.xen/xen3-patch-2.6.38 b/patches.xen/xen3-patch-2.6.38
index 0e330336fd..f5842b58bc 100644
--- a/patches.xen/xen3-patch-2.6.38
+++ b/patches.xen/xen3-patch-2.6.38
@@ -2549,8 +2549,17 @@ Automatically created from "patches.kernel.org/patch-2.6.38" by xen-port-patches
preempt_disable();
cpu = smp_processor_id();
--- sle11sp2.orig/drivers/xen/core/spinlock.c 2012-07-30 12:34:31.000000000 +0200
-+++ sle11sp2/drivers/xen/core/spinlock.c 2012-07-30 12:34:47.000000000 +0200
-@@ -197,7 +197,7 @@ void xen_spin_irq_exit(void)
++++ sle11sp2/drivers/xen/core/spinlock.c 2014-01-10 14:03:51.000000000 +0100
+@@ -87,7 +87,7 @@ static inline void sequence(void)
+ unsigned int rm_idx;
+
+ smp_wmb();
+- rm_idx = __get_cpu_var(rm_seq.idx)++ & 1;
++ rm_idx = (this_cpu_inc_return(rm_seq.idx) - 1) & 1;
+ smp_mb();
+ while (percpu_read(rm_seq.ctr[rm_idx].counter))
+ cpu_relax();
+@@ -195,7 +195,7 @@ void xen_spin_irq_exit(void)
* We're guaranteed to see another invocation of xen_spin_irq_enter()
* if any of the tickets need to be dropped again.
*/
diff --git a/patches.xen/xen3-x86-dumpstack-Fix-printk_address-for-direct-addresse.patch b/patches.xen/xen3-x86-dumpstack-Fix-printk_address-for-direct-addresse.patch
index afe1f568cc..f69aeff77d 100644
--- a/patches.xen/xen3-x86-dumpstack-Fix-printk_address-for-direct-addresse.patch
+++ b/patches.xen/xen3-x86-dumpstack-Fix-printk_address-for-direct-addresse.patch
@@ -1,7 +1,6 @@
From: Jiri Slaby <jslaby@suse.cz>
Date: Fri, 25 Oct 2013 15:06:58 +0200
Subject: x86/dumpstack: Fix printk_address for direct addresses
-Git-commit: 5f01c98859073cb512b01d4fad74b5f4e047be0b
Patch-mainline: v3.13-rc1
References: bnc#845621
@@ -52,13 +51,8 @@ Link: http://lkml.kernel.org/r/1382706418-8435-1-git-send-email-jslaby@suse.cz
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Automatically created from "patches.fixes/x86-dumpstack-Fix-printk_address-for-direct-addresse.patch" by xen-port-patches.py
----
- arch/x86/kernel/process_64-xen.c | 2 +-
- arch/x86/mm/fault-xen.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
---- a/arch/x86/kernel/process_64-xen.c
-+++ b/arch/x86/kernel/process_64-xen.c
+--- sle11sp2.orig/arch/x86/kernel/process_64-xen.c 2011-07-01 15:19:35.000000000 +0200
++++ sle11sp2/arch/x86/kernel/process_64-xen.c 2014-01-13 14:53:07.000000000 +0100
@@ -166,7 +166,7 @@ void __show_regs(struct pt_regs *regs, i
show_regs_common();
@@ -68,14 +62,14 @@ Automatically created from "patches.fixes/x86-dumpstack-Fix-printk_address-for-d
printk(KERN_DEFAULT "RSP: %04lx:%016lx EFLAGS: %08lx\n", regs->ss,
regs->sp, regs->flags);
printk(KERN_DEFAULT "RAX: %016lx RBX: %016lx RCX: %016lx\n",
---- a/arch/x86/mm/fault-xen.c
-+++ b/arch/x86/mm/fault-xen.c
-@@ -602,7 +602,7 @@ show_fault_oops(struct pt_regs *regs, un
+--- sle11sp2.orig/arch/x86/mm/fault-xen.c 2013-04-18 14:03:29.000000000 +0200
++++ sle11sp2/arch/x86/mm/fault-xen.c 2014-01-13 14:53:07.000000000 +0100
+@@ -598,7 +598,7 @@ show_fault_oops(struct pt_regs *regs, un
printk(KERN_CONT " at %p\n", (void *) address);
printk(KERN_ALERT "IP:");
- printk_address(regs->ip, 1);
+ printk_address(regs->ip);
- dump_pagetable(address, !(error_code & PF_USER));
+ dump_pagetable(address);
}
diff --git a/series.conf b/series.conf
index ebba4c8065..540a9b276e 100644
--- a/series.conf
+++ b/series.conf
@@ -5217,6 +5217,7 @@
patches.xen/xen3-x86-mcp51-no-dac
patches.xen/xen3-x86-mark_rodata_rw.patch
patches.xen/xen3-x86_amd_interlagos_mem_alignment_perf_improve_2_4.patch
+ patches.xen/xen3-x86-dumpstack-Fix-printk_address-for-direct-addresse.patch
patches.xen/xen3-dev_mem-read-write-beyond-EOF.patch
patches.xen/xen3-xlate_dev_mem_ptr-use-phys_addr_t.patch
patches.xen/xen3-dev_mem-read-write-phys_addr_t.patch
@@ -5288,7 +5289,6 @@
patches.xen/xen-x86_64-dump-user-pgt
patches.xen/xen-x86_64-note-init-p2m
patches.xen/xen-x86_64-unmapped-initrd
- patches.xen/xen3-x86-dumpstack-Fix-printk_address-for-direct-addresse.patch
# adjustments to preserve kABI
patches.kabi/1231-netfront-limit-skblen.patch