Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Bohac <jbohac@suse.cz>2012-08-02 21:27:58 +0200
committerJiri Bohac <jbohac@suse.cz>2012-08-02 21:27:58 +0200
commit124aaa2d6fa98d186e80aa66badb4e6a14925ef2 (patch)
tree094e6cc995179ae4eda29e63894fa6edcc87f10b
parent68389f4fdeeacd30f267591e4857cece7c394cfd (diff)
parent2ce1a6c4be821c5143fcb4f729842cb3f332352e (diff)
Merge branch 'SLE11-SP2' of kerncvs.suse.de:/home/git/kernel-source into SLE11-SP2
-rw-r--r--README31
-rw-r--r--kernel-source.changes31
-rw-r--r--patches.arch/s390-do-not-clobber-personality-flags-on-exec.patch32
-rw-r--r--patches.fixes/kvm-kvmclock-apply-kvmclock-offset-to-guest-wall-clo.patch45
-rw-r--r--patches.suse/dasd-fail-all-requests-after-timeout.patch6
-rw-r--r--patches.suse/md-bitmap-unplug-fixes72
-rw-r--r--patches.xen/xen-clockevents16
-rw-r--r--patches.xen/xen-spinlock-poll-early20
-rw-r--r--patches.xen/xen-sys-suspend8
-rw-r--r--patches.xen/xen3-patch-2.6.1818
-rw-r--r--patches.xen/xen3-patch-2.6.19202
-rw-r--r--patches.xen/xen3-patch-2.6.2516
-rw-r--r--patches.xen/xen3-patch-2.6.2627
-rw-r--r--patches.xen/xen3-patch-2.6.2786
-rw-r--r--patches.xen/xen3-patch-2.6.2857
-rw-r--r--patches.xen/xen3-patch-2.6.2914
-rw-r--r--patches.xen/xen3-patch-2.6.3058
-rw-r--r--patches.xen/xen3-patch-2.6.3132
-rw-r--r--patches.xen/xen3-patch-2.6.3252
-rw-r--r--patches.xen/xen3-patch-2.6.3336
-rw-r--r--patches.xen/xen3-patch-2.6.3412
-rw-r--r--patches.xen/xen3-patch-2.6.3512
-rw-r--r--patches.xen/xen3-patch-2.6.3744
-rw-r--r--patches.xen/xen3-patch-2.6.3842
-rw-r--r--series.conf4
25 files changed, 600 insertions, 373 deletions
diff --git a/README b/README
index 3b324ff1b7..f72325081f 100644
--- a/README
+++ b/README
@@ -75,19 +75,24 @@ what the patch does, who wrote it, and who inside SUSE/Novell we'll
* The patch must include a Patch-mainline: tag that identifies where
the patch came from (for backports from mainline), or when it is
- expected to be added to mainline. The format is
- Patch-mainline: <upstream version>
- or Patch-mainline: Submitted <timestamp - destination>
- or Patch-mainline: <guess followed by a question mark>
- or Patch-mainline: Never <reason>
-
- If applicable, please also include
- Git-commit: <git hash> (there can be more than one if the patch is an
- aggregate of multiple commits)
-
- If the commit is from a maintainer repository or some other repository
- that isn't Linus's:
- Git-repo: <url to git repo>
+ expected to be added to mainline. The format is one of:
+
+ For backports from mainline:
+ Patch-mainline: <upstream version, ex. "v3.5-rc1">
+ Git-commit: <git hash>
+
+ If the commit is from a maintainer repository or some other
+ repository that isn't Linus's:
+ Patch-mainline: Queued in subsystem maintainer repository
+ Git-repo: <url>
+ Git-commit: <git hash>
+
+ If the patch is not upstream, depending on the situation:
+ Patch-mainline: Submitted, <timestamp - destination>
+
+ Patch-mainline: Not yet, <reason>
+
+ Patch-mainline: Never, <reason>
* The patch should include a References: tag that identifies the
Bugzilla bug number, FATE entry, etc. where the patch is discussed.
diff --git a/kernel-source.changes b/kernel-source.changes
index 680fb2caf3..35a56cf496 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -5,6 +5,37 @@ Thu Aug 2 20:50:49 CEST 2012 - jbohac@suse.cz
avoid printk under xtime_lock (bnc#767684).
-------------------------------------------------------------------
+Thu Aug 2 17:59:01 CEST 2012 - hare@suse.de
+
+- patches.suse/dasd-fail-all-requests-after-timeout.patch:
+ Use correct queue for aborting requests.
+
+-------------------------------------------------------------------
+Thu Aug 2 17:47:42 CEST 2012 - brogers@suse.com
+
+- patches.fixes/kvm-kvmclock-apply-kvmclock-offset-to-guest-wall-clo.patch:
+ kvm: kvmclock: apply kvmclock offset to guest wall clock time
+ (bnc#766445).
+
+-------------------------------------------------------------------
+Thu Aug 2 15:43:40 CEST 2012 - jkosina@suse.cz
+
+- patches.arch/s390-do-not-clobber-personality-flags-on-exec.patch:
+ [S390] Do not clobber personality flags on exec (bnc#770034).
+
+-------------------------------------------------------------------
+Thu Aug 2 11:52:53 CEST 2012 - jbeulich@novell.com
+
+- Refresh Xen patches (bnc#772831, add spinlock.nopoll
+ option).
+
+-------------------------------------------------------------------
+Thu Aug 2 03:41:21 CEST 2012 - nfbrown@suse.de
+
+- patches.suse/md-bitmap-unplug-fixes: md/bitmap: Don't write
+ bitmap while earlier writes might be in-fligh (bnc#771398).
+
+-------------------------------------------------------------------
Wed Aug 1 15:07:52 CEST 2012 - hare@suse.de
- patches.suse/dasd-fail-all-requests-after-timeout.patch:
diff --git a/patches.arch/s390-do-not-clobber-personality-flags-on-exec.patch b/patches.arch/s390-do-not-clobber-personality-flags-on-exec.patch
new file mode 100644
index 0000000000..2b6fee63d4
--- /dev/null
+++ b/patches.arch/s390-do-not-clobber-personality-flags-on-exec.patch
@@ -0,0 +1,32 @@
+From: Martin Schwidefsky <schwidefsky@de.ibm.com>
+Subject: [PATCH] [S390] Do not clobber personality flags on exec
+Patch-mainline: f9783ec862ea8ce0071f34a7fd028229d9fd98b4
+References: bnc#770034
+
+Analog to git commit 59e4c3a2fe9cb1681bb2cff508ff79466f7585ba
+do not clear the additional personality flags on exec. We
+need to inherit the personality bits in PER_MASK across exec.
+
+Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
+Acked-by: Jiri Kosina <jkosina@suse.cz>
+---
+ arch/s390/include/asm/elf.h | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
+index 64b61bf..547f1a6 100644
+--- a/arch/s390/include/asm/elf.h
++++ b/arch/s390/include/asm/elf.h
+@@ -188,7 +188,8 @@ extern char elf_platform[];
+ #define SET_PERSONALITY(ex) \
+ do { \
+ if (personality(current->personality) != PER_LINUX32) \
+- set_personality(PER_LINUX); \
++ set_personality(PER_LINUX | \
++ (current->personality & ~PER_MASK)); \
+ if ((ex).e_ident[EI_CLASS] == ELFCLASS32) \
+ set_thread_flag(TIF_31BIT); \
+ else \
+--
+1.7.3.1
+
diff --git a/patches.fixes/kvm-kvmclock-apply-kvmclock-offset-to-guest-wall-clo.patch b/patches.fixes/kvm-kvmclock-apply-kvmclock-offset-to-guest-wall-clo.patch
new file mode 100644
index 0000000000..2b2af215c8
--- /dev/null
+++ b/patches.fixes/kvm-kvmclock-apply-kvmclock-offset-to-guest-wall-clo.patch
@@ -0,0 +1,45 @@
+From: Bruce Rogers <brogers@suse.com>
+Date: Tue, 17 Jul 2012 19:10:30 -0600
+Subject: [PATCH] kvm: kvmclock: apply kvmclock offset to guest wall clock
+ time
+References: bnc#766445
+Patch-Mainline: not yet
+
+When a guest migrates to a new host, the system time difference from the
+previous host is used in the updates to the kvmclock system time visible
+to the guest, resulting in a continuation of correct kvmclock based guest
+timekeeping.
+
+The wall clock component of the kvmclock provided time is currently not
+updated with this same time offset. Since the Linux guest caches the
+wall clock based time, this discrepency is not noticed until the guest is
+rebooted. After reboot the guest's time calculations are off.
+
+This patch adjusts the wall clock by the kvmclock_offset, resulting in
+correct guest time after a reboot.
+
+Cc: Glauber Costa <glommer@redhat.com>
+Cc: Zachary Amsden <zamsden@gmail.com>
+Signed-off-by: Bruce Rogers <brogers@suse.com>
+---
+ arch/x86/kvm/x86.c | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
+index be6d549..14c290d 100644
+--- a/arch/x86/kvm/x86.c
++++ b/arch/x86/kvm/x86.c
+@@ -907,6 +907,10 @@ static void kvm_write_wall_clock(struct kvm *kvm, gpa_t wall_clock)
+ */
+ getboottime(&boot);
+
++ if (kvm->arch.kvmclock_offset) {
++ struct timespec ts = ns_to_timespec(kvm->arch.kvmclock_offset);
++ boot = timespec_sub(boot, ts);
++ }
+ wc.sec = boot.tv_sec;
+ wc.nsec = boot.tv_nsec;
+ wc.version = version;
+--
+1.7.7
+
diff --git a/patches.suse/dasd-fail-all-requests-after-timeout.patch b/patches.suse/dasd-fail-all-requests-after-timeout.patch
index d734f767f5..74b75ca272 100644
--- a/patches.suse/dasd-fail-all-requests-after-timeout.patch
+++ b/patches.suse/dasd-fail-all-requests-after-timeout.patch
@@ -111,8 +111,8 @@ index 9caeaea5..0c7fce5 100644
+ * blk_abort_request() will take care of aborting
+ * all other noretry requests.
+ */
-+ spin_lock(get_ccwdev_lock(base->cdev));
-+ list_for_each_entry_safe(cqr, n, &base->ccw_queue, blocklist) {
++ spin_lock(&block->queue_lock);
++ list_for_each_entry_safe(cqr, n, &block->ccw_queue, blocklist) {
+ if (cqr->callback_data &&
+ cqr->callback_data != (void *)1 &&
+ cqr->callback_data != (void *)2 )
@@ -123,7 +123,7 @@ index 9caeaea5..0c7fce5 100644
+ break;
+ req = NULL;
+ }
-+ spin_unlock(get_ccwdev_lock(base->cdev));
++ spin_unlock(&block->queue_lock);
+ if (req)
+ blk_abort_request(req);
+ spin_unlock_irqrestore(&block->request_queue_lock, flags);
diff --git a/patches.suse/md-bitmap-unplug-fixes b/patches.suse/md-bitmap-unplug-fixes
new file mode 100644
index 0000000000..b0879e0543
--- /dev/null
+++ b/patches.suse/md-bitmap-unplug-fixes
@@ -0,0 +1,72 @@
+From: NeilBrown <neilb@suse.de>
+Subject: md/bitmap: Don't write bitmap while earlier writes might be in-fligh
+Patch-mainline: not yet
+References: bnc#771398
+
+As we don't wait for writes to complete in bitmap_daemon_work, they
+could still be in-flight when bitmap_unplug writes again. Or when
+bitmap_daemon_work tries to write again.
+This can be confusing and could risk the wrong data being written last.
+
+So make sure we wait for old writes to complete before new writes start.
+In bitmap_unplug, always wait if anything is written as that is probably
+always the case anyway.
+
+Signed-off-by: Neil Brown <neilb@suse.de>
+
+---
+ drivers/md/bitmap.c | 25 +++++++++++++++++++++----
+ 1 file changed, 21 insertions(+), 4 deletions(-)
+
+--- linux-3.0-SLE11-SP2-BTMU.orig/drivers/md/bitmap.c
++++ linux-3.0-SLE11-SP2-BTMU/drivers/md/bitmap.c
+@@ -947,7 +947,7 @@ void bitmap_unplug(struct bitmap *bitmap
+ {
+ unsigned long i;
+ int dirty, need_write;
+- int wait = 0;
++ int writing = 0;
+
+ if (!bitmap || !bitmap->storage.filemap ||
+ test_bit(BITMAP_STALE, &bitmap->flags))
+@@ -962,13 +962,23 @@ void bitmap_unplug(struct bitmap *bitmap
+ need_write = test_and_clear_page_attr(bitmap, i,
+ BITMAP_PAGE_NEEDWRITE);
+ if (dirty || need_write) {
++ if (!writing) {
++ /* Need to ensure any prior writes from
++ * bitmap_daemon_work have completed.
++ * We don't want the writes racing.
++ */
++ if (bitmap->storage.file)
++ wait_event(bitmap->write_wait,
++ atomic_read(&bitmap->pending_writes)==0);
++ else
++ md_super_wait(bitmap->mddev);
++ }
+ clear_page_attr(bitmap, i, BITMAP_PAGE_PENDING);
+ write_page(bitmap, bitmap->storage.filemap[i], 0);
++ writing = 1;
+ }
+- if (dirty)
+- wait = 1;
+ }
+- if (wait) { /* if any writes were performed, we need to wait on them */
++ if (writing) { /* if any writes were performed, we need to wait on them */
+ if (bitmap->storage.file)
+ wait_event(bitmap->write_wait,
+ atomic_read(&bitmap->pending_writes)==0);
+@@ -1258,6 +1268,13 @@ void bitmap_daemon_work(mddev_t *mddev)
+ }
+ spin_unlock_irq(&counts->lock);
+
++ /* Make sure any prior writes have completed */
++ if (bitmap->storage.file)
++ wait_event(bitmap->write_wait,
++ atomic_read(&bitmap->pending_writes)==0);
++ else
++ md_super_wait(bitmap->mddev);
++
+ /* Now start writeout on any page in NEEDWRITE that isn't DIRTY.
+ * DIRTY pages need to be written by bitmap_unplug so it can wait
+ * for them.
diff --git a/patches.xen/xen-clockevents b/patches.xen/xen-clockevents
index 5874b19799..839306ff8d 100644
--- a/patches.xen/xen-clockevents
+++ b/patches.xen/xen-clockevents
@@ -990,7 +990,7 @@ Once validated this could be merged into the 2.6.?? patch.
cpu = smp_processor_id();
notify_cpu_starting(cpu);
ipi_call_lock_irq();
---- sle11sp2.orig/drivers/xen/core/spinlock.c 2012-05-29 11:09:55.000000000 +0200
+--- sle11sp2.orig/drivers/xen/core/spinlock.c 2012-07-30 12:44:41.000000000 +0200
+++ sle11sp2/drivers/xen/core/spinlock.c 2012-06-21 13:49:49.000000000 +0200
@@ -13,6 +13,7 @@
#include <linux/kernel.h>
@@ -1022,9 +1022,9 @@ Once validated this could be merged into the 2.6.?? patch.
+#endif
+
+#endif /* __XEN_CPU_CLOCK_H__ */
---- sle11sp2.orig/kernel/sched.c 2012-06-21 13:36:00.000000000 +0200
-+++ sle11sp2/kernel/sched.c 2012-06-21 13:49:56.000000000 +0200
-@@ -3904,6 +3904,58 @@ unsigned long long task_sched_runtime(st
+--- sle11sp2.orig/kernel/sched.c 2012-07-30 12:31:38.000000000 +0200
++++ sle11sp2/kernel/sched.c 2012-07-30 12:44:58.000000000 +0200
+@@ -3909,6 +3909,58 @@ unsigned long long task_sched_runtime(st
return ns;
}
@@ -1083,7 +1083,7 @@ Once validated this could be merged into the 2.6.?? patch.
/*
* Account user cpu time to a process.
* @p: the process that the cpu time gets accounted to
-@@ -3922,7 +3974,7 @@ void account_user_time(struct task_struc
+@@ -3927,7 +3979,7 @@ void account_user_time(struct task_struc
account_group_user_time(p, cputime);
/* Add user time to cpustat. */
@@ -1092,7 +1092,7 @@ Once validated this could be merged into the 2.6.?? patch.
if (TASK_NICE(p) > 0)
cpustat->nice = cputime64_add(cpustat->nice, tmp);
else
-@@ -3974,7 +4026,7 @@ static inline
+@@ -3979,7 +4031,7 @@ static inline
void __account_system_time(struct task_struct *p, cputime_t cputime,
cputime_t cputime_scaled, cputime64_t *target_cputime64)
{
@@ -1101,7 +1101,7 @@ Once validated this could be merged into the 2.6.?? patch.
/* Add system time to process. */
p->stime = cputime_add(p->stime, cputime);
-@@ -4036,7 +4088,7 @@ void account_steal_time(cputime_t cputim
+@@ -4041,7 +4093,7 @@ void account_steal_time(cputime_t cputim
void account_idle_time(cputime_t cputime)
{
struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
@@ -1110,7 +1110,7 @@ Once validated this could be merged into the 2.6.?? patch.
struct rq *rq = this_rq();
if (atomic_read(&rq->nr_iowait) > 0)
-@@ -4073,7 +4125,7 @@ static void irqtime_account_process_tick
+@@ -4078,7 +4130,7 @@ static void irqtime_account_process_tick
struct rq *rq)
{
cputime_t one_jiffy_scaled = cputime_to_scaled(cputime_one_jiffy);
diff --git a/patches.xen/xen-spinlock-poll-early b/patches.xen/xen-spinlock-poll-early
index 50165dcd1d..a022030d5f 100644
--- a/patches.xen/xen-spinlock-poll-early
+++ b/patches.xen/xen-spinlock-poll-early
@@ -160,18 +160,18 @@ only gets introduced in the 2.6.32 merge.
#else
/*
* This differs from the pre-2.6.24 spinlock by always using xchgb
---- sle11sp2.orig/drivers/xen/core/spinlock.c 2012-04-05 12:12:57.000000000 +0200
-+++ sle11sp2/drivers/xen/core/spinlock.c 2012-05-29 11:32:27.000000000 +0200
-@@ -43,6 +43,8 @@ int __cpuinit xen_spinlock_init(unsigned
+--- sle11sp2.orig/drivers/xen/core/spinlock.c 2012-06-21 13:49:49.000000000 +0200
++++ sle11sp2/drivers/xen/core/spinlock.c 2012-07-30 12:45:05.000000000 +0200
+@@ -46,6 +46,8 @@ int __cpuinit xen_spinlock_init(unsigned
struct evtchn_bind_ipi bind_ipi;
int rc;
+ setup_runstate_area(cpu);
+
- WARN_ON(per_cpu(poll_evtchn, cpu));
- bind_ipi.vcpu = cpu;
- rc = HYPERVISOR_event_channel_op(EVTCHNOP_bind_ipi, &bind_ipi);
-@@ -148,6 +150,7 @@ static unsigned int ticket_drop(struct s
+ if (nopoll)
+ return 0;
+
+@@ -156,6 +158,7 @@ static unsigned int ticket_drop(struct s
if (cmpxchg(&spinning->ticket, ticket, -1) != ticket)
return -1;
@@ -179,12 +179,12 @@ only gets introduced in the 2.6.32 merge.
__ticket_spin_unlock_body;
return kick ? (ticket + 1) & ((1 << TICKET_SHIFT) - 1) : -1;
}
-@@ -228,21 +231,24 @@ void xen_spin_irq_exit(void)
+@@ -235,21 +238,24 @@ void xen_spin_irq_exit(void)
if (spinning->ticket + 1)
continue;
spinning->ticket = ticket_get(lock, spinning->prev);
+ if (ACCESS_ONCE(lock->cur) == spinning->ticket)
-+ lock->owner = cpu;
++ lock->owner = raw_smp_processor_id();
}
}
#endif
@@ -209,7 +209,7 @@ only gets introduced in the 2.6.32 merge.
/* announce we're spinning */
spinning.ticket = *ptok >> TICKET_SHIFT;
-@@ -319,12 +325,14 @@ bool xen_spin_wait(arch_spinlock_t *lock
+@@ -326,12 +332,14 @@ bool xen_spin_wait(arch_spinlock_t *lock
sequence(SEQ_REMOVE_BIAS);
arch_local_irq_restore(upcall_mask);
smp_rmb();
diff --git a/patches.xen/xen-sys-suspend b/patches.xen/xen-sys-suspend
index 6d0e0af022..7c2eea6878 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-05-29 11:06:52.000000000 +0200
-+++ sle11sp2/drivers/xen/core/spinlock.c 2012-05-29 11:09:55.000000000 +0200
-@@ -64,7 +64,9 @@ void __cpuinit xen_spinlock_cleanup(unsi
+--- 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
}
#ifdef CONFIG_PM_SLEEP
@@ -455,7 +455,7 @@ Patch-mainline: n/a
{
unsigned int cpu;
-@@ -73,6 +75,18 @@ void __cpuinit spinlock_resume(void)
+@@ -81,6 +83,18 @@ void __cpuinit spinlock_resume(void)
xen_spinlock_init(cpu);
}
}
diff --git a/patches.xen/xen3-patch-2.6.18 b/patches.xen/xen3-patch-2.6.18
index 03af1b6b91..be7913411a 100644
--- a/patches.xen/xen3-patch-2.6.18
+++ b/patches.xen/xen3-patch-2.6.18
@@ -28,7 +28,7 @@ Acked-by: jbeulich@novell.com
-disabled-obj-$(CONFIG_XEN) := i8259_$(BITS).o reboot.o smpboot_$(BITS).o
+disabled-obj-$(CONFIG_XEN) := i8253.o i8259_$(BITS).o reboot.o smpboot_$(BITS).o tsc_$(BITS).o
%/head_$(BITS).o %/head_$(BITS).s: $(if $(CONFIG_XEN),EXTRA_AFLAGS,dummy) :=
---- sle11sp2.orig/arch/x86/kernel/quirks.c 2012-06-21 12:56:33.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/quirks.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/kernel/quirks.c 2011-02-28 15:04:15.000000000 +0100
@@ -6,7 +6,7 @@
@@ -61,7 +61,7 @@ Acked-by: jbeulich@novell.com
}
/* put back the original value for config space*/
---- sle11sp2.orig/arch/x86/kernel/time-xen.c 2012-06-21 12:56:33.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/time-xen.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/kernel/time-xen.c 2011-07-12 11:09:48.000000000 +0200
@@ -45,7 +45,6 @@
#include <linux/sysdev.h>
@@ -394,7 +394,7 @@ Acked-by: jbeulich@novell.com
timer_name[cpu],
NULL);
if (irq < 0)
---- sle11sp2.orig/arch/x86/pci/irq.c 2012-06-21 12:56:33.000000000 +0200
+--- sle11sp2.orig/arch/x86/pci/irq.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/pci/irq.c 2011-08-09 10:33:29.000000000 +0200
@@ -94,13 +94,18 @@ static struct irq_routing_table * __init
u8 *addr;
@@ -417,7 +417,7 @@ Acked-by: jbeulich@novell.com
rt = pirq_check_routing_table(addr);
if (rt)
return rt;
---- sle11sp2.orig/arch/x86/kernel/setup64-xen.c 2012-06-21 12:56:33.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/setup64-xen.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/kernel/setup64-xen.c 2011-01-31 17:02:29.000000000 +0100
@@ -363,5 +363,7 @@ void __cpuinit cpu_init (void)
@@ -445,7 +445,7 @@ Acked-by: jbeulich@novell.com
EXPORT_SYMBOL(acpi_processor_unregister_performance);
+
+#endif /* !CONFIG_PROCESSOR_EXTERNAL_CONTROL */
---- sle11sp2.orig/drivers/xen/console/console.c 2012-06-21 12:56:33.000000000 +0200
+--- sle11sp2.orig/drivers/xen/console/console.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/drivers/xen/console/console.c 2011-01-31 17:02:29.000000000 +0100
@@ -94,7 +94,6 @@ static int __init xencons_setup(char *st
{
@@ -455,7 +455,7 @@ Acked-by: jbeulich@novell.com
console_use_vt = 1;
if (!strncmp(str, "ttyS", 4)) {
---- sle11sp2.orig/arch/x86/include/mach-xen/asm/processor_32.h 2012-06-21 12:56:33.000000000 +0200
+--- sle11sp2.orig/arch/x86/include/mach-xen/asm/processor_32.h 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:02:29.000000000 +0100
@@ -23,7 +23,7 @@
#include <xen/interface/physdev.h>
@@ -475,7 +475,7 @@ Acked-by: jbeulich@novell.com
+#endif
+
+#include_next <asm/time.h>
---- sle11sp2.orig/arch/x86/include/asm/thread_info.h 2012-06-21 12:56:33.000000000 +0200
+--- sle11sp2.orig/arch/x86/include/asm/thread_info.h 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/include/asm/thread_info.h 2011-01-31 17:02:29.000000000 +0100
@@ -144,11 +144,15 @@ struct thread_info {
_TIF_USER_RETURN_NOTIFY)
@@ -493,8 +493,8 @@ Acked-by: jbeulich@novell.com
#define PREEMPT_ACTIVE 0x10000000
---- sle11sp2.orig/kernel/time/timekeeping.c 2012-06-21 12:56:33.000000000 +0200
-+++ sle11sp2/kernel/time/timekeeping.c 2011-12-14 14:28:28.000000000 +0100
+--- sle11sp2.orig/kernel/time/timekeeping.c 2012-07-30 12:13:22.000000000 +0200
++++ sle11sp2/kernel/time/timekeeping.c 2012-07-30 12:24:40.000000000 +0200
@@ -20,6 +20,9 @@
#include <linux/time.h>
#include <linux/tick.h>
diff --git a/patches.xen/xen3-patch-2.6.19 b/patches.xen/xen3-patch-2.6.19
index a701efe6dd..5e1505b1c2 100644
--- a/patches.xen/xen3-patch-2.6.19
+++ b/patches.xen/xen3-patch-2.6.19
@@ -6,7 +6,7 @@ Automatically created from "patches.kernel.org/patch-2.6.19" by xen-port-patches
Acked-by: jbeulich@novell.com
---- sle11sp2.orig/arch/x86/Kconfig 2011-08-22 10:30:56.000000000 +0200
+--- sle11sp2.orig/arch/x86/Kconfig 2012-06-21 13:02:21.000000000 +0200
+++ sle11sp2/arch/x86/Kconfig 2011-06-30 16:02:26.000000000 +0200
@@ -533,6 +533,7 @@ config SCHED_OMIT_FRAME_POINTER
@@ -16,8 +16,8 @@ Acked-by: jbeulich@novell.com
---help---
Say Y here to get to see options related to running Linux under
various hypervisors. This option alone does not add any kernel code.
---- sle11sp2.orig/arch/x86/kernel/acpi/boot.c 2012-05-15 11:16:13.000000000 +0200
-+++ sle11sp2/arch/x86/kernel/acpi/boot.c 2011-04-13 12:23:45.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/acpi/boot.c 2012-07-30 12:13:22.000000000 +0200
++++ sle11sp2/arch/x86/kernel/acpi/boot.c 2012-07-30 12:25:06.000000000 +0200
@@ -70,8 +70,12 @@ int acpi_strict;
u8 acpi_sci_flags __initdata;
@@ -31,7 +31,7 @@ Acked-by: jbeulich@novell.com
int acpi_fix_pin2_polarity __initdata;
#ifdef CONFIG_X86_LOCAL_APIC
-@@ -587,6 +591,7 @@ void __init acpi_set_irq_model_ioapic(vo
+@@ -589,6 +593,7 @@ void __init acpi_set_irq_model_ioapic(vo
#ifdef CONFIG_ACPI_HOTPLUG_CPU
#include <acpi/processor.h>
@@ -39,7 +39,7 @@ Acked-by: jbeulich@novell.com
static void acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)
{
#ifdef CONFIG_ACPI_NUMA
-@@ -672,6 +677,9 @@ free_tmp_map:
+@@ -674,6 +679,9 @@ free_tmp_map:
out:
return retval;
}
@@ -49,7 +49,7 @@ Acked-by: jbeulich@novell.com
/* wrapper to silence section mismatch warning */
int __ref acpi_map_lsapic(acpi_handle handle, int *pcpu)
-@@ -682,9 +690,11 @@ EXPORT_SYMBOL(acpi_map_lsapic);
+@@ -684,9 +692,11 @@ EXPORT_SYMBOL(acpi_map_lsapic);
int acpi_unmap_lsapic(int cpu)
{
@@ -61,7 +61,7 @@ Acked-by: jbeulich@novell.com
return (0);
}
-@@ -1682,7 +1692,7 @@ int __init acpi_mps_check(void)
+@@ -1687,7 +1697,7 @@ int __init acpi_mps_check(void)
return 0;
}
@@ -70,7 +70,7 @@ Acked-by: jbeulich@novell.com
static int __init parse_acpi_skip_timer_override(char *arg)
{
acpi_skip_timer_override = 1;
---- sle11sp2.orig/arch/x86/kernel/apic/apic-xen.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/apic/apic-xen.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/kernel/apic/apic-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -54,7 +54,6 @@ static cpumask_t timer_bcast_ipi;
/*
@@ -112,7 +112,7 @@ Acked-by: jbeulich@novell.com
#endif
}
}
---- sle11sp2.orig/arch/x86/kernel/cpu/common-xen.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/cpu/common-xen.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -43,7 +43,7 @@ struct cpu_dev * cpu_devs[X86_VENDOR_NUM
@@ -177,7 +177,7 @@ Acked-by: jbeulich@novell.com
/* Clear all 6 debug registers: */
set_debugreg(0, 0);
---- sle11sp2.orig/arch/x86/kernel/cpu/mcheck/mce_dom0.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/cpu/mcheck/mce_dom0.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/kernel/cpu/mcheck/mce_dom0.c 2011-08-15 10:44:20.000000000 +0200
@@ -53,8 +53,7 @@ static struct mc_info *g_mi;
@@ -197,7 +197,7 @@ Acked-by: jbeulich@novell.com
+ mce_dom0_interrupt(VIRQ_MCA, NULL);
}
---- sle11sp2.orig/arch/x86/kernel/entry_32-xen.S 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/entry_32-xen.S 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/kernel/entry_32-xen.S 2011-01-31 17:29:16.000000000 +0100
@@ -80,8 +80,12 @@ VM_MASK = 0x00020000
NMI_MASK = 0x80000000
@@ -585,7 +585,7 @@ Acked-by: jbeulich@novell.com
.section .rodata,"a"
#include "syscall_table.S"
---- sle11sp2.orig/arch/x86/kernel/head_32-xen.S 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/head_32-xen.S 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/kernel/head_32-xen.S 2011-08-09 10:35:35.000000000 +0200
@@ -63,7 +63,7 @@ ENTRY(startup_32)
movl %eax,%gs
@@ -596,7 +596,7 @@ Acked-by: jbeulich@novell.com
jmp start_kernel
#define HYPERCALL_PAGE_OFFSET 0x1000
---- sle11sp2.orig/arch/x86/kernel/io_apic_32-xen.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/io_apic_32-xen.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -31,6 +31,9 @@
#include <linux/acpi.h>
@@ -1677,7 +1677,7 @@ Acked-by: jbeulich@novell.com
+ return 0;
+}
+early_param("noapic", parse_noapic);
---- sle11sp2.orig/arch/x86/kernel/ldt_32-xen.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/ldt_32-xen.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/kernel/ldt_32-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -1,5 +1,5 @@
/*
@@ -1686,7 +1686,7 @@ Acked-by: jbeulich@novell.com
*
* Copyright (C) 1992 Krishna Balasubramanian and Linus Torvalds
* Copyright (C) 1999 Ingo Molnar <mingo@redhat.com>
---- sle11sp2.orig/arch/x86/kernel/microcode_core-xen.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/microcode_core-xen.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/kernel/microcode_core-xen.c 2011-12-07 12:20:24.000000000 +0100
@@ -2,6 +2,7 @@
* Intel CPU Microcode Update Driver for Linux
@@ -1823,7 +1823,7 @@ Acked-by: jbeulich@novell.com
module_init(microcode_init)
module_exit(microcode_exit)
-MODULE_ALIAS_MISCDEV(MICROCODE_MINOR);
---- sle11sp2.orig/arch/x86/kernel/mpparse_32-xen.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/mpparse_32-xen.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -30,6 +30,7 @@
#include <asm/io_apic.h>
@@ -1991,7 +1991,7 @@ Acked-by: jbeulich@novell.com
/*
* Mapping between Global System Interrups, which
* represent all possible interrupts, and IRQs
---- sle11sp2.orig/arch/x86/kernel/pci-dma-xen.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/pci-dma-xen.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -110,8 +110,7 @@ dma_map_sg(struct device *hwdev, struct
{
@@ -2051,7 +2051,7 @@ Acked-by: jbeulich@novell.com
if (swiotlb)
swiotlb_unmap_single(dev, dma_addr, size, direction);
else
---- sle11sp2.orig/arch/x86/kernel/process_32-xen.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/process_32-xen.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/kernel/process_32-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -37,6 +37,7 @@
#include <linux/kallsyms.h>
@@ -2142,7 +2142,7 @@ Acked-by: jbeulich@novell.com
sp -= get_random_int() % 8192;
return sp & ~0xf;
}
---- sle11sp2.orig/arch/x86/kernel/setup_32-xen.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/setup_32-xen.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/kernel/setup_32-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -56,6 +56,7 @@
#include <asm/apic.h>
@@ -2718,7 +2718,7 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_ACPI
acpi_boot_init();
---- sle11sp2.orig/arch/x86/kernel/smp_32-xen.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/smp_32-xen.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -279,8 +279,7 @@ static inline void leave_mm (unsigned lo
* 2) Leave the mm if we are in the lazy tlb mode.
@@ -2819,7 +2819,7 @@ Acked-by: jbeulich@novell.com
+ return 0;
+}
+EXPORT_SYMBOL(smp_call_function_single);
---- sle11sp2.orig/arch/x86/kernel/step.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/step.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/kernel/step.c 2011-07-26 09:25:41.000000000 +0200
@@ -74,7 +74,11 @@ static int is_setting_trap_flag(struct t
@@ -3018,7 +3018,7 @@ Acked-by: jbeulich@novell.com
if ((hpet_enable() >= 0) && hpet_use_timer) {
printk("Using HPET for base-timer\n");
---- sle11sp2.orig/arch/x86/kernel/traps_32-xen.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/traps_32-xen.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -28,6 +28,7 @@
#include <linux/kprobes.h>
@@ -3466,7 +3466,7 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_KPROBES
fastcall void __kprobes do_int3(struct pt_regs *regs, long error_code)
{
---- sle11sp2.orig/arch/x86/mach-xen/setup.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/mach-xen/setup.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/mach-xen/setup.c 2011-08-09 10:35:06.000000000 +0200
@@ -102,8 +102,10 @@ void __init pre_setup_arch_hook(void)
@@ -3481,7 +3481,7 @@ Acked-by: jbeulich@novell.com
if (HYPERVISOR_memory_op(XENMEM_machphys_mapping, &mapping) == 0) {
machine_to_phys_mapping = (unsigned long *)mapping.v_start;
---- sle11sp2.orig/arch/x86/mm/fault_32-xen.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/mm/fault_32-xen.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/mm/fault_32-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -27,21 +27,24 @@
#include <asm/uaccess.h>
@@ -3569,7 +3569,7 @@ Acked-by: jbeulich@novell.com
yield();
down_read(&mm->mmap_sem);
goto survive;
---- sle11sp2.orig/arch/x86/mm/highmem_32-xen.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/mm/highmem_32-xen.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -38,11 +38,9 @@ static void *__kmap_atomic(struct page *
@@ -3637,7 +3637,7 @@ Acked-by: jbeulich@novell.com
return (void*) vaddr;
}
---- sle11sp2.orig/arch/x86/mm/hypervisor.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/mm/hypervisor.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/mm/hypervisor.c 2011-11-14 12:37:07.000000000 +0100
@@ -31,6 +31,7 @@
*/
@@ -3974,7 +3974,7 @@ Acked-by: jbeulich@novell.com
if (++i == MAX_BATCHED_FULL_PTES) {
if ((rc = HYPERVISOR_mmu_update(
&u[0], i, NULL, DOMID_SELF)) != 0)
---- sle11sp2.orig/arch/x86/mm/init_32-xen.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/mm/init_32-xen.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/mm/init_32-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -313,8 +313,7 @@ static void __init permanent_kmaps_init(
static void __meminit free_new_highpage(struct page *page, int pfn)
@@ -4154,7 +4154,7 @@ Acked-by: jbeulich@novell.com
unsigned long start_pfn = start >> PAGE_SHIFT;
unsigned long nr_pages = size >> PAGE_SHIFT;
---- sle11sp2.orig/arch/x86/mm/ioremap-xen.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/mm/ioremap-xen.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/mm/ioremap-xen.c 2011-02-07 15:37:37.000000000 +0100
@@ -12,7 +12,7 @@
#include <linux/init.h>
@@ -4203,7 +4203,7 @@ Acked-by: jbeulich@novell.com
vunmap((void __force *) addr);
return NULL;
}
---- sle11sp2.orig/arch/x86/mm/pgtable_32-xen.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/mm/pgtable_32-xen.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -68,7 +68,9 @@ void show_mem(void)
printk(KERN_INFO "%lu pages writeback\n",
@@ -4260,7 +4260,7 @@ Acked-by: jbeulich@novell.com
}
pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
---- sle11sp2.orig/arch/x86/ia32/ia32entry-xen.S 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/ia32/ia32entry-xen.S 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:29:16.000000000 +0100
@@ -83,6 +83,7 @@
*/
@@ -4331,7 +4331,7 @@ Acked-by: jbeulich@novell.com
+ smpboot_$(BITS).o tsc_$(BITS).o
+disabled-obj-$(CONFIG_XEN_UNPRIVILEGED_GUEST) += mpparse_64.o
%/head_$(BITS).o %/head_$(BITS).s: $(if $(CONFIG_XEN),EXTRA_AFLAGS,dummy) :=
---- sle11sp2.orig/arch/x86/kernel/e820_64-xen.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/e820_64-xen.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -16,6 +16,7 @@
#include <linux/string.h>
@@ -4824,7 +4824,7 @@ Acked-by: jbeulich@novell.com
}
unsigned long pci_mem_start = 0xaeedbabe;
---- sle11sp2.orig/arch/x86/kernel/early_printk-xen.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/early_printk-xen.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -244,20 +244,16 @@ void early_printk(const char *fmt, ...)
@@ -4872,7 +4872,7 @@ Acked-by: jbeulich@novell.com
}
-__setup("earlyprintk=", setup_early_printk);
---- sle11sp2.orig/arch/x86/kernel/entry_64-xen.S 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/entry_64-xen.S 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/kernel/entry_64-xen.S 2011-10-06 11:52:27.000000000 +0200
@@ -4,9 +4,6 @@
* Copyright (C) 1991, 1992 Linus Torvalds
@@ -5116,7 +5116,7 @@ Acked-by: jbeulich@novell.com
ENTRY(alignment_check)
errorentry do_alignment_check
---- sle11sp2.orig/arch/x86/kernel/head_64-xen.S 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/head_64-xen.S 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/kernel/head_64-xen.S 2011-08-09 10:35:37.000000000 +0200
@@ -5,9 +5,6 @@
* Copyright (C) 2000 Pavel Machek <pavel@suse.cz>
@@ -5137,7 +5137,7 @@ Acked-by: jbeulich@novell.com
gdt_end:
/* asm/segment.h:GDT_ENTRIES must match this */
/* This should be a multiple of the cache line size */
---- sle11sp2.orig/arch/x86/kernel/head64-xen.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/head64-xen.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/kernel/head64-xen.c 2011-08-09 10:35:40.000000000 +0200
@@ -7,6 +7,9 @@
* Modified for Xen.
@@ -5230,7 +5230,7 @@ Acked-by: jbeulich@novell.com
- setup_boot_cpu_data();
start_kernel();
}
---- sle11sp2.orig/arch/x86/kernel/io_apic_64-xen.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/io_apic_64-xen.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -26,9 +26,12 @@
#include <linux/delay.h>
@@ -6931,7 +6931,7 @@ Acked-by: jbeulich@novell.com
spin_unlock_irqrestore(&ioapic_lock, flags);
return 0;
---- sle11sp2.orig/arch/x86/kernel/ioport_64-xen.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/ioport_64-xen.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/kernel/ioport_64-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -58,6 +58,7 @@ asmlinkage long sys_ioperm(unsigned long
@@ -6941,7 +6941,7 @@ Acked-by: jbeulich@novell.com
set_xen_guest_handle(set_iobitmap.bitmap, (char *)bitmap);
set_iobitmap.nr_ports = IO_BITMAP_BITS;
---- sle11sp2.orig/arch/x86/kernel/mpparse_64-xen.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/mpparse_64-xen.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -41,8 +41,7 @@ int acpi_found_madt;
* Various Linux-internal data structures created from the
@@ -7556,7 +7556,7 @@ Acked-by: jbeulich@novell.com
-
-#endif /*CONFIG_X86_IO_APIC*/
#endif /*CONFIG_ACPI*/
---- sle11sp2.orig/arch/x86/kernel/process_64-xen.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/process_64-xen.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/kernel/process_64-xen.c 2011-02-02 08:30:50.000000000 +0100
@@ -88,25 +88,24 @@ void idle_notifier_unregister(struct not
}
@@ -7764,7 +7764,7 @@ Acked-by: jbeulich@novell.com
sp -= get_random_int() % 8192;
return sp & ~0xf;
}
---- sle11sp2.orig/arch/x86/kernel/setup_64-xen.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/setup_64-xen.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -88,9 +88,6 @@ extern struct edid_info edid_info;
shared_info_t *HYPERVISOR_shared_info = (shared_info_t *)empty_zero_page;
@@ -8297,7 +8297,7 @@ Acked-by: jbeulich@novell.com
orig_ist->ist[v] = t->ist[v] = (unsigned long)estacks;
}
---- sle11sp2.orig/arch/x86/kernel/smp_64-xen.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/smp_64-xen.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -381,9 +381,8 @@ int smp_call_function_single (int cpu, v
/* prevent preemption and reschedule on another processor */
@@ -8360,7 +8360,7 @@ Acked-by: jbeulich@novell.com
- return 0; /* Should not happen */
-#endif
-}
---- sle11sp2.orig/arch/x86/kernel/traps_64-xen.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/traps_64-xen.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -23,6 +23,7 @@
#include <linux/delay.h>
@@ -8817,7 +8817,7 @@ Acked-by: jbeulich@novell.com
-__setup("call_trace=", call_trace_setup);
+early_param("call_trace", call_trace_setup);
#endif
---- sle11sp2.orig/arch/x86/kernel/vsyscall_64-xen.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/vsyscall_64-xen.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -26,6 +26,10 @@
#include <linux/seqlock.h>
@@ -9129,7 +9129,7 @@ Acked-by: jbeulich@novell.com
+ .byte .Lfinal - memset
+ .byte 2b - 1b
.previous
---- sle11sp2.orig/arch/x86/mm/fault_64-xen.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/mm/fault_64-xen.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/mm/fault_64-xen.c 2011-07-26 09:24:01.000000000 +0200
@@ -40,8 +40,7 @@
#define PF_RSVD (1<<3)
@@ -9268,7 +9268,7 @@ Acked-by: jbeulich@novell.com
pgd_page_table(unlock, page);
}
spin_unlock(&pgd_lock);
---- sle11sp2.orig/arch/x86/mm/init_64-xen.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/mm/init_64-xen.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/mm/init_64-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -61,8 +61,6 @@ EXPORT_SYMBOL(__kernel_page_user);
@@ -9582,7 +9582,7 @@ Acked-by: jbeulich@novell.com
}
int kern_addr_valid(unsigned long addr)
---- sle11sp2.orig/arch/x86/mm/pageattr_64-xen.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/mm/pageattr_64-xen.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -377,8 +377,8 @@ static void revert_page(unsigned long ad
BUG_ON(pud_none(*pud));
@@ -9669,7 +9669,7 @@ Acked-by: jbeulich@novell.com
{
struct tpm_private *tp = tpm_priv;
unsigned long flags;
---- sle11sp2.orig/drivers/pci/Kconfig 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/drivers/pci/Kconfig 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/drivers/pci/Kconfig 2011-01-31 17:29:16.000000000 +0100
@@ -86,7 +86,7 @@ config XEN_PCIDEV_FE_DEBUG
config HT_IRQ
@@ -9680,7 +9680,7 @@ Acked-by: jbeulich@novell.com
help
This allows native hypertransport devices to use interrupts.
---- sle11sp2.orig/drivers/pci/msi-xen.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/drivers/pci/msi-xen.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/drivers/pci/msi-xen.c 2011-10-17 11:20:03.000000000 +0200
@@ -6,6 +6,7 @@
* Copyright (C) Tom Long Nguyen (tom.l.nguyen@intel.com)
@@ -9926,7 +9926,7 @@ Acked-by: jbeulich@novell.com
config NO_IDLE_HZ
def_bool y
---- sle11sp2.orig/drivers/xen/balloon/balloon.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/drivers/xen/balloon/balloon.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/drivers/xen/balloon/balloon.c 2011-03-23 08:48:06.000000000 +0100
@@ -37,6 +37,7 @@
#include <linux/sched.h>
@@ -10221,7 +10221,7 @@ Acked-by: jbeulich@novell.com
{
blkif_notify_work(dev_id);
return IRQ_HANDLED;
---- sle11sp2.orig/drivers/xen/blktap/common.h 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/drivers/xen/blktap/common.h 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/drivers/xen/blktap/common.h 2011-11-22 11:21:38.000000000 +0100
@@ -104,7 +104,7 @@ void tap_blkif_interface_init(void);
@@ -10369,7 +10369,7 @@ Acked-by: jbeulich@novell.com
.open = xencons_open,
.close = xencons_close,
.write = xencons_write,
---- sle11sp2.orig/drivers/xen/console/xencons_ring.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/drivers/xen/console/xencons_ring.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/drivers/xen/console/xencons_ring.c 2011-01-31 17:29:16.000000000 +0100
@@ -83,7 +83,7 @@ int xencons_ring_send(const char *data,
return sent;
@@ -10389,7 +10389,7 @@ Acked-by: jbeulich@novell.com
cons++;
}
---- sle11sp2.orig/drivers/xen/core/evtchn.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/drivers/xen/core/evtchn.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/drivers/xen/core/evtchn.c 2011-01-31 17:29:16.000000000 +0100
@@ -539,7 +539,7 @@ static void unbind_from_irq(unsigned int
@@ -10689,7 +10689,7 @@ Acked-by: jbeulich@novell.com
*pagep = new_page;
SetPageForeign(page, gnttab_page_free);
---- sle11sp2.orig/drivers/xen/core/reboot.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/drivers/xen/core/reboot.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/drivers/xen/core/reboot.c 2011-01-31 17:29:16.000000000 +0100
@@ -1,4 +1,3 @@
-#define __KERNEL_SYSCALLS__
@@ -10744,7 +10744,7 @@ Acked-by: jbeulich@novell.com
#endif
void __init prefill_possible_map(void)
---- sle11sp2.orig/drivers/xen/fbfront/xenfb.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/drivers/xen/fbfront/xenfb.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/drivers/xen/fbfront/xenfb.c 2011-01-31 17:29:16.000000000 +0100
@@ -524,8 +524,7 @@ static struct fb_ops xenfb_fb_ops = {
.fb_set_par = xenfb_set_par,
@@ -10756,7 +10756,7 @@ Acked-by: jbeulich@novell.com
{
/*
* No in events recognized, simply ignore them all.
---- sle11sp2.orig/drivers/xen/fbfront/xenkbd.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/drivers/xen/fbfront/xenkbd.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/drivers/xen/fbfront/xenkbd.c 2011-01-31 17:29:16.000000000 +0100
@@ -46,7 +46,7 @@ static void xenkbd_disconnect_backend(st
* to do that.
@@ -10808,7 +10808,7 @@ Acked-by: jbeulich@novell.com
}
return copy;
---- sle11sp2.orig/drivers/xen/netback/accel.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/drivers/xen/netback/accel.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/drivers/xen/netback/accel.c 2011-01-31 17:29:16.000000000 +0100
@@ -65,7 +65,7 @@ static int match_accelerator(struct xenb
@@ -10838,7 +10838,7 @@ Acked-by: jbeulich@novell.com
static inline int netbk_can_queue(struct net_device *dev)
{
---- sle11sp2.orig/drivers/xen/netback/interface.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/drivers/xen/netback/interface.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/drivers/xen/netback/interface.c 2011-10-17 11:19:52.000000000 +0200
@@ -173,6 +173,7 @@ static const struct netif_stat {
u16 offset;
@@ -10848,7 +10848,7 @@ Acked-by: jbeulich@novell.com
};
static int netbk_get_stats_count(struct net_device *dev)
---- sle11sp2.orig/drivers/xen/netback/loopback.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/drivers/xen/netback/loopback.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/drivers/xen/netback/loopback.c 2011-01-31 17:29:16.000000000 +0100
@@ -152,16 +152,6 @@ static int loopback_start_xmit(struct sk
np->stats.rx_bytes += skb->len;
@@ -10867,7 +10867,7 @@ Acked-by: jbeulich@novell.com
skb->pkt_type = PACKET_HOST; /* overridden by eth_type_trans() */
skb->protocol = eth_type_trans(skb, dev);
skb->dev = dev;
---- sle11sp2.orig/drivers/xen/netback/netback.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/drivers/xen/netback/netback.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/drivers/xen/netback/netback.c 2011-04-11 14:28:01.000000000 +0200
@@ -41,6 +41,7 @@
#include <xen/evtchn.h>
@@ -11099,7 +11099,7 @@ Acked-by: jbeulich@novell.com
};
#ifdef CONFIG_SYSFS
---- sle11sp2.orig/drivers/xen/netfront/netfront.h 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/drivers/xen/netfront/netfront.h 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/drivers/xen/netfront/netfront.h 2011-02-09 15:35:17.000000000 +0100
@@ -150,6 +150,7 @@ struct netfront_info {
struct net_device *netdev;
@@ -11109,7 +11109,7 @@ Acked-by: jbeulich@novell.com
struct netif_tx_front_ring tx;
struct netif_rx_front_ring rx;
---- sle11sp2.orig/drivers/xen/pciback/pciback.h 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/drivers/xen/pciback/pciback.h 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/drivers/xen/pciback/pciback.h 2011-01-31 17:29:16.000000000 +0100
@@ -99,7 +99,7 @@ int pciback_publish_pci_roots(struct pci
void pciback_release_devices(struct pciback_device *pdev);
@@ -11120,7 +11120,7 @@ Acked-by: jbeulich@novell.com
void pciback_do_op(void *data);
int pciback_xenbus_register(void);
---- sle11sp2.orig/drivers/xen/pciback/pciback_ops.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/drivers/xen/pciback/pciback_ops.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/drivers/xen/pciback/pciback_ops.c 2011-02-17 10:07:33.000000000 +0100
@@ -132,7 +132,7 @@ void pciback_do_op(void *data)
test_and_schedule_op(pdev);
@@ -11131,7 +11131,7 @@ Acked-by: jbeulich@novell.com
{
struct pciback_device *pdev = dev_id;
---- sle11sp2.orig/drivers/xen/pcifront/pcifront.h 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/drivers/xen/pcifront/pcifront.h 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/drivers/xen/pcifront/pcifront.h 2011-01-31 17:29:16.000000000 +0100
@@ -51,6 +51,6 @@ void pcifront_free_roots(struct pcifront
@@ -11141,7 +11141,7 @@ Acked-by: jbeulich@novell.com
+irqreturn_t pcifront_handler_aer(int irq, void *dev);
#endif /* __XEN_PCIFRONT_H__ */
---- sle11sp2.orig/drivers/xen/pcifront/pci_op.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/drivers/xen/pcifront/pci_op.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/drivers/xen/pcifront/pci_op.c 2011-11-22 11:21:50.000000000 +0100
@@ -661,7 +661,7 @@ void pcifront_do_aer(void *data)
@@ -11152,7 +11152,7 @@ Acked-by: jbeulich@novell.com
{
struct pcifront_device *pdev = dev;
schedule_pcifront_aer_op(pdev);
---- sle11sp2.orig/drivers/xen/privcmd/compat_privcmd.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/drivers/xen/privcmd/compat_privcmd.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/drivers/xen/privcmd/compat_privcmd.c 2011-01-31 17:29:16.000000000 +0100
@@ -18,7 +18,6 @@
* Authors: Jimi Xenidis <jimix@watson.ibm.com>
@@ -11162,7 +11162,7 @@ Acked-by: jbeulich@novell.com
#include <linux/compat.h>
#include <linux/ioctl.h>
#include <linux/syscalls.h>
---- sle11sp2.orig/drivers/xen/privcmd/privcmd.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/drivers/xen/privcmd/privcmd.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/drivers/xen/privcmd/privcmd.c 2011-01-31 17:29:16.000000000 +0100
@@ -71,43 +71,16 @@ static long privcmd_ioctl(struct file *f
if (copy_from_user(&hypercall, udata, sizeof(hypercall)))
@@ -11224,7 +11224,7 @@ Acked-by: jbeulich@novell.com
vma->vm_ops = &privcmd_vm_ops;
vma->vm_private_data = NULL;
---- sle11sp2.orig/drivers/xen/scsiback/common.h 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/drivers/xen/scsiback/common.h 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/drivers/xen/scsiback/common.h 2011-11-22 11:21:56.000000000 +0100
@@ -137,7 +137,7 @@ typedef struct {
@@ -11235,7 +11235,7 @@ Acked-by: jbeulich@novell.com
int scsiback_init_sring(struct vscsibk_info *, grant_ref_t, evtchn_port_t);
int scsiback_schedule(void *data);
---- sle11sp2.orig/drivers/xen/scsiback/scsiback.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/drivers/xen/scsiback/scsiback.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/drivers/xen/scsiback/scsiback.c 2011-04-11 14:27:51.000000000 +0200
@@ -461,7 +461,7 @@ void scsiback_cmd_exec(pending_req_t *pe
write = (data_dir == DMA_TO_DEVICE);
@@ -11255,7 +11255,7 @@ Acked-by: jbeulich@novell.com
{
scsiback_notify_work((struct vscsibk_info *)dev_id);
return IRQ_HANDLED;
---- sle11sp2.orig/drivers/xen/scsifront/common.h 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/drivers/xen/scsifront/common.h 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/drivers/xen/scsifront/common.h 2011-01-31 17:29:16.000000000 +0100
@@ -128,7 +128,7 @@ struct vscsifrnt_info {
int scsifront_xenbus_init(void);
@@ -11266,7 +11266,7 @@ Acked-by: jbeulich@novell.com
int scsifront_cmd_done(struct vscsifrnt_info *info);
---- sle11sp2.orig/drivers/xen/scsifront/scsifront.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/drivers/xen/scsifront/scsifront.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/drivers/xen/scsifront/scsifront.c 2011-01-31 17:29:16.000000000 +0100
@@ -100,7 +100,7 @@ static void scsifront_do_request(struct
notify_remote_via_irq(irq);
@@ -11277,7 +11277,7 @@ Acked-by: jbeulich@novell.com
{
scsifront_notify_work((struct vscsifrnt_info *)dev_id);
return IRQ_HANDLED;
---- sle11sp2.orig/drivers/xen/sfc_netback/accel_xenbus.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/drivers/xen/sfc_netback/accel_xenbus.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/drivers/xen/sfc_netback/accel_xenbus.c 2011-01-31 17:29:16.000000000 +0100
@@ -69,8 +69,7 @@ static void unlink_bend(struct netback_a
@@ -11299,7 +11299,7 @@ Acked-by: jbeulich@novell.com
{
VPRINTK("netirq %d from device %s\n", irq,
((struct xenbus_device *)context)->nodename);
---- sle11sp2.orig/drivers/xen/sfc_netfront/accel.h 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/drivers/xen/sfc_netfront/accel.h 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/drivers/xen/sfc_netfront/accel.h 2011-01-31 17:29:16.000000000 +0100
@@ -467,10 +467,8 @@ void netfront_accel_msg_tx_fastpath(netf
u32 ip, u16 port, u8 protocol);
@@ -11314,7 +11314,7 @@ Acked-by: jbeulich@novell.com
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
extern void netfront_accel_msg_from_bend(struct work_struct *context);
---- sle11sp2.orig/drivers/xen/sfc_netfront/accel_msg.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/drivers/xen/sfc_netfront/accel_msg.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/drivers/xen/sfc_netfront/accel_msg.c 2011-01-31 17:29:16.000000000 +0100
@@ -488,8 +488,7 @@ void netfront_accel_msg_from_bend(void *
}
@@ -11336,7 +11336,7 @@ Acked-by: jbeulich@novell.com
{
netfront_accel_vnic *vnic = (netfront_accel_vnic *)context;
struct net_device *net_dev = vnic->net_dev;
---- sle11sp2.orig/drivers/xen/sfc_netfront/accel_tso.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/drivers/xen/sfc_netfront/accel_tso.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/drivers/xen/sfc_netfront/accel_tso.c 2011-01-31 17:29:16.000000000 +0100
@@ -363,7 +363,7 @@ int netfront_accel_enqueue_skb_tso(netfr
@@ -11347,7 +11347,7 @@ Acked-by: jbeulich@novell.com
EPRINTK("Trying to TSO send a packet without HW checksum\n");
tso_start(&state, skb);
---- sle11sp2.orig/drivers/xen/sfc_netfront/accel_vi.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/drivers/xen/sfc_netfront/accel_vi.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 16:03:00.000000000 +0200
@@ -463,7 +463,7 @@ netfront_accel_enqueue_skb_multi(netfron
@@ -11367,7 +11367,7 @@ Acked-by: jbeulich@novell.com
/* Set to zero to encourage falcon to work it out for us */
*(u16*)(skb->h.raw + skb->csum) = 0;
}
---- sle11sp2.orig/drivers/xen/tpmback/common.h 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/drivers/xen/tpmback/common.h 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/drivers/xen/tpmback/common.h 2011-11-22 11:22:04.000000000 +0100
@@ -70,7 +70,7 @@ void tpmif_deschedule_work(tpmif_t * tpm
void tpmif_xenbus_init(void);
@@ -11378,7 +11378,7 @@ Acked-by: jbeulich@novell.com
long int tpmback_get_instance(struct backend_info *bi);
---- sle11sp2.orig/drivers/xen/tpmback/tpmback.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/drivers/xen/tpmback/tpmback.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/drivers/xen/tpmback/tpmback.c 2011-01-31 17:29:16.000000000 +0100
@@ -497,7 +497,7 @@ static ssize_t vtpm_op_read(struct file
list_del(&pak->next);
@@ -11398,7 +11398,7 @@ Acked-by: jbeulich@novell.com
{
tpmif_t *tpmif = (tpmif_t *) dev_id;
---- sle11sp2.orig/drivers/xen/usbback/usbback.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/drivers/xen/usbback/usbback.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/drivers/xen/usbback/usbback.c 2011-04-11 14:27:33.000000000 +0200
@@ -290,7 +290,7 @@ static void usbbk_notify_work(usbif_t *u
wake_up(&usbif->wq);
@@ -11418,7 +11418,7 @@ Acked-by: jbeulich@novell.com
{
pending_req_t *pending_req = (pending_req_t *)urb->context;
---- sle11sp2.orig/drivers/xen/usbback/usbback.h 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/drivers/xen/usbback/usbback.h 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/drivers/xen/usbback/usbback.h 2011-04-11 14:27:35.000000000 +0200
@@ -151,7 +151,7 @@ int portid_add(const char *busid,
int portid_remove(const domid_t domid,
@@ -11458,7 +11458,7 @@ Acked-by: jbeulich@novell.com
&driver_attr_port_ids);
usb_deregister(&usbback_usb_driver);
}
---- sle11sp2.orig/drivers/xen/usbfront/usbfront.h 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/drivers/xen/usbfront/usbfront.h 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/drivers/xen/usbfront/usbfront.h 2011-01-31 17:29:16.000000000 +0100
@@ -195,7 +195,7 @@ timer_action(struct usbfront_info *info,
extern struct kmem_cache *xenhcd_urbp_cachep;
@@ -11469,7 +11469,7 @@ Acked-by: jbeulich@novell.com
void xenhcd_rhport_state_change(struct usbfront_info *info,
int port, enum usb_device_speed speed);
int xenhcd_schedule(void *arg);
---- sle11sp2.orig/drivers/xen/usbfront/usbfront-dbg.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/drivers/xen/usbfront/usbfront-dbg.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/drivers/xen/usbfront/usbfront-dbg.c 2011-01-31 17:29:16.000000000 +0100
@@ -90,7 +90,9 @@ static CLASS_DEVICE_ATTR(statistics, S_I
static inline void create_debug_file(struct usbfront_info *info)
@@ -11482,7 +11482,7 @@ Acked-by: jbeulich@novell.com
}
static inline void remove_debug_file(struct usbfront_info *info)
---- sle11sp2.orig/drivers/xen/usbfront/usbfront-q.c 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/drivers/xen/usbfront/usbfront-q.c 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/drivers/xen/usbfront/usbfront-q.c 2011-01-31 17:29:16.000000000 +0100
@@ -236,7 +236,7 @@ __acquires(info->lock)
COUNT(info->stats.complete);
@@ -11536,7 +11536,7 @@ Acked-by: jbeulich@novell.com
#endif
#ifndef __HAVE_ARCH_PMDP_SPLITTING_FLUSH
---- sle11sp2.orig/arch/x86/include/mach-xen/asm/desc_32.h 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/include/mach-xen/asm/desc_32.h 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:29:16.000000000 +0100
@@ -32,52 +32,110 @@ static inline struct desc_struct *get_cp
return (struct desc_struct *)per_cpu(cpu_gdt_descr, cpu).address;
@@ -11698,7 +11698,7 @@ Acked-by: jbeulich@novell.com
static inline void clear_LDT(void)
{
int cpu = get_cpu();
---- sle11sp2.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:29:16.000000000 +0100
@@ -55,7 +55,7 @@ enum fixed_addresses {
#ifdef CONFIG_X86_LOCAL_APIC
@@ -11721,7 +11721,7 @@ Acked-by: jbeulich@novell.com
#define set_fixmap(idx, phys) \
__set_fixmap(idx, phys, PAGE_KERNEL)
---- sle11sp2.orig/arch/x86/include/mach-xen/asm/hypercall_32.h 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/include/mach-xen/asm/hypercall_32.h 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/include/mach-xen/asm/hypercall_32.h 2011-01-31 17:29:16.000000000 +0100
@@ -128,6 +128,23 @@
__res; \
@@ -11793,7 +11793,7 @@ Acked-by: jbeulich@novell.com
return _hypercall3(int, grant_table_op, cmd, uop, count);
}
---- sle11sp2.orig/arch/x86/include/mach-xen/asm/hypercall_64.h 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/include/mach-xen/asm/hypercall_64.h 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/include/mach-xen/asm/hypercall_64.h 2011-01-31 17:29:16.000000000 +0100
@@ -135,6 +135,23 @@
__res; \
@@ -11864,7 +11864,7 @@ Acked-by: jbeulich@novell.com
return _hypercall3(int, grant_table_op, cmd, uop, count);
}
---- sle11sp2.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/include/mach-xen/asm/hypervisor.h 2011-01-31 17:29:16.000000000 +0100
@@ -44,6 +44,7 @@
#include <xen/interface/sched.h>
@@ -11936,7 +11936,7 @@ Acked-by: jbeulich@novell.com
static inline int
HYPERVISOR_yield(
void)
---- sle11sp2.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:29:16.000000000 +0100
@@ -53,7 +53,6 @@ static inline int pte_exec_kernel(pte_t
* not possible, use pte_get_and_clear to obtain the old pte
@@ -11994,7 +11994,7 @@ Acked-by: jbeulich@novell.com
static inline int pte_same(pte_t a, pte_t b)
{
return a.pte_low == b.pte_low && a.pte_high == b.pte_high;
---- sle11sp2.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:37:16.000000000 +0100
@@ -260,31 +260,89 @@ static inline pte_t pte_mkhuge(pte_t pte
# include <asm/pgtable-2level.h>
@@ -12319,7 +12319,7 @@ Acked-by: jbeulich@novell.com
/* from system description table in BIOS. Mostly for MCA use, but
others may find it useful. */
extern unsigned int machine_id;
---- sle11sp2.orig/arch/x86/include/mach-xen/asm/smp_32.h 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/include/mach-xen/asm/smp_32.h 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:29:16.000000000 +0100
@@ -79,25 +79,36 @@ static inline int hard_smp_processor_id(
return GET_APIC_ID(*(unsigned long *)(APIC_BASE+APIC_ID));
@@ -12365,7 +12365,7 @@ Acked-by: jbeulich@novell.com
+#endif
+
#endif
---- sle11sp2.orig/arch/x86/include/mach-xen/asm/system_32.h 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/include/mach-xen/asm/system_32.h 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/include/mach-xen/asm/system_32.h 2011-01-31 17:29:16.000000000 +0100
@@ -267,6 +267,9 @@ static inline unsigned long __xchg(unsig
#define cmpxchg(ptr,o,n)\
@@ -12417,7 +12417,7 @@ Acked-by: jbeulich@novell.com
#ifndef CONFIG_X86_CMPXCHG
/*
* Building a kernel capable running on 80386. It may be necessary to
---- sle11sp2.orig/arch/x86/include/mach-xen/asm/tlbflush_32.h 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/include/mach-xen/asm/tlbflush_32.h 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:29:16.000000000 +0100
@@ -8,8 +8,6 @@
#define __flush_tlb_global() xen_tlb_flush()
@@ -12428,7 +12428,7 @@ Acked-by: jbeulich@novell.com
#define cpu_has_invlpg (boot_cpu_data.x86 > 3)
#define __flush_tlb_single(addr) xen_invlpg(addr)
---- sle11sp2.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:29:16.000000000 +0100
@@ -41,7 +41,7 @@ enum fixed_addresses {
#ifdef CONFIG_X86_LOCAL_APIC
@@ -12439,7 +12439,7 @@ Acked-by: jbeulich@novell.com
FIX_IO_APIC_BASE_0,
FIX_IO_APIC_BASE_END = FIX_IO_APIC_BASE_0 + MAX_IO_APICS-1,
#endif
---- sle11sp2.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-02-07 15:37:14.000000000 +0100
@@ -44,12 +44,9 @@ extern unsigned long __supported_pte_mas
@@ -12619,7 +12619,7 @@ Acked-by: jbeulich@novell.com
#define __HAVE_ARCH_PTEP_GET_AND_CLEAR
#define __HAVE_ARCH_PTEP_GET_AND_CLEAR_FULL
#define __HAVE_ARCH_PTEP_CLEAR_FLUSH
---- sle11sp2.orig/arch/x86/include/mach-xen/asm/processor_64.h 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/include/mach-xen/asm/processor_64.h 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:29:16.000000000 +0100
@@ -484,6 +484,8 @@ static inline void __mwait(unsigned long
: :"a" (eax), "c" (ecx));
@@ -12630,7 +12630,7 @@ Acked-by: jbeulich@novell.com
#define stack_current() \
({ \
struct thread_info *ti; \
---- sle11sp2.orig/arch/x86/include/mach-xen/asm/smp_64.h 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/include/mach-xen/asm/smp_64.h 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:29:16.000000000 +0100
@@ -4,15 +4,12 @@
/*
@@ -12737,7 +12737,7 @@ Acked-by: jbeulich@novell.com
+#endif /* !CONFIG_SMP */
#endif
---- sle11sp2.orig/arch/x86/include/mach-xen/asm/system_64.h 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/include/mach-xen/asm/system_64.h 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/include/mach-xen/asm/system_64.h 2011-01-31 17:29:16.000000000 +0100
@@ -24,6 +24,7 @@
#define __EXTRA_CLOBBER \
@@ -12747,7 +12747,7 @@ Acked-by: jbeulich@novell.com
#define switch_to(prev,next,last) \
asm volatile(SAVE_CONTEXT \
"movq %%rsp,%P[threadrsp](%[prev])\n\t" /* save RSP */ \
---- sle11sp2.orig/arch/x86/include/mach-xen/asm/tlbflush_64.h 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/arch/x86/include/mach-xen/asm/tlbflush_64.h 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:29:16.000000000 +0100
@@ -12,9 +12,6 @@
*/
@@ -12878,7 +12878,7 @@ Acked-by: jbeulich@novell.com
+}
+
+#endif /* __XEN_NETUTIL_H__ */
---- sle11sp2.orig/include/xen/xencons.h 2012-05-15 11:16:13.000000000 +0200
+--- sle11sp2.orig/include/xen/xencons.h 2012-07-30 12:13:22.000000000 +0200
+++ sle11sp2/include/xen/xencons.h 2011-01-31 17:29:16.000000000 +0100
@@ -8,7 +8,7 @@ void xencons_force_flush(void);
void xencons_resume(void);
@@ -12901,8 +12901,8 @@ Acked-by: jbeulich@novell.com
change_pte_range(vma->vm_mm, pmd, addr, next, newprot,
dirty_accountable);
--- sle11sp2.orig/mm/page_alloc.c 2011-06-30 15:38:58.000000000 +0200
-+++ sle11sp2/mm/page_alloc.c 2012-03-19 11:30:51.000000000 +0100
-@@ -5230,6 +5230,23 @@ static void __setup_per_zone_wmarks(void
++++ sle11sp2/mm/page_alloc.c 2012-07-30 12:24:52.000000000 +0200
+@@ -5224,6 +5224,23 @@ static void __setup_per_zone_wmarks(void
spin_unlock_irqrestore(&zone->lock, flags);
}
diff --git a/patches.xen/xen3-patch-2.6.25 b/patches.xen/xen3-patch-2.6.25
index 424373e319..32885b652d 100644
--- a/patches.xen/xen3-patch-2.6.25
+++ b/patches.xen/xen3-patch-2.6.25
@@ -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 2012-05-29 10:51:09.000000000 +0200
-@@ -0,0 +1,379 @@
++++ sle11sp2/drivers/xen/core/spinlock.c 2012-07-26 14:09:46.000000000 +0200
+@@ -0,0 +1,389 @@
+/*
+ * Xen spinlock functions
+ *
@@ -19008,11 +19008,17 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+};
+static DEFINE_PER_CPU(struct rm_seq, rm_seq);
+
++static int __read_mostly nopoll;
++module_param(nopoll, bool, 0);
++
+int __cpuinit xen_spinlock_init(unsigned int cpu)
+{
+ struct evtchn_bind_ipi bind_ipi;
+ int rc;
+
++ if (nopoll)
++ return 0;
++
+ WARN_ON(per_cpu(poll_evtchn, cpu));
+ bind_ipi.vcpu = cpu;
+ rc = HYPERVISOR_event_channel_op(EVTCHNOP_bind_ipi, &bind_ipi);
@@ -19030,6 +19036,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+ struct evtchn_close close;
+
+ close.port = per_cpu(poll_evtchn, cpu);
++ if (!close.port)
++ return;
+ per_cpu(poll_evtchn, cpu) = 0;
+ WARN_ON(HYPERVISOR_event_channel_op(EVTCHNOP_close, &close));
+}
@@ -19151,7 +19159,6 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+void xen_spin_irq_exit(void)
+{
+ struct spinning *spinning = __get_cpu_var(_spinning);
-+ unsigned int cpu = raw_smp_processor_id();
+ /*
+ * Despite its counterpart being first in xen_spin_irq_enter() (to make
+ * xen_spin_kick() properly handle locks that get owned after their
@@ -19285,6 +19292,9 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+{
+ unsigned int cpu = raw_smp_processor_id(), anchor = cpu;
+
++ if (nopoll)
++ return;
++
+ if (unlikely(!cpu_online(cpu)))
+ cpu = -1, anchor = nr_cpu_ids;
+
diff --git a/patches.xen/xen3-patch-2.6.26 b/patches.xen/xen3-patch-2.6.26
index 9b8687137f..2a3f58ec3e 100644
--- a/patches.xen/xen3-patch-2.6.26
+++ b/patches.xen/xen3-patch-2.6.26
@@ -10796,10 +10796,12 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
* old math state array, and gets the new ones from the current task
*
* Careful.. There are problems with IBM-designed IRQ13 behaviour.
-@@ -1087,9 +1117,22 @@ asmlinkage void math_state_restore(void)
- struct thread_info *thread = current_thread_info();
+@@ -1088,8 +1118,23 @@ asmlinkage void math_state_restore(void)
struct task_struct *tsk = thread->task;
+ /* NB. 'clts' is done for us by Xen during virtual trap. */
+- if (!tsk_used_math(tsk))
+- init_fpu(tsk);
+ if (!tsk_used_math(tsk)) {
+ local_irq_enable();
+ /*
@@ -10809,15 +10811,14 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
+ /*
+ * ran out of memory!
+ */
++ stts();
+ do_group_exit(SIGKILL);
+ return;
+ }
+ local_irq_disable();
+ }
+
- /* NB. 'clts' is done for us by Xen during virtual trap. */
-- if (!tsk_used_math(tsk))
-- init_fpu(tsk);
++ /* clts(); Allow maths ops (or we recurse) */
restore_fpu(tsk);
thread->status |= TS_USEDFPU; /* So we fnsave on switch_to() */
tsk->fpu_counter++;
@@ -10949,11 +10950,16 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
{
unsigned char reason = 0;
int cpu;
-@@ -1117,11 +1127,25 @@ asmlinkage void __attribute__((weak)) mc
+@@ -1117,11 +1127,26 @@ asmlinkage void __attribute__((weak)) mc
asmlinkage void math_state_restore(void)
{
struct task_struct *me = current;
-+
+- /* clts(); */ /* 'clts' is done for us by Xen during virtual trap. */
+
+- if (!used_math())
+- init_fpu(me);
+- restore_fpu_checking(&me->thread.i387.fxsave);
++ /* NB. 'clts' is done for us by Xen during virtual trap. */
+ if (!used_math()) {
+ local_irq_enable();
+ /*
@@ -10963,17 +10969,14 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
+ /*
+ * ran out of memory!
+ */
++ stts();
+ do_group_exit(SIGKILL);
+ return;
+ }
+ local_irq_disable();
+ }
+
- /* clts(); */ /* 'clts' is done for us by Xen during virtual trap. */
-
-- if (!used_math())
-- init_fpu(me);
-- restore_fpu_checking(&me->thread.i387.fxsave);
++ /* clts(); Allow maths ops (or we recurse) */
+ restore_fpu_checking(&me->thread.xstate->fxsave);
task_thread_info(me)->status |= TS_USEDFPU;
me->fpu_counter++;
diff --git a/patches.xen/xen3-patch-2.6.27 b/patches.xen/xen3-patch-2.6.27
index 3a68638dc3..028c33d4dd 100644
--- a/patches.xen/xen3-patch-2.6.27
+++ b/patches.xen/xen3-patch-2.6.27
@@ -323,8 +323,8 @@ have been needed - see SLE11 SPn).
+ tlb_$(BITS).o tsc.o tsc_sync.o vsmp_64.o
+disabled-obj-$(CONFIG_XEN_UNPRIVILEGED_GUEST) += probe_roms_32.o
--- sle11sp2.orig/arch/x86/kernel/acpi/boot.c 2011-03-11 10:59:02.000000000 +0100
-+++ sle11sp2/arch/x86/kernel/acpi/boot.c 2011-04-13 13:47:31.000000000 +0200
-@@ -1343,6 +1343,7 @@ static int __init dmi_disable_acpi(const
++++ sle11sp2/arch/x86/kernel/acpi/boot.c 2012-07-30 12:29:15.000000000 +0200
+@@ -1345,6 +1345,7 @@ static int __init dmi_disable_acpi(const
return 0;
}
@@ -332,7 +332,7 @@ have been needed - see SLE11 SPn).
/*
* Force ignoring BIOS IRQ0 override
*/
-@@ -1360,6 +1361,7 @@ static int __init dmi_ignore_irq0_timer_
+@@ -1357,6 +1358,7 @@ static int __init dmi_ignore_irq0_timer_
}
return 0;
}
@@ -340,7 +340,7 @@ have been needed - see SLE11 SPn).
static int __init force_acpi_rsdt(const struct dmi_system_id *d)
{
-@@ -1480,6 +1482,7 @@ static struct dmi_system_id __initdata a
+@@ -1477,6 +1479,7 @@ static struct dmi_system_id __initdata a
{}
};
@@ -348,7 +348,7 @@ have been needed - see SLE11 SPn).
/* second table for DMI checks that should run after early-quirks */
static struct dmi_system_id __initdata acpi_dmi_table_late[] = {
/*
-@@ -1526,6 +1529,7 @@ static struct dmi_system_id __initdata a
+@@ -1531,6 +1534,7 @@ static struct dmi_system_id __initdata a
},
{}
};
@@ -356,7 +356,7 @@ have been needed - see SLE11 SPn).
/*
* acpi_boot_table_init() and acpi_boot_init()
-@@ -1598,8 +1602,10 @@ int __init early_acpi_boot_init(void)
+@@ -1603,8 +1607,10 @@ int __init early_acpi_boot_init(void)
int __init acpi_boot_init(void)
{
@@ -367,7 +367,7 @@ have been needed - see SLE11 SPn).
/*
* If acpi_disabled, bail out
---- sle11sp2.orig/arch/x86/kernel/amd_nb.c 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/amd_nb.c 2012-07-30 12:13:21.000000000 +0200
+++ 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 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/cpu/amd.c 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/arch/x86/kernel/cpu/amd.c 2011-09-22 14:42:04.000000000 +0200
@@ -603,6 +603,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 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/cpu/bugs_64.c 2012-07-30 12:13:21.000000000 +0200
+++ 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 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/entry_64.S 2012-07-30 12:13:21.000000000 +0200
+++ 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 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/probe_roms.c 2012-07-30 12:13:21.000000000 +0200
+++ 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;
@@ -15546,7 +15546,7 @@ have been needed - see SLE11 SPn).
unsigned long new_kesp = kesp - base;
unsigned long lim_pages = (new_kesp | (THREAD_SIZE - 1)) >> PAGE_SHIFT;
--- sle11sp2.orig/arch/x86/kernel/traps_64-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2/arch/x86/kernel/traps_64-xen.c 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2/arch/x86/kernel/traps_64-xen.c 2012-07-30 12:29:18.000000000 +0200
@@ -10,73 +10,56 @@
* 'Traps.c' handles hardware traps and faults after we have saved some
* state in 'entry.S'.
@@ -16444,10 +16444,10 @@ have been needed - see SLE11 SPn).
* old math state array, and gets the new ones from the current task
*
* Careful.. There are problems with IBM-designed IRQ13 behaviour.
-@@ -1145,7 +1135,14 @@ asmlinkage void math_state_restore(void)
-
- /* clts(); */ /* 'clts' is done for us by Xen during virtual trap. */
+@@ -1146,7 +1136,14 @@ asmlinkage void math_state_restore(void)
+ }
+ /* clts(); Allow maths ops (or we recurse) */
- restore_fpu_checking(&me->thread.xstate->fxsave);
+ /*
+ * Paranoid restore. send a SIGSEGV if we fail to restore the state.
@@ -16460,7 +16460,7 @@ have been needed - see SLE11 SPn).
task_thread_info(me)->status |= TS_USEDFPU;
me->fpu_counter++;
}
-@@ -1190,13 +1187,12 @@ void __init trap_init(void)
+@@ -1191,13 +1188,12 @@ void __init trap_init(void)
ret = HYPERVISOR_set_trap_table(trap_table);
if (ret)
printk("HYPERVISOR_set_trap_table failed: error %d\n", ret);
@@ -16476,7 +16476,7 @@ have been needed - see SLE11 SPn).
*/
cpu_init();
}
-@@ -1212,27 +1208,25 @@ void __cpuinit smp_trap_init(trap_info_t
+@@ -1213,27 +1209,25 @@ void __cpuinit smp_trap_init(trap_info_t
}
}
@@ -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 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/arch/x86/pci/amd_bus.c 2012-07-30 12:13:21.000000000 +0200
+++ 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 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/arch/x86/pci/mmconfig-shared.c 2012-07-30 12:13:21.000000000 +0200
+++ 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 2012-05-29 10:51:09.000000000 +0200
-+++ sle11sp2/drivers/xen/core/spinlock.c 2012-05-29 10:55:24.000000000 +0200
+--- sle11sp2.orig/drivers/xen/core/spinlock.c 2012-07-26 14:09:46.000000000 +0200
++++ sle11sp2/drivers/xen/core/spinlock.c 2012-07-30 12:29:07.000000000 +0200
@@ -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>
-@@ -59,6 +63,7 @@ void __cpuinit xen_spinlock_cleanup(unsi
+@@ -67,6 +71,7 @@ void __cpuinit xen_spinlock_cleanup(unsi
WARN_ON(HYPERVISOR_event_channel_op(EVTCHNOP_close, &close));
}
@@ -22192,7 +22192,7 @@ have been needed - see SLE11 SPn).
void __cpuinit spinlock_resume(void)
{
unsigned int cpu;
-@@ -68,16 +73,17 @@ void __cpuinit spinlock_resume(void)
+@@ -76,16 +81,17 @@ void __cpuinit spinlock_resume(void)
xen_spinlock_init(cpu);
}
}
@@ -22213,7 +22213,7 @@ have been needed - see SLE11 SPn).
cpu_relax();
}
-@@ -113,7 +119,7 @@ static unsigned int spin_adjust(struct s
+@@ -121,7 +127,7 @@ static unsigned int spin_adjust(struct s
unsigned int xen_spin_adjust(const raw_spinlock_t *lock, unsigned int token)
{
@@ -22222,7 +22222,7 @@ have been needed - see SLE11 SPn).
token >> TICKET_SHIFT);
return (token << TICKET_SHIFT) | lock->cur;
}
-@@ -127,7 +133,7 @@ static unsigned int ticket_drop(struct s
+@@ -135,7 +141,7 @@ static unsigned int ticket_drop(struct s
if (cmpxchg(&spinning->ticket, ticket, -1) != ticket)
return -1;
@@ -22231,7 +22231,7 @@ have been needed - see SLE11 SPn).
return kick ? (ticket + 1) & ((1 << TICKET_SHIFT) - 1) : -1;
}
-@@ -143,10 +149,10 @@ static unsigned int ticket_get(raw_spinl
+@@ -151,10 +157,10 @@ static unsigned int ticket_get(raw_spinl
void xen_spin_irq_enter(void)
{
@@ -22244,16 +22244,16 @@ have been needed - see SLE11 SPn).
smp_mb();
for (; spinning; spinning = spinning->prev) {
raw_spinlock_t *lock = spinning->lock;
-@@ -175,7 +181,7 @@ void xen_spin_irq_enter(void)
+@@ -183,7 +189,7 @@ void xen_spin_irq_enter(void)
void xen_spin_irq_exit(void)
{
- struct spinning *spinning = __get_cpu_var(_spinning);
+ struct spinning *spinning = x86_read_percpu(_spinning);
- unsigned int cpu = raw_smp_processor_id();
/*
* Despite its counterpart being first in xen_spin_irq_enter() (to make
-@@ -220,13 +226,13 @@ bool xen_spin_wait(raw_spinlock_t *lock,
+ * xen_spin_kick() properly handle locks that get owned after their
+@@ -227,13 +233,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 +22269,7 @@ have been needed - see SLE11 SPn).
#if CONFIG_XEN_SPINLOCK_ACQUIRE_NESTING
spinning.irq_count = UINT_MAX;
if (upcall_mask > flags) {
-@@ -242,10 +248,10 @@ bool xen_spin_wait(raw_spinlock_t *lock,
+@@ -249,10 +255,10 @@ bool xen_spin_wait(raw_spinlock_t *lock,
raw_local_irq_disable();
#endif
smp_wmb();
@@ -22282,7 +22282,7 @@ have been needed - see SLE11 SPn).
/*
* Check again to make sure it didn't become free while
-@@ -258,19 +264,19 @@ bool xen_spin_wait(raw_spinlock_t *lock,
+@@ -265,19 +271,19 @@ bool xen_spin_wait(raw_spinlock_t *lock,
* without rechecking the lock.
*/
if (spinning.prev)
@@ -22305,7 +22305,7 @@ have been needed - see SLE11 SPn).
HYPERVISOR_poll_no_timeout(&__get_cpu_var(poll_evtchn), 1))
BUG();
-@@ -280,7 +286,7 @@ bool xen_spin_wait(raw_spinlock_t *lock,
+@@ -287,7 +293,7 @@ bool xen_spin_wait(raw_spinlock_t *lock,
spinning.irq_count = UINT_MAX;
#endif
@@ -22314,7 +22314,7 @@ have been needed - see SLE11 SPn).
inc_irq_stat(irq_lock_count);
break;
}
-@@ -292,7 +298,7 @@ bool xen_spin_wait(raw_spinlock_t *lock,
+@@ -299,7 +305,7 @@ bool xen_spin_wait(raw_spinlock_t *lock,
*/
/* announce we're done */
@@ -22323,7 +22323,7 @@ have been needed - see SLE11 SPn).
if (!CONFIG_XEN_SPINLOCK_ACQUIRE_NESTING)
raw_local_irq_disable();
sequence(SEQ_REMOVE_BIAS);
-@@ -377,3 +383,5 @@ void xen_spin_kick(raw_spinlock_t *lock,
+@@ -387,3 +393,5 @@ void xen_spin_kick(raw_spinlock_t *lock,
}
}
EXPORT_SYMBOL(xen_spin_kick);
@@ -22453,7 +22453,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 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/drivers/xen/sfc_netback/accel.h 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/drivers/xen/sfc_netback/accel.h 2011-02-01 14:38:38.000000000 +0100
@@ -25,6 +25,7 @@
#ifndef NETBACK_ACCEL_H
@@ -22556,7 +22556,7 @@ have been needed - see SLE11 SPn).
if (fd < 0)
return fd;
---- sle11sp2.orig/include/Kbuild 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/include/Kbuild 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/include/Kbuild 2011-02-01 14:38:38.000000000 +0100
@@ -8,5 +8,6 @@ header-y += mtd/
header-y += rdma/
@@ -24643,7 +24643,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 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/arch/x86/include/mach-xen/irq_vectors.h 2012-07-30 12:13:21.000000000 +0200
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,125 +0,0 @@
-/*
@@ -24771,7 +24771,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 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/arch/x86/include/mach-xen/setup_arch_post.h 2012-07-30 12:13:21.000000000 +0200
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-/**
@@ -24837,7 +24837,7 @@ have been needed - see SLE11 SPn).
-#endif
-#endif
-}
---- sle11sp2.orig/arch/x86/include/mach-xen/setup_arch_pre.h 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/arch/x86/include/mach-xen/setup_arch_pre.h 2012-07-30 12:13:21.000000000 +0200
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-/* Hook to call BIOS initialisation function */
@@ -24845,7 +24845,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 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/arch/x86/include/asm/traps.h 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/arch/x86/include/asm/traps.h 2011-02-01 14:38:38.000000000 +0100
@@ -38,6 +38,9 @@ asmlinkage void alignment_check(void);
asmlinkage void machine_check(void);
@@ -24935,7 +24935,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 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/include/xen/public/Kbuild 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/include/xen/public/Kbuild 2011-02-01 14:38:38.000000000 +0100
@@ -1 +1,5 @@
+header-y += evtchn.h
@@ -24943,7 +24943,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 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/include/xen/public/privcmd.h 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/include/xen/public/privcmd.h 2011-02-01 14:38:38.000000000 +0100
@@ -35,10 +35,6 @@
@@ -24956,7 +24956,7 @@ have been needed - see SLE11 SPn).
typedef struct privcmd_hypercall
{
__u64 op;
---- sle11sp2.orig/include/xen/public/xenbus.h 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/include/xen/public/xenbus.h 2012-07-30 12:13:21.000000000 +0200
+++ 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.28 b/patches.xen/xen3-patch-2.6.28
index 12622a1cca..fb06c714f2 100644
--- a/patches.xen/xen3-patch-2.6.28
+++ b/patches.xen/xen3-patch-2.6.28
@@ -7,7 +7,7 @@ Patch-mainline: 2.6.28
Acked-by: Jeff Mahoney <jeffm@suse.com>
Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches.py
---- sle11sp2.orig/arch/ia64/Kconfig 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/arch/ia64/Kconfig 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/arch/ia64/Kconfig 2011-06-30 16:47:27.000000000 +0200
@@ -227,7 +227,7 @@ config IA64_HP_SIM
config IA64_XEN_GUEST
@@ -18,7 +18,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
help
Build a kernel that runs on Xen guest domain. At this moment only
16KB page size in supported.
---- sle11sp2.orig/arch/ia64/Makefile 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/arch/ia64/Makefile 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/arch/ia64/Makefile 2011-10-04 15:46:26.000000000 +0200
@@ -56,7 +56,7 @@ core-$(CONFIG_IA64_SGI_SN2) += arch/ia64
core-$(CONFIG_PERFMON) += arch/ia64/perfmon/
@@ -29,7 +29,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
drivers-$(CONFIG_KDB) += arch/$(ARCH)/kdb/
drivers-$(CONFIG_PCI) += arch/ia64/pci/
---- sle11sp2.orig/arch/ia64/include/asm/xen/hypervisor.h 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/arch/ia64/include/asm/xen/hypervisor.h 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/arch/ia64/include/asm/xen/hypervisor.h 2011-02-01 14:39:24.000000000 +0100
@@ -40,7 +40,7 @@
#include <xen/xen.h>
@@ -40,7 +40,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
extern struct shared_info *HYPERVISOR_shared_info;
extern struct start_info *xen_start_info;
---- sle11sp2.orig/arch/ia64/include/asm/xen/interface.h 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/arch/ia64/include/asm/xen/interface.h 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/arch/ia64/include/asm/xen/interface.h 2011-02-01 14:39:24.000000000 +0100
@@ -56,29 +56,21 @@
#ifndef _ASM_IA64_XEN_INTERFACE_H
@@ -88,7 +88,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
#ifndef __ASSEMBLY__
---- sle11sp2.orig/arch/ia64/kernel/asm-offsets.c 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/arch/ia64/kernel/asm-offsets.c 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/arch/ia64/kernel/asm-offsets.c 2011-02-01 14:39:24.000000000 +0100
@@ -290,7 +290,7 @@ void foo(void)
DEFINE(IA64_ITC_LASTCYCLE_OFFSET,
@@ -99,7 +99,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
BLANK();
DEFINE(XEN_NATIVE_ASM, XEN_NATIVE);
---- sle11sp2.orig/arch/ia64/xen/Kconfig 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/arch/ia64/xen/Kconfig 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/arch/ia64/xen/Kconfig 2011-02-02 15:36:46.000000000 +0100
@@ -2,7 +2,7 @@
# This Kconfig describes xen/ia64 options
@@ -122,7 +122,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
- depends on XEN
+ depends on PARAVIRT_XEN
bool
---- sle11sp2.orig/arch/ia64/xen/xcom_hcall.c 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/arch/ia64/xen/xcom_hcall.c 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/arch/ia64/xen/xcom_hcall.c 2011-02-01 14:39:24.000000000 +0100
@@ -343,7 +343,7 @@ xencommize_memory_reservation(struct xen
int
@@ -339,7 +339,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
.quad sys_getgroups16 /* 80 */
.quad sys_setgroups16
.quad sys32_old_select
---- sle11sp2.orig/arch/x86/include/asm/agp.h 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/arch/x86/include/asm/agp.h 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/arch/x86/include/asm/agp.h 2011-02-01 14:39:24.000000000 +0100
@@ -15,6 +15,9 @@
#define map_page_into_agp(page) set_pages_uc(page, 1)
@@ -351,7 +351,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
/*
* Could use CLFLUSH here if the cpu supports it. But then it would
* need to be called for each cacheline of the whole page so it may
---- sle11sp2.orig/arch/x86/include/asm/cpufeature.h 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/arch/x86/include/asm/cpufeature.h 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/arch/x86/include/asm/cpufeature.h 2012-05-15 11:23:49.000000000 +0200
@@ -285,7 +285,11 @@ extern const char * const x86_power_flag
#define cpu_has_xmm4_1 boot_cpu_has(X86_FEATURE_XMM4_1)
@@ -365,7 +365,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
#define cpu_has_hypervisor boot_cpu_has(X86_FEATURE_HYPERVISOR)
#define cpu_has_pclmulqdq boot_cpu_has(X86_FEATURE_PCLMULQDQ)
#define cpu_has_perfctr_core boot_cpu_has(X86_FEATURE_PERFCTR_CORE)
---- sle11sp2.orig/arch/x86/include/asm/hw_irq.h 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/arch/x86/include/asm/hw_irq.h 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/arch/x86/include/asm/hw_irq.h 2011-04-13 13:50:37.000000000 +0200
@@ -152,6 +152,7 @@ extern void smp_error_interrupt(struct p
extern asmlinkage void smp_irq_move_cleanup_interrupt(void);
@@ -388,7 +388,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
#endif
extern void (*__initconst interrupt[NR_VECTORS-FIRST_EXTERNAL_VECTOR])(void);
---- sle11sp2.orig/arch/x86/include/asm/mc146818rtc.h 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/arch/x86/include/asm/mc146818rtc.h 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/arch/x86/include/asm/mc146818rtc.h 2011-07-15 12:38:27.000000000 +0200
@@ -14,7 +14,7 @@
#define RTC_ALWAYS_BCD 1 /* RTC operates in binary mode */
@@ -399,7 +399,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
/*
* This lock provides nmi access to the CMOS/RTC registers. It has some
* special properties. It is owned by a CPU and stores the index register
---- sle11sp2.orig/arch/x86/include/asm/segment.h 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/arch/x86/include/asm/segment.h 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/arch/x86/include/asm/segment.h 2011-04-13 13:50:26.000000000 +0200
@@ -188,7 +188,9 @@
#define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
@@ -1835,7 +1835,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
#endif
return 0;
---- sle11sp2.orig/arch/x86/kernel/cpu/topology.c 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/cpu/topology.c 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/arch/x86/kernel/cpu/topology.c 2011-02-01 14:39:24.000000000 +0100
@@ -28,7 +28,7 @@
*/
@@ -4020,7 +4020,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
- if (is_uv_system())
- uv_cpu_init();
-}
---- sle11sp2.orig/arch/x86/kernel/dumpstack_64.c 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/dumpstack_64.c 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/arch/x86/kernel/dumpstack_64.c 2011-02-01 14:39:24.000000000 +0100
@@ -21,6 +21,7 @@
#define N_EXCEPTION_STACKS_END \
@@ -16377,7 +16377,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
cpu_clear(cpu, nohz_cpu_mask);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ sle11sp2/arch/x86/kernel/traps-xen.c 2011-02-01 14:39:24.000000000 +0100
-@@ -0,0 +1,1022 @@
+@@ -0,0 +1,1024 @@
+/*
+ * Copyright (C) 1991, 1992 Linus Torvalds
+ * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
@@ -17247,6 +17247,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
+ struct thread_info *thread = current_thread_info();
+ struct task_struct *tsk = thread->task;
+
++ /* NB. 'clts' is done for us by Xen during virtual trap. */
+ if (!tsk_used_math(tsk)) {
+ local_irq_enable();
+ /*
@@ -17256,13 +17257,14 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
+ /*
+ * ran out of memory!
+ */
++ stts();
+ do_group_exit(SIGKILL);
+ return;
+ }
+ local_irq_disable();
+ }
+
-+ /* NB. 'clts' is done for us by Xen during virtual trap. */
++ /* clts(); Allow maths ops (or we recurse) */
+#ifdef CONFIG_X86_32
+ restore_fpu(tsk);
+#else
@@ -17402,7 +17404,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
+}
--- sle11sp2.orig/arch/x86/kernel/traps_32-xen.c 2011-02-01 14:38:38.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
-@@ -1,1222 +0,0 @@
+@@ -1,1224 +0,0 @@
-/*
- * Copyright (C) 1991, 1992 Linus Torvalds
- * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
@@ -18506,6 +18508,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
- struct thread_info *thread = current_thread_info();
- struct task_struct *tsk = thread->task;
-
+- /* NB. 'clts' is done for us by Xen during virtual trap. */
- if (!tsk_used_math(tsk)) {
- local_irq_enable();
- /*
@@ -18515,13 +18518,14 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
- /*
- * ran out of memory!
- */
+- stts();
- do_group_exit(SIGKILL);
- return;
- }
- local_irq_disable();
- }
-
-- /* NB. 'clts' is done for us by Xen during virtual trap. */
+- /* clts(); Allow maths ops (or we recurse) */
- restore_fpu(tsk);
- thread->status |= TS_USEDFPU; /* So we fnsave on switch_to() */
- tsk->fpu_counter++;
@@ -18625,9 +18629,9 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
- return 1;
-}
-__setup("code_bytes=", code_bytes_setup);
---- sle11sp2.orig/arch/x86/kernel/traps_64-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2.orig/arch/x86/kernel/traps_64-xen.c 2012-07-30 12:29:18.000000000 +0200
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
-@@ -1,1238 +0,0 @@
+@@ -1,1239 +0,0 @@
-/*
- * Copyright (C) 1991, 1992 Linus Torvalds
- * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
@@ -19748,6 +19752,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-{
- struct task_struct *me = current;
-
+- /* NB. 'clts' is done for us by Xen during virtual trap. */
- if (!used_math()) {
- local_irq_enable();
- /*
@@ -19757,14 +19762,14 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
- /*
- * ran out of memory!
- */
+- stts();
- do_group_exit(SIGKILL);
- return;
- }
- local_irq_disable();
- }
-
-- /* clts(); */ /* 'clts' is done for us by Xen during virtual trap. */
--
+- /* clts(); Allow maths ops (or we recurse) */
- /*
- * Paranoid restore. send a SIGSEGV if we fail to restore the state.
- */
@@ -22420,7 +22425,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
#define ACPI_PROCESSOR_CLASS "processor"
#define _COMPONENT ACPI_PROCESSOR_COMPONENT
ACPI_MODULE_NAME("processor_extcntl")
---- sle11sp2.orig/drivers/char/agp/generic.c 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/drivers/char/agp/generic.c 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/drivers/char/agp/generic.c 2011-04-28 11:13:24.000000000 +0200
@@ -1228,7 +1228,7 @@ int agp_generic_alloc_pages(struct agp_b
}
@@ -22440,7 +22445,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
#endif
for (i = 0; i < mem->page_count; i++) {
---- sle11sp2.orig/drivers/firmware/dmi_scan.c 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/drivers/firmware/dmi_scan.c 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/drivers/firmware/dmi_scan.c 2011-02-17 10:11:37.000000000 +0100
@@ -482,6 +482,11 @@ static bool dmi_matches(const struct dmi
{
@@ -22454,7 +22459,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
WARN(!dmi_initialized, KERN_ERR "dmi check: not initialized yet.\n");
for (i = 0; i < ARRAY_SIZE(dmi->matches); i++) {
---- sle11sp2.orig/drivers/idle/Kconfig 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/drivers/idle/Kconfig 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/drivers/idle/Kconfig 2011-02-01 14:39:24.000000000 +0100
@@ -10,7 +10,7 @@ config INTEL_IDLE
processors intel_idle does not support.
@@ -22511,7 +22516,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
+ return;
+ msi_acpi_init();
+}
---- sle11sp2.orig/drivers/pci/probe.c 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/drivers/pci/probe.c 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/drivers/pci/probe.c 2012-03-19 11:36:00.000000000 +0100
@@ -1187,6 +1187,11 @@ static void pci_init_capabilities(struct
/* Vital Product Data */
diff --git a/patches.xen/xen3-patch-2.6.29 b/patches.xen/xen3-patch-2.6.29
index 425ec18274..e517490c4e 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 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/arch/x86/include/asm/hypervisor.h 2012-07-30 12:13:21.000000000 +0200
+++ 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
}
@@ -7436,7 +7436,7 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
/* No locking required. Interrupts are disabled on all CPUs. */
void time_resume(void)
--- sle11sp2.orig/arch/x86/kernel/traps-xen.c 2011-02-01 14:39:24.000000000 +0100
-+++ sle11sp2/arch/x86/kernel/traps-xen.c 2011-02-01 14:42:26.000000000 +0100
++++ sle11sp2/arch/x86/kernel/traps-xen.c 2012-07-30 12:30:48.000000000 +0200
@@ -20,7 +20,6 @@
#include <linux/module.h>
#include <linux/ptrace.h>
@@ -7630,7 +7630,7 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
}
force_sig_info(SIGFPE, &info, task);
}
-@@ -901,7 +901,7 @@ asmlinkage void math_state_restore(void)
+@@ -903,7 +903,7 @@ asmlinkage void math_state_restore(void)
EXPORT_SYMBOL_GPL(math_state_restore);
#ifndef CONFIG_MATH_EMULATION
@@ -7639,7 +7639,7 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
{
printk(KERN_EMERG
"math-emulation not enabled and no coprocessor found.\n");
-@@ -911,16 +911,19 @@ asmlinkage void math_emulate(long arg)
+@@ -913,16 +913,19 @@ asmlinkage void math_emulate(long arg)
}
#endif /* CONFIG_MATH_EMULATION */
@@ -8893,7 +8893,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 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/drivers/gpu/drm/i915/i915_drv.c 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/drivers/gpu/drm/i915/i915_drv.c 2012-06-08 14:42:40.000000000 +0200
@@ -859,7 +859,7 @@ static struct drm_driver driver = {
.open = drm_open,
@@ -8904,7 +8904,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 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/drivers/gpu/drm/i915/i915_drv.h 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/drivers/gpu/drm/i915/i915_drv.h 2012-06-21 13:35:50.000000000 +0200
@@ -1199,6 +1199,11 @@ int __must_check i915_add_request(struct
struct drm_i915_gem_request *request);
@@ -8918,7 +8918,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 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/drivers/gpu/drm/i915/i915_gem.c 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/drivers/gpu/drm/i915/i915_gem.c 2012-01-03 12:00:36.000000000 +0100
@@ -1172,6 +1172,17 @@ i915_gem_mmap_ioctl(struct drm_device *d
return 0;
diff --git a/patches.xen/xen3-patch-2.6.30 b/patches.xen/xen3-patch-2.6.30
index 7d921d6548..4d8b5d8527 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 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/arch/ia64/kernel/vmlinux.lds.S 2012-07-30 12:13:21.000000000 +0200
+++ 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 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/arch/x86/include/asm/page_64_types.h 2012-07-30 12:13:21.000000000 +0200
+++ 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__ */
@@ -3649,7 +3649,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
+ i8259.o irqinit_$(BITS).o pci-swiotlb.o reboot.o smpboot.o tsc.o \
+ tsc_sync.o uv_%.o vsmp_64.o
disabled-obj-$(CONFIG_XEN_UNPRIVILEGED_GUEST) += probe_roms_32.o
---- sle11sp2.orig/arch/x86/kernel/acpi/boot.c 2011-04-13 13:47:31.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/acpi/boot.c 2012-07-30 12:29:15.000000000 +0200
+++ sle11sp2/arch/x86/kernel/acpi/boot.c 2012-04-23 09:03:02.000000000 +0200
@@ -162,11 +162,6 @@ char *__init __acpi_map_table(unsigned l
if (!phys || !size)
@@ -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 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/apic/Makefile 2012-07-30 12:13:21.000000000 +0200
+++ 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 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/setup_percpu.c 2012-07-30 12:13:21.000000000 +0200
+++ 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
@@ -11376,8 +11376,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
{
#ifdef CONFIG_SMP
cycle_t last = get64(&cs_last);
---- sle11sp2.orig/arch/x86/kernel/traps-xen.c 2011-02-01 14:42:26.000000000 +0100
-+++ sle11sp2/arch/x86/kernel/traps-xen.c 2011-02-01 14:44:12.000000000 +0100
+--- sle11sp2.orig/arch/x86/kernel/traps-xen.c 2012-07-30 12:30:48.000000000 +0200
++++ sle11sp2/arch/x86/kernel/traps-xen.c 2012-07-30 12:31:48.000000000 +0200
@@ -54,15 +54,14 @@
#include <asm/desc.h>
#include <asm/i387.h>
@@ -11458,7 +11458,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
if (regs->flags & X86_VM_MASK)
goto gp_in_vm86;
#endif
-@@ -911,19 +862,20 @@ void math_emulate(struct math_emu_info *
+@@ -913,19 +864,20 @@ void math_emulate(struct math_emu_info *
}
#endif /* CONFIG_MATH_EMULATION */
@@ -11483,7 +11483,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
}
#else
math_state_restore();
-@@ -939,7 +891,7 @@ dotraplinkage void do_iret_error(struct
+@@ -941,7 +893,7 @@ dotraplinkage void do_iret_error(struct
info.si_signo = SIGILL;
info.si_errno = 0;
info.si_code = ILL_BADSTK;
@@ -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 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/arch/x86/mach-xen/Makefile 2012-07-30 12:13:21.000000000 +0200
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-#
@@ -17794,9 +17794,9 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
prefill_possible_map();
}
---- sle11sp2.orig/drivers/xen/core/spinlock.c 2012-05-29 10:55:24.000000000 +0200
-+++ sle11sp2/drivers/xen/core/spinlock.c 2012-05-29 11:00:16.000000000 +0200
-@@ -77,13 +77,13 @@ void __cpuinit spinlock_resume(void)
+--- sle11sp2.orig/drivers/xen/core/spinlock.c 2012-07-30 12:29:07.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)
{
@@ -17813,7 +17813,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
cpu_relax();
}
-@@ -119,7 +119,7 @@ static unsigned int spin_adjust(struct s
+@@ -127,7 +127,7 @@ static unsigned int spin_adjust(struct s
unsigned int xen_spin_adjust(const raw_spinlock_t *lock, unsigned int token)
{
@@ -17822,7 +17822,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
token >> TICKET_SHIFT);
return (token << TICKET_SHIFT) | lock->cur;
}
-@@ -149,10 +149,10 @@ static unsigned int ticket_get(raw_spinl
+@@ -157,10 +157,10 @@ static unsigned int ticket_get(raw_spinl
void xen_spin_irq_enter(void)
{
@@ -17835,16 +17835,16 @@ 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;
-@@ -181,7 +181,7 @@ void xen_spin_irq_enter(void)
+@@ -189,7 +189,7 @@ void xen_spin_irq_enter(void)
void xen_spin_irq_exit(void)
{
- struct spinning *spinning = x86_read_percpu(_spinning);
+ struct spinning *spinning = percpu_read(_spinning);
- unsigned int cpu = raw_smp_processor_id();
/*
* Despite its counterpart being first in xen_spin_irq_enter() (to make
-@@ -226,13 +226,13 @@ bool xen_spin_wait(raw_spinlock_t *lock,
+ * xen_spin_kick() properly handle locks that get owned after their
+@@ -233,13 +233,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 +17860,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) {
-@@ -248,10 +248,10 @@ bool xen_spin_wait(raw_spinlock_t *lock,
+@@ -255,10 +255,10 @@ bool xen_spin_wait(raw_spinlock_t *lock,
raw_local_irq_disable();
#endif
smp_wmb();
@@ -17873,7 +17873,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
-@@ -264,19 +264,19 @@ bool xen_spin_wait(raw_spinlock_t *lock,
+@@ -271,19 +271,19 @@ bool xen_spin_wait(raw_spinlock_t *lock,
* without rechecking the lock.
*/
if (spinning.prev)
@@ -17896,7 +17896,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();
-@@ -286,7 +286,7 @@ bool xen_spin_wait(raw_spinlock_t *lock,
+@@ -293,7 +293,7 @@ bool xen_spin_wait(raw_spinlock_t *lock,
spinning.irq_count = UINT_MAX;
#endif
@@ -17905,7 +17905,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
inc_irq_stat(irq_lock_count);
break;
}
-@@ -298,7 +298,7 @@ bool xen_spin_wait(raw_spinlock_t *lock,
+@@ -305,7 +305,7 @@ bool xen_spin_wait(raw_spinlock_t *lock,
*/
/* announce we're done */
@@ -18120,9 +18120,9 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
},
};
---- sle11sp2.orig/kernel/sched.c 2012-06-21 12:56:32.000000000 +0200
-+++ sle11sp2/kernel/sched.c 2012-06-21 13:36:00.000000000 +0200
-@@ -4513,6 +4513,11 @@ asmlinkage void __sched schedule(void)
+--- sle11sp2.orig/kernel/sched.c 2012-07-30 12:13:21.000000000 +0200
++++ sle11sp2/kernel/sched.c 2012-07-30 12:31:38.000000000 +0200
+@@ -4518,6 +4518,11 @@ asmlinkage void __sched schedule(void)
EXPORT_SYMBOL(schedule);
#ifdef CONFIG_MUTEX_SPIN_ON_OWNER
@@ -18134,7 +18134,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
static inline bool owner_running(struct mutex *lock, struct task_struct *owner)
{
-@@ -4530,7 +4535,8 @@ static inline bool owner_running(struct
+@@ -4535,7 +4540,8 @@ static inline bool owner_running(struct
*/
barrier();
@@ -18331,9 +18331,9 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
{
swiotlb_sync_sg(hwdev, sg, nelems, dir, SYNC_FOR_DEVICE);
}
---- sle11sp2.orig/mm/page_alloc.c 2012-03-19 11:30:51.000000000 +0100
-+++ sle11sp2/mm/page_alloc.c 2012-03-19 11:36:18.000000000 +0100
-@@ -5231,11 +5231,9 @@ static void __setup_per_zone_wmarks(void
+--- sle11sp2.orig/mm/page_alloc.c 2012-07-30 12:24:52.000000000 +0200
++++ sle11sp2/mm/page_alloc.c 2012-07-30 12:31:43.000000000 +0200
+@@ -5225,11 +5225,9 @@ static void __setup_per_zone_wmarks(void
}
#ifdef CONFIG_XEN
diff --git a/patches.xen/xen3-patch-2.6.31 b/patches.xen/xen3-patch-2.6.31
index ae685d324a..77c8c6bdc8 100644
--- a/patches.xen/xen3-patch-2.6.31
+++ b/patches.xen/xen3-patch-2.6.31
@@ -71,7 +71,7 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
#endif
#endif
---- sle11sp2.orig/arch/x86/include/asm/required-features.h 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/arch/x86/include/asm/required-features.h 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/arch/x86/include/asm/required-features.h 2012-06-21 13:37:57.000000000 +0200
@@ -48,7 +48,7 @@
#endif
@@ -3023,7 +3023,7 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
#include <asm/segment.h>
#include <asm/page.h>
#include <asm/msr.h>
---- sle11sp2.orig/arch/x86/kernel/init_task.c 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/init_task.c 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/arch/x86/kernel/init_task.c 2011-04-13 13:55:08.000000000 +0200
@@ -31,6 +31,7 @@ union thread_union init_thread_union __i
struct task_struct init_task = INIT_TASK(init_task);
@@ -3868,8 +3868,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
local_irq_save(flags);
disable_all_local_evtchn();
local_irq_restore(flags);
---- sle11sp2.orig/arch/x86/kernel/traps-xen.c 2011-02-01 14:44:12.000000000 +0100
-+++ sle11sp2/arch/x86/kernel/traps-xen.c 2011-02-01 14:50:44.000000000 +0100
+--- sle11sp2.orig/arch/x86/kernel/traps-xen.c 2012-07-30 12:31:48.000000000 +0200
++++ sle11sp2/arch/x86/kernel/traps-xen.c 2012-07-30 12:33:00.000000000 +0200
@@ -45,6 +45,7 @@
#include <linux/edac.h>
#endif
@@ -3935,17 +3935,17 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
#endif /* CONFIG_XEN */
/*
-@@ -834,9 +841,6 @@ asmlinkage void math_state_restore(void)
+@@ -836,9 +843,6 @@ asmlinkage void math_state_restore(void)
}
- /* NB. 'clts' is done for us by Xen during virtual trap. */
+ /* clts(); Allow maths ops (or we recurse) */
-#ifdef CONFIG_X86_32
- restore_fpu(tsk);
-#else
/*
* Paranoid restore. send a SIGSEGV if we fail to restore the state.
*/
-@@ -845,7 +849,7 @@ asmlinkage void math_state_restore(void)
+@@ -847,7 +851,7 @@ asmlinkage void math_state_restore(void)
force_sig(SIGSEGV, tsk);
return;
}
@@ -4952,7 +4952,7 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
if (pgd == NULL)
goto out;
---- sle11sp2.orig/arch/x86/pci/i386.c 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/arch/x86/pci/i386.c 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/arch/x86/pci/i386.c 2011-04-13 13:55:08.000000000 +0200
@@ -239,12 +239,14 @@ void __init pcibios_resource_survey(void
pcibios_allocate_resources(1);
@@ -5046,7 +5046,7 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
return new;
}
---- sle11sp2.orig/drivers/edac/Kconfig 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/drivers/edac/Kconfig 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/drivers/edac/Kconfig 2011-04-13 13:55:08.000000000 +0200
@@ -77,6 +77,7 @@ config EDAC_MCE
config EDAC_AMD64
@@ -5056,7 +5056,7 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
help
Support for error detection and correction of DRAM ECC errors on
the AMD64 families of memory controllers (K8 and F10h)
---- sle11sp2.orig/drivers/gpu/drm/ttm/ttm_bo.c 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/drivers/gpu/drm/ttm/ttm_bo.c 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/drivers/gpu/drm/ttm/ttm_bo.c 2011-12-14 14:29:49.000000000 +0100
@@ -1446,6 +1446,14 @@ int ttm_bo_global_init(struct drm_global
ret = -ENOMEM;
@@ -5073,7 +5073,7 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
INIT_LIST_HEAD(&glob->swap_lru);
INIT_LIST_HEAD(&glob->device_list);
---- sle11sp2.orig/drivers/gpu/drm/ttm/ttm_bo_vm.c 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/drivers/gpu/drm/ttm/ttm_bo_vm.c 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-04-13 13:55:08.000000000 +0200
@@ -169,7 +169,13 @@ static int ttm_bo_vm_fault(struct vm_are
if (bo->mem.bus.is_iomem) {
@@ -6188,7 +6188,7 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
xen_spinlock_cleanup(cpu);
}
---- sle11sp2.orig/drivers/xen/evtchn.c 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/drivers/xen/evtchn.c 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/drivers/xen/evtchn.c 2011-04-13 13:55:08.000000000 +0200
@@ -48,10 +48,17 @@
#include <linux/mutex.h>
@@ -6913,7 +6913,7 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
netfront_accel_vnic *vnic = (netfront_accel_vnic *)np->accel_priv;
DPRINTK("%s %s\n", __FUNCTION__, dev->nodename);
---- sle11sp2.orig/drivers/xen/sys-hypervisor.c 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/drivers/xen/sys-hypervisor.c 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/drivers/xen/sys-hypervisor.c 2011-04-13 13:55:08.000000000 +0200
@@ -20,6 +20,8 @@
#include <xen/interface/xen.h>
@@ -7353,7 +7353,7 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
-header-y += xen/public/
header-y += xen/
header-y += scsi/
---- sle11sp2.orig/include/xen/Kbuild 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/include/xen/Kbuild 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/include/xen/Kbuild 2011-02-01 14:50:44.000000000 +0100
@@ -1,3 +1,2 @@
-header-y += evtchn.h
@@ -7641,7 +7641,7 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
}
void
---- sle11sp2.orig/mm/init-mm.c 2012-06-21 12:56:32.000000000 +0200
+--- sle11sp2.orig/mm/init-mm.c 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/mm/init-mm.c 2011-04-13 13:55:08.000000000 +0200
@@ -13,6 +13,10 @@
#define INIT_MM_CONTEXT(name)
@@ -7665,7 +7665,7 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
continue;
}
}
---- sle11sp2.orig/mm/page_alloc.c 2012-03-19 11:36:18.000000000 +0100
+--- sle11sp2.orig/mm/page_alloc.c 2012-07-30 12:31:43.000000000 +0200
+++ sle11sp2/mm/page_alloc.c 2011-06-30 17:05:24.000000000 +0200
@@ -655,6 +655,7 @@ static bool free_pages_prepare(struct pa
diff --git a/patches.xen/xen3-patch-2.6.32 b/patches.xen/xen3-patch-2.6.32
index a9634eee20..fdbcde9c45 100644
--- a/patches.xen/xen3-patch-2.6.32
+++ b/patches.xen/xen3-patch-2.6.32
@@ -207,7 +207,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
- .quad sys_perf_counter_open
+ .quad sys_perf_event_open
ia32_syscall_end:
---- sle11sp2.orig/arch/x86/include/asm/nmi.h 2012-06-08 15:51:53.000000000 +0200
+--- sle11sp2.orig/arch/x86/include/asm/nmi.h 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/arch/x86/include/asm/nmi.h 2011-04-13 13:55:46.000000000 +0200
@@ -17,7 +17,10 @@ struct ctl_table;
extern int proc_nmi_enabled(struct ctl_table *, int ,
@@ -220,7 +220,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
void arch_trigger_all_cpu_backtrace(void);
#define arch_trigger_all_cpu_backtrace arch_trigger_all_cpu_backtrace
#endif
---- sle11sp2.orig/arch/x86/include/asm/uv/uv_hub.h 2012-06-08 15:51:53.000000000 +0200
+--- sle11sp2.orig/arch/x86/include/asm/uv/uv_hub.h 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/arch/x86/include/asm/uv/uv_hub.h 2011-02-01 14:54:13.000000000 +0100
@@ -11,7 +11,7 @@
#ifndef _ASM_X86_UV_UV_HUB_H
@@ -767,7 +767,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
endif
disabled-obj-$(CONFIG_XEN) := %_uv.o crash.o early-quirks.o hpet.o i8253.o \
---- sle11sp2.orig/arch/x86/kernel/apic/hw_nmi.c 2012-06-08 15:51:53.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/apic/hw_nmi.c 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/arch/x86/kernel/apic/hw_nmi.c 2011-04-13 13:55:59.000000000 +0200
@@ -26,6 +26,10 @@ u64 hw_nmi_get_sample_period(int watchdo
#endif
@@ -1817,7 +1817,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
#endif
/* Make sure %fs and %gs are initialized properly in idle threads */
---- sle11sp2.orig/arch/x86/kernel/cpu/mcheck/mce-inject.c 2012-06-08 15:51:53.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/cpu/mcheck/mce-inject.c 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/arch/x86/kernel/cpu/mcheck/mce-inject.c 2011-02-01 14:54:13.000000000 +0100
@@ -145,7 +145,7 @@ static void raise_mce(struct mce *m)
if (context == MCJ_CTX_RANDOM)
@@ -4051,7 +4051,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
#endif /* CONFIG_X86_32 */
#ifdef CONFIG_XEN
---- sle11sp2.orig/arch/x86/platform/sfi/sfi.c 2012-06-08 15:51:53.000000000 +0200
+--- sle11sp2.orig/arch/x86/platform/sfi/sfi.c 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/arch/x86/platform/sfi/sfi.c 2011-02-02 08:45:00.000000000 +0100
@@ -32,6 +32,7 @@
#include <asm/apic.h>
@@ -4307,8 +4307,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
printk_tick();
scheduler_tick();
run_posix_cpu_timers(current);
---- sle11sp2.orig/arch/x86/kernel/traps-xen.c 2011-02-01 14:50:44.000000000 +0100
-+++ sle11sp2/arch/x86/kernel/traps-xen.c 2011-02-16 13:56:25.000000000 +0100
+--- sle11sp2.orig/arch/x86/kernel/traps-xen.c 2012-07-30 12:33:00.000000000 +0200
++++ sle11sp2/arch/x86/kernel/traps-xen.c 2012-07-30 12:33:50.000000000 +0200
@@ -14,7 +14,6 @@
#include <linux/spinlock.h>
#include <linux/kprobes.h>
@@ -4402,10 +4402,10 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
* 'math_state_restore()' saves the current math information in the
* old math state array, and gets the new ones from the current task
*
-@@ -841,17 +839,7 @@ asmlinkage void math_state_restore(void)
+@@ -843,17 +841,7 @@ asmlinkage void math_state_restore(void)
}
- /* NB. 'clts' is done for us by Xen during virtual trap. */
+ /* clts(); Allow maths ops (or we recurse) */
- /*
- * Paranoid restore. send a SIGSEGV if we fail to restore the state.
- */
@@ -4421,7 +4421,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
}
EXPORT_SYMBOL_GPL(math_state_restore);
-@@ -967,6 +955,8 @@ void __init trap_init(void)
+@@ -969,6 +957,8 @@ void __init trap_init(void)
* Should be a barrier for any external CPU state:
*/
cpu_init();
@@ -4430,7 +4430,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
}
void __cpuinit smp_trap_init(trap_info_t *trap_ctxt)
-@@ -978,4 +968,7 @@ void __cpuinit smp_trap_init(trap_info_t
+@@ -980,4 +970,7 @@ void __cpuinit smp_trap_init(trap_info_t
trap_ctxt[t->vector].cs = t->cs;
trap_ctxt[t->vector].address = t->address;
}
@@ -5789,7 +5789,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
BUG();
} else {
xen_l1_entry_update(ptep, entry);
---- sle11sp2.orig/arch/x86/mm/physaddr.c 2012-06-08 15:51:53.000000000 +0200
+--- sle11sp2.orig/arch/x86/mm/physaddr.c 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/arch/x86/mm/physaddr.c 2011-02-01 14:54:13.000000000 +0100
@@ -8,6 +8,10 @@
@@ -6051,7 +6051,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
pr->cdev = thermal_cooling_device_register("Processor", device,
&processor_cooling_ops);
---- sle11sp2.orig/drivers/char/agp/agp.h 2012-06-08 15:51:53.000000000 +0200
+--- sle11sp2.orig/drivers/char/agp/agp.h 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/drivers/char/agp/agp.h 2011-02-01 14:54:13.000000000 +0100
@@ -31,6 +31,10 @@
@@ -6064,7 +6064,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
#define PFX "agpgart: "
//#define AGP_DEBUG 1
---- sle11sp2.orig/drivers/char/agp/amd-k7-agp.c 2012-06-08 15:51:53.000000000 +0200
+--- sle11sp2.orig/drivers/char/agp/amd-k7-agp.c 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/drivers/char/agp/amd-k7-agp.c 2011-02-17 10:18:42.000000000 +0100
@@ -142,7 +142,7 @@ static int amd_create_gatt_table(struct
@@ -6084,7 +6084,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
page_dir.remapped+GET_PAGE_DIR_OFF(addr));
readl(page_dir.remapped+GET_PAGE_DIR_OFF(addr)); /* PCI Posting. */
}
---- sle11sp2.orig/drivers/char/agp/amd64-agp.c 2012-06-08 15:51:53.000000000 +0200
+--- sle11sp2.orig/drivers/char/agp/amd64-agp.c 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/drivers/char/agp/amd64-agp.c 2011-02-01 14:54:13.000000000 +0100
@@ -178,7 +178,7 @@ static const struct aper_size_info_32 am
@@ -6104,7 +6104,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
amd64_aperture_sizes[bridge->aperture_size_idx].size);
agp_remove_bridge(bridge);
agp_put_bridge(bridge);
---- sle11sp2.orig/drivers/char/agp/ati-agp.c 2012-06-08 15:51:53.000000000 +0200
+--- sle11sp2.orig/drivers/char/agp/ati-agp.c 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/drivers/char/agp/ati-agp.c 2011-02-01 14:54:13.000000000 +0100
@@ -361,7 +361,7 @@ static int ati_create_gatt_table(struct
@@ -6124,7 +6124,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
page_dir.remapped+GET_PAGE_DIR_OFF(addr));
readl(page_dir.remapped+GET_PAGE_DIR_OFF(addr)); /* PCI Posting. */
}
---- sle11sp2.orig/drivers/char/agp/efficeon-agp.c 2012-06-08 15:51:53.000000000 +0200
+--- sle11sp2.orig/drivers/char/agp/efficeon-agp.c 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/drivers/char/agp/efficeon-agp.c 2011-02-01 14:54:13.000000000 +0100
@@ -227,7 +227,7 @@ static int efficeon_create_gatt_table(st
@@ -6155,7 +6155,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
/* AK: bogus, should encode addresses > 4GB */
for (i = 0; i < num_entries; i++) {
---- sle11sp2.orig/drivers/char/agp/sworks-agp.c 2012-06-08 15:51:53.000000000 +0200
+--- sle11sp2.orig/drivers/char/agp/sworks-agp.c 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/drivers/char/agp/sworks-agp.c 2011-02-01 14:54:13.000000000 +0100
@@ -155,7 +155,7 @@ static int serverworks_create_gatt_table
/* Create a fake scratch directory */
@@ -6195,7 +6195,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
#endif
#endif /* IOATDMA_H */
---- sle11sp2.orig/drivers/dma/ioat/dma_v2.h 2012-06-08 15:51:53.000000000 +0200
+--- sle11sp2.orig/drivers/dma/ioat/dma_v2.h 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/drivers/dma/ioat/dma_v2.h 2011-02-01 14:54:13.000000000 +0100
@@ -176,4 +176,10 @@ int ioat2_quiesce(struct ioat_chan_commo
int ioat2_reset_sync(struct ioat_chan_common *chan, unsigned long tmo);
@@ -6208,7 +6208,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
+#endif
+
#endif /* IOATDMA_V2_H */
---- sle11sp2.orig/drivers/dma/ioat/hw.h 2012-06-08 15:51:53.000000000 +0200
+--- sle11sp2.orig/drivers/dma/ioat/hw.h 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/drivers/dma/ioat/hw.h 2011-02-01 14:54:13.000000000 +0100
@@ -39,7 +39,11 @@
#define IOAT_VER_3_0 0x30 /* Version 3.0 */
@@ -6222,7 +6222,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
struct ioat_dma_descriptor {
uint32_t size;
---- sle11sp2.orig/drivers/gpu/drm/radeon/radeon_device.c 2012-06-08 15:51:53.000000000 +0200
+--- sle11sp2.orig/drivers/gpu/drm/radeon/radeon_device.c 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/drivers/gpu/drm/radeon/radeon_device.c 2012-02-28 10:45:27.000000000 +0100
@@ -438,6 +438,18 @@ int radeon_dummy_page_init(struct radeon
rdev->dummy_page.page = alloc_page(GFP_DMA32 | GFP_KERNEL | __GFP_ZERO);
@@ -6489,7 +6489,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
else if (dev->multifunction)
next_fn = next_trad_fn;
---- sle11sp2.orig/drivers/sfi/sfi_core.c 2012-06-08 15:51:53.000000000 +0200
+--- sle11sp2.orig/drivers/sfi/sfi_core.c 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/drivers/sfi/sfi_core.c 2011-02-01 14:54:13.000000000 +0100
@@ -486,6 +486,11 @@ void __init sfi_init(void)
if (!acpi_disabled)
@@ -6503,7 +6503,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
if (sfi_disabled)
return;
---- sle11sp2.orig/drivers/hv/Kconfig 2012-06-08 15:51:53.000000000 +0200
+--- sle11sp2.orig/drivers/hv/Kconfig 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/drivers/hv/Kconfig 2012-03-19 11:38:44.000000000 +0100
@@ -2,7 +2,7 @@ menu "Microsoft Hyper-V guest support"
@@ -7071,7 +7071,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
#include <linux/proc_fs.h>
#include <linux/notifier.h>
#include <linux/mutex.h>
---- sle11sp2.orig/fs/proc/kcore.c 2012-06-08 15:51:53.000000000 +0200
+--- sle11sp2.orig/fs/proc/kcore.c 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/fs/proc/kcore.c 2011-04-13 13:58:56.000000000 +0200
@@ -130,7 +130,7 @@ static void __kcore_update_ram(struct li
}
@@ -7094,7 +7094,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
ent->type = KCORE_RAM;
list_add(&ent->list, &head);
__kcore_update_ram(&head);
---- sle11sp2.orig/include/linux/nmi.h 2012-06-08 15:51:53.000000000 +0200
+--- sle11sp2.orig/include/linux/nmi.h 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/include/linux/nmi.h 2011-02-16 09:06:03.000000000 +0100
@@ -18,6 +18,9 @@
#include <asm/nmi.h>
@@ -7106,7 +7106,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
static inline void touch_nmi_watchdog(void)
{
touch_softlockup_watchdog();
---- sle11sp2.orig/include/xen/interface/platform.h 2012-06-08 15:51:50.000000000 +0200
+--- sle11sp2.orig/include/xen/interface/platform.h 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/include/xen/interface/platform.h 2012-04-04 08:57:09.000000000 +0200
@@ -475,6 +475,20 @@ struct xenpf_mem_hotadd
uint32_t flags;
diff --git a/patches.xen/xen3-patch-2.6.33 b/patches.xen/xen3-patch-2.6.33
index 13afeb5a0e..13335f2e85 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 2011-08-22 10:37:12.000000000 +0200
+--- sle11sp2.orig/arch/x86/Kconfig 2012-06-21 13:38:01.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
@@ -3438,7 +3438,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 2011-02-16 13:56:25.000000000 +0100
+--- sle11sp2.orig/arch/x86/kernel/traps-xen.c 2012-07-30 12:33:50.000000000 +0200
+++ 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)
@@ -3586,7 +3586,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-06-08 14:40:07.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/x8664_ksyms_64.c 2012-07-30 12:13:21.000000000 +0200
+++ 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);
@@ -4055,7 +4055,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-06-08 14:40:07.000000000 +0200
+--- sle11sp2.orig/drivers/gpu/drm/vmwgfx/Kconfig 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/drivers/gpu/drm/vmwgfx/Kconfig 2011-02-01 14:55:46.000000000 +0100
@@ -1,6 +1,6 @@
config DRM_VMWGFX
@@ -4497,7 +4497,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-06-08 14:40:07.000000000 +0200
+--- sle11sp2.orig/drivers/scsi/Kconfig 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/drivers/scsi/Kconfig 2011-10-17 11:51:54.000000000 +0200
@@ -661,7 +661,7 @@ config SCSI_FLASHPOINT
@@ -4647,8 +4647,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-05-29 11:00:16.000000000 +0200
-+++ sle11sp2/drivers/xen/core/spinlock.c 2012-05-29 11:02:34.000000000 +0200
+--- 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
@@ -16,7 +16,7 @@
#include <xen/evtchn.h>
@@ -4658,7 +4658,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;
-@@ -91,7 +91,7 @@ static inline void sequence(unsigned int
+@@ -99,7 +99,7 @@ static inline void sequence(unsigned int
static DEFINE_PER_CPU(unsigned int, _irq_count);
static unsigned int spin_adjust(struct spinning *spinning,
@@ -4667,7 +4667,7 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
unsigned int ticket)
{
for (; spinning; spinning = spinning->prev) {
-@@ -117,7 +117,7 @@ static unsigned int spin_adjust(struct s
+@@ -125,7 +125,7 @@ static unsigned int spin_adjust(struct s
return ticket;
}
@@ -4676,7 +4676,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);
-@@ -127,7 +127,7 @@ unsigned int xen_spin_adjust(const raw_s
+@@ -135,7 +135,7 @@ unsigned int xen_spin_adjust(const raw_s
static unsigned int ticket_drop(struct spinning *spinning,
unsigned int ticket, unsigned int cpu)
{
@@ -4685,7 +4685,7 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
unsigned int token;
bool kick;
-@@ -137,7 +137,7 @@ static unsigned int ticket_drop(struct s
+@@ -145,7 +145,7 @@ static unsigned int ticket_drop(struct s
return kick ? (ticket + 1) & ((1 << TICKET_SHIFT) - 1) : -1;
}
@@ -4694,7 +4694,7 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
{
unsigned int token;
bool free;
-@@ -155,7 +155,7 @@ void xen_spin_irq_enter(void)
+@@ -163,7 +163,7 @@ void xen_spin_irq_enter(void)
percpu_add(_irq_count, 1);
smp_mb();
for (; spinning; spinning = spinning->prev) {
@@ -4703,7 +4703,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
-@@ -206,7 +206,7 @@ void xen_spin_irq_exit(void)
+@@ -213,7 +213,7 @@ void xen_spin_irq_exit(void)
* acquiring them.
*/
for (; spinning; spinning = spinning->prev) {
@@ -4712,7 +4712,7 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
if (spinning->irq_count < irq_count)
break;
-@@ -217,7 +217,7 @@ void xen_spin_irq_exit(void)
+@@ -224,7 +224,7 @@ void xen_spin_irq_exit(void)
}
#endif
@@ -4721,7 +4721,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
-@@ -312,7 +312,7 @@ bool xen_spin_wait(raw_spinlock_t *lock,
+@@ -319,7 +319,7 @@ bool xen_spin_wait(raw_spinlock_t *lock,
return false;
}
@@ -4870,7 +4870,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-06-08 14:40:07.000000000 +0200
+--- sle11sp2.orig/include/xen/compat_ioctl.h 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/include/xen/compat_ioctl.h 2011-02-01 14:55:46.000000000 +0100
@@ -29,7 +29,7 @@
#define xen_pfn32_t __u32
@@ -4911,7 +4911,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-06-08 14:40:07.000000000 +0200
+--- sle11sp2.orig/include/xen/xen.h 2012-07-30 12:13:21.000000000 +0200
+++ 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 */
@@ -4952,7 +4952,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-06-08 14:40:07.000000000 +0200
+--- sle11sp2.orig/kernel/ksysfs.c 2012-07-30 12:13:21.000000000 +0200
+++ 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.34 b/patches.xen/xen3-patch-2.6.34
index 961f4b083f..da368463f5 100644
--- a/patches.xen/xen3-patch-2.6.34
+++ b/patches.xen/xen3-patch-2.6.34
@@ -56,7 +56,7 @@ Automatically created from "patches.kernel.org/patch-2.6.34" by xen-port-patches
.quad sys_modify_ldt
.quad compat_sys_adjtimex
.quad sys32_mprotect /* 125 */
---- sle11sp2.orig/arch/x86/include/asm/i8259.h 2012-06-21 12:56:31.000000000 +0200
+--- sle11sp2.orig/arch/x86/include/asm/i8259.h 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/arch/x86/include/asm/i8259.h 2011-04-13 13:58:56.000000000 +0200
@@ -54,6 +54,7 @@ extern struct irq_chip i8259A_chip;
@@ -3199,7 +3199,7 @@ Automatically created from "patches.kernel.org/patch-2.6.34" by xen-port-patches
goto exit_entry_free;
}
---- sle11sp2.orig/drivers/misc/Kconfig 2012-06-21 12:56:31.000000000 +0200
+--- sle11sp2.orig/drivers/misc/Kconfig 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/drivers/misc/Kconfig 2011-08-22 10:37:55.000000000 +0200
@@ -437,7 +437,7 @@ config TI_DAC7512
@@ -3672,7 +3672,7 @@ Automatically created from "patches.kernel.org/patch-2.6.34" by xen-port-patches
#include <linux/version.h>
#include <linux/list.h>
---- sle11sp2.orig/drivers/xen/sfc_netutil/accel_cuckoo_hash.c 2012-06-21 12:56:31.000000000 +0200
+--- sle11sp2.orig/drivers/xen/sfc_netutil/accel_cuckoo_hash.c 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/drivers/xen/sfc_netutil/accel_cuckoo_hash.c 2011-02-01 15:03:03.000000000 +0100
@@ -24,6 +24,7 @@
@@ -3778,8 +3778,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34" by xen-port-patches
#include <asm/pci.h>
#include <asm/dma.h>
--- sle11sp2.orig/mm/page_alloc.c 2011-06-30 17:05:24.000000000 +0200
-+++ sle11sp2/mm/page_alloc.c 2012-06-15 11:52:04.000000000 +0200
-@@ -5241,7 +5241,8 @@ static void __setup_per_zone_wmarks(void
++++ sle11sp2/mm/page_alloc.c 2012-07-30 12:34:12.000000000 +0200
+@@ -5235,7 +5235,8 @@ static void __setup_per_zone_wmarks(void
high = percpu_pagelist_fraction
? zone->present_pages / percpu_pagelist_fraction
: 5 * zone_batchsize(zone);
@@ -3789,7 +3789,7 @@ Automatically created from "patches.kernel.org/patch-2.6.34" by xen-port-patches
}
}
#endif
-@@ -5923,6 +5924,11 @@ static struct trace_print_flags pageflag
+@@ -5917,6 +5918,11 @@ static struct trace_print_flags pageflag
#ifdef CONFIG_MEMORY_FAILURE
{1UL << PG_hwpoison, "hwpoison" },
#endif
diff --git a/patches.xen/xen3-patch-2.6.35 b/patches.xen/xen3-patch-2.6.35
index 65d902f2d7..bddcf5a28e 100644
--- a/patches.xen/xen3-patch-2.6.35
+++ b/patches.xen/xen3-patch-2.6.35
@@ -1004,7 +1004,7 @@ Automatically created from "patches.kernel.org/patch-2.6.35" by xen-port-patches
/* Convert jiffies to system time. */
--- sle11sp2.orig/arch/x86/kernel/traps-xen.c 2011-02-01 15:03:03.000000000 +0100
-+++ sle11sp2/arch/x86/kernel/traps-xen.c 2011-02-01 15:03:10.000000000 +0100
++++ sle11sp2/arch/x86/kernel/traps-xen.c 2012-07-30 12:34:20.000000000 +0200
@@ -15,6 +15,7 @@
#include <linux/kprobes.h>
#include <linux/uaccess.h>
@@ -1287,7 +1287,7 @@ Automatically created from "patches.kernel.org/patch-2.6.35" by xen-port-patches
}
#ifndef CONFIG_XEN
-@@ -877,12 +815,18 @@ dotraplinkage void do_iret_error(struct
+@@ -879,12 +817,18 @@ dotraplinkage void do_iret_error(struct
* NB. All these are "trap gates" (i.e. events_mask isn't set) except
* for those that specify <dpl>|4 in the second field.
*/
@@ -1307,7 +1307,7 @@ Automatically created from "patches.kernel.org/patch-2.6.35" by xen-port-patches
{ 0, 0|X, __KERNEL_CS, (unsigned long)divide_error },
{ 1, 0|4, __KERNEL_CS, (unsigned long)debug },
{ 3, 3|4, __KERNEL_CS, (unsigned long)int3 },
-@@ -911,6 +855,16 @@ static const trap_info_t __cpuinitconst
+@@ -913,6 +857,16 @@ static const trap_info_t __cpuinitconst
{ 0, 0, 0, 0 }
};
@@ -1858,7 +1858,7 @@ Automatically created from "patches.kernel.org/patch-2.6.35" by xen-port-patches
}
static void *memtype_seq_start(struct seq_file *seq, loff_t *pos)
---- sle11sp2.orig/arch/x86/mm/pat_internal.h 2012-05-29 10:30:33.000000000 +0200
+--- sle11sp2.orig/arch/x86/mm/pat_internal.h 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/arch/x86/mm/pat_internal.h 2011-04-13 14:02:46.000000000 +0200
@@ -21,6 +21,10 @@ static inline char *cattr_name(unsigned
case _PAGE_CACHE_UC_MINUS: return "uncached-minus";
@@ -1979,7 +1979,7 @@ Automatically created from "patches.kernel.org/patch-2.6.35" by xen-port-patches
if (processor_pm_external())
processor_notify_external(pr,
---- sle11sp2.orig/drivers/gpu/drm/ttm/ttm_page_alloc.c 2012-05-29 10:30:33.000000000 +0200
+--- sle11sp2.orig/drivers/gpu/drm/ttm/ttm_page_alloc.c 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/drivers/gpu/drm/ttm/ttm_page_alloc.c 2012-02-28 16:46:29.000000000 +0100
@@ -500,6 +500,19 @@ static int ttm_alloc_new_pages(struct li
for (i = 0, cpages = 0; i < count; ++i) {
@@ -2569,7 +2569,7 @@ Automatically created from "patches.kernel.org/patch-2.6.35" by xen-port-patches
* Map a set of buffers described by scatterlist in streaming mode for DMA.
* This is the scatter-gather version of the above swiotlb_map_page
* interface. Here the scatter gather list elements are each tagged with the
---- sle11sp2.orig/mm/page_alloc.c 2012-03-19 11:39:11.000000000 +0100
+--- sle11sp2.orig/mm/page_alloc.c 2012-07-30 12:34:12.000000000 +0200
+++ sle11sp2/mm/page_alloc.c 2012-01-11 12:19:19.000000000 +0100
@@ -655,9 +655,8 @@ static bool free_pages_prepare(struct pa
diff --git a/patches.xen/xen3-patch-2.6.37 b/patches.xen/xen3-patch-2.6.37
index 07575969f9..487755fcc8 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 2012-06-21 12:56:30.000000000 +0200
+--- sle11sp2.orig/arch/x86/include/asm/io.h 2012-07-30 12:13:21.000000000 +0200
+++ 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);
@@ -3996,7 +3996,7 @@ Automatically created from "patches.kernel.org/patch-2.6.37" by xen-port-patches
return 0;
}
---- sle11sp2.orig/arch/x86/kernel/resource.c 2012-06-21 12:56:30.000000000 +0200
+--- sle11sp2.orig/arch/x86/kernel/resource.c 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/arch/x86/kernel/resource.c 2011-09-23 14:48:43.000000000 +0200
@@ -1,3 +1,7 @@
+#ifdef CONFIG_XEN
@@ -4538,7 +4538,7 @@ Automatically created from "patches.kernel.org/patch-2.6.37" by xen-port-patches
}
--- sle11sp2.orig/arch/x86/kernel/traps-xen.c 2011-02-01 15:04:27.000000000 +0100
-+++ sle11sp2/arch/x86/kernel/traps-xen.c 2011-02-01 15:09:47.000000000 +0100
++++ sle11sp2/arch/x86/kernel/traps-xen.c 2012-07-30 12:34:38.000000000 +0200
@@ -568,6 +568,7 @@ dotraplinkage void __kprobes do_debug(st
if (regs->flags & X86_VM_MASK) {
handle_vm86_trap((struct kernel_vm86_regs *) regs,
@@ -4547,7 +4547,7 @@ Automatically created from "patches.kernel.org/patch-2.6.37" by xen-port-patches
return;
}
-@@ -770,21 +771,10 @@ asmlinkage void math_state_restore(void)
+@@ -772,21 +773,10 @@ asmlinkage void math_state_restore(void)
}
EXPORT_SYMBOL_GPL(math_state_restore);
@@ -4570,7 +4570,7 @@ Automatically created from "patches.kernel.org/patch-2.6.37" by xen-port-patches
if (read_cr0() & X86_CR0_EM) {
struct math_emu_info info = { };
-@@ -792,12 +782,12 @@ do_device_not_available(struct pt_regs *
+@@ -794,12 +784,12 @@ do_device_not_available(struct pt_regs *
info.regs = regs;
math_emulate(&info);
@@ -4588,7 +4588,7 @@ Automatically created from "patches.kernel.org/patch-2.6.37" by xen-port-patches
#endif
}
-@@ -880,20 +870,6 @@ void __init trap_init(void)
+@@ -882,20 +872,6 @@ void __init trap_init(void)
if (ret)
printk("HYPERVISOR_set_trap_table failed (%d)\n", ret);
@@ -5587,7 +5587,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 2012-06-21 12:56:31.000000000 +0200
+--- sle11sp2.orig/arch/x86/mm/memblock.c 2012-07-30 12:13:21.000000000 +0200
+++ 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
{
@@ -5758,7 +5758,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 2012-06-21 12:56:31.000000000 +0200
+--- sle11sp2.orig/drivers/pci/Makefile 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/drivers/pci/Makefile 2011-06-30 17:18:11.000000000 +0200
@@ -74,6 +74,6 @@ obj-$(CONFIG_PCI_SYSCALL) += syscall.o
@@ -5768,7 +5768,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 2012-06-21 12:56:31.000000000 +0200
+--- sle11sp2.orig/drivers/pci/xen-pcifront.c 2012-07-30 12:13:21.000000000 +0200
+++ 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
@@ -7201,8 +7201,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-05-29 11:02:34.000000000 +0200
-+++ sle11sp2/drivers/xen/core/spinlock.c 2012-05-29 11:06:52.000000000 +0200
+--- 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
@@ -24,7 +24,7 @@ struct spinning {
struct spinning *prev;
};
@@ -7212,7 +7212,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
-@@ -221,7 +221,7 @@ bool xen_spin_wait(arch_spinlock_t *lock
+@@ -228,7 +228,7 @@ bool xen_spin_wait(arch_spinlock_t *lock
unsigned int flags)
{
typeof(vcpu_info(0)->evtchn_upcall_mask) upcall_mask
@@ -7221,7 +7221,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. */
-@@ -245,7 +245,7 @@ bool xen_spin_wait(arch_spinlock_t *lock
+@@ -252,7 +252,7 @@ bool xen_spin_wait(arch_spinlock_t *lock
break;
}
}
@@ -7230,7 +7230,7 @@ Automatically created from "patches.kernel.org/patch-2.6.37" by xen-port-patches
#endif
smp_wmb();
percpu_write(_spinning, &spinning);
-@@ -272,7 +272,7 @@ bool xen_spin_wait(arch_spinlock_t *lock
+@@ -279,7 +279,7 @@ bool xen_spin_wait(arch_spinlock_t *lock
if (upcall_mask > flags) {
spinning.irq_count = percpu_read(_irq_count);
smp_wmb();
@@ -7239,7 +7239,7 @@ Automatically created from "patches.kernel.org/patch-2.6.37" by xen-port-patches
}
#endif
-@@ -281,7 +281,7 @@ bool xen_spin_wait(arch_spinlock_t *lock
+@@ -288,7 +288,7 @@ bool xen_spin_wait(arch_spinlock_t *lock
BUG();
#if CONFIG_XEN_SPINLOCK_ACQUIRE_NESTING
@@ -7248,7 +7248,7 @@ Automatically created from "patches.kernel.org/patch-2.6.37" by xen-port-patches
smp_wmb();
spinning.irq_count = UINT_MAX;
#endif
-@@ -300,9 +300,9 @@ bool xen_spin_wait(arch_spinlock_t *lock
+@@ -307,9 +307,9 @@ bool xen_spin_wait(arch_spinlock_t *lock
/* announce we're done */
percpu_write(_spinning, spinning.prev);
if (!CONFIG_XEN_SPINLOCK_ACQUIRE_NESTING)
@@ -7260,7 +7260,7 @@ Automatically created from "patches.kernel.org/patch-2.6.37" by xen-port-patches
smp_rmb();
if (lock->cur == spinning.ticket)
return true;
-@@ -333,7 +333,7 @@ void xen_spin_kick(arch_spinlock_t *lock
+@@ -343,7 +343,7 @@ void xen_spin_kick(arch_spinlock_t *lock
return;
}
@@ -7269,7 +7269,7 @@ Automatically created from "patches.kernel.org/patch-2.6.37" by xen-port-patches
for (;;) {
unsigned int rm_idx = per_cpu(rm_seq.idx, cpu);
-@@ -366,7 +366,7 @@ void xen_spin_kick(arch_spinlock_t *lock
+@@ -376,7 +376,7 @@ void xen_spin_kick(arch_spinlock_t *lock
}
atomic_dec(rm_ctr);
@@ -7325,7 +7325,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 2012-06-21 12:56:31.000000000 +0200
+--- sle11sp2.orig/drivers/xen/pci.c 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/drivers/xen/pci.c 2012-05-22 11:51:14.000000000 +0200
@@ -18,34 +18,105 @@
*/
@@ -7597,7 +7597,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 2012-06-21 12:56:31.000000000 +0200
+--- sle11sp2.orig/drivers/xen/sfc_netback/ci/tools/platform/linux_kernel.h 2012-07-30 12:13:21.000000000 +0200
+++ 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>
@@ -7723,7 +7723,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 2012-06-21 12:56:31.000000000 +0200
+--- sle11sp2.orig/include/xen/privcmd.h 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/include/xen/privcmd.h 2011-04-13 14:05:37.000000000 +0200
@@ -1,77 +1,3 @@
-/******************************************************************************
@@ -7816,7 +7816,7 @@ Automatically created from "patches.kernel.org/patch-2.6.37" by xen-port-patches
typedef struct privcmd_hypercall
{
---- sle11sp2.orig/kernel/power/Kconfig 2012-06-21 12:56:31.000000000 +0200
+--- sle11sp2.orig/kernel/power/Kconfig 2012-07-30 12:13:21.000000000 +0200
+++ 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 a5b22adbc1..9a6946ee2b 100644
--- a/patches.xen/xen3-patch-2.6.38
+++ b/patches.xen/xen3-patch-2.6.38
@@ -7,7 +7,7 @@ Patch-mainline: 2.6.38
Acked-by: Jeff Mahoney <jeffm@suse.com>
Automatically created from "patches.kernel.org/patch-2.6.38" by xen-port-patches.py
---- sle11sp2.orig/arch/x86/Kconfig 2011-08-22 10:40:03.000000000 +0200
+--- sle11sp2.orig/arch/x86/Kconfig 2012-06-21 13:40:35.000000000 +0200
+++ sle11sp2/arch/x86/Kconfig 2011-06-30 17:19:31.000000000 +0200
@@ -50,7 +50,7 @@ config X86
select HAVE_KERNEL_GZIP
@@ -41,7 +41,7 @@ Automatically created from "patches.kernel.org/patch-2.6.38" by xen-port-patches
extern void setup_boot_APIC_clock(void);
extern void setup_secondary_APIC_clock(void);
extern int APIC_init_uniprocessor(void);
---- sle11sp2.orig/arch/x86/include/asm/xen/hypervisor.h 2012-05-29 11:53:28.000000000 +0200
+--- sle11sp2.orig/arch/x86/include/asm/xen/hypervisor.h 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/arch/x86/include/asm/xen/hypervisor.h 2011-04-13 14:08:57.000000000 +0200
@@ -58,7 +58,7 @@ static inline uint32_t xen_cpuid_base(vo
return 0;
@@ -66,7 +66,7 @@ Automatically created from "patches.kernel.org/patch-2.6.38" by xen-port-patches
/*
* 256 temporary boot-time mappings, used by early_ioremap(),
* before ioremap() is functional.
---- sle11sp2.orig/arch/x86/include/mach-xen/asm/mach_traps.h 2012-05-29 11:53:28.000000000 +0200
+--- sle11sp2.orig/arch/x86/include/mach-xen/asm/mach_traps.h 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/arch/x86/include/mach-xen/asm/mach_traps.h 2011-02-07 12:21:00.000000000 +0100
@@ -9,7 +9,11 @@
#include <linux/bitops.h>
@@ -1477,7 +1477,7 @@ Automatically created from "patches.kernel.org/patch-2.6.38" by xen-port-patches
kvm_guest_init();
---- sle11sp2.orig/arch/x86/kernel/traps-xen.c 2011-02-01 15:09:47.000000000 +0100
+--- sle11sp2.orig/arch/x86/kernel/traps-xen.c 2012-07-30 12:34:38.000000000 +0200
+++ sle11sp2/arch/x86/kernel/traps-xen.c 2011-07-21 12:21:48.000000000 +0200
@@ -87,6 +87,13 @@ EXPORT_SYMBOL_GPL(used_vectors);
@@ -2141,6 +2141,26 @@ Automatically created from "patches.kernel.org/patch-2.6.38" by xen-port-patches
/**
* reserve_top_address - reserves a hole in the top of kernel address space
* @reserve - size of hole to reserve
+--- sle11sp2.orig/drivers/acpi/apei/ghes.c 2011-09-22 14:26:35.000000000 +0200
++++ sle11sp2/drivers/acpi/apei/ghes.c 2012-07-26 09:36:38.000000000 +0200
+@@ -203,7 +203,7 @@ static void __iomem *ghes_ioremap_pfn_nm
+
+ vaddr = (unsigned long)GHES_IOREMAP_NMI_PAGE(ghes_ioremap_area->addr);
+ ioremap_page_range(vaddr, vaddr + PAGE_SIZE,
+- pfn << PAGE_SHIFT, PAGE_KERNEL);
++ pfn << PAGE_SHIFT, PAGE_KERNEL_IO);
+
+ return (void __iomem *)vaddr;
+ }
+@@ -214,7 +214,7 @@ static void __iomem *ghes_ioremap_pfn_ir
+
+ vaddr = (unsigned long)GHES_IOREMAP_IRQ_PAGE(ghes_ioremap_area->addr);
+ ioremap_page_range(vaddr, vaddr + PAGE_SIZE,
+- pfn << PAGE_SHIFT, PAGE_KERNEL);
++ pfn << PAGE_SHIFT, PAGE_KERNEL_IO);
+
+ return (void __iomem *)vaddr;
+ }
--- sle11sp2.orig/drivers/hwmon/coretemp-xen.c 2011-02-01 15:04:27.000000000 +0100
+++ sle11sp2/drivers/hwmon/coretemp-xen.c 2011-02-01 16:38:02.000000000 +0100
@@ -20,6 +20,8 @@
@@ -2232,7 +2252,7 @@ Automatically created from "patches.kernel.org/patch-2.6.38" by xen-port-patches
}
}
mutex_unlock(&pdev_list_mutex);
---- sle11sp2.orig/drivers/scsi/arcmsr/arcmsr.h 2012-05-29 11:53:28.000000000 +0200
+--- sle11sp2.orig/drivers/scsi/arcmsr/arcmsr.h 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/drivers/scsi/arcmsr/arcmsr.h 2011-04-13 14:08:57.000000000 +0200
@@ -46,7 +46,7 @@
struct device_attribute;
@@ -2528,9 +2548,9 @@ Automatically created from "patches.kernel.org/patch-2.6.38" by xen-port-patches
touch_softlockup_watchdog();
preempt_disable();
cpu = smp_processor_id();
---- sle11sp2.orig/drivers/xen/core/spinlock.c 2012-05-29 11:06:52.000000000 +0200
-+++ sle11sp2/drivers/xen/core/spinlock.c 2012-05-29 11:54:02.000000000 +0200
-@@ -190,7 +190,7 @@ void xen_spin_irq_exit(void)
+--- 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)
* We're guaranteed to see another invocation of xen_spin_irq_enter()
* if any of the tickets need to be dropped again.
*/
@@ -3522,7 +3542,7 @@ Automatically created from "patches.kernel.org/patch-2.6.38" by xen-port-patches
EXPORT_SYMBOL_GPL(xenbus_for_each_backend);
+
+#endif
---- sle11sp2.orig/include/xen/gntdev.h 2012-05-29 11:53:28.000000000 +0200
+--- sle11sp2.orig/include/xen/gntdev.h 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/include/xen/gntdev.h 2011-04-13 14:08:57.000000000 +0200
@@ -1,150 +1,3 @@
-/******************************************************************************
@@ -3678,7 +3698,7 @@ Automatically created from "patches.kernel.org/patch-2.6.38" by xen-port-patches
+#if defined(CONFIG_PARAVIRT_XEN) || !defined(__KERNEL__)
+#include "public/gntdev.h"
+#endif
---- sle11sp2.orig/include/xen/public/gntdev.h 2012-05-29 11:53:28.000000000 +0200
+--- sle11sp2.orig/include/xen/public/gntdev.h 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/include/xen/public/gntdev.h 2011-02-03 13:52:28.000000000 +0100
@@ -66,7 +66,7 @@ struct ioctl_gntdev_map_grant_ref {
* before this ioctl is called, or an error will result.
@@ -3716,7 +3736,7 @@ Automatically created from "patches.kernel.org/patch-2.6.38" by xen-port-patches
return dev_addr;
}
EXPORT_SYMBOL_GPL(swiotlb_map_page);
---- sle11sp2.orig/mm/Kconfig 2012-05-29 11:53:28.000000000 +0200
+--- sle11sp2.orig/mm/Kconfig 2012-07-30 12:13:21.000000000 +0200
+++ sle11sp2/mm/Kconfig 2011-04-15 10:19:00.000000000 +0200
@@ -304,7 +304,7 @@ config NOMMU_INITIAL_TRIM_EXCESS
diff --git a/series.conf b/series.conf
index a315ecfe3f..85eed85aca 100644
--- a/series.conf
+++ b/series.conf
@@ -504,6 +504,8 @@
patches.arch/s390-55-02-lgr-early-panic.patch
patches.arch/s390-55-03-crst-table-downgrade.patch
+ patches.arch/s390-do-not-clobber-personality-flags-on-exec.patch
+
########################################################
# VM/FS patches
########################################################
@@ -3268,6 +3270,7 @@
+BTMU patches.suse/md-raid10-tracepoints
+BTMU patches.suse/md-wakeup-thread-upon-rdev_dec_pending
+BTMU patches.suse/md-abort-pending-requests
++BTMU patches.suse/md-bitmap-unplug-fixes
##########################################################
#
@@ -3380,6 +3383,7 @@
patches.drivers/0001-ida-simplified-functions-for-id-allocation.patch
patches.drivers/0002-ida-make-ida_simple_get-put-IRQ-safe.patch
patches.drivers/0003-virtio-blk-use-ida-to-allocate-disk-index.patch
+ patches.fixes/kvm-kvmclock-apply-kvmclock-offset-to-guest-wall-clo.patch
########################################################
# Staging tree patches