Home Home > GIT Browse > openSUSE-15.0
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@novell.com>2011-09-08 11:30:21 +0200
committerJan Beulich <jbeulich@novell.com>2011-09-08 11:30:21 +0200
commit249816db9250da316484577e887320f94615cd6c (patch)
treeda1377afad91129a9a025e99edf885e0aeba39a8
parentcc3929b5ba000d8485bd013401ea13881248f341 (diff)
- Update Xen patches to 3.0.4 and c/s 1104.rpm-3.0.4-0.13
- patches.xen/frontswap-*: Update to v8 of upstream submission. - patches.xen/xen3-acpi_processor_delay_cpuidle_init_on_hotplug.patch: Delete.
-rw-r--r--kernel-source.changes8
-rw-r--r--patches.xen/add-console-use-vt12
-rw-r--r--patches.xen/frontswap-config22
-rw-r--r--patches.xen/frontswap-core105
-rw-r--r--patches.xen/frontswap-hooks112
-rw-r--r--patches.xen/frontswap-structure-changes27
-rw-r--r--patches.xen/pci-guestdev56
-rw-r--r--patches.xen/xen-blkback-cdrom32
-rw-r--r--patches.xen/xen-blkfront-hvm-no-cdrom2
-rw-r--r--patches.xen/xen-blkif-protocol-fallback-hack24
-rw-r--r--patches.xen/xen-clockevents68
-rw-r--r--patches.xen/xen-cpufreq-report14
-rw-r--r--patches.xen/xen-kzalloc52
-rw-r--r--patches.xen/xen-op-packet68
-rw-r--r--patches.xen/xen-sys-suspend38
-rw-r--r--patches.xen/xen-virq-per-cpu-irq32
-rw-r--r--patches.xen/xen-x86-bigmem18
-rw-r--r--patches.xen/xen-x86-per-cpu-vcpu-info14
-rw-r--r--patches.xen/xen-x86-pmd-handling40
-rw-r--r--patches.xen/xen-x86_64-pgd-alloc-order44
-rw-r--r--patches.xen/xen-x86_64-pgd-pin18
-rw-r--r--patches.xen/xen-x86_64-unmapped-initrd48
-rw-r--r--patches.xen/xen3-acpi_processor_delay_cpuidle_init_on_hotplug.patch30
-rw-r--r--patches.xen/xen3-auto-arch-i386.diff2
-rw-r--r--patches.xen/xen3-auto-arch-x86.diff2
-rw-r--r--patches.xen/xen3-auto-arch-x86_64.diff2
-rw-r--r--patches.xen/xen3-auto-common.diff213
-rw-r--r--patches.xen/xen3-auto-include-xen-interface.diff2
-rw-r--r--patches.xen/xen3-auto-xen-arch.diff2
-rw-r--r--patches.xen/xen3-auto-xen-drivers.diff2
-rw-r--r--patches.xen/xen3-auto-xen-kconfig.diff2
-rw-r--r--patches.xen/xen3-fixup-common68
-rw-r--r--patches.xen/xen3-fixup-xen2
-rw-r--r--patches.xen/xen3-patch-2.6.19476
-rw-r--r--patches.xen/xen3-patch-2.6.22412
-rw-r--r--patches.xen/xen3-patch-2.6.23496
-rw-r--r--patches.xen/xen3-patch-2.6.2486
-rw-r--r--patches.xen/xen3-patch-2.6.25496
-rw-r--r--patches.xen/xen3-patch-2.6.26458
-rw-r--r--patches.xen/xen3-patch-2.6.27634
-rw-r--r--patches.xen/xen3-patch-2.6.28436
-rw-r--r--patches.xen/xen3-patch-2.6.29380
-rw-r--r--patches.xen/xen3-patch-2.6.30423
-rw-r--r--patches.xen/xen3-patch-2.6.31502
-rw-r--r--patches.xen/xen3-patch-2.6.32463
-rw-r--r--patches.xen/xen3-patch-2.6.3314
-rw-r--r--patches.xen/xen3-patch-2.6.34373
-rw-r--r--patches.xen/xen3-patch-2.6.35198
-rw-r--r--patches.xen/xen3-patch-2.6.3920
-rw-r--r--patches.xen/xen3-patch-3.0365
-rw-r--r--series.conf1
51 files changed, 3827 insertions, 3587 deletions
diff --git a/kernel-source.changes b/kernel-source.changes
index b773549933..d497b2fa8a 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Thu Sep 8 11:29:16 CEST 2011 - jbeulich@novell.com
+
+- Update Xen patches to 3.0.4 and c/s 1104.
+- patches.xen/frontswap-*: Update to v8 of upstream submission.
+- patches.xen/xen3-acpi_processor_delay_cpuidle_init_on_hotplug.patch:
+ Delete.
+
+-------------------------------------------------------------------
Wed Sep 7 23:47:05 CEST 2011 - jeffm@suse.com
- patches.suse/xfs-exports-dmapi: Refresh.
diff --git a/patches.xen/add-console-use-vt b/patches.xen/add-console-use-vt
index 241db027cc..0cee5428cc 100644
--- a/patches.xen/add-console-use-vt
+++ b/patches.xen/add-console-use-vt
@@ -4,8 +4,8 @@ Patch-mainline: no
$subject says all
---- head-2011-06-30.orig/drivers/tty/tty_io.c 2011-06-30 15:04:19.000000000 +0200
-+++ head-2011-06-30/drivers/tty/tty_io.c 2011-06-30 15:21:13.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/tty/tty_io.c 2011-09-06 08:34:28.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/tty/tty_io.c 2011-09-06 08:41:40.000000000 +0200
@@ -137,6 +137,8 @@ EXPORT_SYMBOL(tty_mutex);
/* Spinlock to protect the tty->tty_files list */
DEFINE_SPINLOCK(tty_files_lock);
@@ -15,7 +15,7 @@ $subject says all
static ssize_t tty_read(struct file *, char __user *, size_t, loff_t *);
static ssize_t tty_write(struct file *, const char __user *, size_t, loff_t *);
ssize_t redirected_tty_write(struct file *, const char __user *,
-@@ -1835,7 +1837,7 @@ retry_open:
+@@ -1834,7 +1836,7 @@ retry_open:
goto got_driver;
}
#ifdef CONFIG_VT
@@ -24,7 +24,7 @@ $subject says all
extern struct tty_driver *console_driver;
driver = tty_driver_kref_get(console_driver);
index = fg_console;
-@@ -3327,7 +3329,8 @@ int __init tty_init(void)
+@@ -3326,7 +3328,8 @@ int __init tty_init(void)
WARN_ON(device_create_file(consdev, &dev_attr_active) < 0);
#ifdef CONFIG_VT
@@ -34,8 +34,8 @@ $subject says all
#endif
return 0;
}
---- head-2011-06-30.orig/include/linux/console.h 2011-03-15 02:20:32.000000000 +0100
-+++ head-2011-06-30/include/linux/console.h 2011-01-31 14:30:58.000000000 +0100
+--- sle11sp2-2011-09-06.orig/include/linux/console.h 2011-09-06 08:34:28.000000000 +0200
++++ sle11sp2-2011-09-06/include/linux/console.h 2011-01-31 14:30:58.000000000 +0100
@@ -73,6 +73,7 @@ extern const struct consw dummy_con; /*
extern const struct consw vga_con; /* VGA text console */
extern const struct consw newport_con; /* SGI Newport console */
diff --git a/patches.xen/frontswap-config b/patches.xen/frontswap-config
index 820cecf7b8..5c3e20583d 100644
--- a/patches.xen/frontswap-config
+++ b/patches.xen/frontswap-config
@@ -1,15 +1,18 @@
From: Dan Magenheimer <dan.magenheimer@oracle.com>
-Subject: [PATCH V6 4/4] mm: frontswap: config and doc files
-Patch-mainline: n/a
+Subject: [PATCH V8 4/4] mm: frontswap: config and doc files
+Patch-mainline: slated for 3.2
This fourth patch of four in the frontswap series adds configuration
and documentation files.
+[v8: rebase to 3.0-rc4]
+[v7: rebase to 3.0-rc3]
[v6: rebase to 3.0-rc1]
[v5: change config default to n]
[v4: rebase to 2.6.39]
Signed-off-by: Dan Magenheimer <dan.magenheimer@oracle.com>
Reviewed-by: Konrad Wilk <konrad.wilk@oracle.com>
+Acked-by: Jan Beulich <JBeulich@novell.com>
Acked-by: Seth Jennings <sjenning@linux.vnet.ibm.com>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Hugh Dickins <hughd@google.com>
@@ -17,14 +20,11 @@ Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Nitin Gupta <ngupta@vflare.org>
Cc: Matthew Wilcox <matthew@wil.cx>
Cc: Chris Mason <chris.mason@oracle.com>
-Cc: Jan Beulich <JBeulich@novell.com>
Cc: Rik Riel <riel@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
-Acked-by: jbeulich@novell.com
-
---- head-2011-08-09.orig/mm/Makefile 2011-07-22 04:17:23.000000000 +0200
-+++ head-2011-08-09/mm/Makefile 2011-08-08 16:59:24.000000000 +0200
+--- sle11sp2-2011-09-06.orig/mm/Makefile 2011-09-06 08:34:28.000000000 +0200
++++ sle11sp2-2011-09-06/mm/Makefile 2011-08-29 17:52:14.000000000 +0200
@@ -25,6 +25,7 @@ obj-$(CONFIG_HAVE_MEMBLOCK) += memblock.
obj-$(CONFIG_BOUNCE) += bounce.o
@@ -33,8 +33,8 @@ Acked-by: jbeulich@novell.com
obj-$(CONFIG_HAS_DMA) += dmapool.o
obj-$(CONFIG_HUGETLBFS) += hugetlb.o
obj-$(CONFIG_NUMA) += mempolicy.o
---- head-2011-08-09.orig/mm/Kconfig 2011-08-09 10:14:47.000000000 +0200
-+++ head-2011-08-09/mm/Kconfig 2011-08-08 17:24:13.000000000 +0200
+--- sle11sp2-2011-09-06.orig/mm/Kconfig 2011-09-06 08:34:28.000000000 +0200
++++ sle11sp2-2011-09-06/mm/Kconfig 2011-08-29 17:52:14.000000000 +0200
@@ -370,3 +370,20 @@ config CLEANCACHE
in a negligible performance hit.
@@ -57,7 +57,7 @@ Acked-by: jbeulich@novell.com
+
+ If unsure, say Y to enable frontswap.
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-08-09/Documentation/ABI/testing/sysfs-kernel-mm-frontswap 2011-08-08 17:01:30.000000000 +0200
++++ sle11sp2-2011-09-06/Documentation/ABI/testing/sysfs-kernel-mm-frontswap 2011-08-29 17:52:14.000000000 +0200
@@ -0,0 +1,16 @@
+What: /sys/kernel/mm/frontswap/
+Date: August 2011
@@ -76,7 +76,7 @@ Acked-by: jbeulich@novell.com
+ the number of frontswap pages to that integer if memory
+ constraints permit.
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-08-09/Documentation/vm/frontswap.txt 2011-08-08 17:16:41.000000000 +0200
++++ sle11sp2-2011-09-06/Documentation/vm/frontswap.txt 2011-08-29 17:52:14.000000000 +0200
@@ -0,0 +1,215 @@
+Frontswap provides a "transcendent memory" interface for swap pages.
+In some environments, dramatic performance savings may be obtained because
diff --git a/patches.xen/frontswap-core b/patches.xen/frontswap-core
index 6cd578cae3..42baff56d8 100644
--- a/patches.xen/frontswap-core
+++ b/patches.xen/frontswap-core
@@ -1,6 +1,6 @@
From: Dan Magenheimer <dan.magenheimer@oracle.com>
-Subject: [PATCH V6 2/4] mm: frontswap: core code
-Patch-mainline: n/a
+Subject: [PATCH V8 2/4] mm: frontswap: core code
+Patch-mainline: slated for 3.2
This second patch of four in this frontswap series provides the core code
for frontswap that interfaces between the hooks in the swap subsystem and
@@ -11,6 +11,11 @@ Two new files are added: mm/frontswap.c and include/linux/frontswap.h
Credits: Frontswap_ops design derived from Jeremy Fitzhardinge
design for tmem; sysfs code modelled after mm/ksm.c
+[v8: rebase to 3.0-rc4]
+[v8: kamezawa.hiroyu@jp.fujitsu.com: change count to atomic_t to avoid races]
+[v7: rebase to 3.0-rc3]
+[v7: JBeulich@novell.com: new static inlines resolve to no-ops if not config'd]
+[v7: JBeulich@novell.com: avoid redundant shifts/divides for *_bit lib calls]
[v6: rebase to 3.1-rc1]
[v6: lliubbo@gmail.com: fix null pointer deref if vzalloc fails]
[v6: konrad.wilk@oracl.com: various checks and code clarifications/comments]
@@ -18,6 +23,7 @@ design for tmem; sysfs code modelled after mm/ksm.c
[v4: rebase to 2.6.39]
Signed-off-by: Dan Magenheimer <dan.magenheimer@oracle.com>
Reviewed-by: Konrad Wilk <konrad.wilk@oracle.com>
+Acked-by: Jan Beulich <JBeulich@novell.com>
Acked-by: Seth Jennings <sjenning@linux.vnet.ibm.com>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Hugh Dickins <hughd@google.com>
@@ -25,15 +31,12 @@ Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Nitin Gupta <ngupta@vflare.org>
Cc: Matthew Wilcox <matthew@wil.cx>
Cc: Chris Mason <chris.mason@oracle.com>
-Cc: Jan Beulich <JBeulich@novell.com>
Cc: Rik Riel <riel@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
-Acked-by: jbeulich@novell.com
-
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-08-09/include/linux/frontswap.h 2011-08-09 14:22:03.000000000 +0200
-@@ -0,0 +1,96 @@
++++ sle11sp2-2011-09-06/include/linux/frontswap.h 2011-08-29 17:52:14.000000000 +0200
+@@ -0,0 +1,125 @@
+#ifndef _LINUX_FRONTSWAP_H
+#define _LINUX_FRONTSWAP_H
+
@@ -60,39 +63,68 @@ Acked-by: jbeulich@novell.com
+extern void __frontswap_flush_page(unsigned, pgoff_t);
+extern void __frontswap_flush_area(unsigned);
+
-+#ifndef CONFIG_FRONTSWAP
-+/* all inline routines become no-ops and all externs are ignored */
-+#define frontswap_enabled (0)
-+#endif
++#ifdef CONFIG_FRONTSWAP
+
+static inline int frontswap_test(struct swap_info_struct *sis, pgoff_t offset)
+{
+ int ret = 0;
+
-+#ifdef CONFIG_FRONTSWAP
-+ if (sis->frontswap_map)
++ if (frontswap_enabled && sis->frontswap_map)
+ ret = test_bit(offset, sis->frontswap_map);
-+#endif
-+
+ return ret;
+}
+
+static inline void frontswap_set(struct swap_info_struct *sis, pgoff_t offset)
+{
-+#ifdef CONFIG_FRONTSWAP
-+ if (sis->frontswap_map)
++ if (frontswap_enabled && sis->frontswap_map)
+ set_bit(offset, sis->frontswap_map);
-+#endif
+}
+
+static inline void frontswap_clear(struct swap_info_struct *sis, pgoff_t offset)
+{
-+#ifdef CONFIG_FRONTSWAP
-+ if (sis->frontswap_map)
++ if (frontswap_enabled && sis->frontswap_map)
+ clear_bit(offset, sis->frontswap_map);
-+#endif
+}
+
++static inline void frontswap_map_set(struct swap_info_struct *p,
++ unsigned long *map)
++{
++ p->frontswap_map = map;
++}
++
++static inline unsigned long *frontswap_map_get(struct swap_info_struct *p)
++{
++ return p->frontswap_map;
++}
++#else
++/* all inline routines become no-ops and all externs are ignored */
++
++#define frontswap_enabled (0)
++
++static inline int frontswap_test(struct swap_info_struct *sis, pgoff_t offset)
++{
++ return 0;
++}
++
++static inline void frontswap_set(struct swap_info_struct *sis, pgoff_t offset)
++{
++}
++
++static inline void frontswap_clear(struct swap_info_struct *sis, pgoff_t offset)
++{
++}
++
++static inline void frontswap_map_set(struct swap_info_struct *p,
++ unsigned long *map)
++{
++}
++
++static inline unsigned long *frontswap_map_get(struct swap_info_struct *p)
++{
++ return NULL;
++}
++#endif
++
+static inline int frontswap_put_page(struct page *page)
+{
+ int ret = -1;
@@ -131,8 +163,8 @@ Acked-by: jbeulich@novell.com
+
+#endif /* _LINUX_FRONTSWAP_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-08-09/mm/frontswap.c 2011-08-08 18:27:43.000000000 +0200
-@@ -0,0 +1,346 @@
++++ sle11sp2-2011-09-06/mm/frontswap.c 2011-08-29 18:04:05.000000000 +0200
+@@ -0,0 +1,351 @@
+/*
+ * Frontswap frontend
+ *
@@ -173,14 +205,17 @@ Acked-by: jbeulich@novell.com
+int frontswap_enabled;
+EXPORT_SYMBOL(frontswap_enabled);
+
-+/* useful stats available in /sys/kernel/mm/frontswap */
++/*
++ * Useful stats available in /sys/kernel/mm/frontswap. These are for
++ * information only so are not protected against increment/decrement races.
++ */
+static unsigned long frontswap_gets;
+static unsigned long frontswap_succ_puts;
+static unsigned long frontswap_failed_puts;
+static unsigned long frontswap_flushes;
+
+/*
-+ * register operations for frontswap, returning previous thus allowing
++ * Register operations for frontswap, returning previous thus allowing
+ * detection of multiple backends and possible nesting
+ */
+struct frontswap_ops frontswap_register_ops(struct frontswap_ops *ops)
@@ -230,14 +265,14 @@ Acked-by: jbeulich@novell.com
+ frontswap_set(sis, offset);
+ frontswap_succ_puts++;
+ if (!dup)
-+ sis->frontswap_pages++;
++ atomic_inc(&sis->frontswap_pages);
+ } else if (dup) {
+ /*
+ failed dup always results in automatic flush of
+ the (older) page from frontswap
+ */
+ frontswap_clear(sis, offset);
-+ sis->frontswap_pages--;
++ atomic_dec(&sis->frontswap_pages);
+ frontswap_failed_puts++;
+ } else
+ frontswap_failed_puts++;
@@ -279,7 +314,7 @@ Acked-by: jbeulich@novell.com
+ BUG_ON(sis == NULL);
+ if (frontswap_test(sis, offset)) {
+ (*frontswap_ops.flush_page)(type, offset);
-+ sis->frontswap_pages--;
++ atomic_dec(&sis->frontswap_pages);
+ frontswap_clear(sis, offset);
+ frontswap_flushes++;
+ }
@@ -298,7 +333,7 @@ Acked-by: jbeulich@novell.com
+ if (sis->frontswap_map == NULL)
+ return;
+ (*frontswap_ops.flush_area)(type);
-+ sis->frontswap_pages = 0;
++ atomic_set(&sis->frontswap_pages, 0);
+ memset(sis->frontswap_map, 0, sis->max / sizeof(long));
+}
+EXPORT_SYMBOL(__frontswap_flush_area);
@@ -319,6 +354,7 @@ Acked-by: jbeulich@novell.com
+ for (wrapped = 0; wrapped < 3; wrapped++) {
+
+ struct swap_info_struct *si = NULL;
++ int si_frontswap_pages;
+ unsigned long total_pages = 0, total_pages_to_unuse;
+ unsigned long pages = 0, pages_to_unuse = 0;
+ int type;
@@ -333,17 +369,18 @@ Acked-by: jbeulich@novell.com
+ total_pages = 0;
+ for (type = swap_list.head; type >= 0; type = si->next) {
+ si = swap_info[type];
-+ total_pages += si->frontswap_pages;
++ total_pages += atomic_read(&si->frontswap_pages);
+ }
+ if (total_pages <= target_pages)
+ goto out;
+ total_pages_to_unuse = total_pages - target_pages;
+ for (type = swap_list.head; type >= 0; type = si->next) {
+ si = swap_info[type];
-+ if (total_pages_to_unuse < si->frontswap_pages)
++ si_frontswap_pages = atomic_read(&si->frontswap_pages);
++ if (total_pages_to_unuse < si_frontswap_pages)
+ pages = pages_to_unuse = total_pages_to_unuse;
+ else {
-+ pages = si->frontswap_pages;
++ pages = si_frontswap_pages;
+ pages_to_unuse = 0; /* unuse all */
+ }
+ if (security_vm_enough_memory_kern(pages))
@@ -366,7 +403,7 @@ Acked-by: jbeulich@novell.com
+EXPORT_SYMBOL(frontswap_shrink);
+
+/*
-+ * count and return the number of pages frontswap pages across all
++ * Count and return the number of pages frontswap pages across all
+ * swap devices. This is exported so that a kernel module can
+ * determine current usage without reading sysfs.
+ */
@@ -380,7 +417,7 @@ Acked-by: jbeulich@novell.com
+ for (type = swap_list.head; type >= 0; type = si->next) {
+ si = swap_info[type];
+ if (si != NULL)
-+ totalpages += si->frontswap_pages;
++ totalpages += atomic_read(&si->frontswap_pages);
+ }
+ spin_unlock(&swap_lock);
+ return totalpages;
diff --git a/patches.xen/frontswap-hooks b/patches.xen/frontswap-hooks
index 0b46ca2b7f..9d44255c17 100644
--- a/patches.xen/frontswap-hooks
+++ b/patches.xen/frontswap-hooks
@@ -1,6 +1,6 @@
From: Dan Magenheimer <dan.magenheimer@oracle.com>
-Subject: [PATCH V6 3/4] mm: frontswap: add swap hooks and extend try_to_unuse
-Patch-mainline: n/a
+Subject: [PATCH V8 3/4] mm: frontswap: add swap hooks and extend try_to_unuse
+Patch-mainline: slated for 3.2
This third patch of four in the frontswap series adds hooks in the swap
subsystem and extends try_to_unuse so that frontswap_shrink can do a
@@ -10,12 +10,18 @@ in the first patch are declared.
Note that failed frontswap_map allocation is safe... failure is noted
by lack of "FS" in the subsequent printk.
+[v8: rebase to 3.0-rc4]
+[v8: kamezawa.hiroyu@jp.fujitsu.com: add comment to clarify find_next_to_unuse]
+[v7: rebase to 3.0-rc3]
+[v7: JBeulich@novell.com: use new static inlines, no-ops if not config'd]
[v6: rebase to 3.1-rc1]
[v6: lliubbo@gmail.com: use vzalloc]
+[v6: lliubbo@gmail.com: fix null pointer deref if vzalloc fails]
[v5: accidentally posted stale code for v4 that failed to compile :-(]
[v4: rebase to 2.6.39]
Signed-off-by: Dan Magenheimer <dan.magenheimer@oracle.com>
Reviewed-by: Konrad Wilk <konrad.wilk@oracle.com>
+Acked-by: Jan Beulich <JBeulich@novell.com>
Acked-by: Seth Jennings <sjenning@linux.vnet.ibm.com>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Hugh Dickins <hughd@google.com>
@@ -23,15 +29,11 @@ Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Nitin Gupta <ngupta@vflare.org>
Cc: Matthew Wilcox <matthew@wil.cx>
Cc: Chris Mason <chris.mason@oracle.com>
-Cc: Jan Beulich <JBeulich@novell.com>
Cc: Rik Riel <riel@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
-[added CONFIG_FRONTSWAP conditionals]
-Acked-by: jbeulich@novell.com
-
---- head-2011-08-09.orig/mm/swapfile.c 2011-08-09 14:47:43.000000000 +0200
-+++ head-2011-08-09/mm/swapfile.c 2011-08-09 14:49:40.000000000 +0200
+--- sle11sp2-2011-09-06.orig/mm/swapfile.c 2011-09-06 08:34:28.000000000 +0200
++++ sle11sp2-2011-09-06/mm/swapfile.c 2011-08-29 17:57:06.000000000 +0200
@@ -32,6 +32,8 @@
#include <linux/memcontrol.h>
#include <linux/poll.h>
@@ -62,7 +64,7 @@ Acked-by: jbeulich@novell.com
static DEFINE_MUTEX(swapon_mutex);
-@@ -557,6 +559,7 @@ static unsigned char swap_entry_free(str
+@@ -556,6 +558,7 @@ static unsigned char swap_entry_free(str
swap_list.next = p->type;
nr_swap_pages++;
p->inuse_pages--;
@@ -70,7 +72,13 @@ Acked-by: jbeulich@novell.com
if (p->flags & SWP_BLKDEV) {
struct gendisk *disk = p->bdev->bd_disk;
if (disk->fops->swap_slot_free_notify)
-@@ -1022,7 +1025,7 @@ static int unuse_mm(struct mm_struct *mm
+@@ -1019,11 +1022,12 @@ static int unuse_mm(struct mm_struct *mm
+ }
+
+ /*
+- * Scan swap_map from current position to next entry still in use.
++ * Scan swap_map (or frontswap_map if frontswap parameter is true)
++ * from current position to next entry still in use.
* Recycle to start on reaching the end, returning 0 when empty.
*/
static unsigned int find_next_to_unuse(struct swap_info_struct *si,
@@ -79,7 +87,7 @@ Acked-by: jbeulich@novell.com
{
unsigned int max = si->max;
unsigned int i = prev;
-@@ -1048,6 +1051,12 @@ static unsigned int find_next_to_unuse(s
+@@ -1049,6 +1053,12 @@ static unsigned int find_next_to_unuse(s
prev = 0;
i = 1;
}
@@ -92,7 +100,7 @@ Acked-by: jbeulich@novell.com
count = si->swap_map[i];
if (count && swap_count(count) != SWAP_MAP_BAD)
break;
-@@ -1059,8 +1068,12 @@ static unsigned int find_next_to_unuse(s
+@@ -1060,8 +1070,12 @@ static unsigned int find_next_to_unuse(s
* We completely avoid races by reading each swap page in advance,
* and then search for the process using it. All the necessary
* page table adjustments can then be made atomically.
@@ -106,7 +114,7 @@ Acked-by: jbeulich@novell.com
{
struct swap_info_struct *si = swap_info[type];
struct mm_struct *start_mm;
-@@ -1093,7 +1106,7 @@ static int try_to_unuse(unsigned int typ
+@@ -1094,7 +1108,7 @@ static int try_to_unuse(unsigned int typ
* one pass through swap_map is enough, but not necessarily:
* there are races when an instance of an entry might be missed.
*/
@@ -115,7 +123,7 @@ Acked-by: jbeulich@novell.com
if (signal_pending(current)) {
retval = -EINTR;
break;
-@@ -1260,6 +1273,10 @@ static int try_to_unuse(unsigned int typ
+@@ -1261,6 +1275,10 @@ static int try_to_unuse(unsigned int typ
* interactive performance.
*/
cond_resched();
@@ -126,14 +134,9 @@ Acked-by: jbeulich@novell.com
}
mmput(start_mm);
-@@ -1518,8 +1535,13 @@ bad_bmap:
- return generic_swapfile_activate(sis, swap_file, span);
+@@ -1455,7 +1473,8 @@ static int setup_swap_extents(struct swa
}
-+#ifndef CONFIG_FRONTSWAP
-+#define enable_swap_info(si, prio, swap_map, frontswap_map) \
-+ enable_swap_info(si, prio, swap_map)
-+#endif
static void enable_swap_info(struct swap_info_struct *p, int prio,
- unsigned char *swap_map)
+ unsigned char *swap_map,
@@ -141,17 +144,15 @@ Acked-by: jbeulich@novell.com
{
int i, prev;
-@@ -1529,6 +1551,9 @@ static void enable_swap_info(struct swap
+@@ -1465,6 +1484,7 @@ static void enable_swap_info(struct swap
else
p->prio = --least_priority;
p->swap_map = swap_map;
-+#ifdef CONFIG_FRONTSWAP
-+ p->frontswap_map = frontswap_map;
-+#endif
++ frontswap_map_set(p, frontswap_map);
p->flags |= SWP_WRITEOK;
nr_swap_pages += p->pages;
total_swap_pages += p->pages;
-@@ -1545,6 +1570,7 @@ static void enable_swap_info(struct swap
+@@ -1481,6 +1501,7 @@ static void enable_swap_info(struct swap
swap_list.head = swap_list.next = p->type;
else
swap_info[prev]->next = p->type;
@@ -159,7 +160,7 @@ Acked-by: jbeulich@novell.com
spin_unlock(&swap_lock);
}
-@@ -1616,7 +1642,7 @@ SYSCALL_DEFINE1(swapoff, const char __us
+@@ -1552,7 +1573,7 @@ SYSCALL_DEFINE1(swapoff, const char __us
spin_unlock(&swap_lock);
oom_score_adj = test_set_oom_score_adj(OOM_SCORE_ADJ_MAX);
@@ -168,16 +169,16 @@ Acked-by: jbeulich@novell.com
test_set_oom_score_adj(oom_score_adj);
if (err) {
-@@ -1627,7 +1653,7 @@ SYSCALL_DEFINE1(swapoff, const char __us
+@@ -1563,7 +1584,7 @@ SYSCALL_DEFINE1(swapoff, const char __us
* sys_swapoff for this swap_info_struct at this point.
*/
/* re-insert swap space back into swap_list */
- enable_swap_info(p, p->prio, p->swap_map);
-+ enable_swap_info(p, p->prio, p->swap_map, p->frontswap_map);
++ enable_swap_info(p, p->prio, p->swap_map, frontswap_map_get(p));
goto out_dput;
}
-@@ -1653,9 +1679,14 @@ SYSCALL_DEFINE1(swapoff, const char __us
+@@ -1589,9 +1610,11 @@ SYSCALL_DEFINE1(swapoff, const char __us
swap_map = p->swap_map;
p->swap_map = NULL;
p->flags = 0;
@@ -185,14 +186,11 @@ Acked-by: jbeulich@novell.com
spin_unlock(&swap_lock);
mutex_unlock(&swapon_mutex);
vfree(swap_map);
-+#ifdef CONFIG_FRONTSWAP
-+ if (p->frontswap_map)
-+ vfree(p->frontswap_map);
-+#endif
++ vfree(frontswap_map_get(p));
/* Destroy swap account informatin */
swap_cgroup_swapoff(type);
-@@ -2028,6 +2059,7 @@ SYSCALL_DEFINE2(swapon, const char __use
+@@ -1964,6 +1987,7 @@ SYSCALL_DEFINE2(swapon, const char __use
sector_t span;
unsigned long maxpages;
unsigned char *swap_map = NULL;
@@ -200,7 +198,7 @@ Acked-by: jbeulich@novell.com
struct page *page = NULL;
struct inode *inode = NULL;
-@@ -2108,6 +2140,9 @@ SYSCALL_DEFINE2(swapon, const char __use
+@@ -2044,6 +2068,9 @@ SYSCALL_DEFINE2(swapon, const char __use
error = nr_extents;
goto bad_swap;
}
@@ -210,7 +208,7 @@ Acked-by: jbeulich@novell.com
if (p->bdev) {
if (blk_queue_nonrot(bdev_get_queue(p->bdev))) {
-@@ -2123,14 +2158,15 @@ SYSCALL_DEFINE2(swapon, const char __use
+@@ -2059,14 +2086,15 @@ SYSCALL_DEFINE2(swapon, const char __use
if (swap_flags & SWAP_FLAG_PREFER)
prio =
(swap_flags & SWAP_FLAG_PRIO_MASK) >> SWAP_FLAG_PRIO_SHIFT;
@@ -225,11 +223,11 @@ Acked-by: jbeulich@novell.com
(p->flags & SWP_SOLIDSTATE) ? "SS" : "",
- (p->flags & SWP_DISCARDABLE) ? "D" : "");
+ (p->flags & SWP_DISCARDABLE) ? "D" : "",
-+ frontswap_map ? "FS" : "");
++ (frontswap_map) ? "FS" : "");
mutex_unlock(&swapon_mutex);
atomic_inc(&proc_poll_event);
-@@ -2321,6 +2357,10 @@ int valid_swaphandles(swp_entry_t entry,
+@@ -2283,6 +2311,10 @@ int valid_swaphandles(swp_entry_t entry,
base++;
spin_lock(&swap_lock);
@@ -240,7 +238,7 @@ Acked-by: jbeulich@novell.com
if (end > si->max) /* don't go beyond end of map */
end = si->max;
-@@ -2331,6 +2371,9 @@ int valid_swaphandles(swp_entry_t entry,
+@@ -2293,6 +2325,9 @@ int valid_swaphandles(swp_entry_t entry,
break;
if (swap_count(si->swap_map[toff]) == SWAP_MAP_BAD)
break;
@@ -250,7 +248,7 @@ Acked-by: jbeulich@novell.com
}
/* Count contiguous allocated slots below our target */
for (toff = target; --toff >= base; nr_pages++) {
-@@ -2339,6 +2382,9 @@ int valid_swaphandles(swp_entry_t entry,
+@@ -2301,6 +2336,9 @@ int valid_swaphandles(swp_entry_t entry,
break;
if (swap_count(si->swap_map[toff]) == SWAP_MAP_BAD)
break;
@@ -260,9 +258,9 @@ Acked-by: jbeulich@novell.com
}
spin_unlock(&swap_lock);
---- head-2011-08-09.orig/mm/page_io.c 2011-08-09 14:47:43.000000000 +0200
-+++ head-2011-08-09/mm/page_io.c 2011-08-08 16:59:15.000000000 +0200
-@@ -18,6 +18,7 @@
+--- sle11sp2-2011-09-06.orig/mm/page_io.c 2011-09-06 08:34:28.000000000 +0200
++++ sle11sp2-2011-09-06/mm/page_io.c 2011-08-29 17:52:14.000000000 +0200
+@@ -19,6 +19,7 @@
#include <linux/swapops.h>
#include <linux/buffer_head.h>
#include <linux/writeback.h>
@@ -270,9 +268,9 @@ Acked-by: jbeulich@novell.com
#include <asm/pgtable.h>
static struct bio *get_swap_bio(gfp_t gfp_flags,
-@@ -98,6 +99,12 @@ int generic_swap_writepage(struct page *page, st
- struct bio *bio;
- int rw = WRITE;
+@@ -228,6 +229,13 @@ int swap_writepage(struct page *page, st
+ return ret;
+ }
+ if (frontswap_put_page(page) == 0) {
+ set_page_writeback(page);
@@ -280,18 +278,20 @@ Acked-by: jbeulich@novell.com
+ end_page_writeback(page);
+ return 0;
+ }
- bio = get_swap_bio(GFP_NOIO, page, end_swap_bio_write);
- if (bio == NULL) {
- set_page_dirty(page);
-@@ -122,6 +129,11 @@ int generic_swap_readpage(struct page *page)
- int generic_swap_readpage(struct page *page)
- {
- struct bio *bio;
++
+ swap_file = sis->swap_file;
+ mapping = swap_file->f_mapping;
+ if (mapping->a_ops->swap_writepage) {
+@@ -250,6 +258,12 @@ int swap_readpage(struct page *page)
+ VM_BUG_ON(!PageLocked(page));
+ VM_BUG_ON(PageUptodate(page));
+
+ if (frontswap_get_page(page) == 0) {
+ SetPageUptodate(page);
+ unlock_page(page);
+ return 0;
+ }
- bio = get_swap_bio(GFP_KERNEL, page, end_swap_bio_read);
- if (bio == NULL) {
- unlock_page(page);
++
+ swap_file = sis->swap_file;
+ mapping = swap_file->f_mapping;
+ if (mapping->a_ops->swap_readpage) {
diff --git a/patches.xen/frontswap-structure-changes b/patches.xen/frontswap-structure-changes
index e9f8714ee9..87d3d33b24 100644
--- a/patches.xen/frontswap-structure-changes
+++ b/patches.xen/frontswap-structure-changes
@@ -1,6 +1,6 @@
From: Dan Magenheimer <dan.magenheimer@oracle.com>
-Subject: [PATCH V6 1/4] mm: frontswap: swap data structure changes
-Patch-mainline: n/a
+Subject: [PATCH V8 1/4] mm: frontswap: swap data structure changes
+Patch-mainline: slated for 3.2
This first patch of four in the frontswap series makes available core
swap data structures (swap_lock, swap_list and swap_info) that are
@@ -11,15 +11,20 @@ extern-ify these.
Also add frontswap-related elements to swap_info_struct. Frontswap_map
points to vzalloc'ed one-bit-per-swap-page metadata that indicates
whether the swap page is in frontswap or in the device and frontswap_pages
-counts how many pages are in frontswap. We don't tie these to
-CONFIG_FRONTSWAP to avoid unnecessary clutter around various frontswap
-hooks.
+counts how many pages are in frontswap.
+[v8: rebase to 3.0-rc4]
+[v8: kamezawa.hiroyu@jp.fujitsu.com: frontswap_pages should be atomic_t]
+[v8: kamezawa.hiroyu@jp.fujitsu.com: comment to clarify informational counters]
+[v7: rebase to 3.0-rc3]
+[v7: JBeulich@novell.com: add new swap struct elements only if config'd]
[v6: rebase to 3.0-rc1]
[v5: no change from v4]
[v4: rebase to 2.6.39]
Signed-off-by: Dan Magenheimer <dan.magenheimer@oracle.com>
Reviewed-by: Konrad Wilk <konrad.wilk@oracle.com>
+Reviewed-by: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
+Acked-by: Jan Beulich <JBeulich@novell.com>
Acked-by: Seth Jennings <sjenning@linux.vnet.ibm.com>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Hugh Dickins <hughd@google.com>
@@ -27,15 +32,11 @@ Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Nitin Gupta <ngupta@vflare.org>
Cc: Matthew Wilcox <matthew@wil.cx>
Cc: Chris Mason <chris.mason@oracle.com>
-Cc: Jan Beulich <JBeulich@novell.com>
Cc: Rik Riel <riel@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
-[added CONFIG_FRONTSWAP conditional]
-Acked-by: jbeulich@novell.com
-
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-08-09/include/linux/swapfile.h 2011-08-08 16:59:04.000000000 +0200
++++ sle11sp2-2011-09-06/include/linux/swapfile.h 2011-08-29 17:52:14.000000000 +0200
@@ -0,0 +1,13 @@
+#ifndef _LINUX_SWAPFILE_H
+#define _LINUX_SWAPFILE_H
@@ -50,15 +51,15 @@ Acked-by: jbeulich@novell.com
+extern int try_to_unuse(unsigned int, bool, unsigned long);
+
+#endif /* _LINUX_SWAPFILE_H */
---- head-2011-08-09.orig/include/linux/swap.h 2011-07-22 04:17:23.000000000 +0200
-+++ head-2011-08-09/include/linux/swap.h 2011-08-09 10:22:31.000000000 +0200
+--- sle11sp2-2011-09-06.orig/include/linux/swap.h 2011-09-06 08:34:28.000000000 +0200
++++ sle11sp2-2011-09-06/include/linux/swap.h 2011-08-29 18:02:53.000000000 +0200
@@ -194,6 +194,10 @@ struct swap_info_struct {
struct block_device *bdev; /* swap device or bdev of swap file */
struct file *swap_file; /* seldom referenced */
unsigned int old_block_size; /* seldom referenced */
+#ifdef CONFIG_FRONTSWAP
+ unsigned long *frontswap_map; /* frontswap in-use, one bit per page */
-+ unsigned int frontswap_pages; /* frontswap pages in-use counter */
++ atomic_t frontswap_pages; /* frontswap pages in-use counter */
+#endif
};
diff --git a/patches.xen/pci-guestdev b/patches.xen/pci-guestdev
index aa9f5cb73b..243f987e58 100644
--- a/patches.xen/pci-guestdev
+++ b/patches.xen/pci-guestdev
@@ -8,8 +8,8 @@ jb: Added support for guestiomuldev=all.
jb: split /dev/xen/pci_iomul driver to be separate (so it can be a module)
Acked-by: jbeulich@novell.com
---- sle11sp2-2011-08-22.orig/Documentation/kernel-parameters.txt 2011-08-22 09:47:20.000000000 +0200
-+++ sle11sp2-2011-08-22/Documentation/kernel-parameters.txt 2011-07-21 12:02:12.000000000 +0200
+--- sle11sp2-2011-09-06.orig/Documentation/kernel-parameters.txt 2011-09-06 08:34:28.000000000 +0200
++++ sle11sp2-2011-09-06/Documentation/kernel-parameters.txt 2011-07-21 12:02:12.000000000 +0200
@@ -821,6 +821,24 @@ bytes respectively. Such letter suffixes
gpt [EFI] Forces disk with valid GPT signature but
invalid Protective MBR to be treated as GPT.
@@ -46,8 +46,8 @@ Acked-by: jbeulich@novell.com
reboot= [BUGS=X86-32,BUGS=ARM,BUGS=IA-64] Rebooting mode
Format: <reboot_mode>[,<reboot_mode2>[,...]]
See arch/*/kernel/reboot.c or arch/*/kernel/process.c
---- sle11sp2-2011-08-22.orig/drivers/acpi/pci_root.c 2011-07-22 04:17:23.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/acpi/pci_root.c 2011-06-30 15:22:30.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/acpi/pci_root.c 2011-09-06 08:34:28.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/acpi/pci_root.c 2011-06-30 15:22:30.000000000 +0200
@@ -449,6 +449,41 @@ out:
}
EXPORT_SYMBOL(acpi_pci_osc_control_set);
@@ -136,8 +136,8 @@ Acked-by: jbeulich@novell.com
+ return FALSE;
+}
+#endif
---- sle11sp2-2011-08-22.orig/drivers/acpi/scan.c 2011-05-19 06:06:34.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/acpi/scan.c 2011-05-09 11:37:03.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/acpi/scan.c 2011-09-06 08:34:28.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/acpi/scan.c 2011-05-09 11:37:03.000000000 +0200
@@ -175,6 +175,16 @@ acpi_device_hid_show(struct device *dev,
}
static DEVICE_ATTR(hid, 0444, acpi_device_hid_show, NULL);
@@ -191,8 +191,8 @@ Acked-by: jbeulich@novell.com
if (info->valid & ACPI_VALID_ADR) {
device->pnp.bus_address = info->address;
device->flags.bus_address = 1;
---- sle11sp2-2011-08-22.orig/drivers/pci/Kconfig 2011-05-19 06:06:34.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/pci/Kconfig 2011-01-31 14:31:27.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/pci/Kconfig 2011-09-06 08:34:28.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/pci/Kconfig 2011-01-31 14:31:27.000000000 +0100
@@ -31,6 +31,20 @@ config PCI_DEBUG
When in doubt, say N.
@@ -214,8 +214,8 @@ Acked-by: jbeulich@novell.com
config PCI_STUB
tristate "PCI Stub driver"
depends on PCI
---- sle11sp2-2011-08-22.orig/drivers/pci/Makefile 2011-07-22 04:17:23.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/pci/Makefile 2011-01-31 14:31:28.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/pci/Makefile 2011-09-06 08:34:28.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/pci/Makefile 2011-01-31 14:31:28.000000000 +0100
@@ -7,6 +7,10 @@ obj-y += access.o bus.o probe.o remove.
irq.o vpd.o
obj-$(CONFIG_PROC_FS) += proc.o
@@ -228,7 +228,7 @@ Acked-by: jbeulich@novell.com
obj-$(CONFIG_PCI_QUIRKS) += quirks.o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2-2011-08-22/drivers/pci/guestdev.c 2011-01-31 14:31:28.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/pci/guestdev.c 2011-01-31 14:31:28.000000000 +0100
@@ -0,0 +1,881 @@
+/*
+ * Copyright (c) 2008, 2009 NEC Corporation.
@@ -1112,7 +1112,7 @@ Acked-by: jbeulich@novell.com
+fs_initcall(pci_check_guestdev_exists);
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2-2011-08-22/drivers/pci/iomulti.c 2011-01-31 14:31:28.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/pci/iomulti.c 2011-01-31 14:31:28.000000000 +0100
@@ -0,0 +1,897 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
@@ -2012,7 +2012,7 @@ Acked-by: jbeulich@novell.com
+late_initcall(pci_iomul_hotplug_init);
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2-2011-08-22/drivers/pci/iomulti.h 2011-01-31 14:31:28.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/pci/iomulti.h 2011-01-31 14:31:28.000000000 +0100
@@ -0,0 +1,122 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
@@ -2136,9 +2136,9 @@ Acked-by: jbeulich@novell.com
+int pci_iomul_switch_io_allocated(const struct pci_iomul_switch *);
+void pci_iomul_get_lock_switch(struct pci_dev *, struct pci_iomul_switch **,
+ struct pci_iomul_slot **);
---- sle11sp2-2011-08-22.orig/drivers/pci/pci.c 2011-08-22 09:47:06.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/pci/pci.c 2011-08-09 10:25:20.000000000 +0200
-@@ -3407,6 +3407,13 @@ resource_size_t pci_specified_resource_a
+--- sle11sp2-2011-09-06.orig/drivers/pci/pci.c 2011-09-06 08:34:28.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/pci/pci.c 2011-09-06 09:11:35.000000000 +0200
+@@ -3470,6 +3470,13 @@ resource_size_t pci_specified_resource_a
*/
int pci_is_reassigndev(struct pci_dev *dev)
{
@@ -2152,8 +2152,8 @@ Acked-by: jbeulich@novell.com
return (pci_specified_resource_alignment(dev) != 0);
}
---- sle11sp2-2011-08-22.orig/drivers/pci/pci.h 2011-07-22 04:17:23.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/pci/pci.h 2011-07-21 12:03:10.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/pci/pci.h 2011-09-06 08:34:28.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/pci/pci.h 2011-07-21 12:03:10.000000000 +0200
@@ -314,4 +314,11 @@ static inline int pci_dev_specific_reset
}
#endif
@@ -2167,7 +2167,7 @@ Acked-by: jbeulich@novell.com
+
#endif /* DRIVERS_PCI_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2-2011-08-22/drivers/pci/pci-iomul.c 2011-01-31 14:31:28.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/pci/pci-iomul.c 2011-01-31 14:31:28.000000000 +0100
@@ -0,0 +1,437 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
@@ -2606,8 +2606,8 @@ Acked-by: jbeulich@novell.com
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Isaku Yamahata <yamahata@valinux.co.jp>");
+MODULE_DESCRIPTION("PCI IO space multiplexing driver");
---- sle11sp2-2011-08-22.orig/include/linux/acpi.h 2011-08-22 09:47:21.000000000 +0200
-+++ sle11sp2-2011-08-22/include/linux/acpi.h 2011-06-30 15:21:54.000000000 +0200
+--- sle11sp2-2011-09-06.orig/include/linux/acpi.h 2011-09-06 08:34:28.000000000 +0200
++++ sle11sp2-2011-09-06/include/linux/acpi.h 2011-06-30 15:21:54.000000000 +0200
@@ -247,6 +247,8 @@ int acpi_check_region(resource_size_t st
int acpi_resources_are_enforced(void);
@@ -2617,9 +2617,9 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_PM_SLEEP
void __init acpi_no_s4_hw_signature(void);
void __init acpi_old_suspend_ordering(void);
---- sle11sp2-2011-08-22.orig/include/linux/pci.h 2011-07-22 04:17:23.000000000 +0200
-+++ sle11sp2-2011-08-22/include/linux/pci.h 2011-06-30 15:21:48.000000000 +0200
-@@ -1589,5 +1589,11 @@ int pci_vpd_find_tag(const u8 *buf, unsi
+--- sle11sp2-2011-09-06.orig/include/linux/pci.h 2011-09-06 08:34:28.000000000 +0200
++++ sle11sp2-2011-09-06/include/linux/pci.h 2011-09-06 09:11:28.000000000 +0200
+@@ -1602,5 +1602,11 @@ int pci_vpd_find_tag(const u8 *buf, unsi
int pci_vpd_find_info_keyword(const u8 *buf, unsigned int off,
unsigned int len, const char *kw);
@@ -2631,18 +2631,18 @@ Acked-by: jbeulich@novell.com
+
#endif /* __KERNEL__ */
#endif /* LINUX_PCI_H */
---- sle11sp2-2011-08-22.orig/include/xen/Kbuild 2011-01-05 01:50:19.000000000 +0100
-+++ sle11sp2-2011-08-22/include/xen/Kbuild 2011-01-31 14:31:28.000000000 +0100
+--- sle11sp2-2011-09-06.orig/include/xen/Kbuild 2011-09-06 08:34:28.000000000 +0200
++++ sle11sp2-2011-09-06/include/xen/Kbuild 2011-01-31 14:31:28.000000000 +0100
@@ -1,2 +1,3 @@
header-y += evtchn.h
header-y += privcmd.h
+header-y += public/
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2-2011-08-22/include/xen/public/Kbuild 2011-01-31 14:31:28.000000000 +0100
++++ sle11sp2-2011-09-06/include/xen/public/Kbuild 2011-01-31 14:31:28.000000000 +0100
@@ -0,0 +1 @@
+header-y += iomulti.h
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2-2011-08-22/include/xen/public/iomulti.h 2011-01-31 14:31:28.000000000 +0100
++++ sle11sp2-2011-09-06/include/xen/public/iomulti.h 2011-01-31 14:31:28.000000000 +0100
@@ -0,0 +1,50 @@
+#ifndef __LINUX_PUBLIC_IOMULTI_H__
+#define __LINUX_PUBLIC_IOMULTI_H__
diff --git a/patches.xen/xen-blkback-cdrom b/patches.xen/xen-blkback-cdrom
index 2319e40888..1cc20c0461 100644
--- a/patches.xen/xen-blkback-cdrom
+++ b/patches.xen/xen-blkback-cdrom
@@ -3,8 +3,8 @@ From: plc@novell.com
Patch-mainline: obsolete
References: 159907
---- head-2011-06-30.orig/drivers/xen/blkback/Makefile 2009-06-09 15:01:37.000000000 +0200
-+++ head-2011-06-30/drivers/xen/blkback/Makefile 2010-03-25 14:38:02.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/blkback/Makefile 2009-06-09 15:01:37.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/blkback/Makefile 2010-03-25 14:38:02.000000000 +0100
@@ -1,4 +1,4 @@
obj-$(CONFIG_XEN_BLKDEV_BACKEND) := blkbk.o
obj-$(CONFIG_XEN_BLKBACK_PAGEMAP) += blkback-pagemap.o
@@ -12,7 +12,7 @@ References: 159907
-blkbk-y := blkback.o xenbus.o interface.o vbd.o
+blkbk-y := blkback.o xenbus.o interface.o vbd.o cdrom.o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-06-30/drivers/xen/blkback/cdrom.c 2010-10-11 10:34:44.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/blkback/cdrom.c 2010-10-11 10:34:44.000000000 +0200
@@ -0,0 +1,162 @@
+/******************************************************************************
+ * blkback/cdrom.c
@@ -176,9 +176,9 @@ References: 159907
+ }
+ }
+}
---- head-2011-06-30.orig/drivers/xen/blkback/common.h 2011-04-11 14:51:44.000000000 +0200
-+++ head-2011-06-30/drivers/xen/blkback/common.h 2011-04-04 14:51:29.000000000 +0200
-@@ -95,6 +95,7 @@ struct backend_info
+--- sle11sp2-2011-09-06.orig/drivers/xen/blkback/common.h 2011-09-07 12:34:21.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/blkback/common.h 2011-09-07 12:42:14.000000000 +0200
+@@ -97,6 +97,7 @@ struct backend_info
struct xenbus_device *dev;
blkif_t *blkif;
struct xenbus_watch backend_watch;
@@ -186,17 +186,17 @@ References: 159907
unsigned major;
unsigned minor;
char *mode;
-@@ -141,4 +142,7 @@ int blkif_schedule(void *arg);
- int blkback_barrier(struct xenbus_transaction xbt,
- struct backend_info *be, int state);
+@@ -145,4 +146,7 @@ int blkback_barrier(struct xenbus_transa
+ int blkback_flush_diskcache(struct xenbus_transaction,
+ struct backend_info *, int state);
+/* cdrom media change */
+void cdrom_add_media_watch(struct backend_info *be);
+
#endif /* __BLKIF__BACKEND__COMMON_H__ */
---- head-2011-06-30.orig/drivers/xen/blkback/vbd.c 2011-06-30 17:19:53.000000000 +0200
-+++ head-2011-06-30/drivers/xen/blkback/vbd.c 2011-05-31 11:22:43.000000000 +0200
-@@ -112,6 +112,9 @@ int vbd_translate(struct phys_req *req,
+--- sle11sp2-2011-09-06.orig/drivers/xen/blkback/vbd.c 2011-09-07 12:35:54.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/blkback/vbd.c 2011-09-07 12:42:24.000000000 +0200
+@@ -117,6 +117,9 @@ int vbd_translate(struct phys_req *req,
if ((operation != READ) && vbd->readonly)
goto out;
@@ -206,9 +206,9 @@ References: 159907
if (likely(req->nr_sects)) {
blkif_sector_t end = req->sector_number + req->nr_sects;
---- head-2011-06-30.orig/drivers/xen/blkback/xenbus.c 2011-06-28 14:08:47.000000000 +0200
-+++ head-2011-06-30/drivers/xen/blkback/xenbus.c 2011-06-10 12:08:31.000000000 +0200
-@@ -187,6 +187,12 @@ static int blkback_remove(struct xenbus_
+--- sle11sp2-2011-09-06.orig/drivers/xen/blkback/xenbus.c 2011-09-07 12:41:31.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/blkback/xenbus.c 2011-09-07 12:42:25.000000000 +0200
+@@ -189,6 +189,12 @@ static int blkback_remove(struct xenbus_
be->backend_watch.node = NULL;
}
@@ -221,7 +221,7 @@ References: 159907
if (be->blkif) {
blkif_disconnect(be->blkif);
vbd_free(&be->blkif->vbd);
-@@ -342,6 +348,9 @@ static void backend_changed(struct xenbu
+@@ -358,6 +364,9 @@ static void backend_changed(struct xenbu
/* We're potentially connected now */
update_blkif_status(be->blkif);
diff --git a/patches.xen/xen-blkfront-hvm-no-cdrom b/patches.xen/xen-blkfront-hvm-no-cdrom
index f7df37f21a..bea76d487f 100644
--- a/patches.xen/xen-blkfront-hvm-no-cdrom
+++ b/patches.xen/xen-blkfront-hvm-no-cdrom
@@ -1,6 +1,6 @@
From: K. Y. Srinivasan <ksrinivasan@novell.com>
Subject: In HVM guests do not take over the CDROM device
-References: bnc#645893
+References: bnc#645893, bnc#688483
Patch-mainline: n/a
Signed-off-by: K. Y. Srinivasan <ksrinivasan@novell.com>
diff --git a/patches.xen/xen-blkif-protocol-fallback-hack b/patches.xen/xen-blkif-protocol-fallback-hack
index 5da8589330..8494b6e8fe 100644
--- a/patches.xen/xen-blkif-protocol-fallback-hack
+++ b/patches.xen/xen-blkif-protocol-fallback-hack
@@ -5,8 +5,8 @@ Patch-mainline: never.
See the comment below. Oh well.
---- head-2011-08-09.orig/drivers/xen/Kconfig 2011-04-13 17:01:32.000000000 +0200
-+++ head-2011-08-09/drivers/xen/Kconfig 2011-02-24 15:23:15.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/Kconfig 2011-04-13 17:01:32.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/Kconfig 2011-02-24 15:23:15.000000000 +0100
@@ -26,6 +26,9 @@ config XEN_PRIVCMD
def_bool y
depends on PROC_FS
@@ -33,8 +33,8 @@ See the comment below. Oh well.
help
The block tap driver is an alternative to the block back driver
and allows VM block requests to be redirected to userspace through
---- head-2011-08-09.orig/drivers/xen/blkback/xenbus.c 2011-06-10 12:04:24.000000000 +0200
-+++ head-2011-08-09/drivers/xen/blkback/xenbus.c 2011-06-28 14:08:47.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/blkback/xenbus.c 2011-09-07 12:37:53.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/blkback/xenbus.c 2011-09-07 12:41:31.000000000 +0200
@@ -21,6 +21,7 @@
#include <linux/module.h>
#include <linux/kthread.h>
@@ -43,7 +43,7 @@ See the comment below. Oh well.
#undef DPRINTK
#define DPRINTK(fmt, args...) \
-@@ -496,8 +497,10 @@ static int connect_ring(struct backend_i
+@@ -516,8 +517,10 @@ static int connect_ring(struct backend_i
be->blkif->blk_protocol = BLKIF_PROTOCOL_NATIVE;
err = xenbus_gather(XBT_NIL, dev->otherend, "protocol",
NULL, &protocol, NULL);
@@ -55,7 +55,7 @@ See the comment below. Oh well.
else if (0 == strcmp(protocol, XEN_IO_PROTO_ABI_NATIVE))
be->blkif->blk_protocol = BLKIF_PROTOCOL_NATIVE;
else if (0 == strcmp(protocol, XEN_IO_PROTO_ABI_X86_32))
-@@ -511,7 +514,7 @@ static int connect_ring(struct backend_i
+@@ -531,7 +534,7 @@ static int connect_ring(struct backend_i
}
pr_info("blkback: ring-ref %u, event-channel %u, protocol %d (%s)\n",
ring_ref, evtchn, be->blkif->blk_protocol,
@@ -64,8 +64,8 @@ See the comment below. Oh well.
kfree(protocol);
/* Map the shared frame, irq etc. */
---- head-2011-08-09.orig/drivers/xen/blktap/xenbus.c 2011-06-30 17:04:47.000000000 +0200
-+++ head-2011-08-09/drivers/xen/blktap/xenbus.c 2011-06-28 14:08:59.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/blktap/xenbus.c 2011-06-30 17:04:47.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/blktap/xenbus.c 2011-06-28 14:08:59.000000000 +0200
@@ -39,6 +39,7 @@
#include <linux/kthread.h>
#include <xen/xenbus.h>
@@ -95,8 +95,8 @@ See the comment below. Oh well.
kfree(protocol);
/* Map the shared frame, irq etc. */
---- head-2011-08-09.orig/drivers/xen/core/Makefile 2011-08-18 11:08:49.000000000 +0200
-+++ head-2011-08-09/drivers/xen/core/Makefile 2011-08-18 11:16:38.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/core/Makefile 2011-08-18 11:08:49.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/core/Makefile 2011-08-18 11:16:38.000000000 +0200
@@ -11,3 +11,6 @@ obj-$(CONFIG_XEN_SYSFS) += xen_sysfs.o
obj-$(CONFIG_XEN_SMPBOOT) += smpboot.o
obj-$(CONFIG_SMP) += spinlock.o
@@ -105,7 +105,7 @@ See the comment below. Oh well.
+CFLAGS_domctl.o := -D__XEN_PUBLIC_XEN_H__ -D__XEN_PUBLIC_GRANT_TABLE_H__
+CFLAGS_domctl.o += -D__XEN_TOOLS__ -imacros xen/interface/domctl.h
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-08-09/drivers/xen/core/domctl.c 2010-10-11 10:31:06.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/core/domctl.c 2010-10-11 10:31:06.000000000 +0200
@@ -0,0 +1,127 @@
+/*
+ * !!! dirty hack alert !!!
@@ -235,7 +235,7 @@ See the comment below. Oh well.
+
+MODULE_LICENSE("GPL");
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-08-09/drivers/xen/core/domctl.h 2010-03-25 14:37:59.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/core/domctl.h 2010-03-25 14:37:59.000000000 +0100
@@ -0,0 +1,2 @@
+int xen_guest_address_size(int domid);
+int xen_guest_blkif_protocol(int domid);
diff --git a/patches.xen/xen-clockevents b/patches.xen/xen-clockevents
index 4bbea65227..4670e13a7b 100644
--- a/patches.xen/xen-clockevents
+++ b/patches.xen/xen-clockevents
@@ -4,8 +4,8 @@ Patch-mainline: n/a
Once validated this could be merged into the 2.6.?? patch.
---- head-2011-08-09.orig/arch/x86/Kconfig 2011-06-30 17:25:32.000000000 +0200
-+++ head-2011-08-09/arch/x86/Kconfig 2011-07-04 10:26:08.000000000 +0200
+--- sle11sp2-2011-08-22.orig/arch/x86/Kconfig 2011-08-22 10:40:29.000000000 +0200
++++ sle11sp2-2011-08-22/arch/x86/Kconfig 2011-07-04 10:26:08.000000000 +0200
@@ -93,7 +93,6 @@ config CLOCKSOURCE_WATCHDOG
config GENERIC_CLOCKEVENTS
@@ -14,9 +14,9 @@ Once validated this could be merged into the 2.6.?? patch.
config GENERIC_CLOCKEVENTS_BROADCAST
def_bool y
---- head-2011-08-09.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-07-21 12:19:45.000000000 +0200
-+++ head-2011-08-09/arch/x86/include/mach-xen/asm/hypervisor.h 2011-07-21 12:33:02.000000000 +0200
-@@ -70,7 +70,6 @@ extern start_info_t *xen_start_info;
+--- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-08-23 15:26:08.000000000 +0200
++++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/hypervisor.h 2011-08-23 15:29:18.000000000 +0200
+@@ -68,7 +68,6 @@ extern start_info_t *xen_start_info;
#define init_hypervisor_platform() init_hypervisor(&boot_cpu_data)
DECLARE_PER_CPU(struct vcpu_runstate_info, runstate);
@@ -24,8 +24,8 @@ Once validated this could be merged into the 2.6.?? patch.
#define vcpu_running(cpu) (per_cpu(runstate.state, cpu) == RUNSTATE_running)
/* arch/xen/kernel/evtchn.c */
---- head-2011-08-09.orig/arch/x86/include/mach-xen/asm/irqflags.h 2011-02-01 15:09:47.000000000 +0100
-+++ head-2011-08-09/arch/x86/include/mach-xen/asm/irqflags.h 2011-02-02 15:09:52.000000000 +0100
+--- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/irqflags.h 2011-02-01 15:09:47.000000000 +0100
++++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/irqflags.h 2011-02-02 15:09:52.000000000 +0100
@@ -4,6 +4,8 @@
#include <asm/smp-processor-id.h>
@@ -71,8 +71,8 @@ Once validated this could be merged into the 2.6.?? patch.
/*
* For spinlocks, etc:
---- head-2011-08-09.orig/arch/x86/kernel/time-xen.c 2011-07-11 15:30:50.000000000 +0200
-+++ head-2011-08-09/arch/x86/kernel/time-xen.c 2011-07-11 15:30:55.000000000 +0200
+--- sle11sp2-2011-08-22.orig/arch/x86/kernel/time-xen.c 2011-08-23 15:29:05.000000000 +0200
++++ sle11sp2-2011-08-22/arch/x86/kernel/time-xen.c 2011-08-23 15:29:16.000000000 +0200
@@ -20,15 +20,12 @@
#include <linux/clocksource.h>
#include <linux/sysdev.h>
@@ -158,7 +158,7 @@ Once validated this could be merged into the 2.6.?? patch.
/*
* Reads a consistent set of time-base values from Xen, into a shadow data
* area.
-@@ -319,7 +313,7 @@ static void sync_xen_wallclock(unsigned
+@@ -318,7 +312,7 @@ static void sync_xen_wallclock(unsigned
op.cmd = XENPF_settime;
op.u.settime.secs = now.tv_sec;
op.u.settime.nsecs = now.tv_nsec;
@@ -168,8 +168,8 @@ Once validated this could be merged into the 2.6.?? patch.
update_wallclock(false);
@@ -328,7 +322,7 @@ static void sync_xen_wallclock(unsigned
- mod_timer(&sync_xen_wallclock_timer, jiffies + 60*HZ);
}
+ #endif /* CONFIG_XEN_PRIVILEGED_GUEST */
-static unsigned long long local_clock(void)
+unsigned long long xen_local_clock(void)
@@ -185,7 +185,7 @@ Once validated this could be merged into the 2.6.?? patch.
do_div(delta, NSEC_PER_SEC);
return delta;
-@@ -382,7 +376,7 @@ int xen_write_wallclock(unsigned long no
+@@ -384,7 +378,7 @@ int xen_write_wallclock(unsigned long no
/*
* Runstate accounting
*/
@@ -194,7 +194,7 @@ Once validated this could be merged into the 2.6.?? patch.
{
u64 state_time;
struct vcpu_runstate_info *state;
-@@ -418,7 +412,7 @@ unsigned long long sched_clock(void)
+@@ -420,7 +414,7 @@ unsigned long long sched_clock(void)
*/
preempt_disable();
@@ -203,7 +203,7 @@ Once validated this could be merged into the 2.6.?? patch.
get_runstate_snapshot(&runstate);
-@@ -461,139 +455,6 @@ unsigned long profile_pc(struct pt_regs
+@@ -463,139 +457,6 @@ unsigned long profile_pc(struct pt_regs
}
EXPORT_SYMBOL(profile_pc);
@@ -343,7 +343,7 @@ Once validated this could be merged into the 2.6.?? patch.
void mark_tsc_unstable(char *reason)
{
#ifndef CONFIG_XEN /* XXX Should tell the hypervisor about this fact. */
-@@ -602,24 +463,13 @@ void mark_tsc_unstable(char *reason)
+@@ -604,24 +465,13 @@ void mark_tsc_unstable(char *reason)
}
EXPORT_SYMBOL_GPL(mark_tsc_unstable);
@@ -369,7 +369,7 @@ Once validated this could be merged into the 2.6.?? patch.
if (unlikely((s64)(ret - last) < 0)) {
if (last - ret > permitted_clock_jitter
-@@ -645,7 +495,7 @@ static cycle_t xen_clocksource_read(stru
+@@ -647,7 +497,7 @@ static cycle_t xen_clocksource_read(stru
last = cur;
}
#else
@@ -378,7 +378,7 @@ Once validated this could be merged into the 2.6.?? patch.
#endif
}
-@@ -656,26 +506,13 @@ static void xen_clocksource_resume(struc
+@@ -658,26 +508,13 @@ static void xen_clocksource_resume(struc
init_cpu_khz();
@@ -409,7 +409,7 @@ Once validated this could be merged into the 2.6.?? patch.
}
static struct clocksource clocksource_xen = {
-@@ -706,24 +543,10 @@ struct vcpu_runstate_info *setup_runstat
+@@ -708,24 +545,10 @@ struct vcpu_runstate_info *setup_runstat
return rs;
}
@@ -435,7 +435,7 @@ Once validated this could be merged into the 2.6.?? patch.
}
void __init time_init(void)
-@@ -732,22 +555,11 @@ void __init time_init(void)
+@@ -734,22 +557,11 @@ void __init time_init(void)
printk(KERN_INFO "Xen reported: %u.%03u MHz processor.\n",
cpu_khz / 1000, cpu_khz % 1000);
@@ -461,7 +461,7 @@ Once validated this could be merged into the 2.6.?? patch.
clocksource_register_hz(&clocksource_xen, NSEC_PER_SEC);
-@@ -763,146 +575,23 @@ void __init time_init(void)
+@@ -765,146 +577,23 @@ void __init time_init(void)
/* Convert jiffies to system time. */
u64 jiffies_to_st(unsigned long j)
{
@@ -620,8 +620,8 @@ Once validated this could be merged into the 2.6.?? patch.
#ifdef CONFIG_CPU_FREQ
static int time_cpufreq_notifier(struct notifier_block *nb, unsigned long val,
void *data)
---- head-2011-08-09.orig/drivers/xen/Kconfig 2011-04-11 15:10:40.000000000 +0200
-+++ head-2011-08-09/drivers/xen/Kconfig 2011-04-14 11:21:30.000000000 +0200
+--- sle11sp2-2011-08-22.orig/drivers/xen/Kconfig 2011-04-11 15:10:40.000000000 +0200
++++ sle11sp2-2011-08-22/drivers/xen/Kconfig 2011-04-14 11:21:30.000000000 +0200
@@ -366,9 +366,6 @@ endmenu
config HAVE_IRQ_IGNORE_UNHANDLED
def_bool y
@@ -632,8 +632,8 @@ Once validated this could be merged into the 2.6.?? patch.
config ARCH_HAS_WALK_MEMORY
def_bool y
depends on X86
---- head-2011-08-09.orig/drivers/xen/core/Makefile 2011-08-18 11:16:38.000000000 +0200
-+++ head-2011-08-09/drivers/xen/core/Makefile 2011-08-18 11:16:50.000000000 +0200
+--- sle11sp2-2011-08-22.orig/drivers/xen/core/Makefile 2011-08-18 11:16:38.000000000 +0200
++++ sle11sp2-2011-08-22/drivers/xen/core/Makefile 2011-08-18 11:16:50.000000000 +0200
@@ -11,6 +11,7 @@ obj-$(CONFIG_XEN_SYSFS) += xen_sysfs.o
obj-$(CONFIG_XEN_SMPBOOT) += smpboot.o
obj-$(CONFIG_SMP) += spinlock.o
@@ -643,7 +643,7 @@ Once validated this could be merged into the 2.6.?? patch.
CFLAGS_domctl.o := -D__XEN_PUBLIC_XEN_H__ -D__XEN_PUBLIC_GRANT_TABLE_H__
CFLAGS_domctl.o += -D__XEN_TOOLS__ -imacros xen/interface/domctl.h
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-08-09/drivers/xen/core/clockevents.c 2011-02-02 15:09:52.000000000 +0100
++++ sle11sp2-2011-08-22/drivers/xen/core/clockevents.c 2011-02-02 15:09:52.000000000 +0100
@@ -0,0 +1,298 @@
+/*
+ * Xen clockevent functions
@@ -943,8 +943,8 @@ Once validated this could be merged into the 2.6.?? patch.
+
+ xen_setup_cpu_clockevents();
+}
---- head-2011-08-09.orig/drivers/xen/core/evtchn.c 2011-04-14 16:36:14.000000000 +0200
-+++ head-2011-08-09/drivers/xen/core/evtchn.c 2011-04-13 16:49:13.000000000 +0200
+--- sle11sp2-2011-08-22.orig/drivers/xen/core/evtchn.c 2011-04-14 16:36:14.000000000 +0200
++++ sle11sp2-2011-08-22/drivers/xen/core/evtchn.c 2011-04-13 16:49:13.000000000 +0200
@@ -382,6 +382,7 @@ asmlinkage void __irq_entry evtchn_do_up
wmb();
#endif
@@ -961,8 +961,8 @@ Once validated this could be merged into the 2.6.?? patch.
l1 = xchg(&vcpu_info->evtchn_pending_sel, 0);
---- head-2011-08-09.orig/drivers/xen/core/machine_reboot.c 2011-07-04 10:19:56.000000000 +0200
-+++ head-2011-08-09/drivers/xen/core/machine_reboot.c 2011-07-04 10:25:00.000000000 +0200
+--- sle11sp2-2011-08-22.orig/drivers/xen/core/machine_reboot.c 2011-07-04 10:19:56.000000000 +0200
++++ sle11sp2-2011-08-22/drivers/xen/core/machine_reboot.c 2011-07-04 10:25:00.000000000 +0200
@@ -14,6 +14,7 @@
#include <asm/hypervisor.h>
#include <xen/xenbus.h>
@@ -986,8 +986,8 @@ Once validated this could be merged into the 2.6.?? patch.
if (!suspend_cancelled) {
#ifdef __x86_64__
/*
---- head-2011-08-09.orig/drivers/xen/core/smpboot.c 2011-04-14 16:36:14.000000000 +0200
-+++ head-2011-08-09/drivers/xen/core/smpboot.c 2011-02-07 12:28:20.000000000 +0100
+--- sle11sp2-2011-08-22.orig/drivers/xen/core/smpboot.c 2011-04-14 16:36:14.000000000 +0200
++++ sle11sp2-2011-08-22/drivers/xen/core/smpboot.c 2011-02-07 12:28:20.000000000 +0100
@@ -18,6 +18,7 @@
#include <linux/percpu.h>
#include <asm/desc.h>
@@ -1004,8 +1004,8 @@ Once validated this could be merged into the 2.6.?? patch.
local_irq_enable();
}
---- head-2011-08-09.orig/drivers/xen/core/spinlock.c 2011-04-13 16:38:13.000000000 +0200
-+++ head-2011-08-09/drivers/xen/core/spinlock.c 2011-04-13 16:49:13.000000000 +0200
+--- sle11sp2-2011-08-22.orig/drivers/xen/core/spinlock.c 2011-04-13 16:38:13.000000000 +0200
++++ sle11sp2-2011-08-22/drivers/xen/core/spinlock.c 2011-04-13 16:49:13.000000000 +0200
@@ -13,6 +13,7 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -1015,7 +1015,7 @@ Once validated this could be merged into the 2.6.?? patch.
struct spinning {
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2011-08-09/include/xen/clock.h 2011-02-02 15:09:52.000000000 +0100
++++ sle11sp2-2011-08-22/include/xen/clock.h 2011-02-02 15:09:52.000000000 +0100
@@ -0,0 +1,19 @@
+#ifndef __XEN_CPU_CLOCK_H__
+#define __XEN_CPU_CLOCK_H__
diff --git a/patches.xen/xen-cpufreq-report b/patches.xen/xen-cpufreq-report
index c3aca7f13d..48fcdddc34 100644
--- a/patches.xen/xen-cpufreq-report
+++ b/patches.xen/xen-cpufreq-report
@@ -3,11 +3,11 @@ Subject: make /proc/cpuinfo track CPU speed
Patch-mainline: obsolete
--- head-2011-08-09.orig/arch/x86/kernel/acpi/processor_extcntl_xen.c 2011-02-01 15:03:10.000000000 +0100
-+++ head-2011-08-09/arch/x86/kernel/acpi/processor_extcntl_xen.c 2011-08-15 11:07:43.000000000 +0200
-@@ -220,3 +220,12 @@ bool processor_extcntl_has_mwait(void)
-
- return ecx & (1 << (X86_FEATURE_MWAIT % 32));
++++ head-2011-08-09/arch/x86/kernel/acpi/processor_extcntl_xen.c 2011-08-23 13:12:39.000000000 +0200
+@@ -208,3 +208,12 @@ static int __init init_extcntl(void)
+ return 0;
}
+ arch_initcall(init_extcntl);
+
+unsigned int cpufreq_quick_get(unsigned int cpu)
+{
@@ -29,8 +29,8 @@ Patch-mainline: obsolete
#else
static inline unsigned int cpufreq_quick_get(unsigned int cpu)
--- head-2011-08-09.orig/include/xen/interface/platform.h 2011-08-08 12:54:10.000000000 +0200
-+++ head-2011-08-09/include/xen/interface/platform.h 2011-08-09 11:16:17.000000000 +0200
-@@ -449,6 +449,14 @@ struct xenpf_mem_hotadd
++++ head-2011-08-09/include/xen/interface/platform.h 2011-08-23 13:12:54.000000000 +0200
+@@ -451,6 +451,14 @@ struct xenpf_mem_hotadd
uint32_t flags;
};
@@ -45,7 +45,7 @@ Patch-mainline: obsolete
struct xen_platform_op {
uint32_t cmd;
uint32_t interface_version; /* XENPF_INTERFACE_VERSION */
-@@ -469,6 +477,7 @@ struct xen_platform_op {
+@@ -471,6 +479,7 @@ struct xen_platform_op {
struct xenpf_cpu_ol cpu_ol;
struct xenpf_cpu_hotadd cpu_add;
struct xenpf_mem_hotadd mem_add;
diff --git a/patches.xen/xen-kzalloc b/patches.xen/xen-kzalloc
index eaa4592c18..960c302242 100644
--- a/patches.xen/xen-kzalloc
+++ b/patches.xen/xen-kzalloc
@@ -4,8 +4,8 @@ Patch-mainline: n/a
Also use clear_page() in favor of memset(, 0, PAGE_SIZE).
---- head-2011-08-09.orig/arch/x86/mm/init_32-xen.c 2011-07-01 15:19:35.000000000 +0200
-+++ head-2011-08-09/arch/x86/mm/init_32-xen.c 2011-07-04 12:15:21.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/init_32-xen.c 2011-07-01 15:19:35.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/mm/init_32-xen.c 2011-07-04 12:15:21.000000000 +0200
@@ -725,7 +725,7 @@ unsigned long __init extend_init_mapping
if (pmd_none(*pmd)) {
unsigned long pa = start_pfn++ << PAGE_SHIFT;
@@ -15,8 +15,8 @@ Also use clear_page() in favor of memset(, 0, PAGE_SIZE).
make_lowmem_page_readonly(__va(pa),
XENFEAT_writable_page_tables);
xen_l2_entry_update(pmd, __pmd(pa | _KERNPG_TABLE));
---- head-2011-08-09.orig/arch/x86/mm/init_64-xen.c 2011-08-09 11:14:57.000000000 +0200
-+++ head-2011-08-09/arch/x86/mm/init_64-xen.c 2011-08-09 11:16:50.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/init_64-xen.c 2011-08-09 11:14:57.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/mm/init_64-xen.c 2011-08-09 11:16:50.000000000 +0200
@@ -214,7 +214,7 @@ static __ref void *spp_getpage(void)
else if (pgt_buf_end < pgt_buf_top) {
ptr = __va(pgt_buf_end << PAGE_SHIFT);
@@ -26,9 +26,9 @@ Also use clear_page() in favor of memset(, 0, PAGE_SIZE).
} else
ptr = alloc_bootmem_pages(PAGE_SIZE);
---- head-2011-08-09.orig/drivers/xen/blkback/blkback.c 2011-04-14 17:16:19.000000000 +0200
-+++ head-2011-08-09/drivers/xen/blkback/blkback.c 2011-04-14 17:21:11.000000000 +0200
-@@ -639,7 +639,7 @@ static int __init blkif_init(void)
+--- sle11sp2-2011-09-06.orig/drivers/xen/blkback/blkback.c 2011-09-07 12:48:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/blkback/blkback.c 2011-09-07 12:50:28.000000000 +0200
+@@ -649,7 +649,7 @@ static int __init blkif_init(void)
mmap_pages = blkif_reqs * BLKIF_MAX_SEGMENTS_PER_REQUEST;
@@ -37,7 +37,7 @@ Also use clear_page() in favor of memset(, 0, PAGE_SIZE).
blkif_reqs, GFP_KERNEL);
pending_grant_handles = kmalloc(sizeof(pending_grant_handles[0]) *
mmap_pages, GFP_KERNEL);
-@@ -656,7 +656,6 @@ static int __init blkif_init(void)
+@@ -666,7 +666,6 @@ static int __init blkif_init(void)
blkif_interface_init();
@@ -45,8 +45,8 @@ Also use clear_page() in favor of memset(, 0, PAGE_SIZE).
INIT_LIST_HEAD(&pending_free);
for (i = 0; i < blkif_reqs; i++)
---- head-2011-08-09.orig/drivers/xen/core/gnttab.c 2011-04-14 17:21:05.000000000 +0200
-+++ head-2011-08-09/drivers/xen/core/gnttab.c 2011-02-02 15:10:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/core/gnttab.c 2011-04-14 17:21:05.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/core/gnttab.c 2011-02-02 15:10:16.000000000 +0100
@@ -546,7 +546,7 @@ int gnttab_copy_grant_page(grant_ref_t r
new_addr = page_address(new_page);
@@ -56,8 +56,8 @@ Also use clear_page() in favor of memset(, 0, PAGE_SIZE).
pfn = page_to_pfn(page);
mfn = pfn_to_mfn(pfn);
---- head-2011-08-09.orig/drivers/xen/core/machine_reboot.c 2011-07-04 10:25:00.000000000 +0200
-+++ head-2011-08-09/drivers/xen/core/machine_reboot.c 2011-04-14 17:32:26.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/core/machine_reboot.c 2011-07-04 10:25:00.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/core/machine_reboot.c 2011-04-14 17:32:26.000000000 +0200
@@ -98,7 +98,7 @@ static void post_suspend(int suspend_can
BUG();
HYPERVISOR_shared_info = (shared_info_t *)fix_to_virt(FIX_SHARED_INFO);
@@ -67,8 +67,8 @@ Also use clear_page() in favor of memset(, 0, PAGE_SIZE).
fpp = PAGE_SIZE/sizeof(unsigned long);
for (i = 0, j = 0, k = -1; i < max_pfn; i += fpp, j++) {
---- head-2011-08-09.orig/drivers/xen/core/smpboot.c 2011-02-07 12:28:20.000000000 +0100
-+++ head-2011-08-09/drivers/xen/core/smpboot.c 2011-02-02 15:10:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/core/smpboot.c 2011-02-07 12:28:20.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/core/smpboot.c 2011-02-02 15:10:16.000000000 +0100
@@ -176,17 +176,12 @@ static void __cpuinit cpu_initialize_con
ctxt.flags = VGCF_IN_KERNEL;
ctxt.user_regs.ds = __USER_DS;
@@ -87,8 +87,8 @@ Also use clear_page() in favor of memset(, 0, PAGE_SIZE).
ctxt.gdt_frames[0] = arbitrary_virt_to_mfn(get_cpu_gdt_table(cpu));
ctxt.gdt_ents = GDT_SIZE / 8;
---- head-2011-08-09.orig/drivers/xen/netback/interface.c 2011-07-04 10:36:53.000000000 +0200
-+++ head-2011-08-09/drivers/xen/netback/interface.c 2011-07-04 12:15:32.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/netback/interface.c 2011-07-04 10:36:53.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/netback/interface.c 2011-07-04 12:15:32.000000000 +0200
@@ -215,7 +215,6 @@ netif_t *netif_alloc(struct device *pare
SET_NETDEV_DEV(dev, parent);
@@ -97,8 +97,8 @@ Also use clear_page() in favor of memset(, 0, PAGE_SIZE).
netif->domid = domid;
netif->group = UINT_MAX;
netif->handle = handle;
---- head-2011-08-09.orig/drivers/xen/scsiback/emulate.c 2011-02-08 10:04:09.000000000 +0100
-+++ head-2011-08-09/drivers/xen/scsiback/emulate.c 2011-02-08 10:45:57.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/scsiback/emulate.c 2011-02-08 10:04:09.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/scsiback/emulate.c 2011-02-08 10:45:57.000000000 +0100
@@ -243,13 +243,11 @@ static void __report_luns(pending_req_t
alloc_len = sizeof(struct scsi_lun) * alloc_luns
+ VSCSI_REPORT_LUNS_HEADER;
@@ -114,8 +114,8 @@ Also use clear_page() in favor of memset(, 0, PAGE_SIZE).
one_lun = (struct scsi_lun *) &buff[8];
spin_lock_irqsave(&info->v2p_lock, flags);
list_for_each_entry(entry, head, l) {
---- head-2011-08-09.orig/drivers/xen/scsiback/scsiback.c 2011-04-11 15:06:01.000000000 +0200
-+++ head-2011-08-09/drivers/xen/scsiback/scsiback.c 2011-04-13 16:54:02.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/scsiback/scsiback.c 2011-04-11 15:06:01.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/scsiback/scsiback.c 2011-04-13 16:54:02.000000000 +0200
@@ -670,7 +670,7 @@ static int __init scsiback_init(void)
mmap_pages = vscsiif_reqs * VSCSIIF_SG_TABLESIZE;
@@ -133,8 +133,8 @@ Also use clear_page() in favor of memset(, 0, PAGE_SIZE).
INIT_LIST_HEAD(&pending_free);
for (i = 0; i < vscsiif_reqs; i++)
---- head-2011-08-09.orig/drivers/xen/sfc_netutil/accel_cuckoo_hash.c 2011-02-01 15:03:03.000000000 +0100
-+++ head-2011-08-09/drivers/xen/sfc_netutil/accel_cuckoo_hash.c 2011-02-02 15:10:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/sfc_netutil/accel_cuckoo_hash.c 2011-02-01 15:03:03.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/sfc_netutil/accel_cuckoo_hash.c 2011-02-02 15:10:16.000000000 +0100
@@ -77,7 +77,7 @@ int cuckoo_hash_init(cuckoo_hash_table *
BUG_ON(length_bits >= sizeof(unsigned) * 8);
BUG_ON(key_length > sizeof(cuckoo_hash_key));
@@ -154,8 +154,8 @@ Also use clear_page() in favor of memset(, 0, PAGE_SIZE).
return 0;
}
EXPORT_SYMBOL_GPL(cuckoo_hash_init);
---- head-2011-08-09.orig/drivers/xen/tpmback/interface.c 2011-04-11 15:00:49.000000000 +0200
-+++ head-2011-08-09/drivers/xen/tpmback/interface.c 2011-04-13 16:54:02.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/tpmback/interface.c 2011-04-11 15:00:49.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/tpmback/interface.c 2011-04-13 16:54:02.000000000 +0200
@@ -94,7 +94,7 @@ int tpmif_map(tpmif_t *tpmif, grant_ref_
tpmif->tx_area = area;
@@ -165,8 +165,8 @@ Also use clear_page() in favor of memset(, 0, PAGE_SIZE).
err = bind_interdomain_evtchn_to_irqhandler(
tpmif->domid, evtchn, tpmif_be_int, 0, tpmif->devname, tpmif);
---- head-2011-08-09.orig/drivers/xen/usbback/usbback.c 2011-04-11 15:05:47.000000000 +0200
-+++ head-2011-08-09/drivers/xen/usbback/usbback.c 2011-04-13 16:54:02.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/usbback/usbback.c 2011-04-11 15:05:47.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/usbback/usbback.c 2011-04-13 16:54:02.000000000 +0200
@@ -1142,7 +1142,7 @@ static int __init usbback_init(void)
return -ENODEV;
diff --git a/patches.xen/xen-op-packet b/patches.xen/xen-op-packet
index a1e2a60488..757c55ff1f 100644
--- a/patches.xen/xen-op-packet
+++ b/patches.xen/xen-op-packet
@@ -3,28 +3,30 @@ Subject: add support for new operation type BLKIF_OP_PACKET
Patch-mainline: n/a
References: fate#300964
---- head-2011-07-21.orig/drivers/xen/blkback/blkback.c 2011-04-14 17:15:22.000000000 +0200
-+++ head-2011-07-21/drivers/xen/blkback/blkback.c 2011-04-14 17:16:19.000000000 +0200
-@@ -194,13 +194,15 @@ static void fast_flush_area(pending_req_
-
+--- sle11sp2-2011-09-06.orig/drivers/xen/blkback/blkback.c 2011-09-07 12:29:05.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/blkback/blkback.c 2011-09-07 12:48:27.000000000 +0200
+@@ -195,16 +195,17 @@ static void fast_flush_area(pending_req_
static void print_stats(blkif_t *blkif)
{
-- printk(KERN_DEBUG "%s: oo %3d | rd %4d | wr %4d | br %4d\n",
-+ printk(KERN_DEBUG "%s: oo %3d | rd %4d | wr %4d | br %4d | pk %4d\n",
+ printk(KERN_DEBUG "%s: oo %3d | rd %4d | wr %4d | br %4d"
+- " | fl %4d\n",
++ " | fl %4d | pk %4d\n",
current->comm, blkif->st_oo_req,
-- blkif->st_rd_req, blkif->st_wr_req, blkif->st_br_req);
-+ blkif->st_rd_req, blkif->st_wr_req, blkif->st_br_req,
-+ blkif->st_pk_req);
+ blkif->st_rd_req, blkif->st_wr_req,
+- blkif->st_br_req, blkif->st_fl_req);
++ blkif->st_br_req, blkif->st_fl_req, blkif->st_pk_req);
blkif->st_print = jiffies + msecs_to_jiffies(10 * 1000);
blkif->st_rd_req = 0;
blkif->st_wr_req = 0;
blkif->st_oo_req = 0;
+ blkif->st_br_req = 0;
+ blkif->st_fl_req = 0;
+ blkif->st_pk_req = 0;
}
int blkif_schedule(void *arg)
-@@ -365,6 +367,13 @@ static int do_block_io_op(blkif_t *blkif
- blkif->st_wr_req++;
+@@ -369,6 +370,13 @@ static int do_block_io_op(blkif_t *blkif
+ case BLKIF_OP_FLUSH_DISKCACHE:
dispatch_rw_block_io(blkif, &req, pending_req);
break;
+ case BLKIF_OP_PACKET:
@@ -37,18 +39,18 @@ References: fate#300964
default:
/* A good sign something is wrong: sleep for a while to
* avoid excessive CPU consumption by a bad guest. */
---- head-2011-07-21.orig/drivers/xen/blkback/common.h 2011-04-04 14:51:29.000000000 +0200
-+++ head-2011-07-21/drivers/xen/blkback/common.h 2011-04-04 14:51:59.000000000 +0200
-@@ -84,6 +84,7 @@ typedef struct blkif_st {
- int st_wr_req;
+--- sle11sp2-2011-09-06.orig/drivers/xen/blkback/common.h 2011-09-07 12:42:14.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/blkback/common.h 2011-09-07 12:48:29.000000000 +0200
+@@ -86,6 +86,7 @@ typedef struct blkif_st {
int st_oo_req;
int st_br_req;
+ int st_fl_req;
+ int st_pk_req;
int st_rd_sect;
int st_wr_sect;
---- head-2011-07-21.orig/drivers/xen/blkfront/blkfront.c 2011-07-21 12:22:31.000000000 +0200
-+++ head-2011-07-21/drivers/xen/blkfront/blkfront.c 2011-07-21 12:32:39.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/blkfront/blkfront.c 2011-09-07 12:08:33.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/blkfront/blkfront.c 2011-09-07 12:48:44.000000000 +0200
@@ -718,6 +718,8 @@ static int blkif_queue_request(struct re
if (req->cmd_flags & REQ_HARDBARRIER)
#endif
@@ -76,8 +78,8 @@ References: fate#300964
if (unlikely(bret->status != BLKIF_RSP_OKAY))
DPRINTK("Bad return from blkdev data "
"request: %x\n", bret->status);
---- head-2011-07-21.orig/drivers/xen/blktap/blktap.c 2011-07-04 10:15:07.000000000 +0200
-+++ head-2011-07-21/drivers/xen/blktap/blktap.c 2011-07-04 10:17:28.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/blktap/blktap.c 2011-07-04 10:15:07.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/blktap/blktap.c 2011-07-04 10:17:28.000000000 +0200
@@ -1125,13 +1125,14 @@ static void fast_flush_area(pending_req_
static void print_stats(blkif_t *blkif)
@@ -107,8 +109,8 @@ References: fate#300964
default:
/* A good sign something is wrong: sleep for a while to
* avoid excessive CPU consumption by a bad guest. */
---- head-2011-07-21.orig/drivers/xen/blktap/common.h 2011-04-11 15:01:35.000000000 +0200
-+++ head-2011-07-21/drivers/xen/blktap/common.h 2011-04-04 14:51:50.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/blktap/common.h 2011-04-11 15:01:35.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/blktap/common.h 2011-04-04 14:51:50.000000000 +0200
@@ -70,6 +70,7 @@ typedef struct blkif_st {
int st_rd_req;
int st_wr_req;
@@ -117,8 +119,8 @@ References: fate#300964
int st_rd_sect;
int st_wr_sect;
---- head-2011-07-21.orig/drivers/xen/blktap2/blktap.h 2011-04-11 15:10:09.000000000 +0200
-+++ head-2011-07-21/drivers/xen/blktap2/blktap.h 2011-04-11 15:10:29.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/blktap2/blktap.h 2011-04-11 15:10:09.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/blktap2/blktap.h 2011-04-11 15:10:29.000000000 +0200
@@ -138,6 +138,7 @@ struct blktap_statistics {
int st_rd_req;
int st_wr_req;
@@ -127,8 +129,8 @@ References: fate#300964
int st_rd_sect;
int st_wr_sect;
s64 st_rd_cnt;
---- head-2011-07-21.orig/drivers/xen/blktap2/device.c 2011-02-07 14:13:37.000000000 +0100
-+++ head-2011-07-21/drivers/xen/blktap2/device.c 2010-11-23 15:06:50.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/blktap2/device.c 2011-02-07 14:13:37.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/blktap2/device.c 2010-11-23 15:06:50.000000000 +0100
@@ -366,7 +366,8 @@ blktap_device_fail_pending_requests(stru
BTERR("%u:%u: failing pending %s of %d pages\n",
@@ -167,8 +169,8 @@ References: fate#300964
tap->stats.st_wr_sect += nr_sects;
tap->stats.st_wr_req++;
} else {
---- head-2011-07-21.orig/drivers/xen/blktap2-new/blktap.h 2011-02-24 16:01:23.000000000 +0100
-+++ head-2011-07-21/drivers/xen/blktap2-new/blktap.h 2011-04-11 15:10:27.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/blktap2-new/blktap.h 2011-02-24 16:01:23.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/blktap2-new/blktap.h 2011-04-11 15:10:27.000000000 +0200
@@ -111,6 +111,7 @@ struct blktap_statistics {
int st_rd_req;
int st_wr_req;
@@ -177,8 +179,8 @@ References: fate#300964
int st_rd_sect;
int st_wr_sect;
s64 st_rd_cnt;
---- head-2011-07-21.orig/drivers/xen/blktap2-new/device.c 2011-03-11 00:00:00.000000000 +0100
-+++ head-2011-07-21/drivers/xen/blktap2-new/device.c 2011-03-11 11:09:10.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/blktap2-new/device.c 2011-08-09 11:10:09.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/blktap2-new/device.c 2011-03-11 11:09:10.000000000 +0100
@@ -189,6 +189,8 @@ blktap_device_make_request(struct blktap
request->rq = rq;
@@ -188,8 +190,8 @@ References: fate#300964
err = blktap_request_get_pages(tap, request, nsegs);
if (err)
---- head-2011-07-21.orig/drivers/xen/blktap2-new/ring.c 2011-04-11 15:10:17.000000000 +0200
-+++ head-2011-07-21/drivers/xen/blktap2-new/ring.c 2011-02-24 15:39:28.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/blktap2-new/ring.c 2011-04-11 15:10:17.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/blktap2-new/ring.c 2011-02-24 15:39:28.000000000 +0100
@@ -153,11 +153,11 @@ blktap_ring_map_request(struct blktap *t
int seg, err = 0;
int write;
@@ -270,8 +272,8 @@ References: fate#300964
time->tv_sec, time->tv_usec);
}
---- head-2011-07-21.orig/include/xen/interface/io/blkif.h 2011-06-30 17:26:34.000000000 +0200
-+++ head-2011-07-21/include/xen/interface/io/blkif.h 2011-03-17 14:34:04.000000000 +0100
+--- sle11sp2-2011-09-06.orig/include/xen/interface/io/blkif.h 2011-06-30 17:26:34.000000000 +0200
++++ sle11sp2-2011-09-06/include/xen/interface/io/blkif.h 2011-03-17 14:34:04.000000000 +0100
@@ -77,10 +77,9 @@
*/
#define BLKIF_OP_FLUSH_DISKCACHE 3
diff --git a/patches.xen/xen-sys-suspend b/patches.xen/xen-sys-suspend
index b7c4cf3abe..ef36ad97bf 100644
--- a/patches.xen/xen-sys-suspend
+++ b/patches.xen/xen-sys-suspend
@@ -4,8 +4,8 @@ Patch-mainline: n/a
... rather than calling just a few functions explicitly.
---- head-2011-06-30.orig/arch/x86/kernel/time-xen.c 2011-07-11 15:29:59.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/time-xen.c 2011-07-11 15:30:38.000000000 +0200
+--- sle11sp2-2011-08-22.orig/arch/x86/kernel/time-xen.c 2011-08-23 15:26:53.000000000 +0200
++++ sle11sp2-2011-08-22/arch/x86/kernel/time-xen.c 2011-08-23 15:28:59.000000000 +0200
@@ -72,6 +72,10 @@ DEFINE_PER_CPU(struct vcpu_runstate_info
/* Must be signed, as it's compared with s64 quantities which can be -ve. */
#define NS_PER_TICK (1000000000LL/HZ)
@@ -17,7 +17,7 @@ Patch-mainline: n/a
/*
* GCC 4.3 can turn loops over an induction variable into division. We do
* not support arbitrary 64-bit division, and so must break the induction.
-@@ -598,6 +602,17 @@ void mark_tsc_unstable(char *reason)
+@@ -600,6 +604,17 @@ void mark_tsc_unstable(char *reason)
}
EXPORT_SYMBOL_GPL(mark_tsc_unstable);
@@ -35,7 +35,7 @@ Patch-mainline: n/a
static cycle_t cs_last;
static cycle_t xen_clocksource_read(struct clocksource *cs)
-@@ -634,11 +649,32 @@ static cycle_t xen_clocksource_read(stru
+@@ -636,11 +651,32 @@ static cycle_t xen_clocksource_read(stru
#endif
}
@@ -70,7 +70,7 @@ Patch-mainline: n/a
cs_last = local_clock();
}
-@@ -670,17 +706,6 @@ struct vcpu_runstate_info *setup_runstat
+@@ -672,17 +708,6 @@ struct vcpu_runstate_info *setup_runstat
return rs;
}
@@ -88,7 +88,7 @@ Patch-mainline: n/a
/* Dynamically-mapped IRQ. */
DEFINE_PER_CPU(int, timer_irq);
-@@ -697,10 +722,6 @@ static void setup_cpu0_timer_irq(void)
+@@ -699,10 +724,6 @@ static void setup_cpu0_timer_irq(void)
BUG_ON(per_cpu(timer_irq, 0) < 0);
}
@@ -99,7 +99,7 @@ Patch-mainline: n/a
static void __init _late_time_init(void)
{
update_wallclock(false);
-@@ -843,35 +864,6 @@ void xen_halt(void)
+@@ -845,35 +866,6 @@ void xen_halt(void)
VOID(HYPERVISOR_vcpu_op(VCPUOP_down, smp_processor_id(), NULL));
}
@@ -135,8 +135,8 @@ Patch-mainline: n/a
#ifdef CONFIG_SMP
static char timer_name[NR_CPUS][15];
---- head-2011-06-30.orig/drivers/xen/core/evtchn.c 2011-04-14 17:11:44.000000000 +0200
-+++ head-2011-06-30/drivers/xen/core/evtchn.c 2011-04-14 13:58:21.000000000 +0200
+--- sle11sp2-2011-08-22.orig/drivers/xen/core/evtchn.c 2011-04-14 17:11:44.000000000 +0200
++++ sle11sp2-2011-08-22/drivers/xen/core/evtchn.c 2011-04-14 13:58:21.000000000 +0200
@@ -1085,6 +1085,8 @@ int xen_test_irq_pending(int irq)
}
@@ -188,8 +188,8 @@ Patch-mainline: n/a
#endif
int __init arch_early_irq_init(void)
---- head-2011-06-30.orig/drivers/xen/core/gnttab.c 2011-02-01 15:03:03.000000000 +0100
-+++ head-2011-06-30/drivers/xen/core/gnttab.c 2011-04-14 17:19:31.000000000 +0200
+--- sle11sp2-2011-08-22.orig/drivers/xen/core/gnttab.c 2011-02-01 15:03:03.000000000 +0100
++++ sle11sp2-2011-08-22/drivers/xen/core/gnttab.c 2011-04-14 17:19:31.000000000 +0200
@@ -710,20 +710,35 @@ EXPORT_SYMBOL(gnttab_post_map_adjust);
int gnttab_resume(void)
{
@@ -242,8 +242,8 @@ Patch-mainline: n/a
return 0;
ini_nomem:
---- head-2011-06-30.orig/drivers/xen/core/machine_reboot.c 2011-02-01 15:03:10.000000000 +0100
-+++ head-2011-06-30/drivers/xen/core/machine_reboot.c 2011-07-04 10:19:56.000000000 +0200
+--- sle11sp2-2011-08-22.orig/drivers/xen/core/machine_reboot.c 2011-02-01 15:03:10.000000000 +0100
++++ sle11sp2-2011-08-22/drivers/xen/core/machine_reboot.c 2011-07-04 10:19:56.000000000 +0200
@@ -7,6 +7,7 @@
#include <linux/sysrq.h>
#include <linux/stringify.h>
@@ -442,8 +442,8 @@ Patch-mainline: n/a
+ return err;
}
#endif
---- head-2011-06-30.orig/drivers/xen/core/spinlock.c 2011-03-03 16:11:45.000000000 +0100
-+++ head-2011-06-30/drivers/xen/core/spinlock.c 2011-04-13 16:38:13.000000000 +0200
+--- sle11sp2-2011-08-22.orig/drivers/xen/core/spinlock.c 2011-03-03 16:11:45.000000000 +0100
++++ sle11sp2-2011-08-22/drivers/xen/core/spinlock.c 2011-04-13 16:38:13.000000000 +0200
@@ -60,7 +60,9 @@ void __cpuinit xen_spinlock_cleanup(unsi
}
@@ -474,8 +474,8 @@ Patch-mainline: n/a
#endif
static unsigned int spin_adjust(struct spinning *spinning,
---- head-2011-06-30.orig/include/xen/evtchn.h 2011-02-01 15:09:47.000000000 +0100
-+++ head-2011-06-30/include/xen/evtchn.h 2010-11-23 15:07:01.000000000 +0100
+--- sle11sp2-2011-08-22.orig/include/xen/evtchn.h 2011-02-01 15:09:47.000000000 +0100
++++ sle11sp2-2011-08-22/include/xen/evtchn.h 2010-11-23 15:07:01.000000000 +0100
@@ -109,7 +109,9 @@ int bind_ipi_to_irqhandler(
*/
void unbind_from_irqhandler(unsigned int irq, void *dev_id);
@@ -486,8 +486,8 @@ Patch-mainline: n/a
/* Entry point for notifications into Linux subsystems. */
asmlinkage void evtchn_do_upcall(struct pt_regs *regs);
---- head-2011-06-30.orig/include/xen/gnttab.h 2011-01-31 17:56:27.000000000 +0100
-+++ head-2011-06-30/include/xen/gnttab.h 2010-11-23 15:07:01.000000000 +0100
+--- sle11sp2-2011-08-22.orig/include/xen/gnttab.h 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-08-22/include/xen/gnttab.h 2010-11-23 15:07:01.000000000 +0100
@@ -111,8 +111,9 @@ static inline void __gnttab_dma_unmap_pa
void gnttab_reset_grant_page(struct page *page);
diff --git a/patches.xen/xen-virq-per-cpu-irq b/patches.xen/xen-virq-per-cpu-irq
index 827d44eb5a..d464835a0e 100644
--- a/patches.xen/xen-virq-per-cpu-irq
+++ b/patches.xen/xen-virq-per-cpu-irq
@@ -2,9 +2,9 @@ From: jbeulich@novell.com
Subject: fold per-CPU VIRQs onto a single IRQ each
Patch-mainline: n/a
---- head-2011-06-30.orig/arch/x86/kernel/time-xen.c 2011-07-11 15:30:38.000000000 +0200
-+++ head-2011-06-30/arch/x86/kernel/time-xen.c 2011-07-11 15:30:50.000000000 +0200
-@@ -707,19 +707,17 @@ struct vcpu_runstate_info *setup_runstat
+--- sle11sp2-2011-08-22.orig/arch/x86/kernel/time-xen.c 2011-08-23 15:28:59.000000000 +0200
++++ sle11sp2-2011-08-22/arch/x86/kernel/time-xen.c 2011-08-23 15:29:05.000000000 +0200
+@@ -709,19 +709,17 @@ struct vcpu_runstate_info *setup_runstat
}
/* Dynamically-mapped IRQ. */
@@ -32,7 +32,7 @@ Patch-mainline: n/a
}
static void __init _late_time_init(void)
-@@ -865,8 +863,6 @@ void xen_halt(void)
+@@ -867,8 +865,6 @@ void xen_halt(void)
}
#ifdef CONFIG_SMP
@@ -41,7 +41,7 @@ Patch-mainline: n/a
int __cpuinit local_setup_timer(unsigned int cpu)
{
int seq, irq;
-@@ -892,16 +888,10 @@ int __cpuinit local_setup_timer(unsigned
+@@ -894,16 +890,10 @@ int __cpuinit local_setup_timer(unsigned
init_missing_ticks_accounting(cpu);
} while (read_seqretry(&xtime_lock, seq));
@@ -60,7 +60,7 @@ Patch-mainline: n/a
return 0;
}
-@@ -909,7 +899,7 @@ int __cpuinit local_setup_timer(unsigned
+@@ -911,7 +901,7 @@ int __cpuinit local_setup_timer(unsigned
void __cpuinit local_teardown_timer(unsigned int cpu)
{
BUG_ON(cpu == 0);
@@ -69,8 +69,8 @@ Patch-mainline: n/a
}
#endif
---- head-2011-06-30.orig/drivers/xen/core/evtchn.c 2011-04-14 14:02:49.000000000 +0200
-+++ head-2011-06-30/drivers/xen/core/evtchn.c 2011-04-14 16:36:14.000000000 +0200
+--- sle11sp2-2011-08-22.orig/drivers/xen/core/evtchn.c 2011-04-14 14:02:49.000000000 +0200
++++ sle11sp2-2011-08-22/drivers/xen/core/evtchn.c 2011-04-14 16:36:14.000000000 +0200
@@ -59,6 +59,23 @@ static DEFINE_SPINLOCK(irq_mapping_updat
static int evtchn_to_irq[NR_EVENT_CHANNELS] = {
[0 ... NR_EVENT_CHANNELS-1] = -1 };
@@ -530,8 +530,8 @@ Patch-mainline: n/a
init_evtchn_cpu_bindings();
#ifdef CONFIG_SPARSE_IRQ
---- head-2011-06-30.orig/drivers/xen/core/smpboot.c 2011-03-03 16:14:20.000000000 +0100
-+++ head-2011-06-30/drivers/xen/core/smpboot.c 2011-04-14 16:36:14.000000000 +0200
+--- sle11sp2-2011-08-22.orig/drivers/xen/core/smpboot.c 2011-03-03 16:14:20.000000000 +0100
++++ sle11sp2-2011-08-22/drivers/xen/core/smpboot.c 2011-04-14 16:36:14.000000000 +0200
@@ -125,7 +125,7 @@ static int __cpuinit xen_smp_intr_init(u
fail:
xen_spinlock_cleanup(cpu);
@@ -550,8 +550,8 @@ Patch-mainline: n/a
xen_spinlock_cleanup(cpu);
}
#endif
---- head-2011-06-30.orig/drivers/xen/netback/netback.c 2011-04-13 17:01:32.000000000 +0200
-+++ head-2011-06-30/drivers/xen/netback/netback.c 2011-04-13 16:48:30.000000000 +0200
+--- sle11sp2-2011-08-22.orig/drivers/xen/netback/netback.c 2011-04-13 17:01:32.000000000 +0200
++++ sle11sp2-2011-08-22/drivers/xen/netback/netback.c 2011-04-13 16:48:30.000000000 +0200
@@ -1633,6 +1633,12 @@ static irqreturn_t netif_be_dbg(int irq,
return IRQ_HANDLED;
@@ -581,8 +581,8 @@ Patch-mainline: n/a
#endif
return 0;
---- head-2011-06-30.orig/drivers/xen/xenoprof/xenoprofile.c 2011-04-15 12:46:57.000000000 +0200
-+++ head-2011-06-30/drivers/xen/xenoprof/xenoprofile.c 2011-04-15 12:47:52.000000000 +0200
+--- sle11sp2-2011-08-22.orig/drivers/xen/xenoprof/xenoprofile.c 2011-04-15 12:46:57.000000000 +0200
++++ sle11sp2-2011-08-22/drivers/xen/xenoprof/xenoprofile.c 2011-04-15 12:47:52.000000000 +0200
@@ -198,6 +198,11 @@ static irqreturn_t xenoprof_ovf_interrup
return IRQ_HANDLED;
}
@@ -618,8 +618,8 @@ Patch-mainline: n/a
if (result < 0) {
unbind_virq();
---- head-2011-06-30.orig/include/xen/evtchn.h 2011-02-02 15:09:43.000000000 +0100
-+++ head-2011-06-30/include/xen/evtchn.h 2010-11-23 16:18:23.000000000 +0100
+--- sle11sp2-2011-08-22.orig/include/xen/evtchn.h 2011-02-02 15:09:43.000000000 +0100
++++ sle11sp2-2011-08-22/include/xen/evtchn.h 2010-11-23 16:18:23.000000000 +0100
@@ -94,6 +94,17 @@ int bind_virq_to_irqhandler(
unsigned long irqflags,
const char *devname,
diff --git a/patches.xen/xen-x86-bigmem b/patches.xen/xen-x86-bigmem
index f641ab2b0f..995fd5a97e 100644
--- a/patches.xen/xen-x86-bigmem
+++ b/patches.xen/xen-x86-bigmem
@@ -3,9 +3,9 @@ Subject: fix issues with the assignment of huge amounts of memory
Patch-mainline: obsolete
References: bnc#482614, bnc#537435, bnc#700856
---- head-2011-07-21.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-07-21 12:40:47.000000000 +0200
-+++ head-2011-07-21/arch/x86/include/mach-xen/asm/hypervisor.h 2011-07-20 15:47:08.000000000 +0200
-@@ -102,6 +102,10 @@ void xen_pgd_pin(unsigned long ptr);
+--- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-08-23 15:30:27.000000000 +0200
++++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/hypervisor.h 2011-08-23 15:30:31.000000000 +0200
+@@ -100,6 +100,10 @@ void xen_pgd_pin(unsigned long ptr);
void xen_pgd_unpin(unsigned long ptr);
void xen_init_pgd_pin(void);
@@ -16,8 +16,8 @@ References: bnc#482614, bnc#537435, bnc#700856
void xen_set_ldt(const void *ptr, unsigned int ents);
---- head-2011-07-21.orig/arch/x86/kernel/e820-xen.c 2011-04-26 09:20:05.000000000 +0200
-+++ head-2011-07-21/arch/x86/kernel/e820-xen.c 2011-04-13 17:05:50.000000000 +0200
+--- sle11sp2-2011-08-22.orig/arch/x86/kernel/e820-xen.c 2011-04-26 09:20:05.000000000 +0200
++++ sle11sp2-2011-08-22/arch/x86/kernel/e820-xen.c 2011-04-13 17:05:50.000000000 +0200
@@ -954,6 +954,26 @@ static int __init parse_memopt(char *p)
/* don't remove all of memory when handling "mem={invalid}" param */
if (mem_size == 0)
@@ -76,8 +76,8 @@ References: bnc#482614, bnc#537435, bnc#700856
if (is_initial_xendomain()) {
memmap.nr_entries = E820MAX;
set_xen_guest_handle(memmap.buffer, machine_e820.map);
---- head-2011-07-21.orig/arch/x86/kernel/setup-xen.c 2011-07-04 12:21:52.000000000 +0200
-+++ head-2011-07-21/arch/x86/kernel/setup-xen.c 2011-07-21 12:41:22.000000000 +0200
+--- sle11sp2-2011-08-22.orig/arch/x86/kernel/setup-xen.c 2011-07-04 12:21:52.000000000 +0200
++++ sle11sp2-2011-08-22/arch/x86/kernel/setup-xen.c 2011-07-21 12:41:22.000000000 +0200
@@ -133,12 +133,7 @@ static struct notifier_block xen_panic_b
unsigned long *phys_to_machine_mapping;
EXPORT_SYMBOL(phys_to_machine_mapping);
@@ -221,8 +221,8 @@ References: bnc#482614, bnc#537435, bnc#700856
}
/* Mark all ISA DMA channels in-use - using them wouldn't work. */
---- head-2011-07-21.orig/drivers/xen/core/machine_reboot.c 2011-04-14 17:32:26.000000000 +0200
-+++ head-2011-07-21/drivers/xen/core/machine_reboot.c 2011-07-20 16:09:26.000000000 +0200
+--- sle11sp2-2011-08-22.orig/drivers/xen/core/machine_reboot.c 2011-04-14 17:32:26.000000000 +0200
++++ sle11sp2-2011-08-22/drivers/xen/core/machine_reboot.c 2011-07-20 16:09:26.000000000 +0200
@@ -72,11 +72,7 @@ static void pre_suspend(void)
static void post_suspend(int suspend_cancelled)
diff --git a/patches.xen/xen-x86-per-cpu-vcpu-info b/patches.xen/xen-x86-per-cpu-vcpu-info
index 30dc266a8b..bfcc0432bd 100644
--- a/patches.xen/xen-x86-per-cpu-vcpu-info
+++ b/patches.xen/xen-x86-per-cpu-vcpu-info
@@ -5,7 +5,7 @@ Patch-mainline: obsolete
... reducing access code size and latency, as well as being the
prerequisite for removing the limitation on 32 vCPU-s per guest.
---- sle11sp2-2011-08-22.orig/arch/x86/include/asm/percpu.h 2011-07-22 04:17:23.000000000 +0200
+--- sle11sp2-2011-08-22.orig/arch/x86/include/asm/percpu.h 2011-08-23 15:03:50.000000000 +0200
+++ sle11sp2-2011-08-22/arch/x86/include/asm/percpu.h 2011-04-13 17:06:05.000000000 +0200
@@ -311,6 +311,40 @@ do { \
pxo_ret__; \
@@ -59,9 +59,9 @@ prerequisite for removing the limitation on 32 vCPU-s per guest.
#define __this_cpu_read_1(pcp) percpu_from_op("mov", (pcp), "m"(pcp))
#define __this_cpu_read_2(pcp) percpu_from_op("mov", (pcp), "m"(pcp))
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-07-20 15:47:08.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/hypervisor.h 2011-07-21 12:42:38.000000000 +0200
-@@ -47,12 +47,26 @@
+--- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-08-23 15:30:31.000000000 +0200
++++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/hypervisor.h 2011-08-23 15:30:39.000000000 +0200
+@@ -45,12 +45,26 @@
extern shared_info_t *HYPERVISOR_shared_info;
@@ -254,8 +254,8 @@ prerequisite for removing the limitation on 32 vCPU-s per guest.
/* Set up mapping of lowest 1MB of physical memory. */
for (i = 0; i < NR_FIX_ISAMAPS; i++)
if (is_initial_xendomain())
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/time-xen.c 2011-07-11 15:30:55.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/time-xen.c 2011-07-11 15:31:45.000000000 +0200
+--- sle11sp2-2011-08-22.orig/arch/x86/kernel/time-xen.c 2011-08-23 15:29:16.000000000 +0200
++++ sle11sp2-2011-08-22/arch/x86/kernel/time-xen.c 2011-08-23 15:30:41.000000000 +0200
@@ -243,16 +243,10 @@ static void get_time_values_from_xen(uns
local_irq_restore(flags);
}
@@ -312,7 +312,7 @@ prerequisite for removing the limitation on 32 vCPU-s per guest.
-
return 0;
}
- #endif
+
@@ -333,7 +323,7 @@ unsigned long long xen_local_clock(void)
local_time_version = shadow->version;
rdtsc_barrier();
diff --git a/patches.xen/xen-x86-pmd-handling b/patches.xen/xen-x86-pmd-handling
index 3b45a64da5..243efb21ad 100644
--- a/patches.xen/xen-x86-pmd-handling
+++ b/patches.xen/xen-x86-pmd-handling
@@ -2,9 +2,9 @@ From: jbeulich@novell.com
Subject: consolidate pmd/pud/pgd entry handling
Patch-mainline: obsolete
---- head-2011-08-09.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-07-21 12:33:02.000000000 +0200
-+++ head-2011-08-09/arch/x86/include/mach-xen/asm/hypervisor.h 2011-07-21 12:40:47.000000000 +0200
-@@ -97,10 +97,12 @@ void xen_invlpg(unsigned long ptr);
+--- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-08-23 15:29:18.000000000 +0200
++++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/hypervisor.h 2011-08-23 15:30:27.000000000 +0200
+@@ -95,10 +95,12 @@ void xen_invlpg(unsigned long ptr);
void xen_l1_entry_update(pte_t *ptr, pte_t val);
void xen_l2_entry_update(pmd_t *ptr, pmd_t val);
void xen_l3_entry_update(pud_t *ptr, pud_t val); /* x86_64/PAE */
@@ -18,7 +18,7 @@ Patch-mainline: obsolete
void xen_set_ldt(const void *ptr, unsigned int ents);
#ifdef CONFIG_SMP
-@@ -335,6 +337,18 @@ MULTI_update_va_mapping(
+@@ -333,6 +335,18 @@ MULTI_update_va_mapping(
}
static inline void
@@ -37,8 +37,8 @@ Patch-mainline: obsolete
MULTI_grant_table_op(multicall_entry_t *mcl, unsigned int cmd,
void *uop, unsigned int count)
{
---- head-2011-08-09.orig/arch/x86/include/mach-xen/asm/pgalloc.h 2011-02-01 15:41:35.000000000 +0100
-+++ head-2011-08-09/arch/x86/include/mach-xen/asm/pgalloc.h 2011-02-03 14:41:13.000000000 +0100
+--- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgalloc.h 2011-02-01 15:41:35.000000000 +0100
++++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgalloc.h 2011-02-03 14:41:13.000000000 +0100
@@ -75,20 +75,16 @@ static inline void pmd_populate(struct m
struct page *pte)
{
@@ -118,8 +118,8 @@ Patch-mainline: obsolete
}
static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
---- head-2011-08-09.orig/arch/x86/include/mach-xen/asm/pgtable.h 2011-03-23 10:10:00.000000000 +0100
-+++ head-2011-08-09/arch/x86/include/mach-xen/asm/pgtable.h 2011-03-23 10:11:19.000000000 +0100
+--- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgtable.h 2011-03-23 10:10:00.000000000 +0100
++++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgtable.h 2011-03-23 10:11:19.000000000 +0100
@@ -618,7 +618,7 @@ static inline pmd_t xen_local_pmdp_get_a
{
pmd_t res = *pmdp;
@@ -129,8 +129,8 @@ Patch-mainline: obsolete
return res;
}
---- head-2011-08-09.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-04-12 15:59:10.000000000 +0200
-+++ head-2011-08-09/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-04-11 16:12:34.000000000 +0200
+--- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-04-12 15:59:10.000000000 +0200
++++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-04-11 16:12:34.000000000 +0200
@@ -56,12 +56,15 @@ static inline void __xen_pte_clear(pte_t
ptep->pte_high = 0;
}
@@ -167,8 +167,8 @@ Patch-mainline: obsolete
#ifdef CONFIG_SMP
static inline pte_t xen_ptep_get_and_clear(pte_t *ptep, pte_t res)
{
---- head-2011-08-09.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-04-12 15:59:10.000000000 +0200
-+++ head-2011-08-09/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 10:11:13.000000000 +0100
+--- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-04-12 15:59:10.000000000 +0200
++++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 10:11:13.000000000 +0100
@@ -65,10 +65,13 @@ static inline void xen_set_pmd(pmd_t *pm
xen_l2_entry_update(pmdp, pmd);
}
@@ -226,8 +226,8 @@ Patch-mainline: obsolete
#define __pte_mfn(_pte) (((_pte).pte & PTE_PFN_MASK) >> PAGE_SHIFT)
---- head-2011-08-09.orig/arch/x86/mm/hypervisor.c 2011-08-09 14:33:18.000000000 +0200
-+++ head-2011-08-09/arch/x86/mm/hypervisor.c 2011-08-09 14:33:23.000000000 +0200
+--- sle11sp2-2011-08-22.orig/arch/x86/mm/hypervisor.c 2011-08-09 14:33:18.000000000 +0200
++++ sle11sp2-2011-08-22/arch/x86/mm/hypervisor.c 2011-08-09 14:33:23.000000000 +0200
@@ -361,31 +361,91 @@ void xen_l1_entry_update(pte_t *ptr, pte
}
EXPORT_SYMBOL_GPL(xen_l1_entry_update);
@@ -327,8 +327,8 @@ Patch-mainline: obsolete
}
#endif /* CONFIG_X86_64 */
---- head-2011-08-09.orig/arch/x86/mm/init_32-xen.c 2011-07-04 12:15:21.000000000 +0200
-+++ head-2011-08-09/arch/x86/mm/init_32-xen.c 2011-07-04 12:29:02.000000000 +0200
+--- sle11sp2-2011-08-22.orig/arch/x86/mm/init_32-xen.c 2011-07-04 12:15:21.000000000 +0200
++++ sle11sp2-2011-08-22/arch/x86/mm/init_32-xen.c 2011-07-04 12:29:02.000000000 +0200
@@ -690,6 +690,8 @@ static void __init zone_sizes_init(void)
#endif
@@ -347,8 +347,8 @@ Patch-mainline: obsolete
}
#ifdef CONFIG_MEMORY_HOTPLUG
---- head-2011-08-09.orig/arch/x86/mm/init_64-xen.c 2011-08-09 11:16:50.000000000 +0200
-+++ head-2011-08-09/arch/x86/mm/init_64-xen.c 2011-08-09 11:17:07.000000000 +0200
+--- sle11sp2-2011-08-22.orig/arch/x86/mm/init_64-xen.c 2011-08-09 11:16:50.000000000 +0200
++++ sle11sp2-2011-08-22/arch/x86/mm/init_64-xen.c 2011-08-09 11:17:07.000000000 +0200
@@ -232,8 +232,11 @@ static pud_t *fill_pud(pgd_t *pgd, unsig
{
if (pgd_none(*pgd)) {
@@ -410,8 +410,8 @@ Patch-mainline: obsolete
}
/*
---- head-2011-08-09.orig/arch/x86/mm/pgtable-xen.c 2011-04-12 15:59:10.000000000 +0200
-+++ head-2011-08-09/arch/x86/mm/pgtable-xen.c 2011-04-11 16:12:44.000000000 +0200
+--- sle11sp2-2011-08-22.orig/arch/x86/mm/pgtable-xen.c 2011-04-12 15:59:10.000000000 +0200
++++ sle11sp2-2011-08-22/arch/x86/mm/pgtable-xen.c 2011-04-11 16:12:44.000000000 +0200
@@ -66,16 +66,16 @@ early_param("userpte", setup_userpte);
void __pte_free(pgtable_t pte)
{
diff --git a/patches.xen/xen-x86_64-pgd-alloc-order b/patches.xen/xen-x86_64-pgd-alloc-order
index a0d3690d9b..b171d26273 100644
--- a/patches.xen/xen-x86_64-pgd-alloc-order
+++ b/patches.xen/xen-x86_64-pgd-alloc-order
@@ -4,9 +4,9 @@ Patch-mainline: n/a
At the same time remove the useless user mode pair of init_level4_pgt.
---- head-2011-08-09.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-07-21 12:45:30.000000000 +0200
-+++ head-2011-08-09/arch/x86/include/mach-xen/asm/hypervisor.h 2011-07-21 12:45:52.000000000 +0200
-@@ -102,8 +102,8 @@ void do_hypervisor_callback(struct pt_re
+--- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-08-23 15:30:48.000000000 +0200
++++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/hypervisor.h 2011-08-23 15:30:52.000000000 +0200
+@@ -100,8 +100,8 @@ void do_hypervisor_callback(struct pt_re
* be MACHINE addresses.
*/
@@ -17,7 +17,7 @@ At the same time remove the useless user mode pair of init_level4_pgt.
void xen_load_gs(unsigned int selector); /* x86_64 only */
void xen_tlb_flush(void);
void xen_invlpg(unsigned long ptr);
-@@ -111,7 +111,7 @@ void xen_invlpg(unsigned long ptr);
+@@ -109,7 +109,7 @@ void xen_invlpg(unsigned long ptr);
void xen_l1_entry_update(pte_t *ptr, pte_t val);
void xen_l2_entry_update(pmd_t *ptr, pmd_t val);
void xen_l3_entry_update(pud_t *ptr, pud_t val); /* x86_64/PAE */
@@ -26,8 +26,8 @@ At the same time remove the useless user mode pair of init_level4_pgt.
void xen_pgd_pin(pgd_t *);
void xen_pgd_unpin(pgd_t *);
---- head-2011-08-09.orig/arch/x86/include/mach-xen/asm/mmu_context.h 2011-02-08 10:25:49.000000000 +0100
-+++ head-2011-08-09/arch/x86/include/mach-xen/asm/mmu_context.h 2011-02-08 10:46:27.000000000 +0100
+--- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/mmu_context.h 2011-02-08 10:25:49.000000000 +0100
++++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/mmu_context.h 2011-02-08 10:46:27.000000000 +0100
@@ -82,6 +82,9 @@ static inline void switch_mm(struct mm_s
{
unsigned cpu = smp_processor_id();
@@ -61,8 +61,8 @@ At the same time remove the useless user mode pair of init_level4_pgt.
load_LDT_nolock(&next->context);
}
}
---- head-2011-08-09.orig/arch/x86/include/mach-xen/asm/pgalloc.h 2011-02-03 14:41:13.000000000 +0100
-+++ head-2011-08-09/arch/x86/include/mach-xen/asm/pgalloc.h 2011-02-03 14:42:36.000000000 +0100
+--- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgalloc.h 2011-02-03 14:41:13.000000000 +0100
++++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgalloc.h 2011-02-03 14:42:36.000000000 +0100
@@ -123,15 +123,13 @@ static inline void pud_populate(struct m
#endif /* CONFIG_X86_PAE */
@@ -80,8 +80,8 @@ At the same time remove the useless user mode pair of init_level4_pgt.
else
*__user_pgd(pgd) = *pgd = ent;
}
---- head-2011-08-09.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 10:12:10.000000000 +0100
-+++ head-2011-08-09/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 10:13:50.000000000 +0100
+--- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 10:12:10.000000000 +0100
++++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 10:13:50.000000000 +0100
@@ -106,18 +106,25 @@ static inline void xen_set_pud(pud_t *pu
: (void)(*__pudp = xen_make_pud(0)); \
})
@@ -111,8 +111,8 @@ At the same time remove the useless user mode pair of init_level4_pgt.
: (void)(*__user_pgd(__pgdp) = *__pgdp = xen_make_pgd(0)); \
})
---- head-2011-08-09.orig/arch/x86/kernel/cpu/common-xen.c 2011-07-04 12:30:47.000000000 +0200
-+++ head-2011-08-09/arch/x86/kernel/cpu/common-xen.c 2011-07-04 12:33:38.000000000 +0200
+--- sle11sp2-2011-08-22.orig/arch/x86/kernel/cpu/common-xen.c 2011-07-04 12:30:47.000000000 +0200
++++ sle11sp2-2011-08-22/arch/x86/kernel/cpu/common-xen.c 2011-07-04 12:33:38.000000000 +0200
@@ -1083,8 +1083,7 @@ DEFINE_PER_CPU_FIRST(union irq_stack_uni
void xen_switch_pt(void)
{
@@ -123,8 +123,8 @@ At the same time remove the useless user mode pair of init_level4_pgt.
#endif
}
---- head-2011-08-09.orig/arch/x86/kernel/head_64-xen.S 2011-08-09 11:07:15.000000000 +0200
-+++ head-2011-08-09/arch/x86/kernel/head_64-xen.S 2011-08-09 11:17:44.000000000 +0200
+--- sle11sp2-2011-08-22.orig/arch/x86/kernel/head_64-xen.S 2011-08-09 11:07:15.000000000 +0200
++++ sle11sp2-2011-08-22/arch/x86/kernel/head_64-xen.S 2011-08-09 11:17:44.000000000 +0200
@@ -57,14 +57,6 @@ ENTRY(name)
__PAGE_ALIGNED_BSS
NEXT_PAGE(init_level4_pgt)
@@ -140,8 +140,8 @@ At the same time remove the useless user mode pair of init_level4_pgt.
NEXT_PAGE(level3_kernel_pgt)
.fill 512,8,0
---- head-2011-08-09.orig/arch/x86/mm/hypervisor.c 2011-08-09 14:33:37.000000000 +0200
-+++ head-2011-08-09/arch/x86/mm/hypervisor.c 2011-08-09 14:33:41.000000000 +0200
+--- sle11sp2-2011-08-22.orig/arch/x86/mm/hypervisor.c 2011-08-09 14:33:37.000000000 +0200
++++ sle11sp2-2011-08-22/arch/x86/mm/hypervisor.c 2011-08-09 14:33:41.000000000 +0200
@@ -524,7 +524,7 @@ void xen_l3_entry_update(pud_t *ptr, pud
#endif
@@ -223,8 +223,8 @@ At the same time remove the useless user mode pair of init_level4_pgt.
#endif
if (HYPERVISOR_mmuext_op(op, NR_PGD_PIN_OPS, NULL, DOMID_SELF) < 0)
BUG();
---- head-2011-08-09.orig/arch/x86/mm/init_64-xen.c 2011-08-09 11:17:33.000000000 +0200
-+++ head-2011-08-09/arch/x86/mm/init_64-xen.c 2011-08-09 11:17:38.000000000 +0200
+--- sle11sp2-2011-08-22.orig/arch/x86/mm/init_64-xen.c 2011-08-09 11:17:33.000000000 +0200
++++ sle11sp2-2011-08-22/arch/x86/mm/init_64-xen.c 2011-08-09 11:17:38.000000000 +0200
@@ -766,9 +766,6 @@ void __init xen_init_pt(void)
(PTRS_PER_PUD - pud_index(__START_KERNEL_map))
* sizeof(*level3_kernel_pgt));
@@ -244,8 +244,8 @@ At the same time remove the useless user mode pair of init_level4_pgt.
early_make_page_readonly(level3_kernel_pgt,
XENFEAT_writable_page_tables);
early_make_page_readonly(level3_user_pgt,
---- head-2011-08-09.orig/arch/x86/mm/pgtable-xen.c 2010-11-23 16:31:40.000000000 +0100
-+++ head-2011-08-09/arch/x86/mm/pgtable-xen.c 2011-04-11 16:14:31.000000000 +0200
+--- sle11sp2-2011-08-22.orig/arch/x86/mm/pgtable-xen.c 2010-11-23 16:31:40.000000000 +0100
++++ sle11sp2-2011-08-22/arch/x86/mm/pgtable-xen.c 2011-04-11 16:14:31.000000000 +0200
@@ -291,9 +291,11 @@ static void pgd_walk(pgd_t *pgd_base, pg
BUG();
seq = 0;
@@ -323,8 +323,8 @@ At the same time remove the useless user mode pair of init_level4_pgt.
}
/* blktap and gntdev need this, as otherwise they would implicitly (and
---- head-2011-08-09.orig/drivers/xen/core/machine_reboot.c 2011-07-22 09:35:29.000000000 +0200
-+++ head-2011-08-09/drivers/xen/core/machine_reboot.c 2011-07-22 09:36:42.000000000 +0200
+--- sle11sp2-2011-08-22.orig/drivers/xen/core/machine_reboot.c 2011-07-22 09:35:29.000000000 +0200
++++ sle11sp2-2011-08-22/drivers/xen/core/machine_reboot.c 2011-07-22 09:36:42.000000000 +0200
@@ -175,8 +175,7 @@ static int take_machine_down(void *_susp
* in fast-suspend mode as that implies a new enough Xen.
*/
diff --git a/patches.xen/xen-x86_64-pgd-pin b/patches.xen/xen-x86_64-pgd-pin
index c944da3e29..efb43b0d91 100644
--- a/patches.xen/xen-x86_64-pgd-pin
+++ b/patches.xen/xen-x86_64-pgd-pin
@@ -2,9 +2,9 @@ From: jbeulich@novell.com
Subject: make pinning of pgd pairs transparent to callers
Patch-mainline: obsolete
---- head-2011-08-09.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-07-21 12:42:38.000000000 +0200
-+++ head-2011-08-09/arch/x86/include/mach-xen/asm/hypervisor.h 2011-07-21 12:45:30.000000000 +0200
-@@ -112,8 +112,8 @@ void xen_l1_entry_update(pte_t *ptr, pte
+--- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-08-23 15:30:39.000000000 +0200
++++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/hypervisor.h 2011-08-23 15:30:48.000000000 +0200
+@@ -110,8 +110,8 @@ void xen_l1_entry_update(pte_t *ptr, pte
void xen_l2_entry_update(pmd_t *ptr, pmd_t val);
void xen_l3_entry_update(pud_t *ptr, pud_t val); /* x86_64/PAE */
void xen_l4_entry_update(pgd_t *ptr, int user, pgd_t val); /* x86_64 only */
@@ -15,8 +15,8 @@ Patch-mainline: obsolete
void xen_init_pgd_pin(void);
#ifdef CONFIG_PM_SLEEP
---- head-2011-08-09.orig/arch/x86/mm/hypervisor.c 2011-08-09 14:33:28.000000000 +0200
-+++ head-2011-08-09/arch/x86/mm/hypervisor.c 2011-08-09 14:33:37.000000000 +0200
+--- sle11sp2-2011-08-22.orig/arch/x86/mm/hypervisor.c 2011-08-09 14:33:28.000000000 +0200
++++ sle11sp2-2011-08-22/arch/x86/mm/hypervisor.c 2011-08-09 14:33:37.000000000 +0200
@@ -623,26 +623,38 @@ EXPORT_SYMBOL_GPL(xen_invlpg_mask);
#endif /* CONFIG_SMP */
@@ -70,8 +70,8 @@ Patch-mainline: obsolete
}
void xen_set_ldt(const void *ptr, unsigned int ents)
---- head-2011-08-09.orig/arch/x86/mm/init_64-xen.c 2011-08-09 11:17:15.000000000 +0200
-+++ head-2011-08-09/arch/x86/mm/init_64-xen.c 2011-08-09 11:17:33.000000000 +0200
+--- sle11sp2-2011-08-22.orig/arch/x86/mm/init_64-xen.c 2011-08-09 11:17:15.000000000 +0200
++++ sle11sp2-2011-08-22/arch/x86/mm/init_64-xen.c 2011-08-09 11:17:33.000000000 +0200
@@ -795,10 +795,8 @@ void __init xen_init_pt(void)
early_make_page_readonly(level1_fixmap_pgt,
XENFEAT_writable_page_tables);
@@ -85,8 +85,8 @@ Patch-mainline: obsolete
}
void __init xen_finish_init_mapping(void)
---- head-2011-08-09.orig/arch/x86/mm/pgtable-xen.c 2010-04-15 11:48:29.000000000 +0200
-+++ head-2011-08-09/arch/x86/mm/pgtable-xen.c 2010-11-23 16:31:40.000000000 +0100
+--- sle11sp2-2011-08-22.orig/arch/x86/mm/pgtable-xen.c 2010-04-15 11:48:29.000000000 +0200
++++ sle11sp2-2011-08-22/arch/x86/mm/pgtable-xen.c 2010-11-23 16:31:40.000000000 +0100
@@ -368,19 +368,13 @@ static void __pgd_pin(pgd_t *pgd)
{
pgd_walk(pgd, PAGE_KERNEL_RO);
diff --git a/patches.xen/xen-x86_64-unmapped-initrd b/patches.xen/xen-x86_64-unmapped-initrd
index e1a1d6ded3..b72b0b9863 100644
--- a/patches.xen/xen-x86_64-unmapped-initrd
+++ b/patches.xen/xen-x86_64-unmapped-initrd
@@ -7,10 +7,8 @@ getting mapped into the initial mapping. The kernel doesn't really need
the initrd to be mapped, so use new infrastructure available in 4.1+
Xen to avoid the mapping and hence the restriction.
-Index: linux-3.0-SLE11-SP2-3.0/arch/x86/include/mach-xen/asm/setup.h
-===================================================================
---- linux-3.0-SLE11-SP2-3.0.orig/arch/x86/include/mach-xen/asm/setup.h
-+++ linux-3.0-SLE11-SP2-3.0/arch/x86/include/mach-xen/asm/setup.h
+--- head-2011-08-09.orig/arch/x86/include/mach-xen/asm/setup.h 2011-07-04 12:32:43.000000000 +0200
++++ head-2011-08-09/arch/x86/include/mach-xen/asm/setup.h 2011-07-04 12:35:19.000000000 +0200
@@ -3,6 +3,13 @@
void xen_start_kernel(void);
void xen_arch_setup(void);
@@ -25,10 +23,8 @@ Index: linux-3.0-SLE11-SP2-3.0/arch/x86/include/mach-xen/asm/setup.h
#ifdef CONFIG_EFI
void efi_probe(void);
#else
-Index: linux-3.0-SLE11-SP2-3.0/arch/x86/kernel/head-xen.c
-===================================================================
---- linux-3.0-SLE11-SP2-3.0.orig/arch/x86/kernel/head-xen.c
-+++ linux-3.0-SLE11-SP2-3.0/arch/x86/kernel/head-xen.c
+--- head-2011-08-09.orig/arch/x86/kernel/head-xen.c 2011-08-09 11:17:19.000000000 +0200
++++ head-2011-08-09/arch/x86/kernel/head-xen.c 2011-07-11 15:42:00.000000000 +0200
@@ -76,6 +76,8 @@ extern void nmi(void);
#define CALLBACK_ADDR(fn) { __KERNEL_CS, (unsigned long)(fn) }
#endif
@@ -38,10 +34,8 @@ Index: linux-3.0-SLE11-SP2-3.0/arch/x86/kernel/head-xen.c
unsigned long *__read_mostly machine_to_phys_mapping =
(void *)MACH2PHYS_VIRT_START;
EXPORT_SYMBOL(machine_to_phys_mapping);
-Index: linux-3.0-SLE11-SP2-3.0/arch/x86/kernel/head32-xen.c
-===================================================================
---- linux-3.0-SLE11-SP2-3.0.orig/arch/x86/kernel/head32-xen.c
-+++ linux-3.0-SLE11-SP2-3.0/arch/x86/kernel/head32-xen.c
+--- head-2011-08-09.orig/arch/x86/kernel/head32-xen.c 2011-07-01 15:19:34.000000000 +0200
++++ head-2011-08-09/arch/x86/kernel/head32-xen.c 2011-07-04 12:34:54.000000000 +0200
@@ -76,6 +76,11 @@ void __init i386_start_kernel(void)
break;
}
@@ -54,10 +48,8 @@ Index: linux-3.0-SLE11-SP2-3.0/arch/x86/kernel/head32-xen.c
{
int max_cmdline;
-Index: linux-3.0-SLE11-SP2-3.0/arch/x86/kernel/head64-xen.c
-===================================================================
---- linux-3.0-SLE11-SP2-3.0.orig/arch/x86/kernel/head64-xen.c
-+++ linux-3.0-SLE11-SP2-3.0/arch/x86/kernel/head64-xen.c
+--- head-2011-08-09.orig/arch/x86/kernel/head64-xen.c 2011-04-11 16:14:44.000000000 +0200
++++ head-2011-08-09/arch/x86/kernel/head64-xen.c 2011-04-11 16:14:59.000000000 +0200
@@ -121,13 +121,23 @@ void __init x86_64_start_reservations(ch
memblock_x86_reserve_range(__pa_symbol(&_text), __pa_symbol(&__bss_stop), "TEXT DATA BSS");
@@ -86,10 +78,8 @@ Index: linux-3.0-SLE11-SP2-3.0/arch/x86/kernel/head64-xen.c
/*
* At this point everything still needed from the boot loader
-Index: linux-3.0-SLE11-SP2-3.0/arch/x86/kernel/head_64-xen.S
-===================================================================
---- linux-3.0-SLE11-SP2-3.0.orig/arch/x86/kernel/head_64-xen.S
-+++ linux-3.0-SLE11-SP2-3.0/arch/x86/kernel/head_64-xen.S
+--- head-2011-08-09.orig/arch/x86/kernel/head_64-xen.S 2011-08-09 11:19:00.000000000 +0200
++++ head-2011-08-09/arch/x86/kernel/head_64-xen.S 2011-08-09 11:19:40.000000000 +0200
@@ -160,6 +160,7 @@ ENTRY(empty_zero_page)
ELFNOTE(Xen, XEN_ELFNOTE_ENTRY, .quad startup_64)
ELFNOTE(Xen, XEN_ELFNOTE_HYPERCALL_PAGE, .quad hypercall_page)
@@ -98,10 +88,8 @@ Index: linux-3.0-SLE11-SP2-3.0/arch/x86/kernel/head_64-xen.S
ELFNOTE(Xen, XEN_ELFNOTE_INIT_P2M, .quad VMEMMAP_START)
ELFNOTE(Xen, XEN_ELFNOTE_FEATURES, .ascii "writable_page_tables";
.ascii "|writable_descriptor_tables";
-Index: linux-3.0-SLE11-SP2-3.0/arch/x86/kernel/setup-xen.c
-===================================================================
---- linux-3.0-SLE11-SP2-3.0.orig/arch/x86/kernel/setup-xen.c
-+++ linux-3.0-SLE11-SP2-3.0/arch/x86/kernel/setup-xen.c
+--- head-2011-08-09.orig/arch/x86/kernel/setup-xen.c 2011-07-21 12:50:48.000000000 +0200
++++ head-2011-08-09/arch/x86/kernel/setup-xen.c 2011-07-21 12:51:23.000000000 +0200
@@ -460,7 +460,7 @@ static void __init relocate_initrd(void)
#else
printk(KERN_ERR "initrd extends beyond end of memory "
@@ -120,10 +108,8 @@ Index: linux-3.0-SLE11-SP2-3.0/arch/x86/kernel/setup-xen.c
unsigned long ramdisk_size = xen_start_info->mod_len;
unsigned long ramdisk_end = PAGE_ALIGN(ramdisk_image + ramdisk_size);
unsigned long end_of_lowmem = max_low_pfn_mapped << PAGE_SHIFT;
-Index: linux-3.0-SLE11-SP2-3.0/arch/x86/mm/init-xen.c
-===================================================================
---- linux-3.0-SLE11-SP2-3.0.orig/arch/x86/mm/init-xen.c
-+++ linux-3.0-SLE11-SP2-3.0/arch/x86/mm/init-xen.c
+--- head-2011-08-09.orig/arch/x86/mm/init-xen.c 2011-07-04 12:34:33.000000000 +0200
++++ head-2011-08-09/arch/x86/mm/init-xen.c 2011-07-04 12:35:03.000000000 +0200
@@ -353,14 +353,7 @@ unsigned long __init_refok init_memory_m
*/
if (!after_bootmem && pgt_buf_top > pgt_buf_start) {
@@ -140,10 +126,8 @@ Index: linux-3.0-SLE11-SP2-3.0/arch/x86/mm/init-xen.c
#endif
x86_init.mapping.pagetable_reserve(PFN_PHYS(pgt_buf_start),
PFN_PHYS(pgt_buf_top));
-Index: linux-3.0-SLE11-SP2-3.0/arch/x86/mm/init_64-xen.c
-===================================================================
---- linux-3.0-SLE11-SP2-3.0.orig/arch/x86/mm/init_64-xen.c
-+++ linux-3.0-SLE11-SP2-3.0/arch/x86/mm/init_64-xen.c
+--- head-2011-08-09.orig/arch/x86/mm/init_64-xen.c 2011-08-09 11:19:08.000000000 +0200
++++ head-2011-08-09/arch/x86/mm/init_64-xen.c 2011-08-09 11:19:18.000000000 +0200
@@ -221,13 +221,71 @@ void sync_global_pgds(unsigned long star
}
}
diff --git a/patches.xen/xen3-acpi_processor_delay_cpuidle_init_on_hotplug.patch b/patches.xen/xen3-acpi_processor_delay_cpuidle_init_on_hotplug.patch
deleted file mode 100644
index 3f6c4df6a3..0000000000
--- a/patches.xen/xen3-acpi_processor_delay_cpuidle_init_on_hotplug.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: trenn@suse.de
-Subject: acpi processor hotplug: Delay most initialization to cpu online
-References: fate#311831,bnc#703100
-Patch-Mainline: no
-
-When the CPU hotplug notification comes in via ACPI notify()
-cpu_data of the core is not yet initialized.
-This leads to errors in throttling and (if acpi_idle is used
-as cpuidle driver) to not set up cpu idle subsystem.
--> Only bring up ACPI sysfs at that time
--> Initialize the rest (throttling, cpuidle,...) when a hotplugged
-core is onlined the first time
-
-Signed-off-by: Thomas Renninger <trenn@suse.de>
-Automatically created from "patches.arch/acpi_processor_delay_cpuidle_init_on_hotplug.patch" by xen-port-patches.py
-
---- sle11sp2-2011-08-08.orig/drivers/acpi/processor_core.c 2011-08-08 17:59:23.000000000 +0200
-+++ sle11sp2-2011-08-08/drivers/acpi/processor_core.c 2011-08-08 18:02:13.000000000 +0200
-@@ -778,7 +778,11 @@ static void acpi_processor_notify(struct
-
- static int __cpuinit acpi_processor_start(struct acpi_processor *pr)
- {
-+#ifndef CONFIG_XEN
- struct acpi_device *device = per_cpu(processor_device_array, pr->id);
-+#else
-+ struct acpi_device *device = processor_device_array[pr->acpi_id];
-+#endif
- int result = 0;
-
- /* _PDC call should be done before doing anything else (if reqd.). */
diff --git a/patches.xen/xen3-auto-arch-i386.diff b/patches.xen/xen3-auto-arch-i386.diff
index b4041abf82..08e78e8d62 100644
--- a/patches.xen/xen3-auto-arch-i386.diff
+++ b/patches.xen/xen3-auto-arch-i386.diff
@@ -1,5 +1,5 @@
Subject: xen3 arch-i386
-From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1103:0b8a9b22b70a)
+From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1104:700f70b60d4b)
Patch-mainline: n/a
Acked-by: jbeulich@novell.com
diff --git a/patches.xen/xen3-auto-arch-x86.diff b/patches.xen/xen3-auto-arch-x86.diff
index 1d6591ed73..eb1a5f61b0 100644
--- a/patches.xen/xen3-auto-arch-x86.diff
+++ b/patches.xen/xen3-auto-arch-x86.diff
@@ -1,5 +1,5 @@
Subject: xen3 arch-x86
-From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1103:0b8a9b22b70a)
+From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1104:700f70b60d4b)
Patch-mainline: n/a
Acked-by: jbeulich@novell.com
diff --git a/patches.xen/xen3-auto-arch-x86_64.diff b/patches.xen/xen3-auto-arch-x86_64.diff
index db9ee83691..e24d2805d3 100644
--- a/patches.xen/xen3-auto-arch-x86_64.diff
+++ b/patches.xen/xen3-auto-arch-x86_64.diff
@@ -1,5 +1,5 @@
Subject: xen3 arch-x86_64
-From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1103:0b8a9b22b70a)
+From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1104:700f70b60d4b)
Patch-mainline: n/a
Acked-by: jbeulich@novell.com
diff --git a/patches.xen/xen3-auto-common.diff b/patches.xen/xen3-auto-common.diff
index 418484e888..a54c724c22 100644
--- a/patches.xen/xen3-auto-common.diff
+++ b/patches.xen/xen3-auto-common.diff
@@ -1,5 +1,5 @@
Subject: xen3 common
-From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1103:0b8a9b22b70a)
+From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1104:700f70b60d4b)
Patch-mainline: n/a
Acked-by: jbeulich@novell.com
@@ -19,8 +19,8 @@ take the forward porting patches:
2.6.30/include/linux/pci_regs.h
2.6.35/kernel/time.c
---- sle11sp2-2011-08-22.orig/drivers/Makefile 2011-08-22 09:47:13.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/Makefile 2011-08-22 10:18:43.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/Makefile 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/Makefile 2011-08-22 10:18:43.000000000 +0200
@@ -45,6 +45,7 @@ obj-$(CONFIG_PARPORT) += parport/
obj-y += base/ block/ misc/ mfd/ nfc/
obj-$(CONFIG_NUBUS) += nubus/
@@ -29,8 +29,8 @@ take the forward porting patches:
obj-$(CONFIG_SCSI) += scsi/
obj-$(CONFIG_ATA) += ata/
obj-$(CONFIG_TARGET_CORE) += target/
---- sle11sp2-2011-08-22.orig/drivers/acpi/Makefile 2011-07-22 04:17:23.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/acpi/Makefile 2011-04-13 11:25:29.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/acpi/Makefile 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/acpi/Makefile 2011-04-13 11:25:29.000000000 +0200
@@ -67,6 +67,9 @@ obj-$(CONFIG_ACPI_CUSTOM_METHOD)+= custo
processor-y := processor_driver.o processor_throttling.o
processor-y += processor_idle.o processor_thermal.o
@@ -41,8 +41,8 @@ take the forward porting patches:
obj-$(CONFIG_ACPI_PROCESSOR_AGGREGATOR) += acpi_pad.o
obj-$(CONFIG_ACPI_IPMI) += acpi_ipmi.o
---- sle11sp2-2011-08-22.orig/drivers/acpi/acpica/hwsleep.c 2011-03-15 02:20:32.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/acpi/acpica/hwsleep.c 2011-04-13 11:25:29.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/acpi/acpica/hwsleep.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/acpi/acpica/hwsleep.c 2011-04-13 11:25:29.000000000 +0200
@@ -236,7 +236,11 @@ acpi_status asmlinkage acpi_enter_sleep_
u32 pm1b_control;
struct acpi_bit_register_info *sleep_type_reg_info;
@@ -80,8 +80,8 @@ take the forward porting patches:
return_ACPI_STATUS(AE_OK);
}
---- sle11sp2-2011-08-22.orig/drivers/acpi/processor_driver.c 2011-08-22 09:47:21.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/acpi/processor_driver.c 2011-04-13 11:25:29.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/acpi/processor_driver.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/acpi/processor_driver.c 2011-04-13 11:25:29.000000000 +0200
@@ -325,7 +325,8 @@ static int acpi_processor_get_info(struc
*/
if (pr->id == -1) {
@@ -256,7 +256,7 @@ take the forward porting patches:
cpu_down(pr->id);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2-2011-08-22/drivers/acpi/processor_extcntl.c 2011-01-31 14:53:38.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/acpi/processor_extcntl.c 2011-01-31 14:53:38.000000000 +0100
@@ -0,0 +1,241 @@
+/*
+ * processor_extcntl.c - channel to external control logic
@@ -499,8 +499,8 @@ take the forward porting patches:
+ kfree(perf);
+ return ret;
+}
---- sle11sp2-2011-08-22.orig/drivers/acpi/processor_idle.c 2011-07-22 04:17:23.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/acpi/processor_idle.c 2011-04-13 11:25:29.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/acpi/processor_idle.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/acpi/processor_idle.c 2011-09-06 08:38:22.000000000 +0200
@@ -458,7 +458,8 @@ static int acpi_processor_get_power_info
*/
cx.entry_method = ACPI_CSTATE_HALT;
@@ -524,6 +524,15 @@ take the forward porting patches:
current_count++;
memcpy(&(pr->power.states[current_count]), &cx, sizeof(cx));
+@@ -518,7 +525,7 @@ static int acpi_processor_get_power_info
+ current_count));
+
+ /* Validate number of power states discovered */
+- if (current_count < 2)
++ if (current_count < (processor_pm_external() ? 1 : 2))
+ status = -EFAULT;
+
+ end:
@@ -1130,6 +1137,11 @@ int __cpuinit acpi_processor_power_init(
if (cpuidle_register_device(&pr->power.dev))
return -EIO;
@@ -536,8 +545,8 @@ take the forward porting patches:
return 0;
}
---- sle11sp2-2011-08-22.orig/drivers/acpi/processor_perflib.c 2011-07-22 04:17:23.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/acpi/processor_perflib.c 2011-06-30 15:36:54.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/acpi/processor_perflib.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/acpi/processor_perflib.c 2011-06-30 15:36:54.000000000 +0200
@@ -75,6 +75,7 @@ MODULE_PARM_DESC(ignore_ppc, "If the fre
static int acpi_processor_ppc_status;
@@ -617,8 +626,8 @@ take the forward porting patches:
{
int result = 0;
acpi_status status = AE_OK;
---- sle11sp2-2011-08-22.orig/drivers/acpi/sleep.c 2011-05-19 06:06:34.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/acpi/sleep.c 2011-04-13 11:25:29.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/acpi/sleep.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/acpi/sleep.c 2011-04-13 11:25:29.000000000 +0200
@@ -61,6 +61,7 @@ static struct notifier_block tts_notifie
static int acpi_sleep_prepare(u32 acpi_state)
{
@@ -635,8 +644,8 @@ take the forward porting patches:
ACPI_FLUSH_CPU_CACHE();
#endif
printk(KERN_INFO PREFIX "Preparing to enter system sleep state S%d\n",
---- sle11sp2-2011-08-22.orig/drivers/char/agp/intel-gtt.c 2011-07-22 04:17:23.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/char/agp/intel-gtt.c 2011-04-13 11:25:29.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/char/agp/intel-gtt.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/char/agp/intel-gtt.c 2011-04-13 11:25:29.000000000 +0200
@@ -147,8 +147,19 @@ static struct page *i8xx_alloc_pages(voi
if (page == NULL)
return NULL;
@@ -667,8 +676,8 @@ take the forward porting patches:
put_page(page);
__free_pages(page, 2);
atomic_dec(&agp_bridge->current_memory_agp);
---- sle11sp2-2011-08-22.orig/drivers/char/mem.c 2011-08-22 09:47:10.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/char/mem.c 2011-08-22 10:18:50.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/char/mem.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/char/mem.c 2011-08-22 10:18:50.000000000 +0200
@@ -86,6 +86,7 @@ void __weak unxlate_dev_mem_ptr(phys_add
{
}
@@ -727,16 +736,16 @@ take the forward porting patches:
#ifdef CONFIG_DEVKMEM
static const struct file_operations kmem_fops = {
---- sle11sp2-2011-08-22.orig/drivers/char/tpm/Makefile 2006-09-20 05:42:06.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/char/tpm/Makefile 2011-04-13 11:25:29.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/char/tpm/Makefile 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/char/tpm/Makefile 2011-04-13 11:25:29.000000000 +0200
@@ -9,3 +9,5 @@ obj-$(CONFIG_TCG_TIS) += tpm_tis.o
obj-$(CONFIG_TCG_NSC) += tpm_nsc.o
obj-$(CONFIG_TCG_ATMEL) += tpm_atmel.o
obj-$(CONFIG_TCG_INFINEON) += tpm_infineon.o
+obj-$(CONFIG_TCG_XEN) += tpm_xenu.o
+tpm_xenu-y = tpm_xen.o tpm_vtpm.o
---- sle11sp2-2011-08-22.orig/drivers/char/tpm/tpm.h 2011-03-15 02:20:32.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/char/tpm/tpm.h 2011-04-13 11:25:29.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/char/tpm/tpm.h 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/char/tpm/tpm.h 2011-04-13 11:25:29.000000000 +0200
@@ -108,6 +108,9 @@ struct tpm_chip {
struct dentry **bios_dir;
@@ -767,7 +776,7 @@ take the forward porting patches:
extern void tpm_gen_interrupt(struct tpm_chip *);
extern void tpm_continue_selftest(struct tpm_chip *);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2-2011-08-22/drivers/char/tpm/tpm_vtpm.c 2011-01-31 14:53:38.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/char/tpm/tpm_vtpm.c 2011-01-31 14:53:38.000000000 +0100
@@ -0,0 +1,542 @@
+/*
+ * Copyright (C) 2006 IBM Corporation
@@ -1312,7 +1321,7 @@ take the forward porting patches:
+ kfree(vtpms);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2-2011-08-22/drivers/char/tpm/tpm_vtpm.h 2011-01-31 14:53:38.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/char/tpm/tpm_vtpm.h 2011-01-31 14:53:38.000000000 +0100
@@ -0,0 +1,55 @@
+#ifndef TPM_VTPM_H
+#define TPM_VTPM_H
@@ -1370,7 +1379,7 @@ take the forward porting patches:
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2-2011-08-22/drivers/char/tpm/tpm_xen.c 2011-01-31 14:53:38.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/char/tpm/tpm_xen.c 2011-01-31 14:53:38.000000000 +0100
@@ -0,0 +1,722 @@
+/*
+ * Copyright (c) 2005, IBM Corporation
@@ -2094,8 +2103,8 @@ take the forward porting patches:
+module_init(tpmif_init);
+
+MODULE_LICENSE("Dual BSD/GPL");
---- sle11sp2-2011-08-22.orig/drivers/edac/edac_mc.c 2011-07-22 04:17:23.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/edac/edac_mc.c 2011-06-30 15:37:01.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/edac/edac_mc.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/edac/edac_mc.c 2011-06-30 15:37:01.000000000 +0200
@@ -611,6 +611,10 @@ static void edac_mc_scrub_block(unsigned
debugf3("%s()\n", __func__);
@@ -2107,8 +2116,8 @@ take the forward porting patches:
/* ECC error page was not in our memory. Ignore it. */
if (!pfn_valid(page))
return;
---- sle11sp2-2011-08-22.orig/drivers/firmware/dell_rbu.c 2010-08-02 00:11:14.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/firmware/dell_rbu.c 2011-04-13 11:25:29.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/firmware/dell_rbu.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/firmware/dell_rbu.c 2011-04-13 11:25:29.000000000 +0200
@@ -170,9 +170,28 @@ static int create_packet(void *data, siz
spin_lock(&rbu_data.lock);
goto out_alloc_packet_array;
@@ -2215,8 +2224,8 @@ take the forward porting patches:
spin_lock_init(&rbu_data.lock);
init_packet_head();
---- sle11sp2-2011-08-22.orig/drivers/ide/ide-lib.c 2009-09-10 00:13:59.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/ide/ide-lib.c 2011-04-13 11:25:29.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/ide/ide-lib.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/ide/ide-lib.c 2011-04-13 11:25:29.000000000 +0200
@@ -18,12 +18,12 @@ void ide_toggle_bounce(ide_drive_t *driv
{
u64 addr = BLK_BOUNCE_HIGH; /* dma64_addr_t */
@@ -2234,8 +2243,8 @@ take the forward porting patches:
addr = *dev->dma_mask;
}
---- sle11sp2-2011-08-22.orig/drivers/oprofile/buffer_sync.c 2011-07-22 04:17:23.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/oprofile/buffer_sync.c 2011-06-30 15:37:10.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/oprofile/buffer_sync.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/oprofile/buffer_sync.c 2011-06-30 15:37:10.000000000 +0200
@@ -8,6 +8,10 @@
* @author Barry Kasindorf
* @author Robert Richter <robert.richter@amd.com>
@@ -2412,8 +2421,8 @@ take the forward porting patches:
mark_done(cpu);
mutex_unlock(&buffer_mutex);
---- sle11sp2-2011-08-22.orig/drivers/oprofile/cpu_buffer.c 2011-05-19 06:06:34.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/oprofile/cpu_buffer.c 2011-04-13 11:25:29.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/oprofile/cpu_buffer.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/oprofile/cpu_buffer.c 2011-04-13 11:25:29.000000000 +0200
@@ -8,6 +8,10 @@
* @author Barry Kasindorf <barry.kasindorf@amd.com>
* @author Robert Richter <robert.richter@amd.com>
@@ -2529,8 +2538,8 @@ take the forward porting patches:
/*
* This serves to avoid cpu buffer overflow, and makes sure
* the task mortuary progresses
---- sle11sp2-2011-08-22.orig/drivers/oprofile/cpu_buffer.h 2011-01-05 01:50:19.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/oprofile/cpu_buffer.h 2011-04-13 11:25:29.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/oprofile/cpu_buffer.h 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/oprofile/cpu_buffer.h 2011-04-13 11:25:29.000000000 +0200
@@ -41,7 +41,7 @@ struct op_entry;
struct oprofile_cpu_buffer {
unsigned long buffer_size;
@@ -2565,8 +2574,8 @@ take the forward porting patches:
+#define DOMAIN_SWITCH (1UL << 5)
#endif /* OPROFILE_CPU_BUFFER_H */
---- sle11sp2-2011-08-22.orig/drivers/oprofile/event_buffer.h 2011-07-22 04:17:23.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/oprofile/event_buffer.h 2011-04-13 11:25:29.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/oprofile/event_buffer.h 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/oprofile/event_buffer.h 2011-04-13 11:25:29.000000000 +0200
@@ -30,6 +30,9 @@ void wake_up_buffer_waiter(void);
#define INVALID_COOKIE ~0UL
#define NO_COOKIE 0UL
@@ -2577,8 +2586,8 @@ take the forward porting patches:
extern const struct file_operations event_buffer_fops;
/* mutex between sync_cpu_buffers() and the
---- sle11sp2-2011-08-22.orig/drivers/oprofile/oprof.c 2011-07-22 04:17:23.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/oprofile/oprof.c 2011-04-13 11:25:29.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/oprofile/oprof.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/oprofile/oprof.c 2011-04-13 11:25:29.000000000 +0200
@@ -5,6 +5,10 @@
* @remark Read the file COPYING
*
@@ -2623,8 +2632,8 @@ take the forward porting patches:
int oprofile_setup(void)
{
int err;
---- sle11sp2-2011-08-22.orig/drivers/oprofile/oprof.h 2011-01-05 01:50:19.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/oprofile/oprof.h 2011-04-13 11:25:29.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/oprofile/oprof.h 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/oprofile/oprof.h 2011-04-13 11:25:29.000000000 +0200
@@ -40,4 +40,7 @@ void oprofile_timer_exit(void);
int oprofile_set_ulong(unsigned long *addr, unsigned long val);
int oprofile_set_timeout(unsigned long time);
@@ -2633,8 +2642,8 @@ take the forward porting patches:
+int oprofile_set_passive(int passive_domains[], unsigned int pdomains);
+
#endif /* OPROF_H */
---- sle11sp2-2011-08-22.orig/drivers/oprofile/oprofile_files.c 2011-01-05 01:50:19.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/oprofile/oprofile_files.c 2011-04-13 11:25:29.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/oprofile/oprofile_files.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/oprofile/oprofile_files.c 2011-04-13 11:25:29.000000000 +0200
@@ -5,11 +5,17 @@
* @remark Read the file COPYING
*
@@ -2858,8 +2867,8 @@ take the forward porting patches:
oprofilefs_create_file(sb, root, "buffer", &event_buffer_fops);
oprofilefs_create_ulong(sb, root, "buffer_size", &oprofile_buffer_size);
oprofilefs_create_ulong(sb, root, "buffer_watershed", &oprofile_buffer_watershed);
---- sle11sp2-2011-08-22.orig/fs/aio.c 2011-05-19 06:06:34.000000000 +0200
-+++ sle11sp2-2011-08-22/fs/aio.c 2011-04-13 11:25:29.000000000 +0200
+--- sle11sp2-2011-09-06.orig/fs/aio.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/fs/aio.c 2011-04-13 11:25:29.000000000 +0200
@@ -39,6 +39,11 @@
#include <asm/kmap_types.h>
#include <asm/uaccess.h>
@@ -3047,8 +3056,8 @@ take the forward porting patches:
get_ioctx(ioctx); /* io_destroy() expects us to hold a ref */
io_destroy(ioctx);
---- sle11sp2-2011-08-22.orig/fs/compat_ioctl.c 2011-03-15 02:20:32.000000000 +0100
-+++ sle11sp2-2011-08-22/fs/compat_ioctl.c 2011-04-13 11:25:29.000000000 +0200
+--- sle11sp2-2011-09-06.orig/fs/compat_ioctl.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/fs/compat_ioctl.c 2011-04-13 11:25:29.000000000 +0200
@@ -114,6 +114,13 @@
#include <asm/fbio.h>
#endif
@@ -3083,8 +3092,8 @@ take the forward porting patches:
};
/*
---- sle11sp2-2011-08-22.orig/include/acpi/processor.h 2011-07-22 04:17:23.000000000 +0200
-+++ sle11sp2-2011-08-22/include/acpi/processor.h 2011-06-30 15:37:24.000000000 +0200
+--- sle11sp2-2011-09-06.orig/include/acpi/processor.h 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/include/acpi/processor.h 2011-06-30 15:37:24.000000000 +0200
@@ -17,6 +17,12 @@
#define ACPI_PROCESSOR_MAX_THROTTLE 250 /* 25% */
#define ACPI_PROCESSOR_MAX_DUTY_WIDTH 4
@@ -3268,8 +3277,8 @@ take the forward porting patches:
+#endif /* CONFIG_XEN */
+
#endif
---- sle11sp2-2011-08-22.orig/include/asm-generic/pgtable.h 2011-07-22 04:17:23.000000000 +0200
-+++ sle11sp2-2011-08-22/include/asm-generic/pgtable.h 2011-04-13 11:25:29.000000000 +0200
+--- sle11sp2-2011-09-06.orig/include/asm-generic/pgtable.h 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/include/asm-generic/pgtable.h 2011-04-13 11:25:29.000000000 +0200
@@ -156,6 +156,10 @@ static inline void pmdp_set_wrprotect(st
#endif /* CONFIG_TRANSPARENT_HUGEPAGE */
#endif
@@ -3281,8 +3290,8 @@ take the forward porting patches:
#ifndef __HAVE_ARCH_PMDP_SPLITTING_FLUSH
extern pmd_t pmdp_splitting_flush(struct vm_area_struct *vma,
unsigned long address,
---- sle11sp2-2011-08-22.orig/include/linux/aio.h 2010-08-02 00:11:14.000000000 +0200
-+++ sle11sp2-2011-08-22/include/linux/aio.h 2011-04-13 11:25:29.000000000 +0200
+--- sle11sp2-2011-09-06.orig/include/linux/aio.h 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/include/linux/aio.h 2011-04-13 11:25:29.000000000 +0200
@@ -199,6 +199,12 @@ struct kioctx {
struct delayed_work wq;
@@ -3296,8 +3305,8 @@ take the forward porting patches:
struct rcu_head rcu_head;
};
---- sle11sp2-2011-08-22.orig/include/linux/highmem.h 2011-03-15 02:20:32.000000000 +0100
-+++ sle11sp2-2011-08-22/include/linux/highmem.h 2011-04-13 11:25:29.000000000 +0200
+--- sle11sp2-2011-09-06.orig/include/linux/highmem.h 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/include/linux/highmem.h 2011-04-13 11:25:29.000000000 +0200
@@ -178,12 +178,14 @@ alloc_zeroed_user_highpage_movable(struc
return __alloc_zeroed_user_highpage(__GFP_MOVABLE, vma, vaddr);
}
@@ -3329,8 +3338,8 @@ take the forward porting patches:
+#endif
+
#endif /* _LINUX_HIGHMEM_H */
---- sle11sp2-2011-08-22.orig/include/linux/interrupt.h 2011-07-22 04:17:23.000000000 +0200
-+++ sle11sp2-2011-08-22/include/linux/interrupt.h 2011-04-13 11:26:32.000000000 +0200
+--- sle11sp2-2011-09-06.orig/include/linux/interrupt.h 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/include/linux/interrupt.h 2011-04-13 11:26:32.000000000 +0200
@@ -375,6 +375,11 @@ static inline int disable_irq_wake(unsig
}
#endif /* CONFIG_GENERIC_HARDIRQS */
@@ -3343,8 +3352,8 @@ take the forward porting patches:
#ifdef CONFIG_IRQ_FORCED_THREADING
extern bool force_irqthreads;
---- sle11sp2-2011-08-22.orig/include/linux/kexec.h 2011-08-22 09:47:21.000000000 +0200
-+++ sle11sp2-2011-08-22/include/linux/kexec.h 2011-04-13 11:25:29.000000000 +0200
+--- sle11sp2-2011-09-06.orig/include/linux/kexec.h 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/include/linux/kexec.h 2011-04-13 11:25:29.000000000 +0200
@@ -46,6 +46,13 @@
KEXEC_CORE_NOTE_NAME_BYTES + \
KEXEC_CORE_NOTE_DESC_BYTES )
@@ -3372,8 +3381,8 @@ take the forward porting patches:
extern asmlinkage long sys_kexec_load(unsigned long entry,
unsigned long nr_segments,
struct kexec_segment __user *segments,
---- sle11sp2-2011-08-22.orig/include/linux/mm.h 2011-08-22 09:47:10.000000000 +0200
-+++ sle11sp2-2011-08-22/include/linux/mm.h 2011-06-30 15:37:34.000000000 +0200
+--- sle11sp2-2011-09-06.orig/include/linux/mm.h 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/include/linux/mm.h 2011-06-30 15:37:34.000000000 +0200
@@ -113,7 +113,12 @@ extern unsigned int kobjsize(const void
#define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */
@@ -3416,8 +3425,8 @@ take the forward porting patches:
#ifdef CONFIG_NUMA
/*
* set_policy() op must add a reference to any non-NULL @new mempolicy
---- sle11sp2-2011-08-22.orig/include/linux/oprofile.h 2011-05-19 06:06:34.000000000 +0200
-+++ sle11sp2-2011-08-22/include/linux/oprofile.h 2011-04-13 11:25:29.000000000 +0200
+--- sle11sp2-2011-09-06.orig/include/linux/oprofile.h 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/include/linux/oprofile.h 2011-04-13 11:25:29.000000000 +0200
@@ -19,6 +19,8 @@
#include <linux/errno.h>
#include <linux/printk.h>
@@ -3469,9 +3478,9 @@ take the forward porting patches:
/**
* Create a file of the given name as a child of the given root, with
---- sle11sp2-2011-08-22.orig/include/linux/page-flags.h 2011-08-22 09:47:09.000000000 +0200
-+++ sle11sp2-2011-08-22/include/linux/page-flags.h 2011-08-22 10:19:06.000000000 +0200
-@@ -108,6 +108,11 @@ enum pageflags {
+--- sle11sp2-2011-09-06.orig/include/linux/page-flags.h 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/include/linux/page-flags.h 2011-09-06 09:13:52.000000000 +0200
+@@ -109,6 +109,11 @@ enum pageflags {
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
PG_compound_lock,
#endif
@@ -3483,7 +3492,7 @@ take the forward porting patches:
__NR_PAGEFLAGS,
/* Filesystems */
-@@ -333,6 +338,27 @@ static inline void SetPageUptodate(struc
+@@ -335,6 +340,27 @@ static inline void SetPageUptodate(struc
CLEARPAGEFLAG(Uptodate, uptodate)
@@ -3511,7 +3520,7 @@ take the forward porting patches:
extern void cancel_dirty_page(struct page *page, unsigned int account_size);
int test_clear_page_writeback(struct page *page);
-@@ -463,6 +489,14 @@ static inline int PageTransCompound(stru
+@@ -465,6 +491,14 @@ static inline int PageTransCompound(stru
#define __PG_COMPOUND_LOCK 0
#endif
@@ -3526,7 +3535,7 @@ take the forward porting patches:
/*
* Flags checked when a page is freed. Pages being freed should not have
* these flags set. It they are, there is a problem.
-@@ -473,7 +507,7 @@ static inline int PageTransCompound(stru
+@@ -475,7 +509,7 @@ static inline int PageTransCompound(stru
1 << PG_writeback | 1 << PG_reserved | \
1 << PG_slab | 1 << PG_swapcache | 1 << PG_active | \
1 << PG_unevictable | __PG_MLOCKED | __PG_HWPOISON | \
@@ -3535,9 +3544,9 @@ take the forward porting patches:
/*
* Flags checked when a page is prepped for return by the page allocator.
---- sle11sp2-2011-08-22.orig/include/linux/pci.h 2011-06-30 15:21:48.000000000 +0200
-+++ sle11sp2-2011-08-22/include/linux/pci.h 2011-06-30 15:37:41.000000000 +0200
-@@ -1008,6 +1008,11 @@ static inline int pci_msi_enabled(void)
+--- sle11sp2-2011-09-06.orig/include/linux/pci.h 2011-09-06 09:11:28.000000000 +0200
++++ sle11sp2-2011-09-06/include/linux/pci.h 2011-09-06 09:13:58.000000000 +0200
+@@ -1021,6 +1021,11 @@ static inline int pci_msi_enabled(void)
{
return 0;
}
@@ -3549,7 +3558,7 @@ take the forward porting patches:
#else
extern int pci_enable_msi_block(struct pci_dev *dev, unsigned int nvec);
extern void pci_msi_shutdown(struct pci_dev *dev);
-@@ -1020,6 +1025,10 @@ extern void pci_disable_msix(struct pci_
+@@ -1033,6 +1038,10 @@ extern void pci_disable_msix(struct pci_
extern void msi_remove_pci_irq_vectors(struct pci_dev *dev);
extern void pci_restore_msi_state(struct pci_dev *dev);
extern int pci_msi_enabled(void);
@@ -3560,8 +3569,8 @@ take the forward porting patches:
#endif
#ifdef CONFIG_PCIEPORTBUS
---- sle11sp2-2011-08-22.orig/include/linux/vermagic.h 2010-02-24 19:52:17.000000000 +0100
-+++ sle11sp2-2011-08-22/include/linux/vermagic.h 2011-04-13 11:25:29.000000000 +0200
+--- sle11sp2-2011-09-06.orig/include/linux/vermagic.h 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/include/linux/vermagic.h 2011-04-13 11:25:29.000000000 +0200
@@ -22,6 +22,11 @@
#else
#define MODULE_VERMAGIC_MODVERSIONS ""
@@ -3581,8 +3590,8 @@ take the forward porting patches:
- MODULE_ARCH_VERMAGIC
+ MODULE_VERMAGIC_XEN MODULE_ARCH_VERMAGIC
---- sle11sp2-2011-08-22.orig/kernel/irq/spurious.c 2011-07-22 04:17:23.000000000 +0200
-+++ sle11sp2-2011-08-22/kernel/irq/spurious.c 2011-06-30 15:38:11.000000000 +0200
+--- sle11sp2-2011-09-06.orig/kernel/irq/spurious.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/kernel/irq/spurious.c 2011-06-30 15:38:11.000000000 +0200
@@ -288,7 +288,7 @@ void note_interrupt(unsigned int irq, st
*/
if (time_after(jiffies, desc->last_unhandled + HZ/10))
@@ -3592,8 +3601,8 @@ take the forward porting patches:
desc->irqs_unhandled++;
desc->last_unhandled = jiffies;
}
---- sle11sp2-2011-08-22.orig/kernel/kexec.c 2011-08-22 09:47:21.000000000 +0200
-+++ sle11sp2-2011-08-22/kernel/kexec.c 2011-08-22 10:19:14.000000000 +0200
+--- sle11sp2-2011-09-06.orig/kernel/kexec.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/kernel/kexec.c 2011-08-22 10:19:14.000000000 +0200
@@ -359,13 +359,26 @@ static int kimage_is_destination_range(s
return 0;
}
@@ -3794,8 +3803,8 @@ take the forward porting patches:
/* Install the new kernel, and Uninstall the old */
image = xchg(dest_image, image);
---- sle11sp2-2011-08-22.orig/kernel/sysctl.c 2011-08-22 09:47:09.000000000 +0200
-+++ sle11sp2-2011-08-22/kernel/sysctl.c 2011-08-22 10:19:21.000000000 +0200
+--- sle11sp2-2011-09-06.orig/kernel/sysctl.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/kernel/sysctl.c 2011-08-22 10:19:21.000000000 +0200
@@ -865,7 +865,7 @@ static struct ctl_table kern_table[] = {
.proc_handler = proc_dointvec,
},
@@ -3805,8 +3814,8 @@ take the forward porting patches:
{
.procname = "acpi_video_flags",
.data = &acpi_realmode_flags,
---- sle11sp2-2011-08-22.orig/mm/memory.c 2011-08-22 09:47:10.000000000 +0200
-+++ sle11sp2-2011-08-22/mm/memory.c 2011-07-21 12:07:08.000000000 +0200
+--- sle11sp2-2011-09-06.orig/mm/memory.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/mm/memory.c 2011-09-06 09:14:08.000000000 +0200
@@ -802,6 +802,12 @@ struct page *vm_normal_page(struct vm_ar
{
unsigned long pfn = pte_pfn(pte);
@@ -3845,7 +3854,7 @@ take the forward porting patches:
tlb_remove_tlb_entry(tlb, pte, addr);
if (unlikely(!page))
continue;
-@@ -1396,6 +1409,7 @@ unsigned long zap_page_range(struct vm_a
+@@ -1389,6 +1402,7 @@ unsigned long zap_page_range(struct vm_a
tlb_finish_mmu(&tlb, address, end);
return end;
}
@@ -3853,7 +3862,7 @@ take the forward porting patches:
/**
* zap_vma_ptes - remove ptes mapping the vma
-@@ -1706,6 +1720,28 @@ int __get_user_pages(struct task_struct
+@@ -1699,6 +1713,28 @@ int __get_user_pages(struct task_struct
goto next_page;
}
@@ -3882,9 +3891,9 @@ take the forward porting patches:
if (!vma ||
(vma->vm_flags & (VM_IO | VM_PFNMAP)) ||
!(vm_flags & vma->vm_flags))
---- sle11sp2-2011-08-22.orig/mm/mmap.c 2011-07-22 04:17:23.000000000 +0200
-+++ sle11sp2-2011-08-22/mm/mmap.c 2011-06-30 15:38:40.000000000 +0200
-@@ -1898,6 +1898,12 @@ static void unmap_region(struct mm_struc
+--- sle11sp2-2011-09-06.orig/mm/mmap.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/mm/mmap.c 2011-09-06 09:14:10.000000000 +0200
+@@ -1897,6 +1897,12 @@ static void unmap_region(struct mm_struc
tlb_finish_mmu(&tlb, start, end);
}
@@ -3897,7 +3906,7 @@ take the forward porting patches:
/*
* Create a list of vma's touched by the unmap, removing them from the mm's
* vma list as we go..
-@@ -1914,6 +1920,7 @@ detach_vmas_to_be_unmapped(struct mm_str
+@@ -1913,6 +1919,7 @@ detach_vmas_to_be_unmapped(struct mm_str
vma->vm_prev = NULL;
do {
rb_erase(&vma->vm_rb, &mm->mm_rb);
@@ -3905,7 +3914,7 @@ take the forward porting patches:
mm->map_count--;
tail_vma = vma;
vma = vma->vm_next;
-@@ -2257,6 +2264,9 @@ void exit_mmap(struct mm_struct *mm)
+@@ -2256,6 +2263,9 @@ void exit_mmap(struct mm_struct *mm)
arch_exit_mmap(mm);
@@ -3915,8 +3924,8 @@ take the forward porting patches:
vma = mm->mmap;
if (!vma) /* Can happen if dup_mmap() received an OOM */
return;
---- sle11sp2-2011-08-22.orig/mm/mprotect.c 2011-03-15 02:20:32.000000000 +0100
-+++ sle11sp2-2011-08-22/mm/mprotect.c 2011-06-30 15:38:52.000000000 +0200
+--- sle11sp2-2011-09-06.orig/mm/mprotect.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/mm/mprotect.c 2011-06-30 15:38:52.000000000 +0200
@@ -97,6 +97,8 @@ static inline void change_pmd_range(stru
}
if (pmd_none_or_clear_bad(pmd))
@@ -3926,8 +3935,8 @@ take the forward porting patches:
change_pte_range(vma->vm_mm, pmd, addr, next, newprot,
dirty_accountable);
} while (pmd++, addr = next, addr != end);
---- sle11sp2-2011-08-22.orig/mm/page_alloc.c 2011-08-22 09:47:10.000000000 +0200
-+++ sle11sp2-2011-08-22/mm/page_alloc.c 2011-06-30 15:38:58.000000000 +0200
+--- sle11sp2-2011-09-06.orig/mm/page_alloc.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/mm/page_alloc.c 2011-06-30 15:38:58.000000000 +0200
@@ -653,6 +653,13 @@ static bool free_pages_prepare(struct pa
int i;
int bad = 0;
@@ -3942,8 +3951,8 @@ take the forward porting patches:
trace_mm_page_free_direct(page, order);
kmemcheck_free_shadow(page, order);
---- sle11sp2-2011-08-22.orig/scripts/Makefile.build 2011-08-22 09:47:10.000000000 +0200
-+++ sle11sp2-2011-08-22/scripts/Makefile.build 2011-06-30 15:39:08.000000000 +0200
+--- sle11sp2-2011-09-06.orig/scripts/Makefile.build 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/scripts/Makefile.build 2011-06-30 15:39:08.000000000 +0200
@@ -126,6 +126,21 @@ ifndef obj
$(warning kbuild: Makefile.build is included improperly)
endif
@@ -3966,8 +3975,8 @@ take the forward porting patches:
# ===========================================================================
ifneq ($(strip $(lib-y) $(lib-m) $(lib-n) $(lib-)),)
---- sle11sp2-2011-08-22.orig/scripts/Makefile.lib 2011-07-22 04:17:23.000000000 +0200
-+++ sle11sp2-2011-08-22/scripts/Makefile.lib 2011-04-13 11:25:29.000000000 +0200
+--- sle11sp2-2011-09-06.orig/scripts/Makefile.lib 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/scripts/Makefile.lib 2011-04-13 11:25:29.000000000 +0200
@@ -22,6 +22,12 @@ obj-m := $(filter-out $(obj-y),$(obj-m))
lib-y := $(filter-out $(obj-y), $(sort $(lib-y) $(lib-m)))
diff --git a/patches.xen/xen3-auto-include-xen-interface.diff b/patches.xen/xen3-auto-include-xen-interface.diff
index 71066b7876..dd630fdf9c 100644
--- a/patches.xen/xen3-auto-include-xen-interface.diff
+++ b/patches.xen/xen3-auto-include-xen-interface.diff
@@ -1,5 +1,5 @@
Subject: xen3 include-xen-interface
-From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1103:0b8a9b22b70a)
+From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1104:700f70b60d4b)
Patch-mainline: n/a
Acked-by: jbeulich@novell.com
diff --git a/patches.xen/xen3-auto-xen-arch.diff b/patches.xen/xen3-auto-xen-arch.diff
index c4425301a5..f34c65932f 100644
--- a/patches.xen/xen3-auto-xen-arch.diff
+++ b/patches.xen/xen3-auto-xen-arch.diff
@@ -1,5 +1,5 @@
Subject: xen3 xen-arch
-From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1103:0b8a9b22b70a)
+From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1104:700f70b60d4b)
Patch-mainline: n/a
Acked-by: jbeulich@novell.com
diff --git a/patches.xen/xen3-auto-xen-drivers.diff b/patches.xen/xen3-auto-xen-drivers.diff
index a0caf5689d..09c2ebcbfb 100644
--- a/patches.xen/xen3-auto-xen-drivers.diff
+++ b/patches.xen/xen3-auto-xen-drivers.diff
@@ -1,5 +1,5 @@
Subject: xen3 xen-drivers
-From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1103:0b8a9b22b70a)
+From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1104:700f70b60d4b)
Patch-mainline: n/a
Acked-by: jbeulich@novell.com
diff --git a/patches.xen/xen3-auto-xen-kconfig.diff b/patches.xen/xen3-auto-xen-kconfig.diff
index ff52778c4b..4575692ed2 100644
--- a/patches.xen/xen3-auto-xen-kconfig.diff
+++ b/patches.xen/xen3-auto-xen-kconfig.diff
@@ -1,5 +1,5 @@
Subject: xen3 xen-kconfig
-From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1103:0b8a9b22b70a)
+From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1104:700f70b60d4b)
Patch-mainline: n/a
Acked-by: jbeulich@novell.com
diff --git a/patches.xen/xen3-fixup-common b/patches.xen/xen3-fixup-common
index cbd99c8b8b..3dba84236e 100644
--- a/patches.xen/xen3-fixup-common
+++ b/patches.xen/xen3-fixup-common
@@ -2,8 +2,8 @@ Subject: Fix xen build.
From: jbeulich@novell.com
Patch-mainline: n/a
---- sle11sp2-2011-08-22.orig/drivers/acpi/acpica/hwsleep.c 2011-04-13 11:25:29.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/acpi/acpica/hwsleep.c 2011-01-31 17:01:49.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/acpi/acpica/hwsleep.c 2011-04-13 11:25:29.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/acpi/acpica/hwsleep.c 2011-01-31 17:01:49.000000000 +0100
@@ -419,6 +419,7 @@ ACPI_EXPORT_SYMBOL(acpi_enter_sleep_stat
* THIS FUNCTION MUST BE CALLED WITH INTERRUPTS DISABLED
*
@@ -20,8 +20,8 @@ Patch-mainline: n/a
/*******************************************************************************
*
---- sle11sp2-2011-08-22.orig/drivers/base/cpu.c 2010-08-02 00:11:14.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/base/cpu.c 2011-01-31 17:01:49.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/base/cpu.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/base/cpu.c 2011-01-31 17:01:49.000000000 +0100
@@ -106,7 +106,7 @@ static inline void register_cpu_control(
}
#endif /* CONFIG_HOTPLUG_CPU */
@@ -40,8 +40,8 @@ Patch-mainline: n/a
if (!error)
error = sysdev_create_file(&cpu->sysdev, &attr_crash_notes);
#endif
---- sle11sp2-2011-08-22.orig/drivers/ide/ide-lib.c 2011-04-13 11:25:29.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/ide/ide-lib.c 2011-01-31 17:01:49.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/ide/ide-lib.c 2011-04-13 11:25:29.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/ide/ide-lib.c 2011-01-31 17:01:49.000000000 +0100
@@ -18,6 +18,16 @@ void ide_toggle_bounce(ide_drive_t *driv
{
u64 addr = BLK_BOUNCE_HIGH; /* dma64_addr_t */
@@ -67,8 +67,8 @@ Patch-mainline: n/a
if (drive->queue)
blk_queue_bounce_limit(drive->queue, addr);
---- sle11sp2-2011-08-22.orig/drivers/oprofile/buffer_sync.c 2011-06-30 15:37:10.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/oprofile/buffer_sync.c 2011-06-30 16:01:00.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/oprofile/buffer_sync.c 2011-06-30 15:37:10.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/oprofile/buffer_sync.c 2011-06-30 16:01:00.000000000 +0200
@@ -47,7 +47,9 @@ static cpumask_var_t marked_cpus;
static DEFINE_SPINLOCK(task_mortuary);
static void process_task_mortuary(void);
@@ -170,8 +170,8 @@ Patch-mainline: n/a
mark_done(cpu);
---- sle11sp2-2011-08-22.orig/drivers/oprofile/cpu_buffer.c 2011-04-13 11:25:29.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/oprofile/cpu_buffer.c 2011-04-13 12:22:07.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/oprofile/cpu_buffer.c 2011-04-13 11:25:29.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/oprofile/cpu_buffer.c 2011-04-13 12:22:07.000000000 +0200
@@ -42,7 +42,11 @@ static void wq_sync_buffer(struct work_s
#define DEFAULT_TIMER_EXPIRE (HZ / 10)
static int work_enabled;
@@ -200,8 +200,8 @@ Patch-mainline: n/a
/*
* This serves to avoid cpu buffer overflow, and makes sure
---- sle11sp2-2011-08-22.orig/drivers/oprofile/oprof.c 2011-04-13 11:25:29.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/oprofile/oprof.c 2011-01-31 17:01:49.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/oprofile/oprof.c 2011-04-13 11:25:29.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/oprofile/oprof.c 2011-01-31 17:01:49.000000000 +0100
@@ -39,6 +39,7 @@ static DEFINE_MUTEX(start_mutex);
*/
static int timer = 0;
@@ -218,8 +218,8 @@ Patch-mainline: n/a
int oprofile_setup(void)
{
---- sle11sp2-2011-08-22.orig/drivers/oprofile/oprofile_files.c 2011-04-13 11:25:29.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/oprofile/oprofile_files.c 2011-01-31 17:01:49.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/oprofile/oprofile_files.c 2011-04-13 11:25:29.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/oprofile/oprofile_files.c 2011-01-31 17:01:49.000000000 +0100
@@ -180,6 +180,8 @@ static const struct file_operations dump
.llseek = noop_llseek,
};
@@ -249,8 +249,8 @@ Patch-mainline: n/a
oprofilefs_create_file(sb, root, "buffer", &event_buffer_fops);
oprofilefs_create_ulong(sb, root, "buffer_size", &oprofile_buffer_size);
oprofilefs_create_ulong(sb, root, "buffer_watershed", &oprofile_buffer_watershed);
---- sle11sp2-2011-08-22.orig/drivers/xen/core/smpboot.c 2010-11-08 17:27:03.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/core/smpboot.c 2011-01-31 17:01:49.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/core/smpboot.c 2010-11-08 17:27:03.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/core/smpboot.c 2011-01-31 17:01:49.000000000 +0100
@@ -55,7 +55,6 @@ static char callfunc_name[NR_CPUS][15];
cpumask_t cpu_sibling_map[NR_CPUS] __cacheline_aligned;
@@ -259,8 +259,8 @@ Patch-mainline: n/a
#if defined(__i386__)
u8 x86_cpu_to_apicid[NR_CPUS] = { [0 ... NR_CPUS-1] = 0xff };
---- sle11sp2-2011-08-22.orig/include/linux/mm.h 2011-06-30 15:37:34.000000000 +0200
-+++ sle11sp2-2011-08-22/include/linux/mm.h 2011-06-30 16:01:09.000000000 +0200
+--- sle11sp2-2011-09-06.orig/include/linux/mm.h 2011-06-30 15:37:34.000000000 +0200
++++ sle11sp2-2011-09-06/include/linux/mm.h 2011-06-30 16:01:09.000000000 +0200
@@ -225,6 +225,7 @@ struct vm_operations_struct {
int (*access)(struct vm_area_struct *vma, unsigned long addr,
void *buf, int len, int write);
@@ -277,8 +277,8 @@ Patch-mainline: n/a
#ifdef CONFIG_NUMA
/*
---- sle11sp2-2011-08-22.orig/include/linux/oprofile.h 2011-04-13 11:25:29.000000000 +0200
-+++ sle11sp2-2011-08-22/include/linux/oprofile.h 2011-02-17 10:06:04.000000000 +0100
+--- sle11sp2-2011-09-06.orig/include/linux/oprofile.h 2011-04-13 11:25:29.000000000 +0200
++++ sle11sp2-2011-09-06/include/linux/oprofile.h 2011-02-17 10:06:04.000000000 +0100
@@ -19,8 +19,9 @@
#include <linux/errno.h>
#include <linux/printk.h>
@@ -304,9 +304,9 @@ Patch-mainline: n/a
/* Do any necessary interrupt setup. Optional. */
int (*setup)(void);
/* Do any necessary interrupt shutdown. Optional. */
---- sle11sp2-2011-08-22.orig/include/linux/page-flags.h 2011-08-22 10:19:06.000000000 +0200
-+++ sle11sp2-2011-08-22/include/linux/page-flags.h 2011-08-22 10:30:40.000000000 +0200
-@@ -110,7 +110,7 @@ enum pageflags {
+--- sle11sp2-2011-09-06.orig/include/linux/page-flags.h 2011-09-06 09:13:52.000000000 +0200
++++ sle11sp2-2011-09-06/include/linux/page-flags.h 2011-09-06 09:15:39.000000000 +0200
+@@ -111,7 +111,7 @@ enum pageflags {
#endif
#ifdef CONFIG_XEN
PG_foreign, /* Page is owned by foreign allocator. */
@@ -315,7 +315,7 @@ Patch-mainline: n/a
PG_blkback, /* Page is owned by blkback */
#endif
__NR_PAGEFLAGS,
-@@ -351,9 +351,11 @@ CLEARPAGEFLAG(Uptodate, uptodate)
+@@ -353,9 +353,11 @@ CLEARPAGEFLAG(Uptodate, uptodate)
#define PageForeignDestructor(_page, order) \
((void (*)(struct page *, unsigned int))(_page)->index)(_page, order)
@@ -327,8 +327,8 @@ Patch-mainline: n/a
#define PageBlkback(page) test_bit(PG_blkback, &(page)->flags)
#define SetPageBlkback(page) set_bit(PG_blkback, &(page)->flags)
---- sle11sp2-2011-08-22.orig/kernel/kexec.c 2011-08-22 10:19:14.000000000 +0200
-+++ sle11sp2-2011-08-22/kernel/kexec.c 2011-08-22 10:30:32.000000000 +0200
+--- sle11sp2-2011-09-06.orig/kernel/kexec.c 2011-08-22 10:19:14.000000000 +0200
++++ sle11sp2-2011-09-06/kernel/kexec.c 2011-08-22 10:30:32.000000000 +0200
@@ -42,8 +42,10 @@
#include <asm/system.h>
#include <asm/sections.h>
@@ -372,8 +372,8 @@ Patch-mainline: n/a
#ifdef CONFIG_SYSCTL
register_sysctl_table(kexec_sys_table);
#endif
---- sle11sp2-2011-08-22.orig/mm/memory.c 2011-07-21 12:07:08.000000000 +0200
-+++ sle11sp2-2011-08-22/mm/memory.c 2011-07-21 12:07:22.000000000 +0200
+--- sle11sp2-2011-09-06.orig/mm/memory.c 2011-09-06 09:14:08.000000000 +0200
++++ sle11sp2-2011-09-06/mm/memory.c 2011-07-21 12:07:22.000000000 +0200
@@ -1158,10 +1158,12 @@ again:
page->index > details->last_index))
continue;
@@ -387,9 +387,9 @@ Patch-mainline: n/a
ptent = ptep_get_and_clear_full(mm, addr, pte,
tlb->fullmm);
tlb_remove_tlb_entry(tlb, pte, addr);
---- sle11sp2-2011-08-22.orig/mm/mmap.c 2011-06-30 15:38:40.000000000 +0200
-+++ sle11sp2-2011-08-22/mm/mmap.c 2011-06-30 16:01:21.000000000 +0200
-@@ -1900,8 +1900,10 @@ static void unmap_region(struct mm_struc
+--- sle11sp2-2011-09-06.orig/mm/mmap.c 2011-09-06 09:14:10.000000000 +0200
++++ sle11sp2-2011-09-06/mm/mmap.c 2011-09-06 09:15:43.000000000 +0200
+@@ -1899,8 +1899,10 @@ static void unmap_region(struct mm_struc
static inline void unmap_vma(struct vm_area_struct *vma)
{
@@ -400,7 +400,7 @@ Patch-mainline: n/a
}
/*
-@@ -2264,8 +2266,10 @@ void exit_mmap(struct mm_struct *mm)
+@@ -2263,8 +2265,10 @@ void exit_mmap(struct mm_struct *mm)
arch_exit_mmap(mm);
@@ -411,8 +411,8 @@ Patch-mainline: n/a
vma = mm->mmap;
if (!vma) /* Can happen if dup_mmap() received an OOM */
---- sle11sp2-2011-08-22.orig/mm/tmem-xen.c 2011-05-23 10:40:00.000000000 +0200
-+++ sle11sp2-2011-08-22/mm/tmem-xen.c 2011-05-23 11:03:08.000000000 +0200
+--- sle11sp2-2011-09-06.orig/mm/tmem-xen.c 2011-05-23 10:40:00.000000000 +0200
++++ sle11sp2-2011-09-06/mm/tmem-xen.c 2011-05-23 11:03:08.000000000 +0200
@@ -7,8 +7,9 @@
#include <linux/types.h>
#include <xen/interface/xen.h>
diff --git a/patches.xen/xen3-fixup-xen b/patches.xen/xen3-fixup-xen
index 6e0ae5b680..4575db66e6 100644
--- a/patches.xen/xen3-fixup-xen
+++ b/patches.xen/xen3-fixup-xen
@@ -1,5 +1,5 @@
Subject: Fix Xen build wrt. Xen files coming from mainline.
-From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1103:0b8a9b22b70a)
+From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1104:700f70b60d4b)
Patch-mainline: n/a
Acked-by: jbeulich@novell.com
diff --git a/patches.xen/xen3-patch-2.6.19 b/patches.xen/xen3-patch-2.6.19
index 0d9b335fc6..923f3e3221 100644
--- a/patches.xen/xen3-patch-2.6.19
+++ b/patches.xen/xen3-patch-2.6.19
@@ -6,8 +6,8 @@ Automatically created from "patches.kernel.org/patch-2.6.19" by xen-port-patches
Acked-by: jbeulich@novell.com
---- sle11sp2-2011-08-22.orig/arch/x86/Kconfig 2011-08-22 10:30:56.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/Kconfig 2011-06-30 16:02:26.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/Kconfig 2011-08-22 10:30:56.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/Kconfig 2011-06-30 16:02:26.000000000 +0200
@@ -533,6 +533,7 @@ config SCHED_OMIT_FRAME_POINTER
menuconfig PARAVIRT_GUEST
@@ -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-2011-08-22.orig/arch/x86/kernel/acpi/boot.c 2011-08-22 09:47:10.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/acpi/boot.c 2011-04-13 12:23:45.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/acpi/boot.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/acpi/boot.c 2011-04-13 12:23:45.000000000 +0200
@@ -70,8 +70,12 @@ int acpi_strict;
u8 acpi_sci_flags __initdata;
@@ -70,8 +70,8 @@ Acked-by: jbeulich@novell.com
static int __init parse_acpi_skip_timer_override(char *arg)
{
acpi_skip_timer_override = 1;
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/apic/apic-xen.c 2007-06-12 13:12:48.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/apic/apic-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/apic/apic-xen.c 2007-06-12 13:12:48.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/apic/apic-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -54,7 +54,6 @@ static cpumask_t timer_bcast_ipi;
/*
* Knob to control our willingness to enable the local APIC.
@@ -112,8 +112,8 @@ Acked-by: jbeulich@novell.com
#endif
}
}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/cpu/common-xen.c 2009-05-19 09:16:41.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/cpu/common-xen.c 2009-05-19 09:16:41.000000000 +0200
++++ sle11sp2-2011-09-06/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
extern int disable_pse;
@@ -177,8 +177,8 @@ Acked-by: jbeulich@novell.com
/* Clear all 6 debug registers: */
set_debugreg(0, 0);
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/cpu/mcheck/mce_dom0.c 2011-08-15 10:44:07.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/cpu/mcheck/mce_dom0.c 2011-08-15 10:44:20.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/cpu/mcheck/mce_dom0.c 2011-08-15 10:44:07.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/cpu/mcheck/mce_dom0.c 2011-08-15 10:44:20.000000000 +0200
@@ -53,8 +53,7 @@ static struct mc_info *g_mi;
/*dom0 mce virq handler, logging physical mce error info*/
@@ -197,8 +197,8 @@ Acked-by: jbeulich@novell.com
+ mce_dom0_interrupt(VIRQ_MCA, NULL);
}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/entry_32-xen.S 2009-05-19 09:16:41.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/entry_32-xen.S 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/entry_32-xen.S 2009-05-19 09:16:41.000000000 +0200
++++ sle11sp2-2011-09-06/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,8 +585,8 @@ Acked-by: jbeulich@novell.com
.section .rodata,"a"
#include "syscall_table.S"
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/head_32-xen.S 2011-08-08 12:54:10.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/head_32-xen.S 2011-08-09 10:35:35.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/head_32-xen.S 2011-08-08 12:54:10.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/head_32-xen.S 2011-08-09 10:35:35.000000000 +0200
@@ -63,7 +63,7 @@ ENTRY(startup_32)
movl %eax,%gs
cld # gcc2 wants the direction flag cleared at all times
@@ -596,8 +596,8 @@ Acked-by: jbeulich@novell.com
jmp start_kernel
#define HYPERCALL_PAGE_OFFSET 0x1000
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/io_apic_32-xen.c 2009-03-18 10:39:31.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/io_apic_32-xen.c 2009-03-18 10:39:31.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -31,6 +31,9 @@
#include <linux/acpi.h>
#include <linux/module.h>
@@ -1677,8 +1677,8 @@ Acked-by: jbeulich@novell.com
+ return 0;
+}
+early_param("noapic", parse_noapic);
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/ldt_32-xen.c 2007-06-12 13:12:48.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/ldt_32-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/ldt_32-xen.c 2007-06-12 13:12:48.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/ldt_32-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * linux/kernel/ldt.c
@@ -1686,8 +1686,8 @@ Acked-by: jbeulich@novell.com
*
* Copyright (C) 1992 Krishna Balasubramanian and Linus Torvalds
* Copyright (C) 1999 Ingo Molnar <mingo@redhat.com>
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/microcode-xen.c 2007-06-12 13:12:48.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/microcode-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/microcode-xen.c 2007-06-12 13:12:48.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/microcode-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -2,6 +2,7 @@
* Intel CPU Microcode Update Driver for Linux
*
@@ -1823,8 +1823,8 @@ Acked-by: jbeulich@novell.com
module_init(microcode_init)
module_exit(microcode_exit)
-MODULE_ALIAS_MISCDEV(MICROCODE_MINOR);
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/mpparse_32-xen.c 2007-06-12 13:12:48.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/mpparse_32-xen.c 2007-06-12 13:12:48.000000000 +0200
++++ sle11sp2-2011-09-06/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,8 +1991,8 @@ Acked-by: jbeulich@novell.com
/*
* Mapping between Global System Interrups, which
* represent all possible interrupts, and IRQs
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/pci-dma-xen.c 2009-11-06 10:23:23.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/pci-dma-xen.c 2009-11-06 10:23:23.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -110,8 +110,7 @@ dma_map_sg(struct device *hwdev, struct
{
int i, rc;
@@ -2051,8 +2051,8 @@ Acked-by: jbeulich@novell.com
if (swiotlb)
swiotlb_unmap_single(dev, dma_addr, size, direction);
else
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/process_32-xen.c 2008-07-21 11:00:32.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/process_32-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/process_32-xen.c 2008-07-21 11:00:32.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/process_32-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -37,6 +37,7 @@
#include <linux/kallsyms.h>
#include <linux/ptrace.h>
@@ -2142,8 +2142,8 @@ Acked-by: jbeulich@novell.com
sp -= get_random_int() % 8192;
return sp & ~0xf;
}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/setup_32-xen.c 2008-04-22 15:41:51.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/setup_32-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/setup_32-xen.c 2008-04-22 15:41:51.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/setup_32-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -56,6 +56,7 @@
#include <asm/apic.h>
#include <asm/e820.h>
@@ -2718,8 +2718,8 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_ACPI
acpi_boot_init();
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/smp_32-xen.c 2007-12-10 08:47:31.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/smp_32-xen.c 2007-12-10 08:47:31.000000000 +0100
++++ sle11sp2-2011-09-06/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,8 +2819,8 @@ Acked-by: jbeulich@novell.com
+ return 0;
+}
+EXPORT_SYMBOL(smp_call_function_single);
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/step.c 2011-05-19 06:06:34.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/step.c 2011-07-26 09:25:41.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/step.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/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
#ifdef CONFIG_X86_64
@@ -2833,8 +2833,8 @@ Acked-by: jbeulich@novell.com
/* 32-bit mode: register increment */
return 0;
/* 64-bit mode: REX prefix */
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/time-xen.c 2011-07-12 11:09:48.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/time-xen.c 2011-07-12 11:10:26.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/time-xen.c 2011-07-12 11:09:48.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/time-xen.c 2011-07-12 11:10:26.000000000 +0200
@@ -88,7 +88,6 @@ int pit_latch_buggy; /* ext
unsigned long vxtime_hz = PIT_TICK_RATE;
struct vxtime_data __vxtime __section_vxtime; /* for vsyscalls */
@@ -3018,8 +3018,8 @@ Acked-by: jbeulich@novell.com
if ((hpet_enable() >= 0) && hpet_use_timer) {
printk("Using HPET for base-timer\n");
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/traps_32-xen.c 2008-04-02 12:34:02.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/traps_32-xen.c 2008-04-02 12:34:02.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -28,6 +28,7 @@
#include <linux/kprobes.h>
#include <linux/kexec.h>
@@ -3466,8 +3466,8 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_KPROBES
fastcall void __kprobes do_int3(struct pt_regs *regs, long error_code)
{
---- sle11sp2-2011-08-22.orig/arch/x86/mach-xen/setup.c 2011-08-22 10:03:04.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/mach-xen/setup.c 2011-08-09 10:35:06.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/mach-xen/setup.c 2011-08-22 10:03:04.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/mach-xen/setup.c 2011-08-09 10:35:06.000000000 +0200
@@ -102,8 +102,10 @@ void __init pre_setup_arch_hook(void)
setup_xen_features();
@@ -3481,8 +3481,8 @@ Acked-by: jbeulich@novell.com
if (HYPERVISOR_memory_op(XENMEM_machphys_mapping, &mapping) == 0) {
machine_to_phys_mapping = (unsigned long *)mapping.v_start;
---- sle11sp2-2011-08-22.orig/arch/x86/mm/fault_32-xen.c 2010-09-23 15:39:04.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/mm/fault_32-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/fault_32-xen.c 2010-09-23 15:39:04.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/mm/fault_32-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -27,21 +27,24 @@
#include <asm/uaccess.h>
#include <asm/desc.h>
@@ -3569,8 +3569,8 @@ Acked-by: jbeulich@novell.com
yield();
down_read(&mm->mmap_sem);
goto survive;
---- sle11sp2-2011-08-22.orig/arch/x86/mm/highmem_32-xen.c 2008-10-29 09:55:56.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/highmem_32-xen.c 2008-10-29 09:55:56.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -38,11 +38,9 @@ static void *__kmap_atomic(struct page *
idx = type + KM_TYPE_NR*smp_processor_id();
@@ -3637,8 +3637,8 @@ Acked-by: jbeulich@novell.com
return (void*) vaddr;
}
---- sle11sp2-2011-08-22.orig/arch/x86/mm/hypervisor.c 2011-08-08 12:54:10.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/mm/hypervisor.c 2011-08-09 10:35:46.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/hypervisor.c 2011-08-08 12:54:10.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/mm/hypervisor.c 2011-08-09 10:35:46.000000000 +0200
@@ -31,6 +31,7 @@
*/
@@ -3974,8 +3974,8 @@ Acked-by: jbeulich@novell.com
if (++i == MAX_BATCHED_FULL_PTES) {
if ((rc = HYPERVISOR_mmu_update(
&u[0], i, NULL, DOMID_SELF)) != 0)
---- sle11sp2-2011-08-22.orig/arch/x86/mm/init_32-xen.c 2008-10-29 09:55:56.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/init_32-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/init_32-xen.c 2008-10-29 09:55:56.000000000 +0100
++++ sle11sp2-2011-09-06/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,8 +4154,8 @@ Acked-by: jbeulich@novell.com
unsigned long start_pfn = start >> PAGE_SHIFT;
unsigned long nr_pages = size >> PAGE_SHIFT;
---- sle11sp2-2011-08-22.orig/arch/x86/mm/ioremap-xen.c 2011-04-11 13:43:15.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/mm/ioremap-xen.c 2011-02-07 15:37:37.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/ioremap-xen.c 2011-04-11 13:43:15.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/mm/ioremap-xen.c 2011-02-07 15:37:37.000000000 +0100
@@ -12,7 +12,7 @@
#include <linux/init.h>
#include <linux/slab.h>
@@ -4203,8 +4203,8 @@ Acked-by: jbeulich@novell.com
vunmap((void __force *) addr);
return NULL;
}
---- sle11sp2-2011-08-22.orig/arch/x86/mm/pgtable_32-xen.c 2010-09-23 15:39:04.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/pgtable_32-xen.c 2010-09-23 15:39:04.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -68,7 +68,9 @@ void show_mem(void)
printk(KERN_INFO "%lu pages writeback\n",
global_page_state(NR_WRITEBACK));
@@ -4260,8 +4260,8 @@ Acked-by: jbeulich@novell.com
}
pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
---- sle11sp2-2011-08-22.orig/arch/x86/ia32/ia32entry-xen.S 2008-04-02 12:34:02.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/ia32/ia32entry-xen.S 2008-04-02 12:34:02.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:29:16.000000000 +0100
@@ -83,6 +83,7 @@
*/
ENTRY(ia32_sysenter_target)
@@ -4311,8 +4311,8 @@ Acked-by: jbeulich@novell.com
.quad compat_sys_move_pages
+ .quad sys_getcpu
ia32_syscall_end:
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/Makefile 2011-06-30 16:01:54.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/Makefile 2011-06-30 16:02:19.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/Makefile 2011-06-30 16:01:54.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/Makefile 2011-06-30 16:02:19.000000000 +0200
@@ -121,7 +121,7 @@ obj-$(CONFIG_X86_XEN) += fixup.o
###
# 64 bit specific files
@@ -4331,8 +4331,8 @@ 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-2011-08-22.orig/arch/x86/kernel/e820_64-xen.c 2009-12-04 08:45:56.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/e820_64-xen.c 2009-12-04 08:45:56.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -16,6 +16,7 @@
#include <linux/string.h>
#include <linux/kexec.h>
@@ -4824,8 +4824,8 @@ Acked-by: jbeulich@novell.com
}
unsigned long pci_mem_start = 0xaeedbabe;
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/early_printk-xen.c 2007-06-12 13:13:01.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/early_printk-xen.c 2007-06-12 13:13:01.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -244,20 +244,16 @@ void early_printk(const char *fmt, ...)
static int __initdata keep_early;
@@ -4872,8 +4872,8 @@ Acked-by: jbeulich@novell.com
}
-__setup("earlyprintk=", setup_early_printk);
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/entry_64-xen.S 2009-06-23 09:28:21.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/entry_64-xen.S 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/entry_64-xen.S 2009-06-23 09:28:21.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/entry_64-xen.S 2011-01-31 17:29:16.000000000 +0100
@@ -4,9 +4,6 @@
* Copyright (C) 1991, 1992 Linus Torvalds
* Copyright (C) 2000, 2001, 2002 Andi Kleen SuSE Labs
@@ -5116,8 +5116,8 @@ Acked-by: jbeulich@novell.com
ENTRY(alignment_check)
errorentry do_alignment_check
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/head_64-xen.S 2011-08-08 12:54:10.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/head_64-xen.S 2011-08-09 10:35:37.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/head_64-xen.S 2011-08-08 12:54:10.000000000 +0200
++++ sle11sp2-2011-09-06/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>
* Copyright (C) 2000 Karsten Keil <kkeil@suse.de>
@@ -5137,8 +5137,8 @@ Acked-by: jbeulich@novell.com
gdt_end:
/* asm/segment.h:GDT_ENTRIES must match this */
/* This should be a multiple of the cache line size */
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/head64-xen.c 2011-08-08 12:54:10.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/head64-xen.c 2011-08-09 10:35:40.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/head64-xen.c 2011-08-08 12:54:10.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/head64-xen.c 2011-08-09 10:35:40.000000000 +0200
@@ -7,6 +7,9 @@
* Modified for Xen.
*/
@@ -5230,8 +5230,8 @@ Acked-by: jbeulich@novell.com
- setup_boot_cpu_data();
start_kernel();
}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/io_apic_64-xen.c 2009-03-18 10:39:31.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/io_apic_64-xen.c 2009-03-18 10:39:31.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -26,9 +26,12 @@
#include <linux/delay.h>
#include <linux/sched.h>
@@ -6931,8 +6931,8 @@ Acked-by: jbeulich@novell.com
spin_unlock_irqrestore(&ioapic_lock, flags);
return 0;
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/ioport_64-xen.c 2008-01-28 12:24:19.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/ioport_64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/ioport_64-xen.c 2008-01-28 12:24:19.000000000 +0100
++++ sle11sp2-2011-09-06/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
memset(bitmap, 0xff, IO_BITMAP_BYTES);
@@ -6941,8 +6941,8 @@ Acked-by: jbeulich@novell.com
set_xen_guest_handle(set_iobitmap.bitmap, (char *)bitmap);
set_iobitmap.nr_ports = IO_BITMAP_BITS;
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/mpparse_64-xen.c 2007-06-12 13:13:01.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/mpparse_64-xen.c 2007-06-12 13:13:01.000000000 +0200
++++ sle11sp2-2011-09-06/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
* MP-table.
@@ -7556,8 +7556,8 @@ Acked-by: jbeulich@novell.com
-
-#endif /*CONFIG_X86_IO_APIC*/
#endif /*CONFIG_ACPI*/
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/process_64-xen.c 2011-04-11 13:43:15.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/process_64-xen.c 2011-02-02 08:30:50.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/process_64-xen.c 2011-04-11 13:43:15.000000000 +0200
++++ sle11sp2-2011-09-06/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
}
EXPORT_SYMBOL(idle_notifier_unregister);
@@ -7764,8 +7764,8 @@ Acked-by: jbeulich@novell.com
sp -= get_random_int() % 8192;
return sp & ~0xf;
}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/setup_64-xen.c 2010-10-05 09:58:12.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/setup_64-xen.c 2010-10-05 09:58:12.000000000 +0200
++++ sle11sp2-2011-09-06/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;
EXPORT_SYMBOL(HYPERVISOR_shared_info);
@@ -8202,8 +8202,8 @@ Acked-by: jbeulich@novell.com
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* VIA/Cyrix/Centaur-defined */
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/setup64-xen.c 2011-01-31 17:02:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/setup64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/setup64-xen.c 2011-01-31 17:02:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/setup64-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -31,7 +31,7 @@
#include <asm/hypervisor.h>
#endif
@@ -8297,8 +8297,8 @@ Acked-by: jbeulich@novell.com
orig_ist->ist[v] = t->ist[v] = (unsigned long)estacks;
}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/smp_64-xen.c 2008-04-02 12:34:02.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/smp_64-xen.c 2008-04-02 12:34:02.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -381,9 +381,8 @@ int smp_call_function_single (int cpu, v
/* prevent preemption and reschedule on another processor */
int me = get_cpu();
@@ -8360,8 +8360,8 @@ Acked-by: jbeulich@novell.com
- return 0; /* Should not happen */
-#endif
-}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/traps_64-xen.c 2008-04-02 12:34:02.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/traps_64-xen.c 2008-04-02 12:34:02.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -23,6 +23,7 @@
#include <linux/delay.h>
#include <linux/spinlock.h>
@@ -8817,8 +8817,8 @@ Acked-by: jbeulich@novell.com
-__setup("call_trace=", call_trace_setup);
+early_param("call_trace", call_trace_setup);
#endif
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/vsyscall_64-xen.c 2007-06-18 08:38:13.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/vsyscall_64-xen.c 2007-06-18 08:38:13.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -26,6 +26,10 @@
#include <linux/seqlock.h>
#include <linux/jiffies.h>
@@ -9012,8 +9012,8 @@ Acked-by: jbeulich@novell.com
return 0;
}
---- sle11sp2-2011-08-22.orig/arch/x86/mm/fault_64-xen.c 2011-08-15 10:44:03.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/mm/fault_64-xen.c 2011-07-26 09:24:01.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/fault_64-xen.c 2011-08-15 10:44:03.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/mm/fault_64-xen.c 2011-07-26 09:24:01.000000000 +0200
@@ -40,8 +40,7 @@
#define PF_RSVD (1<<3)
#define PF_INSTR (1<<4)
@@ -9151,8 +9151,8 @@ Acked-by: jbeulich@novell.com
pgd_page_table(unlock, page);
}
spin_unlock(&pgd_lock);
---- sle11sp2-2011-08-22.orig/arch/x86/mm/init_64-xen.c 2011-08-08 12:54:10.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/mm/init_64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/init_64-xen.c 2011-08-08 12:54:10.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/mm/init_64-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -61,8 +61,6 @@ EXPORT_SYMBOL(__kernel_page_user);
int after_bootmem;
@@ -9465,8 +9465,8 @@ Acked-by: jbeulich@novell.com
}
int kern_addr_valid(unsigned long addr)
---- sle11sp2-2011-08-22.orig/arch/x86/mm/pageattr_64-xen.c 2009-03-18 10:39:31.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/pageattr_64-xen.c 2009-03-18 10:39:31.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -377,8 +377,8 @@ static void revert_page(unsigned long ad
BUG_ON(pud_none(*pud));
pmd = pmd_offset(pud, address);
@@ -9531,8 +9531,8 @@ Acked-by: jbeulich@novell.com
}
}
up_write(&init_mm.mmap_sem);
---- sle11sp2-2011-08-22.orig/drivers/char/tpm/tpm_xen.c 2011-01-31 14:53:38.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/char/tpm/tpm_xen.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/char/tpm/tpm_xen.c 2011-01-31 14:53:38.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/char/tpm/tpm_xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -85,8 +85,7 @@ static struct tpm_private *my_priv;
/* local function prototypes */
@@ -9552,8 +9552,8 @@ Acked-by: jbeulich@novell.com
{
struct tpm_private *tp = tpm_priv;
unsigned long flags;
---- sle11sp2-2011-08-22.orig/drivers/pci/Kconfig 2011-01-31 14:32:40.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/pci/Kconfig 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/pci/Kconfig 2011-01-31 14:32:40.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/pci/Kconfig 2011-01-31 17:29:16.000000000 +0100
@@ -86,7 +86,7 @@ config XEN_PCIDEV_FE_DEBUG
config HT_IRQ
bool "Interrupts on hypertransport devices"
@@ -9563,8 +9563,8 @@ Acked-by: jbeulich@novell.com
help
This allows native hypertransport devices to use interrupts.
---- sle11sp2-2011-08-22.orig/drivers/pci/msi-xen.c 2009-12-04 08:45:56.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/pci/msi-xen.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/pci/msi-xen.c 2009-12-04 08:45:56.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/pci/msi-xen.c 2011-01-31 17:29:16.000000000 +0100
@@ -6,6 +6,7 @@
* Copyright (C) Tom Long Nguyen (tom.l.nguyen@intel.com)
*/
@@ -9796,8 +9796,8 @@ Acked-by: jbeulich@novell.com
* allocated for this device function, are reclaimed to unused state,
* which may be used later on.
**/
---- sle11sp2-2011-08-22.orig/drivers/xen/Kconfig 2011-02-24 14:05:09.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/Kconfig 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/Kconfig 2011-02-24 14:05:09.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/Kconfig 2011-01-31 17:29:16.000000000 +0100
@@ -332,6 +332,10 @@ endmenu
config HAVE_IRQ_IGNORE_UNHANDLED
def_bool y
@@ -9809,8 +9809,8 @@ Acked-by: jbeulich@novell.com
config NO_IDLE_HZ
def_bool y
---- sle11sp2-2011-08-22.orig/drivers/xen/balloon/balloon.c 2011-04-11 13:43:15.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/balloon/balloon.c 2011-03-23 08:48:06.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/balloon/balloon.c 2011-04-11 13:43:15.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/balloon/balloon.c 2011-03-23 08:48:06.000000000 +0100
@@ -37,6 +37,7 @@
#include <linux/sched.h>
#include <linux/errno.h>
@@ -10008,8 +10008,8 @@ Acked-by: jbeulich@novell.com
bs.driver_pages--;
balloon_unlock(flags);
---- sle11sp2-2011-08-22.orig/drivers/xen/blkback/blkback.c 2011-04-11 13:43:15.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/blkback/blkback.c 2011-04-11 14:28:25.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/blkback/blkback.c 2011-04-11 13:43:15.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/blkback/blkback.c 2011-04-11 14:28:25.000000000 +0200
@@ -297,7 +297,7 @@ static void blkif_notify_work(blkif_t *b
wake_up(&blkif->wq);
}
@@ -10019,8 +10019,8 @@ Acked-by: jbeulich@novell.com
{
blkif_notify_work(dev_id);
return IRQ_HANDLED;
---- sle11sp2-2011-08-22.orig/drivers/xen/blkback/common.h 2011-04-11 13:43:15.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/blkback/common.h 2011-04-11 14:28:27.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/blkback/common.h 2011-04-11 13:43:15.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/blkback/common.h 2011-04-11 14:28:27.000000000 +0200
@@ -136,7 +136,7 @@ void blkif_interface_init(void);
void blkif_xenbus_init(void);
@@ -10030,8 +10030,8 @@ Acked-by: jbeulich@novell.com
int blkif_schedule(void *arg);
int blkback_barrier(struct xenbus_transaction xbt,
---- sle11sp2-2011-08-22.orig/drivers/xen/blkfront/blkfront.c 2011-07-15 11:19:50.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/blkfront/blkfront.c 2011-07-21 12:07:37.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/blkfront/blkfront.c 2011-07-15 11:19:50.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/blkfront/blkfront.c 2011-07-21 12:07:37.000000000 +0200
@@ -70,9 +70,9 @@ static int setup_blkring(struct xenbus_d
static void kick_pending_request_queues(struct blkfront_info *);
@@ -10093,8 +10093,8 @@ Acked-by: jbeulich@novell.com
}
int blkfront_is_ready(struct xenbus_device *dev)
---- sle11sp2-2011-08-22.orig/drivers/xen/blktap/blktap.c 2011-06-30 15:37:44.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/blktap/blktap.c 2011-06-30 16:02:41.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/blktap/blktap.c 2011-06-30 15:37:44.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/blktap/blktap.c 2011-06-30 16:02:41.000000000 +0200
@@ -1258,7 +1258,7 @@ static void blkif_notify_work(blkif_t *b
wake_up(&blkif->wq);
}
@@ -10104,8 +10104,8 @@ Acked-by: jbeulich@novell.com
{
blkif_notify_work(dev_id);
return IRQ_HANDLED;
---- sle11sp2-2011-08-22.orig/drivers/xen/blktap/common.h 2011-04-11 13:43:15.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/blktap/common.h 2011-04-11 14:28:19.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/blktap/common.h 2011-04-11 13:43:15.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/blktap/common.h 2011-04-11 14:28:19.000000000 +0200
@@ -105,7 +105,7 @@ void tap_blkif_interface_init(void);
void tap_blkif_xenbus_init(void);
@@ -10115,8 +10115,8 @@ Acked-by: jbeulich@novell.com
int tap_blkif_schedule(void *arg);
int dom_to_devid(domid_t domid, int xenbus_id, blkif_t *blkif);
---- sle11sp2-2011-08-22.orig/drivers/xen/blktap2/sysfs.c 2011-03-02 12:00:16.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/blktap2/sysfs.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/blktap2/sysfs.c 2011-03-02 12:00:16.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/blktap2/sysfs.c 2011-01-31 17:29:16.000000000 +0100
@@ -150,7 +150,7 @@ blktap_sysfs_pause_device(struct class_d
err = blktap_device_pause(tap);
if (!err) {
@@ -10205,8 +10205,8 @@ Acked-by: jbeulich@novell.com
- return 0;
+ return err;
}
---- sle11sp2-2011-08-22.orig/drivers/xen/console/console.c 2011-01-31 17:02:29.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/console/console.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/console/console.c 2011-01-31 17:02:29.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/console/console.c 2011-01-31 17:29:16.000000000 +0100
@@ -360,7 +360,7 @@ static struct tty_struct *xencons_tty;
static int xencons_priv_irq;
static char x_char;
@@ -10252,8 +10252,8 @@ Acked-by: jbeulich@novell.com
.open = xencons_open,
.close = xencons_close,
.write = xencons_write,
---- sle11sp2-2011-08-22.orig/drivers/xen/console/xencons_ring.c 2007-06-12 13:13:44.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/console/xencons_ring.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/console/xencons_ring.c 2007-06-12 13:13:44.000000000 +0200
++++ sle11sp2-2011-09-06/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;
}
@@ -10272,8 +10272,8 @@ Acked-by: jbeulich@novell.com
cons++;
}
---- sle11sp2-2011-08-22.orig/drivers/xen/core/evtchn.c 2010-11-25 09:36:37.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/core/evtchn.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/core/evtchn.c 2010-11-25 09:36:37.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/core/evtchn.c 2011-01-31 17:29:16.000000000 +0100
@@ -539,7 +539,7 @@ static void unbind_from_irq(unsigned int
int bind_caller_port_to_irqhandler(
@@ -10553,8 +10553,8 @@ Acked-by: jbeulich@novell.com
+ handle_fasteoi_irq, "fasteoi");
}
}
---- sle11sp2-2011-08-22.orig/drivers/xen/core/gnttab.c 2010-09-23 15:39:04.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/core/gnttab.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/core/gnttab.c 2010-09-23 15:39:04.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/core/gnttab.c 2011-01-31 17:29:16.000000000 +0100
@@ -510,6 +510,7 @@ static void gnttab_page_free(struct page
BUG_ON(order);
ClearPageForeign(page);
@@ -10572,8 +10572,8 @@ Acked-by: jbeulich@novell.com
*pagep = new_page;
SetPageForeign(page, gnttab_page_free);
---- sle11sp2-2011-08-22.orig/drivers/xen/core/reboot.c 2011-06-30 15:37:44.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/core/reboot.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/core/reboot.c 2011-06-30 15:37:44.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/core/reboot.c 2011-01-31 17:29:16.000000000 +0100
@@ -1,4 +1,3 @@
-#define __KERNEL_SYSCALLS__
#include <linux/version.h>
@@ -10605,8 +10605,8 @@ Acked-by: jbeulich@novell.com
{
switch_shutdown_state(SHUTDOWN_SUSPEND);
return IRQ_HANDLED;
---- sle11sp2-2011-08-22.orig/drivers/xen/core/smpboot.c 2011-01-31 17:01:49.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/core/smpboot.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/core/smpboot.c 2011-01-31 17:01:49.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/core/smpboot.c 2011-01-31 17:29:16.000000000 +0100
@@ -25,8 +25,8 @@
#include <xen/cpu_hotplug.h>
#include <xen/xenbus.h>
@@ -10627,8 +10627,8 @@ Acked-by: jbeulich@novell.com
#endif
void __init prefill_possible_map(void)
---- sle11sp2-2011-08-22.orig/drivers/xen/fbfront/xenfb.c 2011-03-02 12:00:16.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/fbfront/xenfb.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/fbfront/xenfb.c 2011-03-02 12:00:16.000000000 +0100
++++ sle11sp2-2011-09-06/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,
};
@@ -10639,8 +10639,8 @@ Acked-by: jbeulich@novell.com
{
/*
* No in events recognized, simply ignore them all.
---- sle11sp2-2011-08-22.orig/drivers/xen/fbfront/xenkbd.c 2011-05-23 10:40:00.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/fbfront/xenkbd.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/fbfront/xenkbd.c 2011-05-23 10:40:00.000000000 +0200
++++ sle11sp2-2011-09-06/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.
*/
@@ -10650,8 +10650,8 @@ Acked-by: jbeulich@novell.com
{
struct xenkbd_info *info = dev_id;
struct xenkbd_page *page = info->page;
---- sle11sp2-2011-08-22.orig/drivers/xen/gntdev/gntdev.c 2011-01-03 12:43:21.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/gntdev/gntdev.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/gntdev/gntdev.c 2011-01-03 12:43:21.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/gntdev/gntdev.c 2011-01-31 17:29:16.000000000 +0100
@@ -744,9 +744,6 @@ static pte_t gntdev_clear_pte(struct vm_
BUG();
}
@@ -10691,8 +10691,8 @@ Acked-by: jbeulich@novell.com
}
return copy;
---- sle11sp2-2011-08-22.orig/drivers/xen/netback/accel.c 2011-06-30 15:37:44.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/netback/accel.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/netback/accel.c 2011-06-30 15:37:44.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/netback/accel.c 2011-01-31 17:29:16.000000000 +0100
@@ -65,7 +65,7 @@ static int match_accelerator(struct xenb
if (IS_ERR(eth_name)) {
@@ -10702,8 +10702,8 @@ Acked-by: jbeulich@novell.com
__FUNCTION__, PTR_ERR(eth_name));
return 0;
} else {
---- sle11sp2-2011-08-22.orig/drivers/xen/netback/common.h 2011-04-11 13:43:15.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/netback/common.h 2011-04-11 14:28:08.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/netback/common.h 2011-04-11 13:43:15.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/netback/common.h 2011-04-11 14:28:08.000000000 +0200
@@ -92,6 +92,7 @@ typedef struct netif_st {
/* Statistics */
@@ -10721,8 +10721,8 @@ Acked-by: jbeulich@novell.com
static inline int netbk_can_queue(struct net_device *dev)
{
---- sle11sp2-2011-08-22.orig/drivers/xen/netback/interface.c 2011-04-11 13:43:15.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/netback/interface.c 2011-04-11 14:28:07.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/netback/interface.c 2011-04-11 13:43:15.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/netback/interface.c 2011-04-11 14:28:07.000000000 +0200
@@ -172,6 +172,7 @@ static const struct netif_stat {
u16 offset;
} netbk_stats[] = {
@@ -10731,8 +10731,8 @@ Acked-by: jbeulich@novell.com
};
static int netbk_get_stats_count(struct net_device *dev)
---- sle11sp2-2011-08-22.orig/drivers/xen/netback/loopback.c 2011-01-03 12:43:21.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/netback/loopback.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/netback/loopback.c 2011-01-03 12:43:21.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/netback/loopback.c 2011-01-31 17:29:16.000000000 +0100
@@ -152,16 +152,6 @@ static int loopback_start_xmit(struct sk
np->stats.rx_bytes += skb->len;
np->stats.rx_packets++;
@@ -10750,8 +10750,8 @@ Acked-by: jbeulich@novell.com
skb->pkt_type = PACKET_HOST; /* overridden by eth_type_trans() */
skb->protocol = eth_type_trans(skb, dev);
skb->dev = dev;
---- sle11sp2-2011-08-22.orig/drivers/xen/netback/netback.c 2011-04-11 13:43:15.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/netback/netback.c 2011-04-11 14:28:01.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/netback/netback.c 2011-04-11 13:43:15.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/netback/netback.c 2011-04-11 14:28:01.000000000 +0200
@@ -41,6 +41,7 @@
#include <xen/evtchn.h>
#include <xen/gnttab.h>
@@ -10839,8 +10839,8 @@ Acked-by: jbeulich@novell.com
{
struct list_head *ent;
netif_t *netif;
---- sle11sp2-2011-08-22.orig/drivers/xen/netfront/netfront.c 2011-06-30 15:37:44.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/netfront/netfront.c 2011-06-30 16:02:48.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/netfront/netfront.c 2011-06-30 15:37:44.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/netfront/netfront.c 2011-06-30 16:02:48.000000000 +0200
@@ -63,6 +63,7 @@
#include <asm/uaccess.h>
#include <xen/interface/grant_table.h>
@@ -10982,8 +10982,8 @@ Acked-by: jbeulich@novell.com
};
#ifdef CONFIG_SYSFS
---- sle11sp2-2011-08-22.orig/drivers/xen/netfront/netfront.h 2010-02-24 13:13:46.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/netfront/netfront.h 2011-02-09 15:35:17.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/netfront/netfront.h 2010-02-24 13:13:46.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/netfront/netfront.h 2011-02-09 15:35:17.000000000 +0100
@@ -150,6 +150,7 @@ struct netfront_info {
struct net_device *netdev;
@@ -10992,8 +10992,8 @@ Acked-by: jbeulich@novell.com
struct netif_tx_front_ring tx;
struct netif_rx_front_ring rx;
---- sle11sp2-2011-08-22.orig/drivers/xen/pciback/pciback.h 2009-03-18 10:39:32.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/pciback/pciback.h 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/pciback/pciback.h 2009-03-18 10:39:32.000000000 +0100
++++ sle11sp2-2011-09-06/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);
@@ -11003,8 +11003,8 @@ Acked-by: jbeulich@novell.com
void pciback_do_op(void *data);
int pciback_xenbus_register(void);
---- sle11sp2-2011-08-22.orig/drivers/xen/pciback/pciback_ops.c 2011-02-17 09:58:10.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/pciback/pciback_ops.c 2011-02-17 10:07:33.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/pciback/pciback_ops.c 2011-02-17 09:58:10.000000000 +0100
++++ sle11sp2-2011-09-06/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);
}
@@ -11014,8 +11014,8 @@ Acked-by: jbeulich@novell.com
{
struct pciback_device *pdev = dev_id;
---- sle11sp2-2011-08-22.orig/drivers/xen/pcifront/pcifront.h 2010-10-05 09:58:12.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/pcifront/pcifront.h 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/pcifront/pcifront.h 2010-10-05 09:58:12.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/pcifront/pcifront.h 2011-01-31 17:29:16.000000000 +0100
@@ -51,6 +51,6 @@ void pcifront_free_roots(struct pcifront
void pcifront_do_aer( void *data);
@@ -11024,8 +11024,8 @@ Acked-by: jbeulich@novell.com
+irqreturn_t pcifront_handler_aer(int irq, void *dev);
#endif /* __XEN_PCIFRONT_H__ */
---- sle11sp2-2011-08-22.orig/drivers/xen/pcifront/pci_op.c 2010-11-25 09:36:37.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/pcifront/pci_op.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/pcifront/pci_op.c 2010-11-25 09:36:37.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/pcifront/pci_op.c 2011-01-31 17:29:16.000000000 +0100
@@ -662,7 +662,7 @@ void pcifront_do_aer(void *data)
}
@@ -11035,8 +11035,8 @@ Acked-by: jbeulich@novell.com
{
struct pcifront_device *pdev = dev;
schedule_pcifront_aer_op(pdev);
---- sle11sp2-2011-08-22.orig/drivers/xen/privcmd/compat_privcmd.c 2010-01-27 14:01:48.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/privcmd/compat_privcmd.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/privcmd/compat_privcmd.c 2010-01-27 14:01:48.000000000 +0100
++++ sle11sp2-2011-09-06/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>
*/
@@ -11045,8 +11045,8 @@ Acked-by: jbeulich@novell.com
#include <linux/compat.h>
#include <linux/ioctl.h>
#include <linux/syscalls.h>
---- sle11sp2-2011-08-22.orig/drivers/xen/privcmd/privcmd.c 2010-01-27 14:01:48.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/privcmd/privcmd.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/privcmd/privcmd.c 2010-01-27 14:01:48.000000000 +0100
++++ sle11sp2-2011-09-06/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)))
return -EFAULT;
@@ -11107,8 +11107,8 @@ Acked-by: jbeulich@novell.com
vma->vm_ops = &privcmd_vm_ops;
vma->vm_private_data = NULL;
---- sle11sp2-2011-08-22.orig/drivers/xen/scsiback/common.h 2011-04-11 13:43:15.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/scsiback/common.h 2011-04-11 14:27:49.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/scsiback/common.h 2011-04-11 13:43:15.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/scsiback/common.h 2011-04-11 14:27:49.000000000 +0200
@@ -138,7 +138,7 @@ typedef struct {
#define VSCSI_TYPE_HOST 1
@@ -11118,8 +11118,8 @@ Acked-by: jbeulich@novell.com
int scsiback_init_sring(struct vscsibk_info *, grant_ref_t, evtchn_port_t);
int scsiback_schedule(void *data);
---- sle11sp2-2011-08-22.orig/drivers/xen/scsiback/scsiback.c 2011-04-11 13:43:15.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/scsiback/scsiback.c 2011-04-11 14:27:51.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/scsiback/scsiback.c 2011-04-11 13:43:15.000000000 +0200
++++ sle11sp2-2011-09-06/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);
rq = blk_get_request(pending_req->sdev->request_queue, write, GFP_KERNEL);
@@ -11138,8 +11138,8 @@ Acked-by: jbeulich@novell.com
{
scsiback_notify_work((struct vscsibk_info *)dev_id);
return IRQ_HANDLED;
---- sle11sp2-2011-08-22.orig/drivers/xen/scsifront/common.h 2010-02-24 13:13:46.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/scsifront/common.h 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/scsifront/common.h 2010-02-24 13:13:46.000000000 +0100
++++ sle11sp2-2011-09-06/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);
void scsifront_xenbus_unregister(void);
@@ -11149,8 +11149,8 @@ Acked-by: jbeulich@novell.com
int scsifront_cmd_done(struct vscsifrnt_info *info);
---- sle11sp2-2011-08-22.orig/drivers/xen/scsifront/scsifront.c 2011-02-02 12:19:11.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/scsifront/scsifront.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/scsifront/scsifront.c 2011-02-02 12:19:11.000000000 +0100
++++ sle11sp2-2011-09-06/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);
}
@@ -11160,8 +11160,8 @@ Acked-by: jbeulich@novell.com
{
scsifront_notify_work((struct vscsifrnt_info *)dev_id);
return IRQ_HANDLED;
---- sle11sp2-2011-08-22.orig/drivers/xen/sfc_netback/accel_xenbus.c 2010-01-04 11:56:34.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/sfc_netback/accel_xenbus.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/sfc_netback/accel_xenbus.c 2010-01-04 11:56:34.000000000 +0100
++++ sle11sp2-2011-09-06/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
@@ -11182,8 +11182,8 @@ Acked-by: jbeulich@novell.com
{
VPRINTK("netirq %d from device %s\n", irq,
((struct xenbus_device *)context)->nodename);
---- sle11sp2-2011-08-22.orig/drivers/xen/sfc_netfront/accel.h 2009-04-07 13:58:48.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/sfc_netfront/accel.h 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/sfc_netfront/accel.h 2009-04-07 13:58:48.000000000 +0200
++++ sle11sp2-2011-09-06/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);
@@ -11197,8 +11197,8 @@ Acked-by: jbeulich@novell.com
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
extern void netfront_accel_msg_from_bend(struct work_struct *context);
---- sle11sp2-2011-08-22.orig/drivers/xen/sfc_netfront/accel_msg.c 2009-04-07 13:58:48.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/sfc_netfront/accel_msg.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/sfc_netfront/accel_msg.c 2009-04-07 13:58:48.000000000 +0200
++++ sle11sp2-2011-09-06/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 *
}
@@ -11219,8 +11219,8 @@ Acked-by: jbeulich@novell.com
{
netfront_accel_vnic *vnic = (netfront_accel_vnic *)context;
struct net_device *net_dev = vnic->net_dev;
---- sle11sp2-2011-08-22.orig/drivers/xen/sfc_netfront/accel_tso.c 2008-02-26 10:54:12.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/sfc_netfront/accel_tso.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/sfc_netfront/accel_tso.c 2008-02-26 10:54:12.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/sfc_netfront/accel_tso.c 2011-01-31 17:29:16.000000000 +0100
@@ -363,7 +363,7 @@ int netfront_accel_enqueue_skb_tso(netfr
tso_check_safe(skb);
@@ -11230,8 +11230,8 @@ Acked-by: jbeulich@novell.com
EPRINTK("Trying to TSO send a packet without HW checksum\n");
tso_start(&state, skb);
---- sle11sp2-2011-08-22.orig/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 15:37:44.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 16:03:00.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 15:37:44.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 16:03:00.000000000 +0200
@@ -463,7 +463,7 @@ netfront_accel_enqueue_skb_multi(netfron
frag_i = -1;
@@ -11250,8 +11250,8 @@ Acked-by: jbeulich@novell.com
/* Set to zero to encourage falcon to work it out for us */
*(u16*)(skb->h.raw + skb->csum) = 0;
}
---- sle11sp2-2011-08-22.orig/drivers/xen/tpmback/common.h 2011-04-11 13:43:15.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/tpmback/common.h 2011-04-11 14:27:26.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/tpmback/common.h 2011-04-11 13:43:15.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/tpmback/common.h 2011-04-11 14:27:26.000000000 +0200
@@ -71,7 +71,7 @@ void tpmif_deschedule_work(tpmif_t * tpm
void tpmif_xenbus_init(void);
void tpmif_xenbus_exit(void);
@@ -11261,8 +11261,8 @@ Acked-by: jbeulich@novell.com
long int tpmback_get_instance(struct backend_info *bi);
---- sle11sp2-2011-08-22.orig/drivers/xen/tpmback/tpmback.c 2010-09-23 15:39:04.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/tpmback/tpmback.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/tpmback/tpmback.c 2010-09-23 15:39:04.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/tpmback/tpmback.c 2011-01-31 17:29:16.000000000 +0100
@@ -497,7 +497,7 @@ static ssize_t vtpm_op_read(struct file
list_del(&pak->next);
write_unlock_irqrestore(&dataex.pak_lock, flags);
@@ -11281,8 +11281,8 @@ Acked-by: jbeulich@novell.com
{
tpmif_t *tpmif = (tpmif_t *) dev_id;
---- sle11sp2-2011-08-22.orig/drivers/xen/usbback/usbback.c 2011-04-11 13:43:15.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/usbback/usbback.c 2011-04-11 14:27:33.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/usbback/usbback.c 2011-04-11 13:43:15.000000000 +0200
++++ sle11sp2-2011-09-06/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);
}
@@ -11301,8 +11301,8 @@ Acked-by: jbeulich@novell.com
{
pending_req_t *pending_req = (pending_req_t *)urb->context;
---- sle11sp2-2011-08-22.orig/drivers/xen/usbback/usbback.h 2011-04-11 13:43:15.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/usbback/usbback.h 2011-04-11 14:27:35.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/usbback/usbback.h 2011-04-11 13:43:15.000000000 +0200
++++ sle11sp2-2011-09-06/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,
const unsigned int handle,
@@ -11312,8 +11312,8 @@ Acked-by: jbeulich@novell.com
int usbbk_schedule(void *arg);
struct usbstub *find_attached_device(usbif_t *usbif, int port);
void usbbk_attach_device(usbif_t *usbif, struct usbstub *stub);
---- sle11sp2-2011-08-22.orig/drivers/xen/usbback/usbstub.c 2011-03-02 12:00:16.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/usbback/usbstub.c 2011-03-11 10:54:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/usbback/usbstub.c 2011-03-02 12:00:16.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/usbback/usbstub.c 2011-03-11 10:54:35.000000000 +0100
@@ -283,7 +283,7 @@ static ssize_t usbstub_show_portids(stru
static DRIVER_ATTR(port_ids, S_IRUSR, usbstub_show_portids, NULL);
@@ -11341,8 +11341,8 @@ Acked-by: jbeulich@novell.com
&driver_attr_port_ids);
usb_deregister(&usbback_usb_driver);
}
---- sle11sp2-2011-08-22.orig/drivers/xen/usbfront/usbfront.h 2009-10-15 11:45:41.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/usbfront/usbfront.h 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/usbfront/usbfront.h 2009-10-15 11:45:41.000000000 +0200
++++ sle11sp2-2011-09-06/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;
extern struct hc_driver xen_usb20_hc_driver;
@@ -11352,8 +11352,8 @@ Acked-by: jbeulich@novell.com
void xenhcd_rhport_state_change(struct usbfront_info *info,
int port, enum usb_device_speed speed);
int xenhcd_schedule(void *arg);
---- sle11sp2-2011-08-22.orig/drivers/xen/usbfront/usbfront-dbg.c 2009-10-15 11:45:41.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/usbfront/usbfront-dbg.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/usbfront/usbfront-dbg.c 2009-10-15 11:45:41.000000000 +0200
++++ sle11sp2-2011-09-06/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)
{
@@ -11365,8 +11365,8 @@ Acked-by: jbeulich@novell.com
}
static inline void remove_debug_file(struct usbfront_info *info)
---- sle11sp2-2011-08-22.orig/drivers/xen/usbfront/usbfront-q.c 2009-10-15 11:45:41.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/usbfront/usbfront-q.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/usbfront/usbfront-q.c 2009-10-15 11:45:41.000000000 +0200
++++ sle11sp2-2011-09-06/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);
}
@@ -11385,8 +11385,8 @@ Acked-by: jbeulich@novell.com
{
xenhcd_notify_work((struct usbfront_info *) dev_id);
return IRQ_HANDLED;
---- sle11sp2-2011-08-22.orig/drivers/xen/xenbus/xenbus_comms.c 2011-04-11 13:43:15.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/xenbus/xenbus_comms.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/xenbus/xenbus_comms.c 2011-04-11 13:43:15.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/xenbus/xenbus_comms.c 2011-01-31 17:29:16.000000000 +0100
@@ -54,7 +54,7 @@ static DECLARE_WORK(probe_work, xenbus_p
static DECLARE_WAIT_QUEUE_HEAD(xb_waitq);
@@ -11396,8 +11396,8 @@ Acked-by: jbeulich@novell.com
{
int old, new;
---- sle11sp2-2011-08-22.orig/drivers/xen/xenoprof/xenoprofile.c 2010-01-07 09:38:29.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/xenoprof/xenoprofile.c 2010-01-07 09:38:29.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 17:29:16.000000000 +0100
@@ -194,8 +194,7 @@ done:
oprofile_add_domain_switch(COORDINATOR_DOMAIN);
}
@@ -11408,8 +11408,8 @@ Acked-by: jbeulich@novell.com
{
struct xenoprof_buf * buf;
static unsigned long flag;
---- sle11sp2-2011-08-22.orig/include/asm-generic/pgtable.h 2011-04-13 11:25:29.000000000 +0200
-+++ sle11sp2-2011-08-22/include/asm-generic/pgtable.h 2011-03-11 10:54:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/include/asm-generic/pgtable.h 2011-04-13 11:25:29.000000000 +0200
++++ sle11sp2-2011-09-06/include/asm-generic/pgtable.h 2011-03-11 10:54:24.000000000 +0100
@@ -157,7 +157,7 @@ static inline void pmdp_set_wrprotect(st
#endif
@@ -11419,8 +11419,8 @@ Acked-by: jbeulich@novell.com
#endif
#ifndef __HAVE_ARCH_PMDP_SPLITTING_FLUSH
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/desc_32.h 2008-01-28 12:24:19.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/desc_32.h 2008-01-28 12:24:19.000000000 +0100
++++ sle11sp2-2011-09-06/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;
}
@@ -11581,8 +11581,8 @@ Acked-by: jbeulich@novell.com
static inline void clear_LDT(void)
{
int cpu = get_cpu();
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2007-06-12 13:14:02.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2007-06-12 13:14:02.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:29:16.000000000 +0100
@@ -55,7 +55,7 @@ enum fixed_addresses {
#ifdef CONFIG_X86_LOCAL_APIC
FIX_APIC_BASE, /* local (CPU) APIC) -- required for SMP or not */
@@ -11604,8 +11604,8 @@ Acked-by: jbeulich@novell.com
#define set_fixmap(idx, phys) \
__set_fixmap(idx, phys, PAGE_KERNEL)
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/hypercall_32.h 2009-06-23 09:28:21.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/hypercall_32.h 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/hypercall_32.h 2009-06-23 09:28:21.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/hypercall_32.h 2011-01-31 17:29:16.000000000 +0100
@@ -128,6 +128,23 @@
__res; \
})
@@ -11676,8 +11676,8 @@ Acked-by: jbeulich@novell.com
return _hypercall3(int, grant_table_op, cmd, uop, count);
}
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/hypercall_64.h 2009-06-23 09:28:21.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/hypercall_64.h 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/hypercall_64.h 2009-06-23 09:28:21.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/hypercall_64.h 2011-01-31 17:29:16.000000000 +0100
@@ -135,6 +135,23 @@
__res; \
})
@@ -11747,8 +11747,8 @@ Acked-by: jbeulich@novell.com
return _hypercall3(int, grant_table_op, cmd, uop, count);
}
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2009-07-13 14:25:35.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/hypervisor.h 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2009-07-13 14:25:35.000000000 +0200
++++ sle11sp2-2011-09-06/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>
#include <xen/interface/nmi.h>
@@ -11819,8 +11819,8 @@ Acked-by: jbeulich@novell.com
static inline int
HYPERVISOR_yield(
void)
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2008-04-02 12:34:02.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2008-04-02 12:34:02.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:29:16.000000000 +0100
@@ -53,7 +53,6 @@ static inline int pte_exec_kernel(pte_t
* not possible, use pte_get_and_clear to obtain the old pte
* value and then use set_pte to update it. -ben
@@ -11877,8 +11877,8 @@ Acked-by: jbeulich@novell.com
static inline int pte_same(pte_t a, pte_t b)
{
return a.pte_low == b.pte_low && a.pte_high == b.pte_high;
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-04-11 13:43:15.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:37:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-04-11 13:43:15.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:37:16.000000000 +0100
@@ -260,31 +260,89 @@ static inline pte_t pte_mkhuge(pte_t pte
# include <asm/pgtable-2level.h>
#endif
@@ -12089,8 +12089,8 @@ Acked-by: jbeulich@novell.com
#include <asm-generic/pgtable.h>
#endif /* _I386_PGTABLE_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:02:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:02:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:29:16.000000000 +0100
@@ -146,6 +146,18 @@ static inline void detect_ht(struct cpui
#define X86_EFLAGS_VIP 0x00100000 /* Virtual Interrupt Pending */
#define X86_EFLAGS_ID 0x00200000 /* CPUID detection flag */
@@ -12202,8 +12202,8 @@ Acked-by: jbeulich@novell.com
/* from system description table in BIOS. Mostly for MCA use, but
others may find it useful. */
extern unsigned int machine_id;
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/smp_32.h 2007-06-12 13:14:02.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/smp_32.h 2007-06-12 13:14:02.000000000 +0200
++++ sle11sp2-2011-09-06/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));
}
@@ -12248,8 +12248,8 @@ Acked-by: jbeulich@novell.com
+#endif
+
#endif
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/system_32.h 2007-06-12 13:14:02.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/system_32.h 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/system_32.h 2007-06-12 13:14:02.000000000 +0200
++++ sle11sp2-2011-09-06/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)\
((__typeof__(*(ptr)))__cmpxchg((ptr),(unsigned long)(o),\
@@ -12300,8 +12300,8 @@ Acked-by: jbeulich@novell.com
#ifndef CONFIG_X86_CMPXCHG
/*
* Building a kernel capable running on 80386. It may be necessary to
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/tlbflush_32.h 2007-11-26 16:59:25.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/tlbflush_32.h 2007-11-26 16:59:25.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:29:16.000000000 +0100
@@ -8,8 +8,6 @@
#define __flush_tlb_global() xen_tlb_flush()
#define __flush_tlb_all() xen_tlb_flush()
@@ -12311,8 +12311,8 @@ Acked-by: jbeulich@novell.com
#define cpu_has_invlpg (boot_cpu_data.x86 > 3)
#define __flush_tlb_single(addr) xen_invlpg(addr)
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2007-06-12 13:14:13.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2007-06-12 13:14:13.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:29:16.000000000 +0100
@@ -41,7 +41,7 @@ enum fixed_addresses {
#ifdef CONFIG_X86_LOCAL_APIC
FIX_APIC_BASE, /* local (CPU) APIC) -- required for SMP or not */
@@ -12322,8 +12322,8 @@ Acked-by: jbeulich@novell.com
FIX_IO_APIC_BASE_0,
FIX_IO_APIC_BASE_END = FIX_IO_APIC_BASE_0 + MAX_IO_APICS-1,
#endif
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-04-11 13:43:15.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-02-07 15:37:14.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-04-11 13:43:15.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-02-07 15:37:14.000000000 +0100
@@ -44,12 +44,9 @@ extern unsigned long __supported_pte_mas
#define swapper_pg_dir init_level4_pgt
@@ -12502,8 +12502,8 @@ Acked-by: jbeulich@novell.com
#define __HAVE_ARCH_PTEP_GET_AND_CLEAR
#define __HAVE_ARCH_PTEP_GET_AND_CLEAR_FULL
#define __HAVE_ARCH_PTEP_CLEAR_FLUSH
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/processor_64.h 2008-03-06 08:54:32.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/processor_64.h 2008-03-06 08:54:32.000000000 +0100
++++ sle11sp2-2011-09-06/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));
}
@@ -12513,8 +12513,8 @@ Acked-by: jbeulich@novell.com
#define stack_current() \
({ \
struct thread_info *ti; \
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/smp_64.h 2007-06-12 13:14:13.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/smp_64.h 2007-06-12 13:14:13.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:29:16.000000000 +0100
@@ -4,15 +4,12 @@
/*
* We need the APIC definitions automatically as part of 'smp.h'
@@ -12620,8 +12620,8 @@ Acked-by: jbeulich@novell.com
+#endif /* !CONFIG_SMP */
#endif
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/system_64.h 2007-11-26 16:59:25.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/system_64.h 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/system_64.h 2007-11-26 16:59:25.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/system_64.h 2011-01-31 17:29:16.000000000 +0100
@@ -24,6 +24,7 @@
#define __EXTRA_CLOBBER \
,"rcx","rbx","rdx","r8","r9","r10","r11","r12","r13","r14","r15"
@@ -12630,8 +12630,8 @@ 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-2011-08-22.orig/arch/x86/include/mach-xen/asm/tlbflush_64.h 2007-11-26 16:59:25.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/tlbflush_64.h 2007-11-26 16:59:25.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:29:16.000000000 +0100
@@ -12,9 +12,6 @@
*/
#define __flush_tlb_global() xen_tlb_flush()
@@ -12642,8 +12642,8 @@ Acked-by: jbeulich@novell.com
#define __flush_tlb_all() __flush_tlb_global()
#define __flush_tlb_one(addr) xen_invlpg((unsigned long)addr)
---- sle11sp2-2011-08-22.orig/include/xen/evtchn.h 2011-01-31 15:14:12.000000000 +0100
-+++ sle11sp2-2011-08-22/include/xen/evtchn.h 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/include/xen/evtchn.h 2011-01-31 15:14:12.000000000 +0100
++++ sle11sp2-2011-09-06/include/xen/evtchn.h 2011-01-31 17:29:16.000000000 +0100
@@ -57,34 +57,34 @@
*/
int bind_caller_port_to_irqhandler(
@@ -12685,7 +12685,7 @@ Acked-by: jbeulich@novell.com
const char *devname,
void *dev_id);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2-2011-08-22/include/xen/net-util.h 2011-02-09 15:49:42.000000000 +0100
++++ sle11sp2-2011-09-06/include/xen/net-util.h 2011-02-09 15:49:42.000000000 +0100
@@ -0,0 +1,74 @@
+#ifndef __XEN_NETUTIL_H__
+#define __XEN_NETUTIL_H__
@@ -12761,8 +12761,8 @@ Acked-by: jbeulich@novell.com
+}
+
+#endif /* __XEN_NETUTIL_H__ */
---- sle11sp2-2011-08-22.orig/include/xen/xencons.h 2007-10-15 09:39:38.000000000 +0200
-+++ sle11sp2-2011-08-22/include/xen/xencons.h 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/include/xen/xencons.h 2007-10-15 09:39:38.000000000 +0200
++++ sle11sp2-2011-09-06/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);
@@ -12772,8 +12772,8 @@ Acked-by: jbeulich@novell.com
void xencons_tx(void);
int xencons_ring_init(void);
---- sle11sp2-2011-08-22.orig/mm/mprotect.c 2011-06-30 15:38:52.000000000 +0200
-+++ sle11sp2-2011-08-22/mm/mprotect.c 2011-01-31 17:29:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/mm/mprotect.c 2011-06-30 15:38:52.000000000 +0200
++++ sle11sp2-2011-09-06/mm/mprotect.c 2011-01-31 17:29:16.000000000 +0100
@@ -97,7 +97,7 @@ static inline void change_pmd_range(stru
}
if (pmd_none_or_clear_bad(pmd))
@@ -12783,9 +12783,9 @@ Acked-by: jbeulich@novell.com
continue;
change_pte_range(vma->vm_mm, pmd, addr, next, newprot,
dirty_accountable);
---- sle11sp2-2011-08-22.orig/mm/page_alloc.c 2011-06-30 15:38:58.000000000 +0200
-+++ sle11sp2-2011-08-22/mm/page_alloc.c 2011-08-22 10:31:12.000000000 +0200
-@@ -5146,6 +5146,23 @@ void setup_per_zone_wmarks(void)
+--- sle11sp2-2011-09-06.orig/mm/page_alloc.c 2011-06-30 15:38:58.000000000 +0200
++++ sle11sp2-2011-09-06/mm/page_alloc.c 2011-09-06 09:15:59.000000000 +0200
+@@ -5165,6 +5165,23 @@ static void __setup_per_zone_wmarks(void
spin_unlock_irqrestore(&zone->lock, flags);
}
diff --git a/patches.xen/xen3-patch-2.6.22 b/patches.xen/xen3-patch-2.6.22
index 7209c5ccd5..64a320fc43 100644
--- a/patches.xen/xen3-patch-2.6.22
+++ b/patches.xen/xen3-patch-2.6.22
@@ -6,8 +6,8 @@ Automatically created from "patches.kernel.org/patch-2.6.22" by xen-port-patches
Acked-by: jbeulich@novell.com
---- sle11sp2-2011-08-22.orig/arch/x86/Kconfig 2011-06-30 16:04:41.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/Kconfig 2011-08-22 10:31:55.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/Kconfig 2011-06-30 16:04:41.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/Kconfig 2011-08-22 10:31:55.000000000 +0200
@@ -1652,7 +1652,7 @@ config PHYSICAL_START
config RELOCATABLE
@@ -33,16 +33,16 @@ Acked-by: jbeulich@novell.com
---help---
Find out whether you have a PCI motherboard. PCI is the name of a
bus system, i.e. the way the CPU talks to the other stuff inside
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/Makefile 2011-06-30 16:04:43.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/Makefile 2011-06-30 16:06:01.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/Makefile 2011-06-30 16:04:43.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/Makefile 2011-06-30 16:06:01.000000000 +0200
@@ -138,4 +138,4 @@ endif
disabled-obj-$(CONFIG_XEN) := early-quirks.o hpet.o i8253.o i8259_$(BITS).o reboot.o \
smpboot_$(BITS).o tsc_$(BITS).o tsc_sync.o
disabled-obj-$(CONFIG_XEN_UNPRIVILEGED_GUEST) += mpparse_64.o
-%/head_$(BITS).o %/head_$(BITS).s: $(if $(CONFIG_XEN),EXTRA_AFLAGS,dummy) :=
+%/head_64.o %/head_64.s: $(if $(CONFIG_XEN),EXTRA_AFLAGS,dummy) :=
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/apic/apic-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/apic/apic-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/apic/apic-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/apic/apic-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -19,7 +19,6 @@
#include <linux/mm.h>
#include <linux/delay.h>
@@ -51,8 +51,8 @@ Acked-by: jbeulich@novell.com
#include <linux/interrupt.h>
#include <linux/mc146818rtc.h>
#include <linux/kernel_stat.h>
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/asm-offsets_32.c 2011-04-13 12:30:12.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/asm-offsets_32.c 2011-04-13 12:31:22.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/asm-offsets_32.c 2011-04-13 12:30:12.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/asm-offsets_32.c 2011-04-13 12:31:22.000000000 +0200
@@ -64,11 +64,6 @@ void foo(void)
DEFINE(SYSENTER_stack_sp0, 0);
#endif
@@ -65,8 +65,8 @@ Acked-by: jbeulich@novell.com
#if defined(CONFIG_LGUEST) || defined(CONFIG_LGUEST_GUEST) || defined(CONFIG_LGUEST_MODULE)
BLANK();
OFFSET(LGUEST_DATA_irq_enabled, lguest_data, irq_enabled);
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -22,16 +22,40 @@
#define phys_pkg_id(a,b) a
#endif
@@ -359,8 +359,8 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_HOTPLUG_CPU
void __cpuinit cpu_uninit(void)
{
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -167,7 +167,7 @@ mtrr_del(int reg, unsigned long base, un
EXPORT_SYMBOL(mtrr_add);
EXPORT_SYMBOL(mtrr_del);
@@ -370,8 +370,8 @@ Acked-by: jbeulich@novell.com
{
}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -162,26 +162,27 @@ static struct resource standard_io_resou
static int __init romsignature(const unsigned char *rom)
@@ -499,8 +499,8 @@ Acked-by: jbeulich@novell.com
start = 0x100000ULL;
size = end - start;
}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:08:37.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/entry_32-xen.S 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:08:37.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/entry_32-xen.S 2011-01-31 17:32:29.000000000 +0100
@@ -15,7 +15,7 @@
* I changed all the .align's to 4 (16 byte alignment), as that's faster
* on a 486.
@@ -607,8 +607,8 @@ Acked-by: jbeulich@novell.com
movl %ecx, %fs
UNWIND_ESPFIX_STACK
popl %ecx
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/head_32-xen.S 2011-08-09 10:36:25.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/head_32-xen.S 2011-08-09 10:37:32.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/head_32-xen.S 2011-08-09 10:36:25.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/head_32-xen.S 2011-08-09 10:37:32.000000000 +0200
@@ -38,7 +38,8 @@ ENTRY(startup_32)
/* Set up the stack pointer */
movl $(init_thread_union+THREAD_SIZE),%esp
@@ -736,8 +736,8 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_XEN_UNPRIVILEGED_GUEST
# define XEN_DOM0_CAP 0
# define XEN_DOM0_CAP_STR ""
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -25,7 +25,6 @@
#include <linux/init.h>
#include <linux/delay.h>
@@ -862,8 +862,8 @@ Acked-by: jbeulich@novell.com
}
void arch_teardown_msi_irq(unsigned int irq)
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/ioport_32-xen.c 2008-01-28 12:24:19.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/ioport_32-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/ioport_32-xen.c 2008-01-28 12:24:19.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/ioport_32-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -12,10 +12,10 @@
#include <linux/types.h>
#include <linux/ioport.h>
@@ -876,8 +876,8 @@ Acked-by: jbeulich@novell.com
#include <xen/interface/physdev.h>
/* Set EXTENT bits starting at BASE in BITMAP to value TURN_ON. */
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/ldt_32-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/ldt_32-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/ldt_32-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/ldt_32-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -10,7 +10,6 @@
#include <linux/string.h>
#include <linux/mm.h>
@@ -886,8 +886,8 @@ Acked-by: jbeulich@novell.com
#include <linux/vmalloc.h>
#include <linux/slab.h>
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/microcode-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/microcode-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/microcode-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/microcode-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -135,7 +135,7 @@ static int __init microcode_dev_init (vo
return 0;
}
@@ -897,8 +897,8 @@ Acked-by: jbeulich@novell.com
{
misc_deregister(&microcode_dev);
}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -18,7 +18,6 @@
#include <linux/acpi.h>
#include <linux/delay.h>
@@ -916,8 +916,8 @@ Acked-by: jbeulich@novell.com
if (!num_processors)
printk(KERN_ERR "SMP mptable: no processors registered!\n");
return num_processors;
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -13,6 +13,7 @@
#include <linux/pci.h>
#include <linux/module.h>
@@ -968,8 +968,8 @@ Acked-by: jbeulich@novell.com
dma_addr_t
dma_map_single(struct device *dev, void *ptr, size_t size,
enum dma_data_direction direction)
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/process_32-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/process_32-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/process_32-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/process_32-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -21,7 +21,6 @@
#include <linux/mm.h>
#include <linux/elfcore.h>
@@ -1067,8 +1067,8 @@ Acked-by: jbeulich@novell.com
return prev_p;
}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -13,7 +13,6 @@
#include <linux/mm.h>
#include <linux/delay.h>
@@ -1389,8 +1389,8 @@ Acked-by: jbeulich@novell.com
- return 0;
-}
-EXPORT_SYMBOL(smp_call_function_single);
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/time-xen.c 2011-07-12 11:13:30.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/time-xen.c 2011-07-11 11:10:56.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/time-xen.c 2011-07-12 11:13:30.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/time-xen.c 2011-07-11 11:10:56.000000000 +0200
@@ -79,7 +79,6 @@
#include <asm/i8253.h>
DEFINE_SPINLOCK(i8253_lock);
@@ -1717,8 +1717,8 @@ Acked-by: jbeulich@novell.com
/* No locking required. Interrupts are disabled on all CPUs. */
void time_resume(void)
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -52,7 +52,7 @@
#include <asm/unwind.h>
#include <asm/smp.h>
@@ -1829,8 +1829,8 @@ Acked-by: jbeulich@novell.com
unsigned long base = (kesp - uesp) & -THREAD_SIZE;
unsigned long new_kesp = kesp - base;
unsigned long lim_pages = (new_kesp | (THREAD_SIZE - 1)) >> PAGE_SHIFT;
---- sle11sp2-2011-08-22.orig/arch/x86/mm/fault_32-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/fault_32-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/fault_32-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/fault_32-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -14,19 +14,20 @@
#include <linux/mman.h>
#include <linux/mm.h>
@@ -1951,8 +1951,8 @@ Acked-by: jbeulich@novell.com
}
}
-#endif
---- sle11sp2-2011-08-22.orig/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -26,7 +26,7 @@ void kunmap(struct page *page)
* However when holding an atomic kmap is is not legal to sleep, so atomic
* kmaps are appropriate for short, tight code paths only.
@@ -1995,8 +1995,8 @@ Acked-by: jbeulich@novell.com
EXPORT_SYMBOL(kunmap_atomic);
EXPORT_SYMBOL(kmap_atomic_to_page);
EXPORT_SYMBOL(clear_highpage);
---- sle11sp2-2011-08-22.orig/arch/x86/mm/hypervisor.c 2011-08-09 10:35:46.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/mm/hypervisor.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/hypervisor.c 2011-08-09 10:35:46.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/mm/hypervisor.c 2011-01-31 17:32:29.000000000 +0100
@@ -419,13 +419,13 @@ void xen_tlb_flush_all(void)
}
EXPORT_SYMBOL_GPL(xen_tlb_flush_all);
@@ -2030,8 +2030,8 @@ Acked-by: jbeulich@novell.com
BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
}
EXPORT_SYMBOL_GPL(xen_invlpg_mask);
---- sle11sp2-2011-08-22.orig/arch/x86/mm/init_32-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/init_32-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/init_32-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/init_32-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -22,6 +22,7 @@
#include <linux/init.h>
#include <linux/highmem.h>
@@ -2303,8 +2303,8 @@ Acked-by: jbeulich@novell.com
}
void free_initmem(void)
---- sle11sp2-2011-08-22.orig/arch/x86/mm/ioremap-xen.c 2011-02-07 15:37:37.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/ioremap-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/ioremap-xen.c 2011-02-07 15:37:37.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/ioremap-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -13,6 +13,7 @@
#include <linux/slab.h>
#include <linux/module.h>
@@ -2313,8 +2313,8 @@ Acked-by: jbeulich@novell.com
#include <asm/fixmap.h>
#include <asm/cacheflush.h>
#include <asm/tlbflush.h>
---- sle11sp2-2011-08-22.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -13,6 +13,7 @@
#include <linux/pagemap.h>
#include <linux/spinlock.h>
@@ -2638,8 +2638,8 @@ Acked-by: jbeulich@novell.com
{
struct task_struct *tsk = current;
---- sle11sp2-2011-08-22.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:32:29.000000000 +0100
@@ -431,11 +431,7 @@ ia32_sys_call_table:
.quad sys_symlink
.quad sys_lstat
@@ -2688,8 +2688,8 @@ Acked-by: jbeulich@novell.com
+ .quad compat_sys_timerfd
+ .quad sys_eventfd
+ia32_syscall_end:
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -17,6 +17,8 @@
#include <linux/kexec.h>
#include <linux/module.h>
@@ -2749,8 +2749,8 @@ Acked-by: jbeulich@novell.com
if (paddr >= (end_pfn << PAGE_SHIFT))
break;
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -11,13 +11,12 @@
#ifdef __i386__
@@ -2815,8 +2815,8 @@ Acked-by: jbeulich@novell.com
- }
-}
-
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/entry_64-xen.S 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/entry_64-xen.S 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/entry_64-xen.S 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/entry_64-xen.S 2011-01-31 17:32:29.000000000 +0100
@@ -1249,3 +1249,23 @@ ENTRY(call_softirq)
ret
CFI_ENDPROC
@@ -2841,8 +2841,8 @@ Acked-by: jbeulich@novell.com
+ CFI_ENDPROC
+ENDPROC(ignore_sysret)
+#endif
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/head_64-xen.S 2011-08-09 10:35:37.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/head_64-xen.S 2011-08-09 10:37:34.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/head_64-xen.S 2011-08-09 10:35:37.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/head_64-xen.S 2011-08-09 10:37:34.000000000 +0200
@@ -5,6 +5,7 @@
* Copyright (C) 2000 Pavel Machek <pavel@suse.cz>
* Copyright (C) 2000 Karsten Keil <kkeil@suse.de>
@@ -2937,8 +2937,8 @@ Acked-by: jbeulich@novell.com
.endm
.section __xen_guest
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/head64-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/head64-xen.c 2011-08-09 10:37:35.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/head64-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/head64-xen.c 2011-08-09 10:37:35.000000000 +0200
@@ -25,13 +25,21 @@
#include <asm/setup.h>
#include <asm/desc.h>
@@ -3020,8 +3020,8 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_SMP
cpu_set(0, cpu_online_map);
#endif
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -25,7 +25,6 @@
#include <linux/init.h>
#include <linux/delay.h>
@@ -3130,8 +3130,8 @@ Acked-by: jbeulich@novell.com
}
void arch_teardown_msi_irq(unsigned int irq)
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/ioport_64-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/ioport_64-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/ioport_64-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/ioport_64-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -13,10 +13,10 @@
#include <linux/ioport.h>
#include <linux/mm.h>
@@ -3144,8 +3144,8 @@ Acked-by: jbeulich@novell.com
#include <xen/interface/physdev.h>
/* Set EXTENT bits starting at BASE in BITMAP to value TURN_ON. */
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/ldt_64-xen.c 2007-06-12 13:13:01.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/ldt_64-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/ldt_64-xen.c 2007-06-12 13:13:01.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/ldt_64-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -13,7 +13,6 @@
#include <linux/string.h>
#include <linux/mm.h>
@@ -3154,8 +3154,8 @@ Acked-by: jbeulich@novell.com
#include <linux/vmalloc.h>
#include <linux/slab.h>
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -17,7 +17,6 @@
#include <linux/init.h>
#include <linux/delay.h>
@@ -3173,8 +3173,8 @@ Acked-by: jbeulich@novell.com
if (!num_processors)
printk(KERN_ERR "MPTABLE: no processors registered!\n");
return num_processors;
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/process_64-xen.c 2011-02-02 08:31:05.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/process_64-xen.c 2011-02-02 08:31:39.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/process_64-xen.c 2011-02-02 08:31:05.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/process_64-xen.c 2011-02-02 08:31:39.000000000 +0100
@@ -39,6 +39,7 @@
#include <linux/random.h>
#include <linux/notifier.h>
@@ -3224,8 +3224,8 @@ Acked-by: jbeulich@novell.com
__save_init_fpu(prev_p); /* _not_ save_init_fpu() */
mcl->op = __HYPERVISOR_fpu_taskswitch;
mcl->args[0] = 1;
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -120,6 +120,8 @@ int bootloader_type;
unsigned long saved_video_mode;
@@ -3308,8 +3308,8 @@ Acked-by: jbeulich@novell.com
};
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/setup64-xen.c 2011-01-31 17:29:16.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/setup64-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/setup64-xen.c 2011-01-31 17:29:16.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/setup64-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -113,9 +113,9 @@ void __init setup_per_cpu_areas(void)
if (!NODE_DATA(cpu_to_node(i))) {
printk("cpu with no node %d, num_online_nodes %d\n",
@@ -3362,8 +3362,8 @@ Acked-by: jbeulich@novell.com
}
#ifndef CONFIG_X86_NO_TSS
else
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -14,7 +14,6 @@
#include <linux/mm.h>
#include <linux/delay.h>
@@ -3427,8 +3427,8 @@ Acked-by: jbeulich@novell.com
}
/*
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:32:16.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:32:16.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -32,6 +32,7 @@
#include <linux/unwind.h>
#include <linux/uaccess.h>
@@ -3563,8 +3563,8 @@ Acked-by: jbeulich@novell.com
if (notify_die(DIE_GPF, "general protection fault", regs,
error_code, 13, SIGSEGV) == NOTIFY_STOP)
return;
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -45,14 +45,34 @@
#define __vsyscall(nr) __attribute__ ((unused,__section__(".vsyscall_" #nr)))
@@ -3702,8 +3702,8 @@ Acked-by: jbeulich@novell.com
smp_call_function_single(cpu, cpu_vsyscall_init, NULL, 0, 1);
return NOTIFY_DONE;
}
---- sle11sp2-2011-08-22.orig/arch/x86/mm/fault_64-xen.c 2011-07-26 09:27:34.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/mm/fault_64-xen.c 2011-07-26 09:27:41.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/fault_64-xen.c 2011-07-26 09:27:34.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/mm/fault_64-xen.c 2011-07-26 09:27:41.000000000 +0200
@@ -15,22 +15,22 @@
#include <linux/mman.h>
#include <linux/mm.h>
@@ -3765,8 +3765,8 @@ Acked-by: jbeulich@novell.com
pgd_t *pgd;
pgd = (pgd_t *)page_address(page) + pgd_index(address);
---- sle11sp2-2011-08-22.orig/arch/x86/mm/init_64-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/init_64-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/init_64-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/init_64-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -25,10 +25,12 @@
#include <linux/bootmem.h>
#include <linux/proc_fs.h>
@@ -4000,8 +4000,8 @@ Acked-by: jbeulich@novell.com
+ SMP_CACHE_BYTES, (4UL*1024*1024*1024), 0);
+}
+#endif
---- sle11sp2-2011-08-22.orig/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -215,13 +215,13 @@ void mm_pin_all(void)
preempt_enable();
}
@@ -4062,8 +4062,8 @@ Acked-by: jbeulich@novell.com
/* Handle kernel mapping too which aliases part of the
* lowmem */
if (__pa(address) < KERNEL_TEXT_SIZE) {
---- sle11sp2-2011-08-22.orig/drivers/char/tpm/tpm_xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/char/tpm/tpm_xen.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/char/tpm/tpm_xen.c 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/char/tpm/tpm_xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -463,7 +463,7 @@ static int tpmif_connect(struct xenbus_d
tp->backend_id = domid;
@@ -4073,8 +4073,8 @@ Acked-by: jbeulich@novell.com
if (err <= 0) {
WPRINTK("bind_listening_port_to_irqhandler failed "
"(err=%d)\n", err);
---- sle11sp2-2011-08-22.orig/drivers/hwmon/Kconfig 2011-07-22 04:17:23.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/hwmon/Kconfig 2011-06-30 16:06:09.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/hwmon/Kconfig 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/hwmon/Kconfig 2011-06-30 16:06:09.000000000 +0200
@@ -412,7 +412,7 @@ config SENSORS_GPIO_FAN
config SENSORS_CORETEMP
@@ -4085,7 +4085,7 @@ Acked-by: jbeulich@novell.com
If you say yes here you get support for the temperature
sensor inside your CPU. Most of the family 6 CPUs
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2-2011-08-22/drivers/hwmon/coretemp-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/hwmon/coretemp-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -0,0 +1,449 @@
+/*
+ * coretemp.c - Linux kernel module for hardware monitoring
@@ -4536,8 +4536,8 @@ Acked-by: jbeulich@novell.com
+
+module_init(coretemp_init)
+module_exit(coretemp_exit)
---- sle11sp2-2011-08-22.orig/drivers/pci/msi-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/pci/msi-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/pci/msi-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/pci/msi-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -12,16 +12,15 @@
#include <linux/interrupt.h>
#include <linux/init.h>
@@ -4775,8 +4775,8 @@ Acked-by: jbeulich@novell.com
+{
+ return 0;
+}
---- sle11sp2-2011-08-22.orig/drivers/xen/blkfront/blkfront.c 2011-07-21 12:07:52.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/blkfront/blkfront.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/blkfront/blkfront.c 2011-07-21 12:07:52.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/blkfront/blkfront.c 2011-01-31 17:32:29.000000000 +0100
@@ -244,7 +244,7 @@ static int setup_blkring(struct xenbus_d
info->ring_ref = err;
@@ -4786,8 +4786,8 @@ Acked-by: jbeulich@novell.com
if (err <= 0) {
xenbus_dev_fatal(dev, err,
"bind_listening_port_to_irqhandler");
---- sle11sp2-2011-08-22.orig/drivers/xen/char/mem.c 2011-01-31 17:32:16.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/char/mem.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/char/mem.c 2011-01-31 17:32:16.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/char/mem.c 2011-01-31 17:32:29.000000000 +0100
@@ -18,7 +18,6 @@
#include <linux/raw.h>
#include <linux/tty.h>
@@ -4796,8 +4796,8 @@ Acked-by: jbeulich@novell.com
#include <linux/ptrace.h>
#include <linux/device.h>
#include <asm/pgalloc.h>
---- sle11sp2-2011-08-22.orig/drivers/xen/core/hypervisor_sysfs.c 2007-07-10 09:42:30.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/core/hypervisor_sysfs.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/core/hypervisor_sysfs.c 2007-07-10 09:42:30.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/core/hypervisor_sysfs.c 2011-01-31 17:32:29.000000000 +0100
@@ -50,7 +50,7 @@ static int __init hypervisor_subsys_init
if (!is_running_on_xen())
return -ENODEV;
@@ -4807,8 +4807,8 @@ Acked-by: jbeulich@novell.com
return 0;
}
---- sle11sp2-2011-08-22.orig/drivers/xen/core/machine_reboot.c 2011-01-24 12:06:05.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/core/machine_reboot.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/core/machine_reboot.c 2011-01-24 12:06:05.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/core/machine_reboot.c 2011-01-31 17:32:29.000000000 +0100
@@ -80,6 +80,8 @@ static void post_suspend(int suspend_can
#ifdef CONFIG_SMP
cpu_initialized_map = cpu_online_map;
@@ -4818,8 +4818,8 @@ Acked-by: jbeulich@novell.com
}
shinfo_mfn = xen_start_info->shared_info >> PAGE_SHIFT;
---- sle11sp2-2011-08-22.orig/drivers/xen/core/smpboot.c 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/core/smpboot.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/core/smpboot.c 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/core/smpboot.c 2011-01-31 17:32:29.000000000 +0100
@@ -158,13 +158,12 @@ static void xen_smp_intr_exit(unsigned i
void __cpuinit cpu_bringup(void)
@@ -4929,8 +4929,8 @@ Acked-by: jbeulich@novell.com
prefill_possible_map();
}
---- sle11sp2-2011-08-22.orig/drivers/xen/core/xen_sysfs.c 2009-05-29 10:25:53.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/core/xen_sysfs.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/core/xen_sysfs.c 2009-05-29 10:25:53.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/core/xen_sysfs.c 2011-01-31 17:32:29.000000000 +0100
@@ -30,12 +30,12 @@ HYPERVISOR_ATTR_RO(type);
static int __init xen_sysfs_type_init(void)
@@ -5025,8 +5025,8 @@ Acked-by: jbeulich@novell.com
}
#endif
---- sle11sp2-2011-08-22.orig/drivers/xen/netback/common.h 2011-04-11 14:28:08.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/netback/common.h 2011-04-11 14:38:17.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/netback/common.h 2011-04-11 14:28:08.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/netback/common.h 2011-04-11 14:38:17.000000000 +0200
@@ -98,7 +98,6 @@ typedef struct netif_st {
struct list_head list; /* scheduling list */
atomic_t refcnt;
@@ -5043,8 +5043,8 @@ Acked-by: jbeulich@novell.com
irqreturn_t netif_be_int(int irq, void *dev_id);
static inline int netbk_can_queue(struct net_device *dev)
---- sle11sp2-2011-08-22.orig/drivers/xen/netback/interface.c 2011-02-17 10:08:03.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/netback/interface.c 2011-04-11 14:38:22.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/netback/interface.c 2011-02-17 10:08:03.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/netback/interface.c 2011-04-11 14:38:22.000000000 +0200
@@ -257,7 +257,6 @@ netif_t *netif_alloc(struct device *pare
init_timer(&netif->tx_queue_timeout);
@@ -5053,8 +5053,8 @@ Acked-by: jbeulich@novell.com
dev->open = net_open;
dev->stop = net_close;
dev->change_mtu = netbk_change_mtu;
---- sle11sp2-2011-08-22.orig/drivers/xen/netback/loopback.c 2011-01-31 17:32:16.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/netback/loopback.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/netback/loopback.c 2011-01-31 17:32:16.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/netback/loopback.c 2011-01-31 17:32:29.000000000 +0100
@@ -62,14 +62,17 @@ MODULE_PARM_DESC(nloopbacks, "Number of
struct net_private {
@@ -5149,8 +5149,8 @@ Acked-by: jbeulich@novell.com
dev->set_multicast_list = loopback_set_multicast_list;
dev->change_mtu = NULL; /* allow arbitrary mtu */
---- sle11sp2-2011-08-22.orig/drivers/xen/netback/netback.c 2011-04-11 14:28:01.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/netback/netback.c 2011-04-11 14:38:25.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/netback/netback.c 2011-04-11 14:28:01.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/netback/netback.c 2011-04-11 14:38:25.000000000 +0200
@@ -210,7 +210,7 @@ static struct sk_buff *netbk_copy_skb(st
goto err;
@@ -5276,8 +5276,8 @@ Acked-by: jbeulich@novell.com
"net-be-dbg",
&netif_be_dbg);
#endif
---- sle11sp2-2011-08-22.orig/drivers/xen/netback/xenbus.c 2011-02-17 10:08:09.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/netback/xenbus.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/netback/xenbus.c 2011-02-17 10:08:09.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/netback/xenbus.c 2011-01-31 17:32:29.000000000 +0100
@@ -19,6 +19,7 @@
#include <stdarg.h>
@@ -5391,8 +5391,8 @@ Acked-by: jbeulich@novell.com
xenbus_switch_state(dev, XenbusStateClosing);
break;
---- sle11sp2-2011-08-22.orig/drivers/xen/netfront/accel.c 2009-05-04 10:01:03.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/netfront/accel.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/netfront/accel.c 2009-05-04 10:01:03.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/netfront/accel.c 2011-01-31 17:32:29.000000000 +0100
@@ -548,7 +548,7 @@ static void accelerator_remove_hooks(str
/* Last chance to get statistics from the accelerator */
@@ -5433,8 +5433,8 @@ Acked-by: jbeulich@novell.com
spin_unlock_irqrestore(&accelerator->vif_states_lock, flags);
}
return rc;
---- sle11sp2-2011-08-22.orig/drivers/xen/netfront/netfront.c 2011-06-30 16:05:07.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/netfront/netfront.c 2011-06-30 16:06:26.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/netfront/netfront.c 2011-06-30 16:05:07.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/netfront/netfront.c 2011-06-30 16:06:26.000000000 +0200
@@ -515,7 +515,7 @@ static int setup_device(struct xenbus_de
memcpy(netdev->dev_addr, info->mac, ETH_ALEN);
@@ -5506,8 +5506,8 @@ Acked-by: jbeulich@novell.com
}
static int xennet_set_mac_address(struct net_device *dev, void *p)
---- sle11sp2-2011-08-22.orig/drivers/xen/netfront/netfront.h 2011-02-09 15:35:17.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/netfront/netfront.h 2011-02-09 15:54:19.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/netfront/netfront.h 2011-02-09 15:35:17.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/netfront/netfront.h 2011-02-09 15:54:19.000000000 +0100
@@ -149,9 +149,6 @@ struct netfront_info {
struct list_head list;
struct net_device *netdev;
@@ -5538,8 +5538,8 @@ Acked-by: jbeulich@novell.com
extern
void netfront_accelerator_add_watch(struct netfront_info *np);
---- sle11sp2-2011-08-22.orig/drivers/xen/pciback/xenbus.c 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/pciback/xenbus.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/pciback/xenbus.c 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/pciback/xenbus.c 2011-01-31 17:32:29.000000000 +0100
@@ -100,7 +100,7 @@ static int pciback_do_attach(struct pcib
err = bind_interdomain_evtchn_to_irqhandler(
@@ -5549,8 +5549,8 @@ Acked-by: jbeulich@novell.com
if (err < 0) {
xenbus_dev_fatal(pdev->xdev, err,
"Error binding event channel to IRQ");
---- sle11sp2-2011-08-22.orig/drivers/xen/pcifront/xenbus.c 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/pcifront/xenbus.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/pcifront/xenbus.c 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/pcifront/xenbus.c 2011-01-31 17:32:29.000000000 +0100
@@ -11,10 +11,6 @@
#include <xen/gnttab.h>
#include "pcifront.h"
@@ -5571,8 +5571,8 @@ Acked-by: jbeulich@novell.com
"pcifront", pdev);
if (err < 0) {
xenbus_dev_fatal(pdev->xdev, err,
---- sle11sp2-2011-08-22.orig/drivers/xen/scsifront/xenbus.c 2011-02-08 10:03:34.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/scsifront/xenbus.c 2011-02-08 10:03:46.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/scsifront/xenbus.c 2011-02-08 10:03:34.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/scsifront/xenbus.c 2011-02-08 10:03:46.000000000 +0100
@@ -100,7 +100,7 @@ static int scsifront_alloc_ring(struct v
err = bind_listening_port_to_irqhandler(
@@ -5582,8 +5582,8 @@ Acked-by: jbeulich@novell.com
if (err <= 0) {
xenbus_dev_fatal(dev, err, "bind_listening_port_to_irqhandler");
---- sle11sp2-2011-08-22.orig/drivers/xen/sfc_netback/accel_fwd.c 2008-04-02 12:34:02.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/sfc_netback/accel_fwd.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/sfc_netback/accel_fwd.c 2008-04-02 12:34:02.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/sfc_netback/accel_fwd.c 2011-01-31 17:32:29.000000000 +0100
@@ -308,7 +308,7 @@ static struct netback_accel *for_a_vnic(
static inline int packet_is_arp_reply(struct sk_buff *skb)
{
@@ -5609,8 +5609,8 @@ Acked-by: jbeulich@novell.com
DPRINTK("%s: found gratuitous ARP for " MAC_FMT "\n",
__FUNCTION__, MAC_ARG(mac));
---- sle11sp2-2011-08-22.orig/drivers/xen/sfc_netback/accel_solarflare.c 2010-01-18 15:23:12.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/sfc_netback/accel_solarflare.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/sfc_netback/accel_solarflare.c 2010-01-18 15:23:12.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/sfc_netback/accel_solarflare.c 2011-01-31 17:32:29.000000000 +0100
@@ -113,7 +113,7 @@ bend_dl_tx_packet(struct efx_dl_device *
BUG_ON(port == NULL);
@@ -5620,8 +5620,8 @@ Acked-by: jbeulich@novell.com
netback_accel_tx_packet(skb, port->fwd_priv);
else {
DPRINTK("Ignoring packet with missing mac address\n");
---- sle11sp2-2011-08-22.orig/drivers/xen/sfc_netfront/accel_tso.c 2011-01-31 17:29:16.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/sfc_netfront/accel_tso.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/sfc_netfront/accel_tso.c 2011-01-31 17:29:16.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/sfc_netfront/accel_tso.c 2011-01-31 17:32:29.000000000 +0100
@@ -33,10 +33,9 @@
#include "accel_tso.h"
@@ -5683,8 +5683,8 @@ Acked-by: jbeulich@novell.com
}
tsoh_iph->tot_len = htons(ip_length);
---- sle11sp2-2011-08-22.orig/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 16:03:44.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 16:06:37.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 16:03:44.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/sfc_netfront/accel_vi.c 2011-06-30 16:06:37.000000000 +0200
@@ -465,7 +465,7 @@ netfront_accel_enqueue_skb_multi(netfron
if (skb->ip_summed == CHECKSUM_PARTIAL) {
@@ -5711,8 +5711,8 @@ Acked-by: jbeulich@novell.com
skb->protocol = eth_type_trans(skb, net_dev);
/* CHECKSUM_UNNECESSARY as hardware has done it already */
skb->ip_summed = CHECKSUM_UNNECESSARY;
---- sle11sp2-2011-08-22.orig/drivers/xen/sfc_netfront/accel_xenbus.c 2008-02-20 09:32:49.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/sfc_netfront/accel_xenbus.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/sfc_netfront/accel_xenbus.c 2008-02-20 09:32:49.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/sfc_netfront/accel_xenbus.c 2011-01-31 17:32:29.000000000 +0100
@@ -356,7 +356,7 @@ static int vnic_setup_domU_shared_state(
/* Create xenbus msg event channel */
err = bind_listening_port_to_irqhandler
@@ -5731,8 +5731,8 @@ Acked-by: jbeulich@novell.com
if (err < 0) {
EPRINTK("Couldn't bind net event channel\n");
goto fail_net_irq;
---- sle11sp2-2011-08-22.orig/drivers/xen/usbfront/xenbus.c 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/usbfront/xenbus.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/usbfront/xenbus.c 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/usbfront/xenbus.c 2011-01-31 17:32:29.000000000 +0100
@@ -111,7 +111,7 @@ static int setup_rings(struct xenbus_dev
info->conn_ring_ref = err;
@@ -5742,8 +5742,8 @@ Acked-by: jbeulich@novell.com
if (err <= 0) {
xenbus_dev_fatal(dev, err,
"bind_listening_port_to_irqhandler");
---- sle11sp2-2011-08-22.orig/drivers/xen/xenbus/xenbus_xs.c 2011-06-30 15:37:44.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/xenbus/xenbus_xs.c 2011-06-30 16:06:45.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/xenbus/xenbus_xs.c 2011-06-30 15:37:44.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/xenbus/xenbus_xs.c 2011-06-30 16:06:45.000000000 +0200
@@ -538,18 +538,15 @@ int xenbus_printf(struct xenbus_transact
{
va_list ap;
@@ -5767,8 +5767,8 @@ Acked-by: jbeulich@novell.com
ret = xenbus_write(t, dir, node, printf_buffer);
kfree(printf_buffer);
---- sle11sp2-2011-08-22.orig/fs/aio.c 2011-04-13 11:25:29.000000000 +0200
-+++ sle11sp2-2011-08-22/fs/aio.c 2011-04-13 12:31:48.000000000 +0200
+--- sle11sp2-2011-09-06.orig/fs/aio.c 2011-04-13 11:25:29.000000000 +0200
++++ sle11sp2-2011-09-06/fs/aio.c 2011-04-13 12:31:48.000000000 +0200
@@ -41,7 +41,7 @@
#ifdef CONFIG_EPOLL
@@ -5797,8 +5797,8 @@ Acked-by: jbeulich@novell.com
if (error)
return error;
---- sle11sp2-2011-08-22.orig/arch/x86/include/asm/boot.h 2011-03-15 02:20:32.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/asm/boot.h 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/asm/boot.h 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/include/asm/boot.h 2011-01-31 17:32:29.000000000 +0100
@@ -16,7 +16,7 @@
& ~(CONFIG_PHYSICAL_ALIGN - 1))
@@ -5808,8 +5808,8 @@ Acked-by: jbeulich@novell.com
#define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
#else
#define MIN_KERNEL_ALIGN_LG2 (PAGE_SHIFT + THREAD_ORDER)
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:32:29.000000000 +0100
@@ -11,23 +11,24 @@
#include <asm/mmu.h>
@@ -5974,8 +5974,8 @@ Acked-by: jbeulich@novell.com
#endif
#ifndef CONFIG_X86_NO_IDT
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:32:16.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:32:16.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:32:29.000000000 +0100
@@ -19,10 +19,8 @@
* the start of the fixmap.
*/
@@ -5999,8 +5999,8 @@ Acked-by: jbeulich@novell.com
FIX_SHARED_INFO,
#define NR_FIX_ISAMAPS 256
FIX_ISAMAP_END,
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 17:32:16.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 17:32:16.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 17:32:29.000000000 +0100
@@ -67,12 +67,17 @@ extern void FASTCALL(kunmap_high(struct
void *kmap(struct page *page);
@@ -6020,8 +6020,8 @@ Acked-by: jbeulich@novell.com
#define flush_cache_kmaps() do { } while (0)
void clear_highpage(struct page *);
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/hypervisor.h 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/hypervisor.h 2011-01-31 17:32:29.000000000 +0100
@@ -69,6 +69,8 @@ extern start_info_t *xen_start_info;
#define is_initial_xendomain() 0
#endif
@@ -6053,8 +6053,8 @@ Acked-by: jbeulich@novell.com
#define arch_use_lazy_mmu_mode() unlikely(__get_cpu_var(xen_lazy_mmu))
#endif
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:32:29.000000000 +0100
@@ -11,6 +11,40 @@
#define _ASM_IRQFLAGS_H
@@ -6166,8 +6166,8 @@ Acked-by: jbeulich@novell.com
push %esp ; \
mov %ecx, %fs ; \
call evtchn_do_upcall ; \
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:32:29.000000000 +0100
@@ -6,6 +6,20 @@
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
@@ -6217,8 +6217,8 @@ Acked-by: jbeulich@novell.com
+ } while(0)
#endif
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 17:32:29.000000000 +0100
@@ -1,7 +1,6 @@
#ifndef _I386_PGALLOC_H
#define _I386_PGALLOC_H
@@ -6234,8 +6234,8 @@ Acked-by: jbeulich@novell.com
-#define check_pgt_cache() do { } while (0)
-
#endif /* _I386_PGALLOC_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:32:16.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:32:16.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:32:29.000000000 +0100
@@ -52,32 +52,40 @@ static inline int pte_exec_kernel(pte_t
* value and then use set_pte to update it. -ben
*/
@@ -6354,8 +6354,8 @@ Acked-by: jbeulich@novell.com
-void vmalloc_sync_all(void);
-
#endif /* _I386_PGTABLE_3LEVEL_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgtable-3level-defs.h 2007-06-12 13:14:02.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgtable-3level-defs.h 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pgtable-3level-defs.h 2007-06-12 13:14:02.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/pgtable-3level-defs.h 2011-01-31 17:32:29.000000000 +0100
@@ -1,7 +1,7 @@
#ifndef _I386_PGTABLE_3LEVEL_DEFS_H
#define _I386_PGTABLE_3LEVEL_DEFS_H
@@ -6365,8 +6365,8 @@ Acked-by: jbeulich@novell.com
/*
* PGDIR_SHIFT determines what a top-level page table entry can map
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:38:07.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:38:07.000000000 +0100
@@ -24,11 +24,11 @@
#include <linux/slab.h>
#include <linux/list.h>
@@ -6540,8 +6540,8 @@ Acked-by: jbeulich@novell.com
#include <asm-generic/pgtable.h>
#endif /* _I386_PGTABLE_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:32:29.000000000 +0100
@@ -21,6 +21,7 @@
#include <asm/percpu.h>
#include <linux/cpumask.h>
@@ -6784,8 +6784,8 @@ Acked-by: jbeulich@novell.com
+extern int force_mwait;
#endif /* __ASM_I386_PROCESSOR_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:32:29.000000000 +0100
@@ -8,19 +8,15 @@
#include <linux/kernel.h>
#include <linux/threads.h>
@@ -6950,8 +6950,8 @@ Acked-by: jbeulich@novell.com
extern u8 apicid_2_node[];
#ifdef CONFIG_X86_LOCAL_APIC
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/system_32.h 2011-01-31 17:32:16.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/system_32.h 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/system_32.h 2011-01-31 17:32:16.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/system_32.h 2011-01-31 17:32:29.000000000 +0100
@@ -4,7 +4,7 @@
#include <linux/kernel.h>
#include <asm/segment.h>
@@ -7337,8 +7337,8 @@ Acked-by: jbeulich@novell.com
/*
* Force strict CPU ordering.
* And yes, this is required on UP too when we're talking
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:29:16.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:29:16.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:32:29.000000000 +0100
@@ -29,8 +29,13 @@
* and page-granular flushes are available only on i486 and up.
*/
@@ -7373,8 +7373,8 @@ Acked-by: jbeulich@novell.com
#define flush_tlb_kernel_range(start, end) flush_tlb_all()
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/desc_64.h 2011-01-31 17:32:16.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/desc_64.h 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/desc_64.h 2011-01-31 17:32:16.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/desc_64.h 2011-01-31 17:32:29.000000000 +0100
@@ -127,16 +127,6 @@ static inline void set_ldt_desc(unsigned
DESC_LDT, size * 8 - 1);
}
@@ -7423,8 +7423,8 @@ Acked-by: jbeulich@novell.com
}
/*
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:29:16.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:29:16.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:32:29.000000000 +0100
@@ -15,7 +15,6 @@
#include <asm/apicdef.h>
#include <asm/page.h>
@@ -7433,8 +7433,8 @@ Acked-by: jbeulich@novell.com
#include <asm/acpi.h>
/*
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/irqflags_64.h 2007-06-12 13:14:13.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/irqflags_64.h 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/irqflags_64.h 2007-06-12 13:14:13.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/irqflags_64.h 2011-01-31 17:32:29.000000000 +0100
@@ -9,6 +9,7 @@
*/
#ifndef _ASM_IRQFLAGS_H
@@ -7490,8 +7490,8 @@ Acked-by: jbeulich@novell.com
#else /* __ASSEMBLY__: */
# ifdef CONFIG_TRACE_IRQFLAGS
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/mmu_context_64.h 2007-06-12 13:14:13.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/mmu_context_64.h 2007-06-12 13:14:13.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 17:32:29.000000000 +0100
@@ -9,6 +9,9 @@
#include <asm/pgtable.h>
#include <asm/tlbflush.h>
@@ -7502,8 +7502,8 @@ Acked-by: jbeulich@novell.com
/*
* possibly do the LDT unload here?
*/
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgalloc_64.h 2010-09-23 15:39:04.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pgalloc_64.h 2010-09-23 15:39:04.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 17:32:29.000000000 +0100
@@ -1,7 +1,6 @@
#ifndef _X86_64_PGALLOC_H
#define _X86_64_PGALLOC_H
@@ -7553,8 +7553,8 @@ Acked-by: jbeulich@novell.com
}
static inline pgd_t *pgd_alloc(struct mm_struct *mm)
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-02-07 15:38:08.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-02-07 15:38:08.000000000 +0100
@@ -1,12 +1,14 @@
#ifndef _X86_64_PGTABLE_H
#define _X86_64_PGTABLE_H
@@ -7765,8 +7765,8 @@ Acked-by: jbeulich@novell.com
+#endif /* !__ASSEMBLY__ */
#endif /* _X86_64_PGTABLE_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:32:16.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:32:16.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:32:29.000000000 +0100
@@ -20,6 +20,7 @@
#include <asm/percpu.h>
#include <linux/personality.h>
@@ -7850,8 +7850,8 @@ Acked-by: jbeulich@novell.com
* NSC/Cyrix CPU indexed register access macros
*/
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:32:29.000000000 +0100
@@ -11,12 +11,11 @@
extern int disable_apic;
@@ -7904,8 +7904,8 @@ Acked-by: jbeulich@novell.com
#endif
/*
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/system_64.h 2011-01-31 17:29:16.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/system_64.h 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/system_64.h 2011-01-31 17:29:16.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/system_64.h 2011-01-31 17:32:29.000000000 +0100
@@ -3,7 +3,7 @@
#include <linux/kernel.h>
@@ -8047,8 +8047,8 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_SMP
#define smp_mb() mb()
#define smp_rmb() rmb()
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:29:16.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:29:16.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:32:29.000000000 +0100
@@ -2,7 +2,9 @@
#define _X8664_TLBFLUSH_H
@@ -8059,9 +8059,9 @@ Acked-by: jbeulich@novell.com
#define __flush_tlb() xen_tlb_flush()
---- sle11sp2-2011-08-22.orig/include/linux/pci.h 2011-06-30 15:37:41.000000000 +0200
-+++ sle11sp2-2011-08-22/include/linux/pci.h 2011-06-30 16:06:54.000000000 +0200
-@@ -330,7 +330,7 @@ struct pci_dev {
+--- sle11sp2-2011-09-06.orig/include/linux/pci.h 2011-09-06 09:13:58.000000000 +0200
++++ sle11sp2-2011-09-06/include/linux/pci.h 2011-09-06 09:16:16.000000000 +0200
+@@ -331,7 +331,7 @@ struct pci_dev {
int rom_attr_enabled; /* has display of the rom attribute been enabled? */
struct bin_attribute *res_attr[DEVICE_COUNT_RESOURCE]; /* sysfs file for resources */
struct bin_attribute *res_attr_wc[DEVICE_COUNT_RESOURCE]; /* sysfs file for WC mapping of resources */
@@ -8070,8 +8070,8 @@ Acked-by: jbeulich@novell.com
struct list_head msi_list;
#endif
struct pci_vpd *vpd;
---- sle11sp2-2011-08-22.orig/include/xen/net-util.h 2011-02-09 15:50:19.000000000 +0100
-+++ sle11sp2-2011-08-22/include/xen/net-util.h 2011-02-09 15:53:07.000000000 +0100
+--- sle11sp2-2011-09-06.orig/include/xen/net-util.h 2011-02-09 15:50:19.000000000 +0100
++++ sle11sp2-2011-09-06/include/xen/net-util.h 2011-02-09 15:53:07.000000000 +0100
@@ -11,6 +11,7 @@ static inline int skb_checksum_setup(str
unsigned long *fixup_counter)
{
@@ -8119,8 +8119,8 @@ Acked-by: jbeulich@novell.com
goto out;
if (csum) {
---- sle11sp2-2011-08-22.orig/lib/swiotlb-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/lib/swiotlb-xen.c 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/lib/swiotlb-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/lib/swiotlb-xen.c 2011-01-31 17:32:29.000000000 +0100
@@ -751,7 +751,6 @@ swiotlb_dma_supported (struct device *hw
return (mask >= ((1UL << dma_bits) - 1));
}
@@ -8129,8 +8129,8 @@ Acked-by: jbeulich@novell.com
EXPORT_SYMBOL(swiotlb_map_single);
EXPORT_SYMBOL(swiotlb_unmap_single);
EXPORT_SYMBOL(swiotlb_map_sg);
---- sle11sp2-2011-08-22.orig/mm/vmalloc.c 2011-08-22 09:47:10.000000000 +0200
-+++ sle11sp2-2011-08-22/mm/vmalloc.c 2011-08-22 10:31:50.000000000 +0200
+--- sle11sp2-2011-09-06.orig/mm/vmalloc.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/mm/vmalloc.c 2011-08-22 10:31:50.000000000 +0200
@@ -1542,6 +1542,13 @@ static void *__vmalloc_area_node(struct
struct page **pages;
unsigned int nr_pages, array_size, i;
@@ -8171,8 +8171,8 @@ Acked-by: jbeulich@novell.com
#else
#define GFP_VMALLOC32 GFP_KERNEL
#endif
---- sle11sp2-2011-08-22.orig/scripts/Makefile.xen.awk 2007-08-06 15:10:49.000000000 +0200
-+++ sle11sp2-2011-08-22/scripts/Makefile.xen.awk 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/scripts/Makefile.xen.awk 2007-08-06 15:10:49.000000000 +0200
++++ sle11sp2-2011-09-06/scripts/Makefile.xen.awk 2011-01-31 17:32:29.000000000 +0100
@@ -13,7 +13,7 @@ BEGIN {
next
}
diff --git a/patches.xen/xen3-patch-2.6.23 b/patches.xen/xen3-patch-2.6.23
index 1f872fdf7c..aec0b71a11 100644
--- a/patches.xen/xen3-patch-2.6.23
+++ b/patches.xen/xen3-patch-2.6.23
@@ -6,8 +6,8 @@ Automatically created from "patches.kernel.org/patch-2.6.23" by xen-port-patches
Acked-by: jbeulich@novell.com
---- sle11sp2-2011-08-22.orig/arch/x86/Kbuild 2011-07-22 04:17:23.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/Kbuild 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/Kbuild 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/Kbuild 2011-01-31 17:49:31.000000000 +0100
@@ -2,7 +2,7 @@
obj-$(CONFIG_KVM) += kvm/
@@ -17,8 +17,8 @@ Acked-by: jbeulich@novell.com
# lguest paravirtualization support
obj-$(CONFIG_LGUEST_GUEST) += lguest/
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/asm-offsets.c 2011-05-19 06:06:34.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/asm-offsets.c 2011-04-13 12:42:43.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/asm-offsets.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/asm-offsets.c 2011-04-13 12:42:43.000000000 +0200
@@ -17,7 +17,7 @@
#include <asm/bootparam.h>
#include <asm/suspend.h>
@@ -37,8 +37,8 @@ Acked-by: jbeulich@novell.com
BLANK();
OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
OFFSET(XEN_vcpu_info_pending, vcpu_info, evtchn_upcall_pending);
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -362,6 +362,8 @@ static void __cpuinit generic_identify(s
if ( xlvl >= 0x80000004 )
get_model_name(c); /* Default name */
@@ -64,8 +64,8 @@ Acked-by: jbeulich@novell.com
nexgen_init_cpu();
umc_init_cpu();
early_cpu_detect();
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -167,7 +167,7 @@ mtrr_del(int reg, unsigned long base, un
EXPORT_SYMBOL(mtrr_add);
EXPORT_SYMBOL(mtrr_del);
@@ -75,8 +75,8 @@ Acked-by: jbeulich@novell.com
{
}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -10,6 +10,7 @@
#include <linux/efi.h>
#include <linux/pfn.h>
@@ -132,8 +132,8 @@ Acked-by: jbeulich@novell.com
break;
}
}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/entry_32.S 2011-04-13 11:32:39.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/entry_32.S 2011-04-13 12:42:53.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/entry_32.S 2011-04-13 11:32:39.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/entry_32.S 2011-04-13 12:42:53.000000000 +0200
@@ -1049,7 +1049,7 @@ ENTRY(kernel_thread_helper)
CFI_ENDPROC
ENDPROC(kernel_thread_helper)
@@ -152,8 +152,8 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_FUNCTION_TRACER
#ifdef CONFIG_DYNAMIC_FTRACE
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/entry_32-xen.S 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/entry_32-xen.S 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/entry_32-xen.S 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/entry_32-xen.S 2011-01-31 17:49:31.000000000 +0100
@@ -452,9 +452,6 @@ restore_nocheck_notrace:
1: INTERRUPT_RETURN
.section .fixup,"ax"
@@ -164,8 +164,8 @@ Acked-by: jbeulich@novell.com
pushl $0 # no error code
pushl $do_iret_error
jmp error_code
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/head_32-xen.S 2011-08-09 10:37:32.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/head_32-xen.S 2011-08-09 10:41:46.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/head_32-xen.S 2011-08-09 10:37:32.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/head_32-xen.S 2011-08-09 10:41:46.000000000 +0200
@@ -87,7 +87,10 @@ ENTRY(_stext)
/*
* BSS section
@@ -237,8 +237,8 @@ Acked-by: jbeulich@novell.com
- ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long, 1)
+ ELFNOTE(Xen, XEN_ELFNOTE_LOADER, .asciz "generic")
+ ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long 1)
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -402,14 +402,6 @@ static void set_ioapic_affinity_irq(unsi
# include <linux/slab.h> /* kmalloc() */
# include <linux/timer.h> /* time_after() */
@@ -352,8 +352,8 @@ Acked-by: jbeulich@novell.com
{
unsigned long t1 = jiffies;
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/microcode-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/microcode-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/microcode-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/microcode-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -33,6 +33,7 @@
#include <linux/miscdevice.h>
#include <linux/spinlock.h>
@@ -362,8 +362,8 @@ Acked-by: jbeulich@novell.com
#include <linux/mutex.h>
#include <linux/cpu.h>
#include <linux/firmware.h>
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -24,7 +24,7 @@
#include <asm/bug.h>
@@ -373,8 +373,8 @@ Acked-by: jbeulich@novell.com
int iommu_merge __read_mostly = 0;
EXPORT_SYMBOL(iommu_merge);
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/process_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/process_32-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/process_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/process_32-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -241,6 +241,7 @@ early_param("idle", idle_setup);
void show_regs(struct pt_regs * regs)
{
@@ -490,8 +490,8 @@ Acked-by: jbeulich@novell.com
/*
* Leave lazy mode, flushing any hypercalls made here.
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/setup_32-xen.c 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/setup_32-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/setup_32-xen.c 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/setup_32-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -114,19 +114,10 @@ static unsigned int highmem_pages = -1;
/*
* Setup options
@@ -578,8 +578,8 @@ Acked-by: jbeulich@novell.com
if (is_initial_xendomain()) {
#ifdef CONFIG_VT
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -22,6 +22,7 @@
#include <asm/mtrr.h>
@@ -604,8 +604,8 @@ Acked-by: jbeulich@novell.com
{
if (per_cpu(cpu_tlbstate, cpu).state == TLBSTATE_OK)
BUG();
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/time-xen.c 2011-07-11 11:10:56.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/time-xen.c 2011-07-11 11:22:42.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/time-xen.c 2011-07-11 11:10:56.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/time-xen.c 2011-07-11 11:22:42.000000000 +0200
@@ -75,11 +75,12 @@
#include <xen/evtchn.h>
#include <xen/interface/vcpu.h>
@@ -680,8 +680,8 @@ Acked-by: jbeulich@novell.com
}
extern void (*late_time_init)(void);
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -41,6 +41,10 @@
#include <linux/mca.h>
#endif
@@ -888,8 +888,8 @@ Acked-by: jbeulich@novell.com
#ifndef CONFIG_MATH_EMULATION
---- sle11sp2-2011-08-22.orig/arch/x86/mach-xen/setup.c 2011-08-09 10:35:06.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/mach-xen/setup.c 2011-08-22 10:32:28.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/mach-xen/setup.c 2011-08-09 10:35:06.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/mach-xen/setup.c 2011-08-22 10:32:28.000000000 +0200
@@ -12,6 +12,7 @@
#include <asm/e820.h>
#include <asm/setup.h>
@@ -926,8 +926,8 @@ Acked-by: jbeulich@novell.com
+ set_pmd(pmd, __pmd(__pa_symbol(swapper_pg_pmd) | _PAGE_TABLE));
+ }
}
---- sle11sp2-2011-08-22.orig/arch/x86/mm/fault_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/fault_32-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/fault_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/fault_32-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -346,7 +346,10 @@ static inline pmd_t *vmalloc_sync_one(pg
pmd_k = pmd_offset(pud_k, address);
if (!pmd_present(*pmd_k))
@@ -1013,8 +1013,8 @@ Acked-by: jbeulich@novell.com
tsk->thread.cr2 = address;
/* Kernel addresses are always protection faults */
tsk->thread.error_code = error_code | (address >= TASK_SIZE);
---- sle11sp2-2011-08-22.orig/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -34,17 +34,16 @@ void *kmap_atomic_prot(struct page *page
/* even !CONFIG_PREEMPT needs this, for in_atomic in do_page_fault */
pagefault_disable();
@@ -1036,8 +1036,8 @@ Acked-by: jbeulich@novell.com
}
void *kmap_atomic(struct page *page, enum km_type type)
---- sle11sp2-2011-08-22.orig/arch/x86/mm/init_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/init_32-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/init_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/init_32-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -96,7 +96,7 @@ static pte_t * __init one_page_table_ini
#endif
pte_t *page_table = (pte_t *) alloc_bootmem_low_pages(PAGE_SIZE);
@@ -1100,8 +1100,8 @@ Acked-by: jbeulich@novell.com
if (!SHARED_KERNEL_PMD) {
/* If we're in PAE mode and have a non-shared
kernel pmd, then the pgd size must be a
---- sle11sp2-2011-08-22.orig/arch/x86/mm/ioremap-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/ioremap-xen.c 2011-02-07 15:38:30.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/ioremap-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/ioremap-xen.c 2011-02-07 15:38:30.000000000 +0100
@@ -344,9 +344,8 @@ void iounmap(volatile void __iomem *addr
/* Reset the direct mapping. Can block */
@@ -1113,8 +1113,8 @@ Acked-by: jbeulich@novell.com
PAGE_KERNEL);
global_flush_tlb();
}
---- sle11sp2-2011-08-22.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -198,7 +198,7 @@ void pte_free(struct page *pte)
va, pfn_pte(pfn, PAGE_KERNEL), 0))
BUG();
@@ -1213,8 +1213,8 @@ Acked-by: jbeulich@novell.com
(atomic_read(&mm->mm_count) == 1) &&
!mm->context.has_foreign_mappings)
mm_unpin(mm);
---- sle11sp2-2011-08-22.orig/arch/x86/xen/Kconfig 2011-05-19 06:06:34.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/xen/Kconfig 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/xen/Kconfig 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/xen/Kconfig 2011-01-31 17:49:31.000000000 +0100
@@ -2,7 +2,7 @@
# This Kconfig describes xen options
#
@@ -1224,8 +1224,8 @@ Acked-by: jbeulich@novell.com
bool "Xen guest support"
select PARAVIRT
select PARAVIRT_CLOCK
---- sle11sp2-2011-08-22.orig/arch/x86/xen/xen-head.S 2011-05-19 06:06:34.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/xen/xen-head.S 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/xen/xen-head.S 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/xen/xen-head.S 2011-01-31 17:49:31.000000000 +0100
@@ -1,7 +1,7 @@
/* Xen-specific pieces of head.S, intended to be included in the right
place in head.S */
@@ -1241,8 +1241,8 @@ Acked-by: jbeulich@novell.com
-#endif /*CONFIG_XEN */
+#endif /* CONFIG_PARAVIRT_XEN */
---- sle11sp2-2011-08-22.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:49:31.000000000 +0100
@@ -105,7 +105,7 @@ ENTRY(ia32_sysenter_target)
movl $VSYSCALL32_SYSEXIT,8(%rsp)
movq %rax,(%rsp)
@@ -1284,8 +1284,8 @@ Acked-by: jbeulich@novell.com
.quad sys_eventfd
+ .quad sys32_fallocate
ia32_syscall_end:
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -224,37 +224,6 @@ unsigned long __init e820_end_of_ram(voi
}
@@ -1469,8 +1469,8 @@ Acked-by: jbeulich@novell.com
(unsigned long long) e820.map[i].addr,
(unsigned long long) (e820.map[i].addr + e820.map[i].size));
switch (e820.map[i].type) {
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -174,6 +174,7 @@ static __init void early_serial_init(cha
* mappings. Someone should fix this for domain 0. For now, use fake serial.
*/
@@ -1505,8 +1505,8 @@ Acked-by: jbeulich@novell.com
}
if (keep_early)
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/entry_64-xen.S 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/entry_64-xen.S 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/entry_64-xen.S 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/entry_64-xen.S 2011-01-31 17:49:31.000000000 +0100
@@ -310,7 +310,7 @@ sysret_signal:
TRACE_IRQS_ON
/* sti */
@@ -1534,8 +1534,8 @@ Acked-by: jbeulich@novell.com
jz retint_restore_args
TRACE_IRQS_ON
XEN_UNBLOCK_EVENTS(%rsi)
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/head_64-xen.S 2011-08-09 10:37:34.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/head_64-xen.S 2011-08-09 10:41:44.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/head_64-xen.S 2011-08-09 10:37:34.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/head_64-xen.S 2011-08-09 10:41:44.000000000 +0200
@@ -24,7 +24,7 @@
#include <xen/interface/elfnote.h>
#include <xen/interface/features.h>
@@ -1612,8 +1612,8 @@ Acked-by: jbeulich@novell.com
- ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long, 1)
+ ELFNOTE(Xen, XEN_ELFNOTE_LOADER, .asciz "generic")
+ ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long 1)
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/head64-xen.c 2011-08-09 10:37:35.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/head64-xen.c 2011-08-09 10:41:42.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/head64-xen.c 2011-08-09 10:37:35.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/head64-xen.c 2011-08-09 10:41:42.000000000 +0200
@@ -89,7 +89,7 @@ void __init x86_64_start_kernel(char * r
struct xen_machphys_mapping mapping;
int i;
@@ -1623,8 +1623,8 @@ Acked-by: jbeulich@novell.com
xen_start_info = (struct start_info *)real_mode_data;
if (!xen_feature(XENFEAT_auto_translated_physmap))
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -165,7 +165,9 @@ static inline void io_apic_write(unsigne
#endif
}
@@ -1747,8 +1747,8 @@ Acked-by: jbeulich@novell.com
}
static struct irq_chip ioapic_chip __read_mostly = {
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/ldt_64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/ldt_64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/ldt_64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/ldt_64-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -114,6 +114,8 @@ int init_new_context(struct task_struct
memset(&mm->context, 0, sizeof(mm->context));
init_MUTEX(&mm->context.sem);
@@ -1767,8 +1767,8 @@ Acked-by: jbeulich@novell.com
spin_lock(&mm_unpinned_lock);
list_del(&mm->context.unpinned);
spin_unlock(&mm_unpinned_lock);
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -32,7 +32,6 @@
/* Have we found an MP table */
@@ -1825,8 +1825,8 @@ Acked-by: jbeulich@novell.com
}
void __init
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/process_64-xen.c 2011-02-02 08:31:39.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/process_64-xen.c 2011-02-02 08:31:50.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/process_64-xen.c 2011-02-02 08:31:39.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/process_64-xen.c 2011-02-02 08:31:50.000000000 +0100
@@ -26,6 +26,7 @@
#include <linux/sched.h>
#include <linux/kernel.h>
@@ -1858,8 +1858,8 @@ Acked-by: jbeulich@novell.com
}
void show_regs(struct pt_regs *regs)
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -828,6 +828,8 @@ static void __cpuinit init_amd(struct cp
level = cpuid_eax(1);
if (c->x86 == 15 && ((level >= 0x0f48 && level < 0x0f50) || level >= 0x0f58))
@@ -1942,8 +1942,8 @@ Acked-by: jbeulich@novell.com
};
static char *x86_power_flags[] = {
"ts", /* temperature sensor */
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/setup64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/setup64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/setup64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/setup64-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -125,11 +125,14 @@ void __init setup_per_cpu_areas(void)
}
@@ -1970,8 +1970,8 @@ Acked-by: jbeulich@novell.com
/* others are initialized in smpboot.c */
pda->pcurrent = &init_task;
pda->irqstackptr = boot_cpu_stack;
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -362,7 +362,7 @@ __smp_call_function_single(int cpu, void
}
@@ -2008,8 +2008,8 @@ Acked-by: jbeulich@novell.com
put_cpu();
return 0;
}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -34,6 +34,10 @@
#include <linux/bug.h>
#include <linux/kdebug.h>
@@ -2080,8 +2080,8 @@ Acked-by: jbeulich@novell.com
if (panic_on_unrecovered_nmi)
panic("NMI: Not continuing");
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -42,6 +42,7 @@
#include <asm/segment.h>
#include <asm/desc.h>
@@ -2127,8 +2127,8 @@ Acked-by: jbeulich@novell.com
write_sequnlock_irqrestore(&vsyscall_gtod_data.lock, flags);
}
---- sle11sp2-2011-08-22.orig/arch/x86/mm/fault_64-xen.c 2011-07-26 09:27:41.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/mm/fault_64-xen.c 2011-08-15 10:44:41.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/fault_64-xen.c 2011-07-26 09:27:41.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/mm/fault_64-xen.c 2011-08-15 10:44:41.000000000 +0200
@@ -160,7 +160,9 @@ void dump_pagetable(unsigned long addres
pmd_t *pmd;
pte_t *pte;
@@ -2250,8 +2250,8 @@ Acked-by: jbeulich@novell.com
goto no_context;
do_sigbus:
---- sle11sp2-2011-08-22.orig/arch/x86/mm/init_64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/init_64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/init_64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/init_64-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -66,6 +66,9 @@ int after_bootmem;
DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
extern unsigned long start_pfn;
@@ -2375,8 +2375,8 @@ Acked-by: jbeulich@novell.com
+ return "[vsyscall]";
+ return NULL;
+}
---- sle11sp2-2011-08-22.orig/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:49:31.000000000 +0100
@@ -171,7 +171,7 @@ void mm_pin(struct mm_struct *mm)
mm_walk(mm, PAGE_KERNEL_RO);
xen_pgd_pin(__pa(mm->pgd)); /* kernel */
@@ -2481,8 +2481,8 @@ Acked-by: jbeulich@novell.com
ClearPagePrivate(pg);
__free_page(pg);
}
---- sle11sp2-2011-08-22.orig/arch/x86/oprofile/xenoprof.c 2008-01-28 12:24:19.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/oprofile/xenoprof.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/oprofile/xenoprof.c 2008-01-28 12:24:19.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/oprofile/xenoprof.c 2011-01-31 17:49:31.000000000 +0100
@@ -18,9 +18,9 @@
#include <linux/init.h>
#include <linux/oprofile.h>
@@ -2494,8 +2494,8 @@ Acked-by: jbeulich@novell.com
#include <xen/interface/xen.h>
#include <xen/interface/xenoprof.h>
#include <xen/xenoprof.h>
---- sle11sp2-2011-08-22.orig/arch/x86/vdso/vdso32/note.S 2008-04-17 04:49:44.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/vdso/vdso32/note.S 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/vdso/vdso32/note.S 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/vdso/vdso32/note.S 2011-01-31 17:49:31.000000000 +0100
@@ -13,7 +13,7 @@ ELFNOTE_START(Linux, 0, "a")
.long LINUX_VERSION_CODE
ELFNOTE_END
@@ -2518,8 +2518,8 @@ Acked-by: jbeulich@novell.com
.byte VDSO_NOTE_NONEGSEG_BIT; .asciz "nosegneg" /* bit, name */
ELFNOTE_END
#endif
---- sle11sp2-2011-08-22.orig/drivers/Makefile 2011-08-22 10:18:43.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/Makefile 2011-06-30 16:09:27.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/Makefile 2011-08-22 10:18:43.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/Makefile 2011-06-30 16:09:27.000000000 +0200
@@ -22,7 +22,7 @@ obj-$(CONFIG_ARM_AMBA) += amba/
obj-$(CONFIG_DMA_ENGINE) += dma/
@@ -2529,8 +2529,8 @@ Acked-by: jbeulich@novell.com
# regulators early, since some subsystems rely on them to initialize
obj-$(CONFIG_REGULATOR) += regulator/
---- sle11sp2-2011-08-22.orig/drivers/block/Kconfig 2011-08-22 09:47:21.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/block/Kconfig 2011-08-22 10:32:15.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/block/Kconfig 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/block/Kconfig 2011-08-22 10:32:15.000000000 +0200
@@ -466,9 +466,9 @@ config XILINX_SYSACE
help
Include support for the Xilinx SystemACE CompactFlash interface
@@ -2543,8 +2543,8 @@ Acked-by: jbeulich@novell.com
default y
select XEN_XENBUS_FRONTEND
help
---- sle11sp2-2011-08-22.orig/drivers/block/Makefile 2011-08-22 09:47:21.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/block/Makefile 2011-06-30 16:09:48.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/block/Makefile 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/block/Makefile 2011-06-30 16:09:48.000000000 +0200
@@ -35,7 +35,7 @@ obj-$(CONFIG_BLK_DEV_SX8) += sx8.o
obj-$(CONFIG_BLK_DEV_UB) += ub.o
obj-$(CONFIG_BLK_DEV_HD) += hd.o
@@ -2554,8 +2554,8 @@ Acked-by: jbeulich@novell.com
obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/
obj-$(CONFIG_BLK_DEV_DRBD) += drbd/
obj-$(CONFIG_BLK_DEV_RBD) += rbd.o
---- sle11sp2-2011-08-22.orig/drivers/block/xen-blkfront.c 2011-07-22 04:17:23.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/block/xen-blkfront.c 2011-06-30 16:09:40.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/block/xen-blkfront.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/block/xen-blkfront.c 2011-06-30 16:09:40.000000000 +0200
@@ -1374,7 +1374,6 @@ static const struct xenbus_device_id blk
static struct xenbus_driver blkfront = {
@@ -2564,8 +2564,8 @@ Acked-by: jbeulich@novell.com
.ids = blkfront_ids,
.probe = blkfront_probe,
.remove = blkfront_remove,
---- sle11sp2-2011-08-22.orig/drivers/tty/hvc/Kconfig 2011-05-19 06:06:34.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/tty/hvc/Kconfig 2011-04-13 12:42:05.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/tty/hvc/Kconfig 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/tty/hvc/Kconfig 2011-04-13 12:42:05.000000000 +0200
@@ -55,7 +55,7 @@ config HVC_IUCV
config HVC_XEN
@@ -2575,8 +2575,8 @@ Acked-by: jbeulich@novell.com
select HVC_DRIVER
select HVC_IRQ
default y
---- sle11sp2-2011-08-22.orig/drivers/net/Kconfig 2011-07-22 04:17:23.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/net/Kconfig 2011-06-30 16:09:58.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/net/Kconfig 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/net/Kconfig 2011-06-30 16:09:58.000000000 +0200
@@ -2961,9 +2961,9 @@ config TILE_NET
To compile this driver as a module, choose M here: the module
will be called tile_net.
@@ -2589,8 +2589,8 @@ Acked-by: jbeulich@novell.com
select XEN_XENBUS_FRONTEND
default y
help
---- sle11sp2-2011-08-22.orig/drivers/net/Makefile 2011-08-22 09:47:08.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/net/Makefile 2011-04-13 12:41:54.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/net/Makefile 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/net/Makefile 2011-04-13 12:41:54.000000000 +0200
@@ -172,7 +172,7 @@ obj-$(CONFIG_PPTP) += pppox.o pptp.o
obj-$(CONFIG_SLIP) += slip.o
obj-$(CONFIG_SLHC) += slhc.o
@@ -2600,8 +2600,8 @@ Acked-by: jbeulich@novell.com
obj-$(CONFIG_XEN_NETDEV_BACKEND) += xen-netback/
obj-$(CONFIG_DUMMY) += dummy.o
---- sle11sp2-2011-08-22.orig/drivers/net/xen-netfront.c 2011-07-22 04:17:23.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/net/xen-netfront.c 2011-06-30 16:10:07.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/net/xen-netfront.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/net/xen-netfront.c 2011-06-30 16:10:07.000000000 +0200
@@ -1876,7 +1876,6 @@ static int __devexit xennet_remove(struc
static struct xenbus_driver netfront_driver = {
@@ -2610,8 +2610,8 @@ Acked-by: jbeulich@novell.com
.ids = netfront_ids,
.probe = netfront_probe,
.remove = __devexit_p(xennet_remove),
---- sle11sp2-2011-08-22.orig/drivers/xen/Kconfig 2011-01-31 17:29:16.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/Kconfig 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/Kconfig 2011-01-31 17:29:16.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/Kconfig 2011-01-31 17:49:31.000000000 +0100
@@ -23,6 +23,9 @@ config XEN_PRIVILEGED_GUEST
config XEN_UNPRIVILEGED_GUEST
def_bool !XEN_PRIVILEGED_GUEST
@@ -2622,8 +2622,8 @@ Acked-by: jbeulich@novell.com
config XEN_PRIVCMD
def_bool y
---- sle11sp2-2011-08-22.orig/drivers/xen/Makefile 2011-02-24 13:56:24.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/Makefile 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/Makefile 2011-02-24 13:56:24.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/Makefile 2011-01-31 17:49:31.000000000 +0100
@@ -1,10 +1,14 @@
-obj-y += core/
-obj-y += console/
@@ -2645,8 +2645,8 @@ Acked-by: jbeulich@novell.com
obj-$(CONFIG_XEN_BALLOON) += balloon/
obj-$(CONFIG_XEN_BLKDEV_BACKEND) += blkback/
obj-$(CONFIG_XEN_BLKDEV_TAP) += blktap/
---- sle11sp2-2011-08-22.orig/drivers/xen/balloon/balloon.c 2011-03-23 08:51:42.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/balloon/balloon.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/balloon/balloon.c 2011-03-23 08:51:42.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/balloon/balloon.c 2011-01-31 17:49:31.000000000 +0100
@@ -324,13 +324,9 @@ static int increase_reservation(unsigned
#ifndef MODULE
@@ -2661,8 +2661,8 @@ Acked-by: jbeulich@novell.com
vm_total_pages = nr_free_pagecache_pages();
#endif
---- sle11sp2-2011-08-22.orig/drivers/xen/blkback/blkback.c 2011-01-31 17:32:16.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/blkback/blkback.c 2011-04-11 14:51:40.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/blkback/blkback.c 2011-01-31 17:32:16.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/blkback/blkback.c 2011-04-11 14:51:40.000000000 +0200
@@ -157,7 +157,7 @@ static void unplug_queue(blkif_t *blkif)
static void plug_queue(blkif_t *blkif, struct block_device *bdev)
@@ -2672,8 +2672,8 @@ Acked-by: jbeulich@novell.com
if (q == blkif->plug)
return;
---- sle11sp2-2011-08-22.orig/drivers/xen/blkback/common.h 2011-04-11 14:28:27.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/blkback/common.h 2011-04-11 14:51:44.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/blkback/common.h 2011-04-11 14:28:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/blkback/common.h 2011-04-11 14:51:44.000000000 +0200
@@ -35,7 +35,6 @@
#include <linux/wait.h>
#include <asm/hypervisor.h>
@@ -2691,8 +2691,8 @@ Acked-by: jbeulich@novell.com
/* statistics */
unsigned long st_print;
---- sle11sp2-2011-08-22.orig/drivers/xen/blkback/interface.c 2011-04-11 14:29:25.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/blkback/interface.c 2011-04-11 14:51:52.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/blkback/interface.c 2011-04-11 14:29:25.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/blkback/interface.c 2011-04-11 14:51:52.000000000 +0200
@@ -140,5 +140,5 @@ void blkif_free(blkif_t *blkif)
void __init blkif_interface_init(void)
{
@@ -2700,8 +2700,8 @@ Acked-by: jbeulich@novell.com
- 0, 0, NULL, NULL);
+ 0, 0, NULL);
}
---- sle11sp2-2011-08-22.orig/drivers/xen/blkback/xenbus.c 2011-06-30 16:04:52.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/blkback/xenbus.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/blkback/xenbus.c 2011-06-30 16:04:52.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/blkback/xenbus.c 2011-01-31 17:49:31.000000000 +0100
@@ -27,8 +27,6 @@
pr_debug("blkback/xenbus (%s:%d) " fmt ".\n", \
__FUNCTION__, __LINE__, ##args)
@@ -2738,8 +2738,8 @@ Acked-by: jbeulich@novell.com
return 0;
}
---- sle11sp2-2011-08-22.orig/drivers/xen/blkfront/blkfront.c 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/blkfront/blkfront.c 2011-07-21 12:08:17.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/blkfront/blkfront.c 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/blkfront/blkfront.c 2011-07-21 12:08:17.000000000 +0200
@@ -572,14 +572,20 @@ int blkif_ioctl(struct inode *inode, str
return -EINVAL;
@@ -2771,8 +2771,8 @@ Acked-by: jbeulich@novell.com
{
struct blkfront_info *info = NULL;
struct request *req;
---- sle11sp2-2011-08-22.orig/drivers/xen/blkfront/block.h 2010-02-24 13:13:46.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/blkfront/block.h 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/blkfront/block.h 2010-02-24 13:13:46.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/blkfront/block.h 2011-01-31 17:49:31.000000000 +0100
@@ -107,7 +107,7 @@ struct blkfront_info
struct scatterlist sg[BLKIF_MAX_SEGMENTS_PER_REQUEST];
unsigned int irq;
@@ -2791,8 +2791,8 @@ Acked-by: jbeulich@novell.com
/* Virtual block-device subsystem. */
/* Note that xlvbd_add doesn't call add_disk for you: you're expected
---- sle11sp2-2011-08-22.orig/drivers/xen/blkfront/vbd.c 2010-01-18 15:23:12.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/blkfront/vbd.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/blkfront/vbd.c 2010-01-18 15:23:12.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/blkfront/vbd.c 2011-01-31 17:49:31.000000000 +0100
@@ -298,7 +298,7 @@ xlbd_release_minors(struct xlbd_major_in
static int
xlvbd_init_blk_queue(struct gendisk *gd, u16 sector_size)
@@ -2802,8 +2802,8 @@ Acked-by: jbeulich@novell.com
rq = blk_init_queue(do_blkif_request, &blkif_io_lock);
if (rq == NULL)
---- sle11sp2-2011-08-22.orig/drivers/xen/blktap/common.h 2011-04-11 14:28:19.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/blktap/common.h 2011-04-11 14:51:59.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/blktap/common.h 2011-04-11 14:28:19.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/blktap/common.h 2011-04-11 14:51:59.000000000 +0200
@@ -34,7 +34,6 @@
#include <linux/blkdev.h>
#include <asm/hypervisor.h>
@@ -2821,8 +2821,8 @@ Acked-by: jbeulich@novell.com
/* statistics */
unsigned long st_print;
---- sle11sp2-2011-08-22.orig/drivers/xen/blktap/interface.c 2011-04-11 14:29:39.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/blktap/interface.c 2011-04-11 14:52:00.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/blktap/interface.c 2011-04-11 14:29:39.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/blktap/interface.c 2011-04-11 14:52:00.000000000 +0200
@@ -136,5 +136,5 @@ void tap_blkif_kmem_cache_free(blkif_t *
void __init tap_blkif_interface_init(void)
{
@@ -2830,8 +2830,8 @@ Acked-by: jbeulich@novell.com
- 0, 0, NULL, NULL);
+ 0, 0, NULL);
}
---- sle11sp2-2011-08-22.orig/drivers/xen/blktap/xenbus.c 2011-06-30 16:05:02.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/blktap/xenbus.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/blktap/xenbus.c 2011-06-30 16:05:02.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/blktap/xenbus.c 2011-01-31 17:49:31.000000000 +0100
@@ -50,8 +50,6 @@ struct backend_info
int group_added;
};
@@ -2868,8 +2868,8 @@ Acked-by: jbeulich@novell.com
return 0;
}
---- sle11sp2-2011-08-22.orig/drivers/xen/blktap2/blktap.h 2010-02-24 13:13:46.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/blktap2/blktap.h 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/blktap2/blktap.h 2010-02-24 13:13:46.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/blktap2/blktap.h 2011-01-31 17:49:31.000000000 +0100
@@ -203,6 +203,7 @@ blktap_validate_params(struct blktap *ta
}
@@ -2878,8 +2878,8 @@ Acked-by: jbeulich@novell.com
int blktap_ring_init(int *);
int blktap_ring_free(void);
---- sle11sp2-2011-08-22.orig/drivers/xen/blktap2/control.c 2011-04-11 13:43:15.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/blktap2/control.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/blktap2/control.c 2011-04-11 13:43:15.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/blktap2/control.c 2011-01-31 17:49:31.000000000 +0100
@@ -194,14 +194,20 @@ blktap_control_destroy_device(struct blk
clear_bit(BLKTAP_SHUTDOWN_REQUESTED, &tap->dev_inuse);
@@ -2904,8 +2904,8 @@ Acked-by: jbeulich@novell.com
static int __init
blktap_control_init(void)
{
---- sle11sp2-2011-08-22.orig/drivers/xen/blktap2/device.c 2010-11-25 09:36:37.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/blktap2/device.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/blktap2/device.c 2010-11-25 09:36:37.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/blktap2/device.c 2011-01-31 17:49:31.000000000 +0100
@@ -833,7 +833,7 @@ static void
blktap_device_run_queue(struct blktap *tap)
{
@@ -2932,8 +2932,8 @@ Acked-by: jbeulich@novell.com
- BTERR("blktap device unregister failed\n");
+ unregister_blkdev(blktap_device_major, "tapdev");
}
---- sle11sp2-2011-08-22.orig/drivers/xen/blktap2/sysfs.c 2011-01-31 17:29:16.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/blktap2/sysfs.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/blktap2/sysfs.c 2011-01-31 17:29:16.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/blktap2/sysfs.c 2011-01-31 17:49:31.000000000 +0100
@@ -334,6 +334,24 @@ blktap_sysfs_create(struct blktap *tap)
return err;
}
@@ -2978,8 +2978,8 @@ Acked-by: jbeulich@novell.com
}
static ssize_t
---- sle11sp2-2011-08-22.orig/drivers/xen/core/gnttab.c 2011-01-31 17:29:16.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/core/gnttab.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/core/gnttab.c 2011-01-31 17:29:16.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/core/gnttab.c 2011-01-31 17:49:31.000000000 +0100
@@ -42,7 +42,6 @@
#include <asm/synch_bitops.h>
#include <asm/io.h>
@@ -2988,8 +2988,8 @@ Acked-by: jbeulich@novell.com
#include <asm/gnttab_dma.h>
#ifdef HAVE_XEN_PLATFORM_COMPAT_H
---- sle11sp2-2011-08-22.orig/drivers/xen/core/reboot.c 2011-01-31 17:32:16.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/core/reboot.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/core/reboot.c 2011-01-31 17:32:16.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/core/reboot.c 2011-01-31 17:49:31.000000000 +0100
@@ -3,6 +3,7 @@
#include <linux/unistd.h>
#include <linux/module.h>
@@ -2998,8 +2998,8 @@ Acked-by: jbeulich@novell.com
#include <linux/sysrq.h>
#include <asm/hypervisor.h>
#include <xen/xenbus.h>
---- sle11sp2-2011-08-22.orig/drivers/xen/core/xen_proc.c 2011-04-11 13:43:15.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/core/xen_proc.c 2011-04-01 13:07:57.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/core/xen_proc.c 2011-04-11 13:43:15.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/core/xen_proc.c 2011-04-01 13:07:57.000000000 +0200
@@ -1,11 +1,15 @@
-
+#include <linux/init.h>
@@ -3027,8 +3027,8 @@ Acked-by: jbeulich@novell.com
void remove_xen_proc_entry(const char *name)
{
---- sle11sp2-2011-08-22.orig/drivers/xen/netback/common.h 2011-04-11 14:38:17.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/netback/common.h 2011-04-11 14:52:16.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/netback/common.h 2011-04-11 14:38:17.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/netback/common.h 2011-04-11 14:52:16.000000000 +0200
@@ -39,7 +39,6 @@
#include <linux/etherdevice.h>
#include <linux/wait.h>
@@ -3037,8 +3037,8 @@ Acked-by: jbeulich@novell.com
#include <xen/xenbus.h>
#include <xen/interface/event_channel.h>
---- sle11sp2-2011-08-22.orig/drivers/xen/scsiback/common.h 2011-04-11 14:27:49.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/scsiback/common.h 2011-04-11 14:52:20.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/scsiback/common.h 2011-04-11 14:27:49.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/scsiback/common.h 2011-04-11 14:52:20.000000000 +0200
@@ -49,7 +49,6 @@
#include <scsi/scsi_dbg.h>
#include <scsi/scsi_eh.h>
@@ -3047,8 +3047,8 @@ Acked-by: jbeulich@novell.com
#include <xen/xenbus.h>
#include <xen/interface/io/ring.h>
#include <xen/interface/io/vscsiif.h>
---- sle11sp2-2011-08-22.orig/drivers/xen/scsiback/interface.c 2011-04-11 14:30:02.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/scsiback/interface.c 2011-04-11 14:52:22.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/scsiback/interface.c 2011-04-11 14:30:02.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/scsiback/interface.c 2011-04-11 14:52:22.000000000 +0200
@@ -126,7 +126,7 @@ void scsiback_free(struct vscsibk_info *
int __init scsiback_interface_init(void)
{
@@ -3058,8 +3058,8 @@ Acked-by: jbeulich@novell.com
if (!scsiback_cachep) {
printk(KERN_ERR "scsiback: can't init scsi cache\n");
return -ENOMEM;
---- sle11sp2-2011-08-22.orig/drivers/xen/scsifront/scsifront.c 2011-01-31 17:29:16.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/scsifront/scsifront.c 2011-02-08 10:03:55.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/scsifront/scsifront.c 2011-01-31 17:29:16.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/scsifront/scsifront.c 2011-02-08 10:03:55.000000000 +0100
@@ -147,7 +147,7 @@ static void scsifront_cdb_cmd_done(struc
add_id_to_freelist(info, id);
@@ -3089,8 +3089,8 @@ Acked-by: jbeulich@novell.com
vscsiif_request_t *ring_req;
uint16_t rqid;
---- sle11sp2-2011-08-22.orig/drivers/xen/sfc_netback/accel_solarflare.c 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/sfc_netback/accel_solarflare.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/sfc_netback/accel_solarflare.c 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/sfc_netback/accel_solarflare.c 2011-01-31 17:49:31.000000000 +0100
@@ -37,7 +37,6 @@
#include "ci/efhw/public.h"
@@ -3099,8 +3099,8 @@ Acked-by: jbeulich@novell.com
#include <linux/list.h>
#include <linux/mutex.h>
---- sle11sp2-2011-08-22.orig/drivers/xen/sfc_netutil/accel_util.c 2010-09-23 15:39:04.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/sfc_netutil/accel_util.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/sfc_netutil/accel_util.c 2010-09-23 15:39:04.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/sfc_netutil/accel_util.c 2011-01-31 17:49:31.000000000 +0100
@@ -28,7 +28,6 @@
#include <asm/pgtable.h>
#include <asm/hypercall.h>
@@ -3109,8 +3109,8 @@ Acked-by: jbeulich@novell.com
#include <xen/gnttab.h>
#include "accel_util.h"
---- sle11sp2-2011-08-22.orig/drivers/xen/tpmback/common.h 2011-04-11 14:32:54.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/tpmback/common.h 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/tpmback/common.h 2011-04-11 14:32:54.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/tpmback/common.h 2011-01-31 17:49:31.000000000 +0100
@@ -10,7 +10,6 @@
#include <linux/interrupt.h>
#include <linux/mm.h>
@@ -3119,8 +3119,8 @@ Acked-by: jbeulich@novell.com
#include <xen/xenbus.h>
#include <xen/interface/event_channel.h>
#include <xen/interface/io/tpmif.h>
---- sle11sp2-2011-08-22.orig/drivers/xen/tpmback/interface.c 2011-04-11 14:31:42.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/tpmback/interface.c 2011-04-11 14:52:30.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/tpmback/interface.c 2011-04-11 14:31:42.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/tpmback/interface.c 2011-04-11 14:52:30.000000000 +0200
@@ -13,6 +13,7 @@
#include "common.h"
@@ -3138,8 +3138,8 @@ Acked-by: jbeulich@novell.com
return tpmif_cachep ? 0 : -ENOMEM;
}
---- sle11sp2-2011-08-22.orig/drivers/xen/usbback/usbback.h 2011-04-11 14:27:35.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/usbback/usbback.h 2011-04-11 14:52:41.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/usbback/usbback.h 2011-04-11 14:27:35.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/usbback/usbback.h 2011-04-11 14:52:41.000000000 +0200
@@ -55,7 +55,6 @@
#include <linux/wait.h>
#include <linux/list.h>
@@ -3148,8 +3148,8 @@ Acked-by: jbeulich@novell.com
#include <xen/xenbus.h>
#include <xen/interface/event_channel.h>
#include <xen/interface/io/usbif.h>
---- sle11sp2-2011-08-22.orig/drivers/xen/usbfront/xenbus.c 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/usbfront/xenbus.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/usbfront/xenbus.c 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/usbfront/xenbus.c 2011-01-31 17:49:31.000000000 +0100
@@ -393,7 +393,7 @@ static int __init usbfront_init(void)
return -ENODEV;
@@ -3159,8 +3159,8 @@ Acked-by: jbeulich@novell.com
if (!xenhcd_urbp_cachep) {
printk(KERN_ERR "usbfront failed to create kmem cache\n");
return -ENOMEM;
---- sle11sp2-2011-08-22.orig/drivers/xen/util.c 2007-07-10 09:42:30.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/util.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/util.c 2007-07-10 09:42:30.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/util.c 2011-01-31 17:49:31.000000000 +0100
@@ -1,8 +1,5 @@
-#include <linux/mm.h>
+#include <linux/err.h>
@@ -3217,8 +3217,8 @@ Acked-by: jbeulich@novell.com
-}
-EXPORT_SYMBOL_GPL(free_vm_area);
-#endif /* CONFIG_X86 */
---- sle11sp2-2011-08-22.orig/drivers/xen/xenbus/xenbus_backend_client.c 2011-04-11 13:43:15.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/xenbus/xenbus_backend_client.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/xenbus/xenbus_backend_client.c 2011-04-11 13:43:15.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/xenbus/xenbus_backend_client.c 2011-01-31 17:49:31.000000000 +0100
@@ -32,9 +32,9 @@
#include <linux/err.h>
@@ -3230,8 +3230,8 @@ Acked-by: jbeulich@novell.com
/* Based on Rusty Russell's skeleton driver's map_page */
struct vm_struct *xenbus_map_ring_valloc(struct xenbus_device *dev, grant_ref_t gnt_ref)
---- sle11sp2-2011-08-22.orig/drivers/xen/xenbus/xenbus_client.c 2011-06-30 15:37:44.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/xenbus/xenbus_client.c 2011-06-30 16:10:27.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/xenbus/xenbus_client.c 2011-06-30 15:37:44.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/xenbus/xenbus_client.c 2011-06-30 16:10:27.000000000 +0200
@@ -30,19 +30,25 @@
* IN THE SOFTWARE.
*/
@@ -3677,8 +3677,8 @@ Acked-by: jbeulich@novell.com
enum xenbus_state xenbus_read_driver_state(const char *path)
{
int result;
---- sle11sp2-2011-08-22.orig/drivers/xen/xenbus/xenbus_comms.c 2011-01-31 17:32:16.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/xenbus/xenbus_comms.c 2011-04-11 14:52:53.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/xenbus/xenbus_comms.c 2011-01-31 17:32:16.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/xenbus/xenbus_comms.c 2011-04-11 14:52:53.000000000 +0200
@@ -34,12 +34,15 @@
#include <linux/interrupt.h>
#include <linux/sched.h>
@@ -3744,8 +3744,8 @@ Acked-by: jbeulich@novell.com
xen_store_evtchn, wake_waiting,
0, "xenbus", &xb_waitq);
if (err <= 0) {
---- sle11sp2-2011-08-22.orig/drivers/xen/xenbus/xenbus_dev.c 2011-06-30 15:37:44.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/xenbus/xenbus_dev.c 2011-06-30 16:10:32.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/xenbus/xenbus_dev.c 2011-06-30 15:37:44.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/xenbus/xenbus_dev.c 2011-06-30 16:10:32.000000000 +0200
@@ -487,7 +487,13 @@ static const struct file_operations xenb
#endif
};
@@ -3761,8 +3761,8 @@ Acked-by: jbeulich@novell.com
{
xenbus_dev_intf = create_xen_proc_entry("xenbus", 0400);
if (xenbus_dev_intf)
---- sle11sp2-2011-08-22.orig/drivers/xen/xenbus/xenbus_probe.c 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/xenbus/xenbus_probe.c 2011-06-30 16:10:35.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/xenbus/xenbus_probe.c 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/xenbus/xenbus_probe.c 2011-06-30 16:10:35.000000000 +0200
@@ -43,21 +43,26 @@
#include <linux/mm.h>
#include <linux/notifier.h>
@@ -4062,8 +4062,8 @@ Acked-by: jbeulich@novell.com
{
return xenbus_probe_init();
}
---- sle11sp2-2011-08-22.orig/drivers/xen/xenbus/xenbus_probe.h 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/xenbus/xenbus_probe.h 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/xenbus/xenbus_probe.h 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/xenbus/xenbus_probe.h 2011-01-31 17:49:31.000000000 +0100
@@ -62,7 +62,9 @@ struct xen_bus_type
int (*get_bus_id)(char bus_id[XEN_BUS_ID_SIZE], const char *nodename);
int (*probe)(const char *type, const char *dir);
@@ -4082,8 +4082,8 @@ Acked-by: jbeulich@novell.com
+extern void xenbus_dev_changed(const char *node, struct xen_bus_type *bus);
#endif
---- sle11sp2-2011-08-22.orig/drivers/xen/xenbus/xenbus_probe_backend.c 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/xenbus/xenbus_probe_backend.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/xenbus/xenbus_probe_backend.c 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/xenbus/xenbus_probe_backend.c 2011-01-31 17:49:31.000000000 +0100
@@ -236,7 +236,7 @@ static void backend_changed(struct xenbu
{
DPRINTK("");
@@ -4093,8 +4093,8 @@ Acked-by: jbeulich@novell.com
}
static struct xenbus_watch be_watch = {
---- sle11sp2-2011-08-22.orig/drivers/xen/xenbus/xenbus_xs.c 2011-06-30 16:06:45.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/xenbus/xenbus_xs.c 2011-06-30 16:10:38.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/xenbus/xenbus_xs.c 2011-06-30 16:06:45.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/xenbus/xenbus_xs.c 2011-06-30 16:10:38.000000000 +0200
@@ -661,7 +661,9 @@ void unregister_xenbus_watch(struct xenb
char token[sizeof(watch) * 2 + 1];
int err;
@@ -4170,8 +4170,8 @@ Acked-by: jbeulich@novell.com
}
return 0;
---- sle11sp2-2011-08-22.orig/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 17:49:31.000000000 +0100
@@ -26,7 +26,6 @@
#include <asm/pgtable.h>
#include <xen/evtchn.h>
@@ -4180,8 +4180,8 @@ Acked-by: jbeulich@novell.com
#include <xen/interface/xen.h>
#include <xen/interface/xenoprof.h>
#include "../../../drivers/oprofile/cpu_buffer.h"
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:49:31.000000000 +0100
@@ -53,6 +53,8 @@ extern unsigned long __FIXADDR_TOP;
enum fixed_addresses {
FIX_HOLE,
@@ -4191,8 +4191,8 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_X86_LOCAL_APIC
FIX_APIC_BASE, /* local (CPU) APIC) -- required for SMP or not */
#endif
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 17:49:31.000000000 +0100
@@ -75,8 +75,7 @@ struct page *kmap_atomic_to_page(void *p
#define kmap_atomic_pte(page, type) \
@@ -4203,8 +4203,8 @@ Acked-by: jbeulich@novell.com
#define flush_cache_kmaps() do { } while (0)
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/maddr_32.h 2011-08-08 12:54:10.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/maddr_32.h 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/maddr_32.h 2011-08-08 12:54:10.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/maddr_32.h 2011-01-31 17:49:31.000000000 +0100
@@ -155,6 +155,7 @@ static inline paddr_t pte_machine_to_phy
#ifdef CONFIG_X86_PAE
@@ -4213,8 +4213,8 @@ Acked-by: jbeulich@novell.com
static inline pte_t pfn_pte_ma(unsigned long page_nr, pgprot_t pgprot)
{
pte_t pte;
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:49:31.000000000 +0100
@@ -16,7 +16,7 @@ void mm_pin_all(void);
static inline void xen_activate_mm(struct mm_struct *prev,
struct mm_struct *next)
@@ -4242,8 +4242,8 @@ Acked-by: jbeulich@novell.com
/* stop flush ipis for the previous mm */
cpu_clear(cpu, prev->cpu_vm_mask);
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 17:49:31.000000000 +0100
@@ -5,7 +5,7 @@
#include <linux/mm.h> /* for struct page */
#include <asm/io.h> /* for phys_to_virt and page_to_pseudophys */
@@ -4272,8 +4272,8 @@ Acked-by: jbeulich@novell.com
if (!PageHighMem(pte)) \
BUG_ON(HYPERVISOR_update_va_mapping( \
(unsigned long)__va(pfn << PAGE_SHIFT), \
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:38:07.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:38:23.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:38:07.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:38:23.000000000 +0100
@@ -26,9 +26,6 @@
#include <linux/spinlock.h>
#include <linux/sched.h>
@@ -4405,8 +4405,8 @@ Acked-by: jbeulich@novell.com
xen_l1_entry_update(ptep, __pte(0)); \
else \
*(ptep) = __pte(0); \
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:49:31.000000000 +0100
@@ -23,26 +23,11 @@
#define pud_present(pud) 1
@@ -4435,8 +4435,8 @@ Acked-by: jbeulich@novell.com
}
/* Rules for using set_pte: the pte being assigned *must* be
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:49:31.000000000 +0100
@@ -89,7 +89,6 @@ struct cpuinfo_x86 {
#define X86_VENDOR_UMC 3
#define X86_VENDOR_NEXGEN 4
@@ -4482,8 +4482,8 @@ Acked-by: jbeulich@novell.com
/*
* Size of io_bitmap.
*/
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/system_32.h 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/system_32.h 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/system_32.h 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/system_32.h 2011-01-31 17:49:31.000000000 +0100
@@ -205,11 +205,6 @@ static inline unsigned long get_limit(un
*/
@@ -4512,8 +4512,8 @@ Acked-by: jbeulich@novell.com
extern unsigned long arch_align_stack(unsigned long sp);
extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:49:31.000000000 +0100
@@ -91,7 +91,11 @@ struct tlb_state
DECLARE_PER_CPU(struct tlb_state, cpu_tlbstate);
#endif /* SMP */
@@ -4527,8 +4527,8 @@ Acked-by: jbeulich@novell.com
static inline void flush_tlb_pgtables(struct mm_struct *mm,
unsigned long start, unsigned long end)
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:49:31.000000000 +0100
@@ -23,9 +23,9 @@
* compile time, but to set the physical address only
* in the boot process.
@@ -4560,8 +4560,8 @@ Acked-by: jbeulich@novell.com
}
#endif
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 17:49:31.000000000 +0100
@@ -76,7 +76,7 @@ static inline void switch_mm(struct mm_s
if (likely(prev != next)) {
@@ -4580,8 +4580,8 @@ Acked-by: jbeulich@novell.com
mm_pin(next);
switch_mm(prev, next, NULL);
}
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 17:49:31.000000000 +0100
@@ -21,7 +21,7 @@ static inline void pmd_populate_kernel(s
static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, struct page *pte)
@@ -4609,8 +4609,8 @@ Acked-by: jbeulich@novell.com
BUG_ON(HYPERVISOR_update_va_mapping(
(unsigned long)pud,
pfn_pte(virt_to_phys(pud)>>PAGE_SHIFT,
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-02-07 15:38:08.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-02-07 15:38:18.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-02-07 15:38:08.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-02-07 15:38:18.000000000 +0100
@@ -304,7 +304,7 @@ static inline pte_t ptep_get_and_clear_f
{
if (full) {
@@ -4701,8 +4701,8 @@ Acked-by: jbeulich@novell.com
#define __HAVE_ARCH_PTEP_GET_AND_CLEAR
#define __HAVE_ARCH_PTEP_GET_AND_CLEAR_FULL
#define __HAVE_ARCH_PTEP_CLEAR_FLUSH
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:49:31.000000000 +0100
@@ -83,7 +83,6 @@ struct cpuinfo_x86 {
#define X86_VENDOR_UMC 3
#define X86_VENDOR_NEXGEN 4
@@ -4751,8 +4751,8 @@ Acked-by: jbeulich@novell.com
static inline void serialize_cpu(void)
{
__asm__ __volatile__ ("cpuid" : : : "ax", "bx", "cx", "dx");
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/system_64.h 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/system_64.h 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/system_64.h 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/system_64.h 2011-01-31 17:49:31.000000000 +0100
@@ -79,12 +79,16 @@ static inline unsigned long read_cr0(voi
unsigned long cr0;
asm volatile("movq %%cr0,%0" : "=r" (cr0));
@@ -4813,8 +4813,8 @@ Acked-by: jbeulich@novell.com
#endif /* __KERNEL__ */
#define nop() __asm__ __volatile__ ("nop")
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:49:31.000000000 +0100
@@ -89,7 +89,11 @@ static inline void flush_tlb_range(struc
#endif
@@ -4828,8 +4828,8 @@ Acked-by: jbeulich@novell.com
static inline void flush_tlb_pgtables(struct mm_struct *mm,
unsigned long start, unsigned long end)
---- sle11sp2-2011-08-22.orig/arch/x86/include/asm/thread_info.h 2011-01-31 17:02:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/asm/thread_info.h 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/asm/thread_info.h 2011-01-31 17:02:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/asm/thread_info.h 2011-01-31 17:49:31.000000000 +0100
@@ -151,7 +151,8 @@ struct thread_info {
#define _TIF_WORK_CTXSW_PREV (_TIF_WORK_CTXSW|_TIF_USER_RETURN_NOTIFY)
#define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW|_TIF_DEBUG)
@@ -4840,8 +4840,8 @@ Acked-by: jbeulich@novell.com
#endif
#define PREEMPT_ACTIVE 0x10000000
---- sle11sp2-2011-08-22.orig/arch/x86/include/asm/xen/interface.h 2011-05-19 06:06:34.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/include/asm/xen/interface.h 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/asm/xen/interface.h 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/include/asm/xen/interface.h 2011-01-31 17:49:31.000000000 +0100
@@ -10,17 +10,20 @@
#define _ASM_X86_XEN_INTERFACE_H
@@ -4894,8 +4894,8 @@ Acked-by: jbeulich@novell.com
/*
* SEGMENT DESCRIPTOR TABLES
---- sle11sp2-2011-08-22.orig/include/linux/elfnote.h 2008-04-17 04:49:44.000000000 +0200
-+++ sle11sp2-2011-08-22/include/linux/elfnote.h 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/include/linux/elfnote.h 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/include/linux/elfnote.h 2011-01-31 17:49:31.000000000 +0100
@@ -52,7 +52,7 @@
4484:.balign 4 ; \
.popsection ;
@@ -4905,9 +4905,9 @@ Acked-by: jbeulich@novell.com
ELFNOTE_START(name, type, "") \
desc ; \
ELFNOTE_END
---- sle11sp2-2011-08-22.orig/include/linux/page-flags.h 2011-08-22 10:30:40.000000000 +0200
-+++ sle11sp2-2011-08-22/include/linux/page-flags.h 2011-08-22 10:32:06.000000000 +0200
-@@ -125,8 +125,15 @@ enum pageflags {
+--- sle11sp2-2011-09-06.orig/include/linux/page-flags.h 2011-09-06 09:15:39.000000000 +0200
++++ sle11sp2-2011-09-06/include/linux/page-flags.h 2011-09-06 09:16:27.000000000 +0200
+@@ -126,8 +126,15 @@ enum pageflags {
PG_fscache = PG_private_2, /* page backed by cache */
/* XEN */
@@ -4923,7 +4923,7 @@ Acked-by: jbeulich@novell.com
/* SLOB */
PG_slob_free = PG_private,
-@@ -491,10 +498,8 @@ static inline int PageTransCompound(stru
+@@ -493,10 +500,8 @@ static inline int PageTransCompound(stru
#define __PG_COMPOUND_LOCK 0
#endif
@@ -4935,8 +4935,8 @@ Acked-by: jbeulich@novell.com
#else
# define __PG_XEN (1 << PG_foreign)
#endif
---- sle11sp2-2011-08-22.orig/include/xen/driver_util.h 2007-06-12 13:14:19.000000000 +0200
-+++ sle11sp2-2011-08-22/include/xen/driver_util.h 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/include/xen/driver_util.h 2007-06-12 13:14:19.000000000 +0200
++++ sle11sp2-2011-09-06/include/xen/driver_util.h 2011-01-31 17:49:31.000000000 +0100
@@ -1,14 +1,8 @@
+#ifndef __XEN_DRIVER_UTIL_H__
+#define __XEN_DRIVER_UTIL_H__
@@ -4955,8 +4955,8 @@ Acked-by: jbeulich@novell.com
-#endif /* __ASM_XEN_DRIVER_UTIL_H__ */
+#endif /* __XEN_DRIVER_UTIL_H__ */
---- sle11sp2-2011-08-22.orig/include/xen/features.h 2007-10-09 22:31:38.000000000 +0200
-+++ sle11sp2-2011-08-22/include/xen/features.h 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/include/xen/features.h 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/include/xen/features.h 2011-01-31 17:49:31.000000000 +0100
@@ -10,6 +10,7 @@
#define __XEN_FEATURES_H__
@@ -4971,8 +4971,8 @@ Acked-by: jbeulich@novell.com
-#endif /* __ASM_XEN_FEATURES_H__ */
+#endif /* __XEN_FEATURES_H__ */
---- sle11sp2-2011-08-22.orig/include/xen/interface/arch-x86/xen.h 2011-03-17 13:50:24.000000000 +0100
-+++ sle11sp2-2011-08-22/include/xen/interface/arch-x86/xen.h 2011-03-17 14:11:48.000000000 +0100
+--- sle11sp2-2011-09-06.orig/include/xen/interface/arch-x86/xen.h 2011-03-17 13:50:24.000000000 +0100
++++ sle11sp2-2011-09-06/include/xen/interface/arch-x86/xen.h 2011-03-17 14:11:48.000000000 +0100
@@ -50,6 +50,9 @@
#endif
#define set_xen_guest_handle(hnd, val) set_xen_guest_handle_raw(hnd, val)
@@ -4983,8 +4983,8 @@ Acked-by: jbeulich@novell.com
#if defined(__i386__)
#include "xen-x86_32.h"
#elif defined(__x86_64__)
---- sle11sp2-2011-08-22.orig/include/xen/interface/event_channel.h 2011-01-31 15:14:12.000000000 +0100
-+++ sle11sp2-2011-08-22/include/xen/interface/event_channel.h 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/include/xen/interface/event_channel.h 2011-01-31 15:14:12.000000000 +0100
++++ sle11sp2-2011-09-06/include/xen/interface/event_channel.h 2011-01-31 17:49:31.000000000 +0100
@@ -250,6 +250,7 @@ struct evtchn_op {
struct evtchn_unmask unmask;
} u;
@@ -4993,8 +4993,8 @@ Acked-by: jbeulich@novell.com
typedef struct evtchn_op evtchn_op_t;
DEFINE_XEN_GUEST_HANDLE(evtchn_op_t);
---- sle11sp2-2011-08-22.orig/include/xen/interface/io/netif.h 2011-01-31 15:14:12.000000000 +0100
-+++ sle11sp2-2011-08-22/include/xen/interface/io/netif.h 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/include/xen/interface/io/netif.h 2011-01-31 15:14:12.000000000 +0100
++++ sle11sp2-2011-09-06/include/xen/interface/io/netif.h 2011-01-31 17:49:31.000000000 +0100
@@ -183,8 +183,22 @@ typedef struct netif_rx_response netif_r
* Generate netif ring structures and types.
*/
@@ -5018,8 +5018,8 @@ Acked-by: jbeulich@novell.com
#define NETIF_RSP_DROPPED -2
#define NETIF_RSP_ERROR -1
---- sle11sp2-2011-08-22.orig/include/xen/interface/memory.h 2011-01-31 15:14:12.000000000 +0100
-+++ sle11sp2-2011-08-22/include/xen/interface/memory.h 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/include/xen/interface/memory.h 2011-01-31 15:14:12.000000000 +0100
++++ sle11sp2-2011-09-06/include/xen/interface/memory.h 2011-01-31 17:49:31.000000000 +0100
@@ -88,6 +88,7 @@ struct xen_memory_reservation {
*/
domid_t domid;
@@ -5044,8 +5044,8 @@ Acked-by: jbeulich@novell.com
typedef struct xen_add_to_physmap xen_add_to_physmap_t;
DEFINE_XEN_GUEST_HANDLE(xen_add_to_physmap_t);
---- sle11sp2-2011-08-22.orig/include/xen/interface/sched.h 2011-01-31 15:14:12.000000000 +0100
-+++ sle11sp2-2011-08-22/include/xen/interface/sched.h 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/include/xen/interface/sched.h 2011-01-31 15:14:12.000000000 +0100
++++ sle11sp2-2011-09-06/include/xen/interface/sched.h 2011-01-31 17:49:31.000000000 +0100
@@ -67,6 +67,7 @@
struct sched_shutdown {
unsigned int reason; /* SHUTDOWN_* */
@@ -5062,8 +5062,8 @@ Acked-by: jbeulich@novell.com
typedef struct sched_poll sched_poll_t;
DEFINE_XEN_GUEST_HANDLE(sched_poll_t);
---- sle11sp2-2011-08-22.orig/include/xen/interface/version.h 2011-01-31 15:14:12.000000000 +0100
-+++ sle11sp2-2011-08-22/include/xen/interface/version.h 2011-01-31 17:49:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/include/xen/interface/version.h 2011-01-31 15:14:12.000000000 +0100
++++ sle11sp2-2011-09-06/include/xen/interface/version.h 2011-01-31 17:49:31.000000000 +0100
@@ -36,6 +36,9 @@
/* arg == xen_extraversion_t. */
#define XENVER_extraversion 1
@@ -5091,8 +5091,8 @@ Acked-by: jbeulich@novell.com
#define XEN_CHANGESET_INFO_LEN (sizeof(xen_changeset_info_t))
#define XENVER_platform_parameters 5
---- sle11sp2-2011-08-22.orig/include/xen/interface/xen.h 2011-08-22 10:26:36.000000000 +0200
-+++ sle11sp2-2011-08-22/include/xen/interface/xen.h 2011-08-09 10:41:09.000000000 +0200
+--- sle11sp2-2011-09-06.orig/include/xen/interface/xen.h 2011-08-22 10:26:36.000000000 +0200
++++ sle11sp2-2011-09-06/include/xen/interface/xen.h 2011-08-09 10:41:09.000000000 +0200
@@ -32,7 +32,9 @@
#include <asm/pvclock-abi.h>
#endif
@@ -5155,8 +5155,8 @@ Acked-by: jbeulich@novell.com
typedef struct multicall_entry multicall_entry_t;
DEFINE_XEN_GUEST_HANDLE(multicall_entry_t);
---- sle11sp2-2011-08-22.orig/include/xen/xenbus.h 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/include/xen/xenbus.h 2011-04-11 14:54:41.000000000 +0200
+--- sle11sp2-2011-09-06.orig/include/xen/xenbus.h 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/include/xen/xenbus.h 2011-04-11 14:54:41.000000000 +0200
@@ -57,16 +57,20 @@ struct xenbus_watch
void (*callback)(struct xenbus_watch *,
const char **vec, unsigned int len);
diff --git a/patches.xen/xen3-patch-2.6.24 b/patches.xen/xen3-patch-2.6.24
index aef0625a19..7f5f945c65 100644
--- a/patches.xen/xen3-patch-2.6.24
+++ b/patches.xen/xen3-patch-2.6.24
@@ -2790,7 +2790,7 @@ Acked-by: jbeulich@novell.com
if (wait) {
mb();
--- sle11sp2-2011-08-22.orig/arch/x86/kernel/time-xen.c 2011-07-11 11:22:42.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/time-xen.c 2011-07-11 11:22:52.000000000 +0200
++++ sle11sp2-2011-08-22/arch/x86/kernel/time-xen.c 2011-08-23 13:45:52.000000000 +0200
@@ -1,6 +1,4 @@
/*
- * linux/arch/i386/kernel/time.c
@@ -2806,6 +2806,22 @@ Acked-by: jbeulich@novell.com
#include <xen/interface/vcpu.h>
#include <asm/i8253.h>
+@@ -400,7 +399,6 @@ int xen_update_wallclock(const struct ti
+
+ return 0;
+ }
+-#endif
+
+ static void sync_xen_wallclock(unsigned long dummy);
+ static DEFINE_TIMER(sync_xen_wallclock_timer, sync_xen_wallclock, 0, 0);
+@@ -449,6 +447,7 @@ static int set_rtc_mmss(unsigned long no
+
+ return retval;
+ }
++#endif /* CONFIG_XEN_PRIVILEGED_GUEST */
+
+ static unsigned long long local_clock(void)
+ {
@@ -578,6 +577,13 @@ irqreturn_t timer_interrupt(int irq, voi
struct shadow_time_info *shadow = &per_cpu(shadow_time, cpu);
struct vcpu_runstate_info runstate;
@@ -2820,7 +2836,20 @@ Acked-by: jbeulich@novell.com
/*
* Here we are in the timer irq handler. We just have irqs locally
* disabled but we don't know if the timer_bh is running on the other
-@@ -1054,7 +1060,7 @@ static int time_cpufreq_notifier(struct
+@@ -806,8 +812,12 @@ unsigned long read_persistent_clock(void
+
+ int update_persistent_clock(struct timespec now)
+ {
++#ifdef CONFIG_XEN_PRIVILEGED_GUEST
+ mod_timer(&sync_xen_wallclock_timer, jiffies + 1);
+ return set_rtc_mmss(now.tv_sec);
++#else
++ return 0;
++#endif
+ }
+
+ extern void (*late_time_init)(void);
+@@ -1054,7 +1064,7 @@ static int time_cpufreq_notifier(struct
struct cpufreq_freqs *freq = data;
struct xen_platform_op op;
@@ -2829,7 +2858,7 @@ Acked-by: jbeulich@novell.com
return 0;
if (val == CPUFREQ_PRECHANGE)
-@@ -1092,30 +1098,33 @@ core_initcall(cpufreq_time_setup);
+@@ -1092,30 +1102,33 @@ core_initcall(cpufreq_time_setup);
*/
static ctl_table xen_subtable[] = {
{
@@ -7786,8 +7815,34 @@ Acked-by: jbeulich@novell.com
}
--- sle11sp2-2011-08-22.orig/arch/x86/include/asm/acpi.h 2011-06-30 15:41:07.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/include/asm/acpi.h 2011-06-30 16:33:29.000000000 +0200
-@@ -153,6 +153,7 @@ static inline int acpi_notify_hypervisor
++++ sle11sp2-2011-08-22/arch/x86/include/asm/acpi.h 2011-08-23 14:04:36.000000000 +0200
+@@ -31,7 +31,7 @@
+ #include <asm/mpspec.h>
+ #include <asm/trampoline.h>
+
+-#ifdef CONFIG_XEN
++#ifdef CONFIG_XEN_PRIVILEGED_GUEST
+ #include <xen/interface/platform.h>
+ #endif
+
+@@ -127,7 +127,7 @@ extern const unsigned char acpi_wakeup_c
+ /* early initialization routine */
+ extern void acpi_reserve_wakeup_memory(void);
+
+-#ifdef CONFIG_XEN
++#ifdef CONFIG_XEN_PRIVILEGED_GUEST
+ static inline int acpi_notify_hypervisor_state(u8 sleep_state,
+ u32 pm1a_cnt_val,
+ u32 pm1b_cnt_val)
+@@ -146,13 +146,14 @@ static inline int acpi_notify_hypervisor
+
+ return HYPERVISOR_platform_op(&op);
+ }
+-#endif /* CONFIG_XEN */
++#endif
+
+ /*
+ * Check if the CPU can handle C2 and deeper
*/
static inline unsigned int acpi_processor_cstate_check(unsigned int max_cstate)
{
@@ -7935,8 +7990,8 @@ Acked-by: jbeulich@novell.com
+# include "fixmap_64.h"
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/hypercall.h 2011-07-20 15:39:42.000000000 +0200
-@@ -0,0 +1,424 @@
++++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/hypercall.h 2011-08-23 13:29:27.000000000 +0200
+@@ -0,0 +1,429 @@
+/******************************************************************************
+ * hypercall.h
+ *
@@ -7980,6 +8035,10 @@ Acked-by: jbeulich@novell.com
+# error "please don't include this file directly"
+#endif
+
++#ifdef CONFIG_XEN_PRIVILEGED_GUEST
++# include <xen/interface/platform.h>
++# include <xen/interface/arch-x86/xen-mca.h>
++#endif
+#if CONFIG_XEN_COMPAT <= 0x030002
+# include <linux/string.h> /* memcpy() */
+# include <xen/interface/event_channel.h>
@@ -8170,6 +8229,7 @@ Acked-by: jbeulich@novell.com
+ return _hypercall2(int, sched_op, cmd, arg);
+}
+
++#ifdef CONFIG_XEN_PRIVILEGED_GUEST
+static inline int __must_check
+HYPERVISOR_platform_op(
+ struct xen_platform_op *platform_op)
@@ -8178,7 +8238,6 @@ Acked-by: jbeulich@novell.com
+ return _hypercall1(int, platform_op, platform_op);
+}
+
-+struct xen_mc;
+static inline int __must_check
+HYPERVISOR_mca(
+ struct xen_mc *mc_op)
@@ -8186,6 +8245,7 @@ Acked-by: jbeulich@novell.com
+ mc_op->interface_version = XEN_MCA_INTERFACE_VERSION;
+ return _hypercall1(int, mca, mc_op);
+}
++#endif
+
+static inline int __must_check
+HYPERVISOR_set_debugreg(
@@ -9258,21 +9318,21 @@ Acked-by: jbeulich@novell.com
-
-#endif /* __HYPERCALL_H__ */
--- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/hypervisor.h 2011-07-20 15:40:13.000000000 +0200
-@@ -39,11 +39,8 @@
++++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/hypervisor.h 2011-08-23 13:27:38.000000000 +0200
+@@ -38,12 +38,7 @@
+ #include <linux/version.h>
#include <linux/errno.h>
#include <xen/interface/xen.h>
- #include <xen/interface/platform.h>
+-#include <xen/interface/platform.h>
-#include <xen/interface/event_channel.h>
-#include <xen/interface/physdev.h>
#include <xen/interface/sched.h>
-#include <xen/interface/nmi.h>
-#include <xen/interface/tmem.h>
-+#include <xen/interface/arch-x86/xen-mca.h>
#include <asm/percpu.h>
#include <asm/ptrace.h>
#include <asm/page.h>
-@@ -200,7 +197,6 @@ static inline void xen_multicall_flush(b
+@@ -200,7 +195,6 @@ static inline void xen_multicall_flush(b
extern char hypercall_page[PAGE_SIZE];
#else
extern char *hypercall_stubs;
diff --git a/patches.xen/xen3-patch-2.6.25 b/patches.xen/xen3-patch-2.6.25
index 4237668b7f..66a357384e 100644
--- a/patches.xen/xen3-patch-2.6.25
+++ b/patches.xen/xen3-patch-2.6.25
@@ -8,8 +8,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
2.6.32/arch/x86/kernel/rtc.c (hooks in {update,read}_persistent_clock() removed)
---- sle11sp2-2011-08-22.orig/arch/x86/Kconfig 2011-08-22 10:32:56.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/Kconfig 2011-08-22 10:33:19.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/Kconfig 2011-08-22 10:32:56.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/Kconfig 2011-08-22 10:33:19.000000000 +0200
@@ -39,7 +39,7 @@ config X86
select HAVE_FUNCTION_TRACE_MCOUNT_TEST
select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE
@@ -77,8 +77,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
help
Enables some debug statements within the PCI Frontend.
---- sle11sp2-2011-08-22.orig/arch/x86/Kconfig.debug 2011-06-30 15:35:42.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/Kconfig.debug 2011-06-30 16:33:56.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/Kconfig.debug 2011-06-30 15:35:42.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/Kconfig.debug 2011-06-30 16:33:56.000000000 +0200
@@ -247,6 +247,7 @@ config DEBUG_BOOT_PARAMS
bool "Debug boot parameters"
depends on DEBUG_KERNEL
@@ -87,8 +87,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
---help---
This option will cause struct boot_params to be exported via debugfs.
---- sle11sp2-2011-08-22.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/ia32/ia32entry-xen.S 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/ia32/ia32entry-xen.S 2011-01-31 18:01:51.000000000 +0100
@@ -12,7 +12,6 @@
#include <asm/ia32_unistd.h>
#include <asm/thread_info.h>
@@ -132,8 +132,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+ .quad compat_sys_timerfd_settime /* 325 */
+ .quad compat_sys_timerfd_gettime
ia32_syscall_end:
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/Makefile 2011-06-30 16:31:37.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/Makefile 2011-06-30 16:34:04.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/Makefile 2011-06-30 16:31:37.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/Makefile 2011-06-30 16:34:04.000000000 +0200
@@ -131,11 +131,10 @@ ifeq ($(CONFIG_X86_64),y)
obj-$(CONFIG_PCI_MMCONFIG) += mmconf-fam10h_64.o
obj-y += vsmp_64.o
@@ -147,8 +147,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
smpboot_$(BITS).o tsc_$(BITS).o tsc_sync.o
-disabled-obj-$(CONFIG_XEN_UNPRIVILEGED_GUEST) += mpparse_64.o
-%/head_64.o %/head_64.s: asflags-$(CONFIG_XEN) :=
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/acpi/boot.c 2011-04-13 12:23:45.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/acpi/boot.c 2011-03-11 10:56:21.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/acpi/boot.c 2011-04-13 12:23:45.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/acpi/boot.c 2011-03-11 10:56:21.000000000 +0100
@@ -162,6 +162,11 @@ char *__init __acpi_map_table(unsigned l
if (!phys || !size)
return NULL;
@@ -161,8 +161,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
return early_ioremap(phys, size);
}
void __init __acpi_unmap_table(char *map, unsigned long size)
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/apic/apic-xen.c 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/apic/apic-xen.c 2011-02-24 15:45:13.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/apic/apic-xen.c 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/apic/apic-xen.c 2011-02-24 15:45:13.000000000 +0100
@@ -82,11 +82,12 @@ int setup_profiling_timer(unsigned int m
return -EINVAL;
}
@@ -182,8 +182,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
return 0;
}
+#endif
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/asm-offsets_32.c 2011-04-13 12:31:22.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/asm-offsets_32.c 2011-04-13 12:45:37.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/asm-offsets_32.c 2011-04-13 12:31:22.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/asm-offsets_32.c 2011-04-13 12:45:37.000000000 +0200
@@ -1,7 +1,9 @@
#include <asm/ucontext.h>
@@ -194,8 +194,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
/* workaround for a warning with -Wmissing-prototypes */
void foo(void);
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/cpu/common-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/cpu/common-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/cpu/common-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -27,45 +27,50 @@
#include "cpu.h"
@@ -597,8 +597,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
load_LDT(&init_mm.context);
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -33,7 +33,7 @@ struct mtrr_ops generic_mtrr_ops = {
struct mtrr_ops *mtrr_if = &generic_mtrr_ops;
@@ -660,8 +660,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
op.cmd = XENPF_del_memtype;
op.u.del_memtype.handle = 0;
op.u.del_memtype.reg = reg;
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/e820_32-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/e820_32-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -7,7 +7,6 @@
#include <linux/kexec.h>
#include <linux/module.h>
@@ -1032,8 +1032,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+ print_memory_map("modified");
+}
+#endif
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/e820_64-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/e820_64-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -1,4 +1,4 @@
-/*
+/*
@@ -1832,8 +1832,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
}
int __init arch_get_ram_range(int slot, u64 *addr, u64 *size)
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/early_printk-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/early_printk-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/early_printk-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -222,7 +222,7 @@ static struct console simnow_console = {
};
@@ -1843,8 +1843,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
static int early_console_initialized = 0;
void early_printk(const char *fmt, ...)
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:10:06.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:10:15.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:10:06.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:10:15.000000000 +0200
@@ -59,7 +59,7 @@
* for paravirtualization. The following will never clobber any registers:
* INTERRUPT_RETURN (aka. "iret")
@@ -2185,8 +2185,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+#undef sys_fork
+#undef sys_clone
+#undef sys_vfork
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/entry_64-xen.S 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/entry_64-xen.S 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/entry_64-xen.S 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/entry_64-xen.S 2011-01-31 18:01:51.000000000 +0100
@@ -54,11 +54,9 @@
#include <asm/page.h>
#include <asm/irqflags.h>
@@ -2487,8 +2487,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
TRACE_IRQS_OFF
GET_THREAD_INFO(%rcx)
jmp retint_restore_args
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/fixup.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/fixup.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/fixup.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/fixup.c 2011-01-31 18:01:51.000000000 +0100
@@ -36,7 +36,7 @@
#define DP(_f, _args...) pr_alert(" " _f "\n" , ## _args )
@@ -2498,8 +2498,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
{
static unsigned long printed = 0;
char info[100];
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/head64-xen.c 2011-08-09 10:44:02.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/head64-xen.c 2011-08-09 10:49:01.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/head64-xen.c 2011-08-09 10:44:02.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/head64-xen.c 2011-08-09 10:49:01.000000000 +0200
@@ -16,6 +16,7 @@
#include <linux/kernel.h>
#include <linux/string.h>
@@ -2605,8 +2605,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+
start_kernel();
}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/head_32-xen.S 2011-08-09 10:41:46.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/head_32-xen.S 2011-08-09 10:48:56.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/head_32-xen.S 2011-08-09 10:41:46.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/head_32-xen.S 2011-08-09 10:48:56.000000000 +0200
@@ -3,6 +3,7 @@
.text
#include <linux/elfnote.h>
@@ -2624,8 +2624,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
.fill 1024,4,0
ENTRY(empty_zero_page)
.fill 4096,1,0
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -35,6 +35,7 @@
#include <linux/htirq.h>
#include <linux/freezer.h>
@@ -2697,8 +2697,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
.suspend = ioapic_suspend,
.resume = ioapic_resume,
};
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -32,9 +32,11 @@
#include <linux/msi.h>
#include <linux/htirq.h>
@@ -2888,7 +2888,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+late_initcall(ioapic_insert_resources);
+#endif /* !CONFIG_XEN */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2-2011-08-22/arch/x86/kernel/ioport-xen.c 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/ioport-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -0,0 +1,112 @@
+/*
+ * This contains the io-permission bitmap code - written by obz, with changes
@@ -3002,7 +3002,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+out:
+ return rc;
+}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/ioport_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/ioport_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,121 +0,0 @@
-/*
@@ -3126,7 +3126,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
- set_iopl_mask(t->iopl);
- return 0;
-}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/ioport_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/ioport_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,99 +0,0 @@
-/*
@@ -3229,7 +3229,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
- return 0;
-}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2-2011-08-22/arch/x86/kernel/ldt-xen.c 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/ldt-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -0,0 +1,272 @@
+/*
+ * Copyright (C) 1992 Krishna Balasubramanian and Linus Torvalds
@@ -3503,7 +3503,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+ }
+ return ret;
+}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/ldt_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/ldt_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,265 +0,0 @@
-/*
@@ -3771,7 +3771,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
- }
- return ret;
-}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/ldt_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/ldt_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,271 +0,0 @@
-/*
@@ -4045,8 +4045,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
- }
- return ret;
-}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/machine_kexec_64.c 2010-04-15 09:44:51.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/machine_kexec_64.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/machine_kexec_64.c 2010-04-15 09:44:51.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/machine_kexec_64.c 2011-01-31 18:01:51.000000000 +0100
@@ -407,7 +407,9 @@ void machine_kexec(struct kimage *image)
void arch_crash_save_vmcoreinfo(void)
@@ -4057,8 +4057,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
VMCOREINFO_SYMBOL(init_level4_pgt);
#ifdef CONFIG_NUMA
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/microcode-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/microcode-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/microcode-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/microcode-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -167,7 +167,7 @@ static int request_microcode(void)
}
@@ -4068,8 +4068,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
op.u.microcode.length = firmware->size;
error = HYPERVISOR_platform_op(&op);
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -70,7 +70,7 @@ unsigned int def_to_bigsmp = 0;
unsigned int boot_cpu_physical_apicid = -1U;
#endif
@@ -4198,8 +4198,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
/*
* For PCI devices assign IRQs in order, avoiding gaps
* due to unused I/O APIC pins.
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -61,14 +61,20 @@ EXPORT_SYMBOL(boot_cpu_id);
#endif
@@ -4257,8 +4257,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
}
cpu_set(cpu, cpu_possible_map);
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/pci-dma-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/pci-dma-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/pci-dma-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -431,3 +431,23 @@ dma_sync_single_for_device(struct device
swiotlb_sync_single_for_device(dev, dma_handle, size, direction);
}
@@ -4283,8 +4283,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+ flush_write_buffers();
+}
+EXPORT_SYMBOL(dma_sync_sg_for_device);
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/process_32-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/process_32-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/process_32-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/process_32-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -23,7 +23,6 @@
#include <linux/slab.h>
#include <linux/vmalloc.h>
@@ -4980,8 +4980,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+ unsigned long range_end = mm->brk + 0x02000000;
+ return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
+}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/process_64-xen.c 2011-02-02 08:32:00.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/process_64-xen.c 2011-02-02 08:32:11.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/process_64-xen.c 2011-02-02 08:32:00.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/process_64-xen.c 2011-02-02 08:32:11.000000000 +0100
@@ -3,7 +3,7 @@
*
* Pentium III FXSR, SSE support
@@ -5643,8 +5643,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+ unsigned long range_end = mm->brk + 0x02000000;
+ return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
+}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/rtc.c 2011-05-19 06:06:34.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/rtc.c 2011-07-11 12:50:41.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/rtc.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/rtc.c 2011-07-11 12:50:41.000000000 +0200
@@ -28,6 +28,7 @@ EXPORT_SYMBOL(cmos_lock);
DEFINE_SPINLOCK(rtc_lock);
EXPORT_SYMBOL(rtc_lock);
@@ -5661,8 +5661,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
/* Routines for accessing the CMOS RAM/RTC. */
unsigned char rtc_cmos_read(unsigned char addr)
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/setup64-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/setup64-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/setup64-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/setup64-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -31,7 +31,11 @@
#include <asm/hypervisor.h>
#endif
@@ -5792,8 +5792,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
/*
* <= is required because the CPU will access up to
* 8 bits beyond the end of the IO permission bitmap.
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/setup_32-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/setup_32-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/setup_32-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/setup_32-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -47,9 +47,12 @@
#include <linux/crash_dump.h>
#include <linux/dmi.h>
@@ -6288,8 +6288,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+}
+
+subsys_initcall(request_standard_resources);
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/setup_64-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/setup_64-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/setup_64-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -15,7 +15,6 @@
#include <linux/ptrace.h>
#include <linux/slab.h>
@@ -7529,8 +7529,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
.next = c_next,
.stop = c_stop,
.show = show_cpuinfo,
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/smp_32-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/smp_32-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/smp_32-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -168,7 +168,7 @@ void __send_IPI_shortcut(unsigned int sh
}
}
@@ -7556,8 +7556,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
/*
*
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/smp_64-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/smp_64-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/smp_64-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -33,7 +33,7 @@
#ifndef CONFIG_XEN
@@ -7810,8 +7810,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
void smp_send_stop(void)
{
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/time-xen.c 2011-07-11 11:22:52.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/time-xen.c 2011-07-11 11:37:23.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/time-xen.c 2011-08-23 13:45:52.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/time-xen.c 2011-08-23 13:48:43.000000000 +0200
@@ -28,47 +28,19 @@
* serialize accesses to xtime/lost_ticks).
*/
@@ -7936,7 +7936,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
cpu = get_cpu();
shadow = &per_cpu(shadow_time, cpu);
-@@ -409,7 +352,8 @@ static void sync_xen_wallclock(unsigned
+@@ -408,7 +351,8 @@ static void sync_xen_wallclock(unsigned
s64 nsec;
struct xen_platform_op op;
@@ -7946,10 +7946,11 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
return;
write_seqlock_irq(&xtime_lock);
-@@ -432,23 +376,6 @@ static void sync_xen_wallclock(unsigned
+@@ -430,23 +374,6 @@ static void sync_xen_wallclock(unsigned
+ /* Once per minute. */
mod_timer(&sync_xen_wallclock_timer, jiffies + 60*HZ);
}
-
+-
-static int set_rtc_mmss(unsigned long nowtime)
-{
- int retval;
@@ -7966,10 +7967,9 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-
- return retval;
-}
--
+ #endif /* CONFIG_XEN_PRIVILEGED_GUEST */
+
static unsigned long long local_clock(void)
- {
- unsigned int cpu = get_cpu();
@@ -458,7 +385,7 @@ static unsigned long long local_clock(vo
do {
@@ -8041,7 +8041,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
return sp[0];
if (sp[1] >> 22)
return sp[1];
-@@ -795,27 +738,6 @@ static void init_missing_ticks_accountin
+@@ -795,31 +738,6 @@ static void init_missing_ticks_accountin
runstate->time[RUNSTATE_offline];
}
@@ -8062,15 +8062,19 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-
-int update_persistent_clock(struct timespec now)
-{
+-#ifdef CONFIG_XEN_PRIVILEGED_GUEST
- mod_timer(&sync_xen_wallclock_timer, jiffies + 1);
- return set_rtc_mmss(now.tv_sec);
+-#else
+- return 0;
+-#endif
-}
-
extern void (*late_time_init)(void);
/* Dynamically-mapped IRQ. */
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/traps_32-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/traps_32-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/traps_32-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -79,7 +79,8 @@ char ignore_fpu_irq = 0;
* F0 0F bug workaround.. We have a special link segment
* for this.
@@ -8755,8 +8759,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
printk(KERN_INFO "Enabling fast FPU save and restore... ");
set_in_cr4(X86_CR4_OSFXSR);
printk("done.\n");
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/traps_64-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/traps_64-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/traps_64-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -74,38 +74,41 @@ asmlinkage void alignment_check(void);
asmlinkage void machine_check(void);
asmlinkage void spurious_interrupt_bug(void);
@@ -9492,8 +9496,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+ return 1;
+}
+__setup("code_bytes=", code_bytes_setup);
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -43,12 +43,7 @@
#include <asm/vgtod.h>
@@ -9625,7 +9629,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
#ifdef CONFIG_XEN
vsyscall_gtod_data.sysctl_enabled = 0; /* disable vgettimeofay() */
if (boot_cpu_has(X86_FEATURE_RDTSCP))
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/xen_entry_64.S 2008-04-02 12:34:02.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/xen_entry_64.S 2008-04-02 12:34:02.000000000 +0200
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-/*
@@ -9664,8 +9668,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
- XEN_LOCKED_UNBLOCK_EVENTS(reg) ; \
- XEN_PUT_VCPU_INFO(reg)
-#define XEN_TEST_PENDING(reg) testb $0xFF,evtchn_upcall_pending(reg)
---- sle11sp2-2011-08-22.orig/arch/x86/mach-xen/setup.c 2011-08-22 10:32:28.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/mach-xen/setup.c 2011-08-22 10:33:23.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/mach-xen/setup.c 2011-08-22 10:32:28.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/mach-xen/setup.c 2011-08-22 10:33:23.000000000 +0200
@@ -161,15 +161,12 @@ void __init machine_specific_arch_setup(
/* Do an early initialization of the fixmap area */
@@ -9687,7 +9691,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
}
}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2-2011-08-22/arch/x86/mm/fault-xen.c 2011-08-15 10:46:15.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/mm/fault-xen.c 2011-08-15 10:46:15.000000000 +0200
@@ -0,0 +1,1037 @@
+/*
+ * Copyright (C) 1995 Linus Torvalds
@@ -10726,7 +10730,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+ (__START_KERNEL & PGDIR_MASK)));
+#endif
+}
---- sle11sp2-2011-08-22.orig/arch/x86/mm/fault_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/fault_32-xen.c 2011-01-31 17:56:27.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,770 +0,0 @@
-/*
@@ -11499,7 +11503,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
- start = address + (1UL << PMD_SHIFT);
- }
-}
---- sle11sp2-2011-08-22.orig/arch/x86/mm/fault_64-xen.c 2011-07-26 09:28:01.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/fault_64-xen.c 2011-07-26 09:28:01.000000000 +0200
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,693 +0,0 @@
-/*
@@ -12195,8 +12199,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
- BUILD_BUG_ON(!(((MODULES_END - 1) & PGDIR_MASK) ==
- (__START_KERNEL & PGDIR_MASK)));
-}
---- sle11sp2-2011-08-22.orig/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:49:31.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/highmem_32-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/highmem_32-xen.c 2011-01-31 17:49:31.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/highmem_32-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -18,6 +18,49 @@ void kunmap(struct page *page)
kunmap_high(page);
}
@@ -12256,8 +12260,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
idx = type + KM_TYPE_NR*smp_processor_id();
vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
BUG_ON(!pte_none(*(kmap_pte-idx)));
---- sle11sp2-2011-08-22.orig/arch/x86/mm/hypervisor.c 2011-08-09 10:46:16.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/mm/hypervisor.c 2011-08-09 10:50:48.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/hypervisor.c 2011-08-09 10:46:16.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/mm/hypervisor.c 2011-08-09 10:50:48.000000000 +0200
@@ -488,9 +488,9 @@ void xen_set_ldt(const void *ptr, unsign
#define INIT_CONTIG_ORDER 6 /* 256kB */
static unsigned int __read_mostly max_contig_order = INIT_CONTIG_ORDER;
@@ -12295,8 +12299,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
#define MAX_BATCHED_FULL_PTES 32
---- sle11sp2-2011-08-22.orig/arch/x86/mm/init_32-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/init_32-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/init_32-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/init_32-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -27,13 +27,13 @@
#include <linux/bootmem.h>
#include <linux/slab.h>
@@ -13182,8 +13186,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
}
#endif
-
---- sle11sp2-2011-08-22.orig/arch/x86/mm/init_64-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/init_64-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/init_64-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/init_64-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -46,14 +46,13 @@
#include <asm/proto.h>
#include <asm/smp.h>
@@ -14173,8 +14177,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
return 0;
}
#endif
---- sle11sp2-2011-08-22.orig/arch/x86/mm/ioremap-xen.c 2011-02-07 15:38:30.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/ioremap-xen.c 2011-02-07 15:38:58.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/ioremap-xen.c 2011-02-07 15:38:30.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/ioremap-xen.c 2011-02-07 15:38:58.000000000 +0100
@@ -1,6 +1,4 @@
/*
- * arch/i386/mm/ioremap.c
@@ -14873,7 +14877,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+ WARN_ON(1);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2-2011-08-22/arch/x86/mm/pageattr-xen.c 2011-03-23 09:46:36.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/pageattr-xen.c 2011-03-23 09:46:36.000000000 +0100
@@ -0,0 +1,1436 @@
+/*
+ * Copyright 2002 Andi Kleen, SuSE Labs.
@@ -16311,7 +16315,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+#ifdef CONFIG_CPA_DEBUG
+#include "pageattr-test.c"
+#endif
---- sle11sp2-2011-08-22.orig/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/pageattr_64-xen.c 2011-01-31 17:56:27.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,542 +0,0 @@
-/*
@@ -16856,8 +16860,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-
-EXPORT_SYMBOL(change_page_attr);
-EXPORT_SYMBOL(global_flush_tlb);
---- sle11sp2-2011-08-22.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/pgtable_32-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/pgtable_32-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -29,8 +29,6 @@
#include <xen/features.h>
#include <asm/hypervisor.h>
@@ -17658,8 +17662,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
- !mm->context.has_foreign_mappings)
- mm_unpin(mm);
-}
---- sle11sp2-2011-08-22.orig/arch/x86/vdso/Makefile 2011-06-30 15:41:26.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/vdso/Makefile 2011-06-30 16:34:12.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/vdso/Makefile 2011-06-30 15:41:26.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/vdso/Makefile 2011-06-30 16:34:12.000000000 +0200
@@ -79,6 +79,7 @@ vdso32.so-$(VDSO32-y) += int80
vdso32.so-$(CONFIG_COMPAT) += syscall
vdso32.so-$(VDSO32-y) += sysenter
@@ -17668,8 +17672,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
vdso32.so-$(CONFIG_XEN) += $(xen-vdso32-y)
vdso32-images = $(vdso32.so-y:%=vdso32-%.so)
---- sle11sp2-2011-08-22.orig/arch/x86/vdso/vdso32/syscall.S 2008-04-17 04:49:44.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/vdso/vdso32/syscall.S 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/vdso/vdso32/syscall.S 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/vdso/vdso32/syscall.S 2011-01-31 18:01:51.000000000 +0100
@@ -19,8 +19,10 @@ __kernel_vsyscall:
.Lpush_ebp:
movl %ecx, %ebp
@@ -17681,8 +17685,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
movl %ebp, %ecx
popl %ebp
.Lpop_ebp:
---- sle11sp2-2011-08-22.orig/arch/x86/vdso/vdso32.S 2008-10-10 00:13:53.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/vdso/vdso32.S 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/vdso/vdso32.S 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/vdso/vdso32.S 2011-01-31 18:01:51.000000000 +0100
@@ -19,4 +19,16 @@ vdso32_sysenter_start:
.incbin "arch/x86/vdso/vdso32-sysenter.so"
vdso32_sysenter_end:
@@ -17700,8 +17704,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+#endif
+
__FINIT
---- sle11sp2-2011-08-22.orig/arch/x86/vdso/vdso32-setup.c 2011-04-13 11:31:41.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/vdso/vdso32-setup.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/vdso/vdso32-setup.c 2011-04-13 11:31:41.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/vdso/vdso32-setup.c 2011-01-31 18:01:51.000000000 +0100
@@ -26,10 +26,6 @@
#include <asm/vdso.h>
#include <asm/proto.h>
@@ -17758,7 +17762,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
static struct vm_area_struct gate_vma;
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2-2011-08-22/arch/x86/vdso/vdso32-setup-xen.c 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/vdso/vdso32-setup-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -0,0 +1,506 @@
+/*
+ * (C) Copyright 2002 Linus Torvalds
@@ -18266,8 +18270,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+}
+
+#endif /* CONFIG_X86_64 */
---- sle11sp2-2011-08-22.orig/drivers/hwmon/coretemp-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/hwmon/coretemp-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/hwmon/coretemp-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/hwmon/coretemp-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -38,7 +38,8 @@
#define DRVNAME "coretemp"
#define coretemp_data pdev_entry
@@ -18458,8 +18462,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
/* supported CPU not found, but report the unknown
family 6 CPU */
---- sle11sp2-2011-08-22.orig/drivers/pci/msi-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/pci/msi-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/pci/msi-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/pci/msi-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -45,6 +45,14 @@ struct msi_pirq_entry {
int entry_nr;
};
@@ -18505,9 +18509,9 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-{
- return 0;
-}
---- sle11sp2-2011-08-22.orig/drivers/pci/pci.c 2011-08-09 10:25:20.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/pci/pci.c 2011-01-31 18:01:51.000000000 +0100
-@@ -471,7 +471,12 @@ pci_find_parent_resource(const struct pc
+--- sle11sp2-2011-09-06.orig/drivers/pci/pci.c 2011-09-06 09:11:35.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/pci/pci.c 2011-09-06 09:17:01.000000000 +0200
+@@ -473,7 +473,12 @@ pci_find_parent_resource(const struct pc
* Restore the BAR values for a given device, so as to make it
* accessible by its driver.
*/
@@ -18520,8 +18524,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
pci_restore_bars(struct pci_dev *dev)
{
int i;
---- sle11sp2-2011-08-22.orig/drivers/xen/balloon/sysfs.c 2011-01-31 17:32:22.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/balloon/sysfs.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/balloon/sysfs.c 2011-01-31 17:32:22.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/balloon/sysfs.c 2011-01-31 18:01:51.000000000 +0100
@@ -104,7 +104,7 @@ static struct attribute_group balloon_in
};
@@ -18531,8 +18535,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
};
static struct sys_device balloon_sysdev;
---- sle11sp2-2011-08-22.orig/drivers/xen/blkback/blkback.c 2011-04-11 15:01:24.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/blkback/blkback.c 2011-04-11 15:02:05.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/blkback/blkback.c 2011-04-11 15:01:24.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/blkback/blkback.c 2011-04-11 15:02:05.000000000 +0200
@@ -151,7 +151,7 @@ static void unplug_queue(blkif_t *blkif)
return;
if (blkif->plug->unplug_fn)
@@ -18552,8 +18556,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
blkif->plug = q;
}
---- sle11sp2-2011-08-22.orig/drivers/xen/blkfront/blkfront.c 2011-07-21 12:16:23.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/blkfront/blkfront.c 2011-07-21 12:17:10.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/blkfront/blkfront.c 2011-07-21 12:16:23.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/blkfront/blkfront.c 2011-07-21 12:17:10.000000000 +0200
@@ -750,7 +750,6 @@ static irqreturn_t blkif_int(int irq, vo
RING_IDX i, rp;
unsigned long flags;
@@ -18591,8 +18595,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
break;
default:
BUG();
---- sle11sp2-2011-08-22.orig/drivers/xen/blktap/blktap.c 2011-04-11 15:01:34.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/blktap/blktap.c 2011-04-11 15:02:02.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/blktap/blktap.c 2011-04-11 15:01:34.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/blktap/blktap.c 2011-04-11 15:02:02.000000000 +0200
@@ -310,8 +310,8 @@ static pte_t blktap_clear_pte(struct vm_
uvstart = info->rings_vstart + (RING_PAGES << PAGE_SHIFT);
}
@@ -18615,8 +18619,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
}
if (count) {
---- sle11sp2-2011-08-22.orig/drivers/xen/blktap2/device.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/blktap2/device.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/blktap2/device.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/blktap2/device.c 2011-01-31 18:01:51.000000000 +0100
@@ -161,9 +161,9 @@ blktap_map_uaddr_fn(pte_t *ptep, struct
}
@@ -18752,8 +18756,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
blktap_request_free(tap, request);
}
---- sle11sp2-2011-08-22.orig/drivers/xen/blktap2/ring.c 2011-04-11 13:43:15.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/blktap2/ring.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/blktap2/ring.c 2011-04-11 13:43:15.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/blktap2/ring.c 2011-01-31 18:01:51.000000000 +0100
@@ -103,8 +103,8 @@ blktap_ring_clear_pte(struct vm_area_str
* mapped region.
*/
@@ -18776,8 +18780,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
if (count)
if (HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref,
---- sle11sp2-2011-08-22.orig/drivers/xen/core/Makefile 2008-07-21 11:00:33.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/core/Makefile 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/core/Makefile 2008-07-21 11:00:33.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/core/Makefile 2011-01-31 18:01:51.000000000 +0100
@@ -10,5 +10,6 @@ obj-$(CONFIG_SYS_HYPERVISOR) += hypervis
obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o
obj-$(CONFIG_XEN_SYSFS) += xen_sysfs.o
@@ -18785,8 +18789,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+obj-$(CONFIG_X86_SMP) += spinlock.o
obj-$(CONFIG_KEXEC) += machine_kexec.o
obj-$(CONFIG_XEN_XENCOMM) += xencomm.o
---- sle11sp2-2011-08-22.orig/drivers/xen/core/evtchn.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/core/evtchn.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/core/evtchn.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/core/evtchn.c 2011-01-31 18:01:51.000000000 +0100
@@ -197,7 +197,7 @@ static inline unsigned int cpu_from_evtc
/* Upcall to generic IRQ layer. */
@@ -18837,8 +18841,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
}
}
---- sle11sp2-2011-08-22.orig/drivers/xen/core/hypervisor_sysfs.c 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/core/hypervisor_sysfs.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/core/hypervisor_sysfs.c 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/core/hypervisor_sysfs.c 2011-01-31 18:01:51.000000000 +0100
@@ -50,7 +50,7 @@ static int __init hypervisor_subsys_init
if (!is_running_on_xen())
return -ENODEV;
@@ -18848,8 +18852,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
return 0;
}
---- sle11sp2-2011-08-22.orig/drivers/xen/core/machine_reboot.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/core/machine_reboot.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/core/machine_reboot.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/core/machine_reboot.c 2011-01-31 18:01:51.000000000 +0100
@@ -174,6 +174,9 @@ static int take_machine_down(void *_susp
post_suspend(suspend_cancelled);
gnttab_resume();
@@ -18860,8 +18864,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
irq_resume();
#ifdef __x86_64__
/*
---- sle11sp2-2011-08-22.orig/drivers/xen/core/smpboot.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/core/smpboot.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/core/smpboot.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/core/smpboot.c 2011-01-31 18:01:51.000000000 +0100
@@ -59,6 +59,10 @@ void __init prefill_possible_map(void)
return;
@@ -18944,7 +18948,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
ctxt.ctrlreg[3] = xen_pfn_to_cr3(virt_to_mfn(init_level4_pgt));
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2-2011-08-22/drivers/xen/core/spinlock.c 2011-03-15 16:52:48.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/core/spinlock.c 2011-03-15 16:52:48.000000000 +0100
@@ -0,0 +1,285 @@
+/*
+ * Xen spinlock functions
@@ -19231,8 +19235,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+ }
+}
+EXPORT_SYMBOL(xen_spin_kick);
---- sle11sp2-2011-08-22.orig/drivers/xen/core/xen_sysfs.c 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/core/xen_sysfs.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/core/xen_sysfs.c 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/core/xen_sysfs.c 2011-01-31 18:01:51.000000000 +0100
@@ -30,12 +30,12 @@ HYPERVISOR_ATTR_RO(type);
static int __init xen_sysfs_type_init(void)
@@ -19329,8 +19333,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
}
#endif
---- sle11sp2-2011-08-22.orig/drivers/xen/gntdev/gntdev.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/gntdev/gntdev.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/gntdev/gntdev.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/gntdev/gntdev.c 2011-01-31 18:01:51.000000000 +0100
@@ -771,7 +771,7 @@ static pte_t gntdev_clear_pte(struct vm_
op.status);
} else {
@@ -19349,8 +19353,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
}
return copy;
---- sle11sp2-2011-08-22.orig/drivers/xen/pciback/pci_stub.c 2011-03-11 10:55:55.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/pciback/pci_stub.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/pciback/pci_stub.c 2011-03-11 10:55:55.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/pciback/pci_stub.c 2011-01-31 18:01:51.000000000 +0100
@@ -493,7 +493,7 @@ static void pcistub_remove(struct pci_de
}
}
@@ -19360,8 +19364,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
{
.vendor = PCI_ANY_ID,
.device = PCI_ANY_ID,
---- sle11sp2-2011-08-22.orig/drivers/xen/scsifront/scsifront.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/scsifront/scsifront.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/scsifront/scsifront.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/scsifront/scsifront.c 2011-01-31 18:01:51.000000000 +0100
@@ -260,19 +260,19 @@ static int map_data_for_request(struct v
return -ENOMEM;
}
@@ -19433,8 +19437,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
}
big_to_sg:
---- sle11sp2-2011-08-22.orig/drivers/xen/usbfront/usbfront-dbg.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/usbfront/usbfront-dbg.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/usbfront/usbfront-dbg.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/usbfront/usbfront-dbg.c 2011-01-31 18:01:51.000000000 +0100
@@ -43,17 +43,16 @@
* DEALINGS IN THE SOFTWARE.
*/
@@ -19480,8 +19484,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+ struct device *dev = info_to_hcd(info)->self.controller;
+ device_remove_file(dev, &dev_attr_statistics);
}
---- sle11sp2-2011-08-22.orig/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/xenoprof/xenoprofile.c 2011-01-31 18:01:51.000000000 +0100
@@ -77,7 +77,7 @@ static int xenoprof_resume(struct sys_de
@@ -19491,8 +19495,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
.resume = xenoprof_resume,
.suspend = xenoprof_suspend
};
---- sle11sp2-2011-08-22.orig/arch/x86/include/asm/e820.h 2011-05-19 06:06:34.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/include/asm/e820.h 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/asm/e820.h 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/include/asm/e820.h 2011-01-31 18:01:51.000000000 +0100
@@ -66,7 +66,11 @@ struct e820map {
struct e820entry map[E820_X_MAX];
};
@@ -19505,8 +19509,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
#define ISA_END_ADDRESS 0x100000
#define BIOS_BEGIN 0x000a0000
---- sle11sp2-2011-08-22.orig/arch/x86/include/asm/hardirq.h 2011-01-05 01:50:19.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/asm/hardirq.h 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/asm/hardirq.h 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/include/asm/hardirq.h 2011-01-31 18:01:51.000000000 +0100
@@ -18,7 +18,11 @@ typedef struct {
#ifdef CONFIG_SMP
unsigned int irq_resched_count;
@@ -19519,8 +19523,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
#endif
#ifdef CONFIG_X86_THERMAL_VECTOR
unsigned int irq_thermal_count;
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/agp.h 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/agp.h 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/agp.h 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/agp.h 2011-01-31 18:01:51.000000000 +0100
@@ -13,18 +13,13 @@
* page. This avoids data corruption on some CPUs.
*/
@@ -19542,8 +19546,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
/*
* Could use CLFLUSH here if the cpu supports it. But then it would
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/desc.h 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/desc.h 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/desc.h 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/desc.h 2011-01-31 18:01:51.000000000 +0100
@@ -1,5 +1,404 @@
+#ifndef _ASM_DESC_H_
+#define _ASM_DESC_H_
@@ -19951,7 +19955,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+#endif /* __ASSEMBLY__ */
+
#endif
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:32:29.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/desc_32.h 2011-01-31 17:32:29.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,262 +0,0 @@
-#ifndef __ARCH_DESC_H
@@ -20216,7 +20220,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-#endif /* !__ASSEMBLY__ */
-
-#endif
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/desc_64.h 2011-01-31 17:56:27.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/desc_64.h 2011-01-31 17:56:27.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,228 +0,0 @@
-/* Written 2000 by Andi Kleen */
@@ -20447,8 +20451,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-#endif /* !__ASSEMBLY__ */
-
-#endif
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:49:31.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 17:49:31.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 18:01:51.000000000 +0100
@@ -64,7 +64,7 @@ enum fixed_addresses {
#endif
#ifdef CONFIG_X86_VISWS_APIC
@@ -20495,8 +20499,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
__end_of_fixed_addresses
};
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:49:31.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 17:49:31.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 18:01:51.000000000 +0100
@@ -15,6 +15,7 @@
#include <asm/apicdef.h>
#include <asm/page.h>
@@ -20543,8 +20547,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
__end_of_fixed_addresses
};
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 17:49:31.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 17:49:31.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 18:01:51.000000000 +0100
@@ -37,11 +37,6 @@ extern pte_t *pkmap_page_table;
* easily, subsequent pte tables have to be allocated in one physical
* chunk of RAM.
@@ -20573,9 +20577,9 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
void *kmap(struct page *page);
void kunmap(struct page *page);
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-07-20 15:40:13.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/hypervisor.h 2011-07-21 12:16:58.000000000 +0200
-@@ -121,6 +121,8 @@ struct page;
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-08-23 13:27:38.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/hypervisor.h 2011-08-23 15:15:35.000000000 +0200
+@@ -119,6 +119,8 @@ struct page;
int xen_limit_pages_to_max_mfn(
struct page *pages, unsigned int order, unsigned int address_bits);
@@ -20584,7 +20588,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
/* Turn jiffies into Xen system time. */
u64 jiffies_to_st(unsigned long jiffies);
-@@ -267,6 +269,25 @@ HYPERVISOR_poll(
+@@ -265,6 +267,25 @@ HYPERVISOR_poll(
return rc;
}
@@ -20610,15 +20614,15 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
#ifdef CONFIG_XEN
static inline void
-@@ -306,4 +327,6 @@ MULTI_grant_table_op(multicall_entry_t *
+@@ -304,4 +325,6 @@ MULTI_grant_table_op(multicall_entry_t *
#endif
+#define uvm_multi(cpumask) ((unsigned long)cpus_addr(cpumask) | UVMF_MULTI)
+
#endif /* __HYPERVISOR_H__ */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/irqflags.h 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/irqflags.h 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/irqflags.h 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/irqflags.h 2011-01-31 18:01:51.000000000 +0100
@@ -1,5 +1,249 @@
-#ifdef CONFIG_X86_32
-# include "irqflags_32.h"
@@ -20872,7 +20876,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+
+#endif /* __ASSEMBLY__ */
#endif
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:56:27.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/irqflags_32.h 2011-01-31 17:56:27.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,214 +0,0 @@
-/*
@@ -21089,7 +21093,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-#endif
-
-#endif
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/irqflags_64.h 2011-01-31 17:56:27.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/irqflags_64.h 2011-01-31 17:56:27.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,178 +0,0 @@
-/*
@@ -21270,8 +21274,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-#endif
-
-#endif
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/maddr.h 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/maddr.h 2011-08-09 10:52:22.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/maddr.h 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/maddr.h 2011-08-09 10:52:22.000000000 +0200
@@ -1,5 +1,155 @@
+#ifndef _X86_MADDR_H
+#define _X86_MADDR_H
@@ -21428,8 +21432,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+#define mfn_to_virt(m) __va(mfn_to_pfn(m) << PAGE_SHIFT)
+
+#endif /* _X86_MADDR_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/maddr_32.h 2011-01-31 17:49:31.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/maddr_32.h 2011-08-09 10:48:33.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/maddr_32.h 2011-01-31 17:49:31.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/maddr_32.h 2011-08-09 10:48:33.000000000 +0200
@@ -1,130 +1,6 @@
#ifndef _I386_MADDR_H
#define _I386_MADDR_H
@@ -21608,8 +21612,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-#define mfn_to_virt(m) (__va(mfn_to_pfn(m) << PAGE_SHIFT))
-
#endif /* _I386_MADDR_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/maddr_64.h 2011-08-08 12:54:10.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/maddr_64.h 2011-08-09 10:48:35.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/maddr_64.h 2011-08-08 12:54:10.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/maddr_64.h 2011-08-09 10:48:35.000000000 +0200
@@ -1,124 +1,6 @@
#ifndef _X86_64_MADDR_H
#define _X86_64_MADDR_H
@@ -21763,8 +21767,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-
#endif /* _X86_64_MADDR_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:49:31.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 17:49:31.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 18:01:51.000000000 +0100
@@ -51,8 +51,6 @@ static inline void __prepare_arch_switch
: : "r" (0) );
}
@@ -21774,8 +21778,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
static inline void switch_mm(struct mm_struct *prev,
struct mm_struct *next,
struct task_struct *tsk)
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 17:49:31.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 17:49:31.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 18:01:51.000000000 +0100
@@ -62,12 +62,6 @@ extern void mm_pin(struct mm_struct *mm)
extern void mm_unpin(struct mm_struct *mm);
void mm_pin_all(void);
@@ -21816,8 +21820,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
}
}
#endif
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pci.h 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pci.h 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pci.h 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/pci.h 2011-01-31 18:01:51.000000000 +0100
@@ -71,6 +71,7 @@ extern int pci_mmap_page_range(struct pc
@@ -21858,8 +21862,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+#endif
#endif
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 17:49:31.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 17:49:31.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 18:01:51.000000000 +0100
@@ -3,69 +3,109 @@
#include <linux/threads.h>
@@ -22008,8 +22012,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+#endif /* CONFIG_X86_PAE */
#endif /* _I386_PGALLOC_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 18:01:51.000000000 +0100
@@ -6,30 +6,13 @@
#include <linux/mm.h>
#include <asm/io.h> /* for phys_to_virt and page_to_pseudophys */
@@ -22168,8 +22172,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
#define __pmd_free_tlb(tlb,x) tlb_remove_page((tlb),virt_to_page(x))
#define __pud_free_tlb(tlb,x) tlb_remove_page((tlb),virt_to_page(x))
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgtable.h 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgtable.h 2011-03-23 09:14:47.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pgtable.h 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/pgtable.h 2011-03-23 09:14:47.000000000 +0100
@@ -1,5 +1,461 @@
+#ifndef _ASM_X86_PGTABLE_H
+#define _ASM_X86_PGTABLE_H
@@ -22632,8 +22636,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+#endif /* __ASSEMBLY__ */
+
+#endif /* _ASM_X86_PGTABLE_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:49:31.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-03-23 09:14:16.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-01-31 17:49:31.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-03-23 09:14:16.000000000 +0100
@@ -18,16 +18,18 @@
printk("%s:%d: bad pgd %p(%016Lx pfn %08Lx).\n", __FILE__, __LINE__, \
&(e), __pgd_val(e), (pgd_val(e) & PTE_MASK) >> PAGE_SHIFT)
@@ -22802,8 +22806,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+#define __swp_entry_to_pte(x) ((pte_t){ { .pte_high = (x).val } })
#endif /* _I386_PGTABLE_3LEVEL_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:38:52.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:38:52.000000000 +0100
@@ -1,8 +1,6 @@
#ifndef _I386_PGTABLE_H
#define _I386_PGTABLE_H
@@ -23264,8 +23268,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-#include <asm-generic/pgtable.h>
-
#endif /* _I386_PGTABLE_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 09:14:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 09:14:24.000000000 +0100
@@ -13,49 +13,26 @@
#include <linux/threads.h>
#include <linux/sched.h>
@@ -23801,8 +23805,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
#endif /* !__ASSEMBLY__ */
#endif /* _X86_64_PGTABLE_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/processor.h 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/processor.h 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/processor.h 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/processor.h 2011-01-31 18:01:51.000000000 +0100
@@ -1,5 +1,795 @@
+#ifndef __ASM_X86_PROCESSOR_H
+#define __ASM_X86_PROCESSOR_H
@@ -24601,7 +24605,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+#define KSTK_ESP(task) (task_pt_regs(task)->sp)
+
#endif
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:56:27.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/processor_32.h 2011-01-31 17:56:27.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,755 +0,0 @@
-/*
@@ -25359,7 +25363,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-extern int force_mwait;
-
-#endif /* __ASM_I386_PROCESSOR_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:56:27.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/processor_64.h 2011-01-31 17:56:27.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,467 +0,0 @@
-/*
@@ -25829,8 +25833,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-#define HAVE_ARCH_PICK_MMAP_LAYOUT 1
-
-#endif /* __ASM_X86_64_PROCESSOR_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 18:01:51.000000000 +0100
@@ -1,55 +1,50 @@
#ifndef __ASM_SMP_H
#define __ASM_SMP_H
@@ -26021,8 +26025,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-
+#endif /* !ASSEMBLY */
#endif
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 18:01:51.000000000 +0100
@@ -1,130 +1,101 @@
#ifndef __ASM_SMP_H
#define __ASM_SMP_H
@@ -26206,7 +26210,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/spinlock.h 2011-07-12 10:55:12.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/spinlock.h 2011-07-12 10:55:12.000000000 +0200
@@ -0,0 +1,345 @@
+#ifndef _X86_SPINLOCK_H_
+#define _X86_SPINLOCK_H_
@@ -26554,7 +26558,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/spinlock_types.h 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/spinlock_types.h 2011-01-31 18:01:51.000000000 +0100
@@ -0,0 +1,36 @@
+#ifndef __ASM_SPINLOCK_TYPES_H
+#define __ASM_SPINLOCK_TYPES_H
@@ -26592,8 +26596,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+#define __RAW_RW_LOCK_UNLOCKED { RW_LOCK_BIAS }
+
+#endif
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/system.h 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/system.h 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/system.h 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/system.h 2011-01-31 18:01:51.000000000 +0100
@@ -1,5 +1,393 @@
+#ifndef _ASM_X86_SYSTEM_H_
+#define _ASM_X86_SYSTEM_H_
@@ -26990,7 +26994,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+}
+
#endif
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/system_32.h 2011-01-31 17:56:27.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/system_32.h 2011-01-31 17:56:27.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,312 +0,0 @@
-#ifndef __ASM_SYSTEM_H
@@ -27305,7 +27309,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-void __show_registers(struct pt_regs *, int all);
-
-#endif
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/system_64.h 2011-01-31 17:56:27.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/system_64.h 2011-01-31 17:56:27.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,179 +0,0 @@
-#ifndef __ASM_SYSTEM_H
@@ -27487,8 +27491,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
-
-#endif
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/time.h 2011-07-11 10:35:24.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/time.h 2011-07-11 11:48:04.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/time.h 2011-07-11 10:35:24.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/time.h 2011-07-11 11:48:04.000000000 +0200
@@ -1,6 +1,17 @@
-#ifdef CONFIG_XEN_PRIVILEGED_GUEST
+#ifndef _XEN_ASM_TIME_H
@@ -27508,8 +27512,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+#endif /* _XEN_ASM_TIME_H */
+
#include_next <asm/time.h>
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/tlbflush.h 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/tlbflush.h 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/tlbflush.h 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/tlbflush.h 2011-01-31 18:01:51.000000000 +0100
@@ -1,5 +1,106 @@
+#ifndef _ASM_X86_TLBFLUSH_H
+#define _ASM_X86_TLBFLUSH_H
@@ -27619,7 +27623,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
+}
+
+#endif /* _ASM_X86_TLBFLUSH_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:56:27.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/tlbflush_32.h 2011-01-31 17:56:27.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,99 +0,0 @@
-#ifndef _I386_TLBFLUSH_H
@@ -27721,7 +27725,7 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-}
-
-#endif /* _I386_TLBFLUSH_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:56:27.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/tlbflush_64.h 2011-01-31 17:56:27.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,97 +0,0 @@
-#ifndef _X8664_TLBFLUSH_H
@@ -27821,8 +27825,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
-}
-
-#endif /* _X8664_TLBFLUSH_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/asm/mmu.h 2011-06-30 16:30:20.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/include/asm/mmu.h 2011-06-30 16:34:46.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/include/asm/mmu.h 2011-06-30 16:30:20.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/include/asm/mmu.h 2011-06-30 16:34:46.000000000 +0200
@@ -24,7 +24,7 @@ typedef struct {
void *vdso;
} mm_context_t;
@@ -27832,8 +27836,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
void leave_mm(int cpu);
#else
static inline void leave_mm(int cpu)
---- sle11sp2-2011-08-22.orig/arch/x86/include/asm/ptrace.h 2011-07-22 04:17:23.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/include/asm/ptrace.h 2011-06-30 16:34:54.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/include/asm/ptrace.h 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/include/asm/ptrace.h 2011-06-30 16:34:54.000000000 +0200
@@ -267,7 +267,9 @@ static inline unsigned long regs_get_ker
}
@@ -27845,8 +27849,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
#define arch_has_block_step() (1)
#else
#define arch_has_block_step() (boot_cpu_data.x86 >= 6)
---- sle11sp2-2011-08-22.orig/arch/x86/include/asm/thread_info.h 2011-01-31 17:49:31.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/asm/thread_info.h 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/asm/thread_info.h 2011-01-31 17:49:31.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/asm/thread_info.h 2011-01-31 18:01:51.000000000 +0100
@@ -95,6 +95,9 @@ struct thread_info {
#define TIF_BLOCKSTEP 25 /* set when we want DEBUGCTLMSR_BTF */
#define TIF_LAZY_MMU_UPDATES 27 /* task is updating the mmu lazily */
@@ -27882,9 +27886,9 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
#define PREEMPT_ACTIVE 0x10000000
---- sle11sp2-2011-08-22.orig/include/linux/page-flags.h 2011-08-22 10:32:06.000000000 +0200
-+++ sle11sp2-2011-08-22/include/linux/page-flags.h 2011-08-22 10:33:10.000000000 +0200
-@@ -128,8 +128,8 @@ enum pageflags {
+--- sle11sp2-2011-09-06.orig/include/linux/page-flags.h 2011-09-06 09:16:27.000000000 +0200
++++ sle11sp2-2011-09-06/include/linux/page-flags.h 2011-09-06 09:16:42.000000000 +0200
+@@ -129,8 +129,8 @@ enum pageflags {
#ifdef CONFIG_XEN
PG_pinned = PG_locked, /* Cannot alias with PG_owner_priv_1 since
* bad_page() checks should include this bit.
@@ -27895,9 +27899,9 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
#else
PG_pinned = PG_owner_priv_1,
PG_savepinned = PG_dirty,
---- sle11sp2-2011-08-22.orig/include/linux/pci.h 2011-06-30 16:06:54.000000000 +0200
-+++ sle11sp2-2011-08-22/include/linux/pci.h 2011-06-30 16:35:02.000000000 +0200
-@@ -801,6 +801,9 @@ int pci_reset_function(struct pci_dev *d
+--- sle11sp2-2011-09-06.orig/include/linux/pci.h 2011-09-06 09:16:16.000000000 +0200
++++ sle11sp2-2011-09-06/include/linux/pci.h 2011-09-06 09:16:48.000000000 +0200
+@@ -814,6 +814,9 @@ int pci_reset_function(struct pci_dev *d
void pci_update_resource(struct pci_dev *dev, int resno);
int __must_check pci_assign_resource(struct pci_dev *dev, int i);
int pci_select_bars(struct pci_dev *dev, unsigned long flags);
@@ -27907,8 +27911,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
/* ROM control related routines */
int pci_enable_rom(struct pci_dev *pdev);
---- sle11sp2-2011-08-22.orig/include/xen/evtchn.h 2011-01-31 17:29:16.000000000 +0100
-+++ sle11sp2-2011-08-22/include/xen/evtchn.h 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/include/xen/evtchn.h 2011-01-31 17:29:16.000000000 +0100
++++ sle11sp2-2011-09-06/include/xen/evtchn.h 2011-01-31 18:01:51.000000000 +0100
@@ -133,6 +133,18 @@ static inline void clear_evtchn(int port
synch_clear_bit(port, s->evtchn_pending);
}
@@ -27928,8 +27932,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
static inline void notify_remote_via_evtchn(int port)
{
struct evtchn_send send = { .port = port };
---- sle11sp2-2011-08-22.orig/kernel/sysctl_binary.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/kernel/sysctl_binary.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/kernel/sysctl_binary.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/kernel/sysctl_binary.c 2011-01-31 18:01:51.000000000 +0100
@@ -874,7 +874,7 @@ static const struct bin_table bin_bus_ta
@@ -27939,8 +27943,8 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
{ CTL_XEN_INDEPENDENT_WALLCLOCK, "independent_wallclock" },
{ CTL_XEN_PERMITTED_CLOCK_JITTER, "permitted_clock_jitter" },
{}
---- sle11sp2-2011-08-22.orig/lib/swiotlb-xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/lib/swiotlb-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/lib/swiotlb-xen.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/lib/swiotlb-xen.c 2011-01-31 18:01:51.000000000 +0100
@@ -30,7 +30,6 @@
#include <asm/gnttab_dma.h>
@@ -28014,9 +28018,9 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
spin_unlock_irqrestore(&io_tlb_lock, flags);
return NULL;
}
---- sle11sp2-2011-08-22.orig/mm/memory.c 2011-07-21 12:07:22.000000000 +0200
-+++ sle11sp2-2011-08-22/mm/memory.c 2011-08-09 10:48:05.000000000 +0200
-@@ -2430,6 +2430,10 @@ int apply_to_page_range(struct mm_struct
+--- sle11sp2-2011-09-06.orig/mm/memory.c 2011-07-21 12:07:22.000000000 +0200
++++ sle11sp2-2011-09-06/mm/memory.c 2011-09-06 09:16:53.000000000 +0200
+@@ -2423,6 +2423,10 @@ int apply_to_page_range(struct mm_struct
unsigned long end = addr + size;
int err;
diff --git a/patches.xen/xen3-patch-2.6.26 b/patches.xen/xen3-patch-2.6.26
index 080c8812a3..0310eeb51b 100644
--- a/patches.xen/xen3-patch-2.6.26
+++ b/patches.xen/xen3-patch-2.6.26
@@ -7,8 +7,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
2.6.35/arch/x86/include/asm/scatterlist.h (would need to be reverted there)
---- sle11sp2-2011-08-22.orig/arch/x86/Kconfig 2011-08-22 10:33:19.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/Kconfig 2011-08-22 10:33:47.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/Kconfig 2011-08-22 10:33:19.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/Kconfig 2011-08-22 10:33:47.000000000 +0200
@@ -40,7 +40,7 @@ config X86
select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE
select HAVE_SYSCALL_TRACEPOINTS
@@ -42,8 +42,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
-source "drivers/xen/Kconfig"
-
source "lib/Kconfig"
---- sle11sp2-2011-08-22.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/ia32/ia32entry-xen.S 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/ia32/ia32entry-xen.S 2011-01-31 18:07:35.000000000 +0100
@@ -129,12 +129,14 @@ sysenter_tracesys:
SAVE_REST
CLEAR_RREGS
@@ -104,8 +104,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
.quad sys_alarm
.quad sys_fstat /* (old)fstat */
.quad sys_pause
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/Makefile 2011-06-30 16:34:04.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/Makefile 2011-06-30 16:36:14.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/Makefile 2011-06-30 16:34:04.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/Makefile 2011-06-30 16:36:14.000000000 +0200
@@ -133,8 +133,7 @@ ifeq ($(CONFIG_X86_64),y)
obj-$(CONFIG_XEN) += nmi_64.o
@@ -117,16 +117,16 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
- smpboot_$(BITS).o tsc_$(BITS).o tsc_sync.o
+disabled-obj-$(CONFIG_XEN) := crash.o early-quirks.o hpet.o i8253.o i8259_$(BITS).o \
+ pci-swiotlb_64.o reboot.o smpboot.o tlb_$(BITS).o tsc_$(BITS).o tsc_sync.o vsmp_64.o
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/acpi/Makefile 2011-04-13 11:31:41.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/acpi/Makefile 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/acpi/Makefile 2011-04-13 11:31:41.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/acpi/Makefile 2011-01-31 18:07:35.000000000 +0100
@@ -15,4 +15,4 @@ $(obj)/wakeup_rm.o: $(obj)/realmode/w
$(obj)/realmode/wakeup.bin: FORCE
$(Q)$(MAKE) $(build)=$(obj)/realmode
-disabled-obj-$(CONFIG_XEN) := cstate.o wakeup_$(BITS).o
+disabled-obj-$(CONFIG_XEN) := cstate.o wakeup_%.o
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/acpi/boot.c 2011-03-11 10:56:21.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/acpi/boot.c 2011-03-11 10:59:02.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/acpi/boot.c 2011-03-11 10:56:21.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/acpi/boot.c 2011-03-11 10:59:02.000000000 +0100
@@ -206,6 +206,7 @@ static int __init acpi_parse_madt(struct
static void __cpuinit acpi_register_lapic(int id, u8 enabled)
@@ -143,8 +143,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
}
static int __init
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/cpu/common-xen.c 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/cpu/common-xen.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/cpu/common-xen.c 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/cpu/common-xen.c 2011-01-31 18:07:35.000000000 +0100
@@ -5,7 +5,6 @@
#include <linux/module.h>
#include <linux/percpu.h>
@@ -538,8 +538,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
void __cpuinit cpu_uninit(void)
{
int cpu = raw_smp_processor_id();
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 18:07:35.000000000 +0100
@@ -35,6 +35,8 @@ struct mtrr_ops *mtrr_if = &generic_mtrr
unsigned int num_var_ranges;
unsigned int mtrr_usage_table[MAX_VAR_RANGES];
@@ -694,8 +694,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
}
void mtrr_ap_init(void)
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/cpu/bugs.c 2011-07-22 04:17:23.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/cpu/bugs.c 2011-06-30 16:36:18.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/cpu/bugs.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/cpu/bugs.c 2011-06-30 16:36:18.000000000 +0200
@@ -17,6 +17,7 @@
#include <asm/paravirt.h>
#include <asm/alternative.h>
@@ -737,8 +737,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
}
/*
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/cpu/proc.c 2009-12-03 04:51:21.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/cpu/proc.c 2011-03-03 16:38:42.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/cpu/proc.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/cpu/proc.c 2011-03-03 16:38:42.000000000 +0100
@@ -10,7 +10,7 @@
static void show_cpuinfo_core(struct seq_file *m, struct cpuinfo_x86 *c,
unsigned int cpu)
@@ -771,8 +771,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
c->hard_math ? "yes" : "no",
fpu_exception ? "yes" : "no",
c->cpuid_level,
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/e820_32-xen.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/e820_32-xen.c 2011-01-31 18:07:35.000000000 +0100
@@ -469,7 +469,7 @@ int __init sanitize_e820_map(struct e820
* thinkpad 560x, for example, does not cooperate with the memory
* detection code.)
@@ -839,8 +839,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
saved_max_pfn = max_pfn;
#endif
e820.nr_map = 0;
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/e820_64-xen.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/e820_64-xen.c 2011-01-31 18:07:35.000000000 +0100
@@ -41,11 +41,11 @@ unsigned long end_pfn;
#ifndef CONFIG_XEN
@@ -1169,8 +1169,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
e820.nr_map = 0;
userdef = 1;
return 0;
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/early_printk-xen.c 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/early_printk-xen.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/early_printk-xen.c 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/early_printk-xen.c 2011-01-31 18:07:35.000000000 +0100
@@ -13,7 +13,7 @@
#define VGABASE (__ISA_IO_base + 0xb8000)
@@ -1239,8 +1239,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
#ifdef CONFIG_XEN
} else if (!strncmp(buf, "xen", 3)) {
early_console = &xenboot_console;
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:10:15.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/entry_32-xen.S 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:10:15.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/entry_32-xen.S 2011-01-31 18:07:35.000000000 +0100
@@ -1,5 +1,4 @@
/*
- * linux/arch/i386/entry.S
@@ -1408,8 +1408,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
GET_THREAD_INFO(%ebp)
movl $-EFAULT,PT_EAX(%esp)
jmp resume_userspace
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/entry_64-xen.S 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/entry_64-xen.S 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/entry_64-xen.S 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/entry_64-xen.S 2011-01-31 18:07:35.000000000 +0100
@@ -331,19 +331,17 @@ badsys:
/* Do syscall tracing */
tracesys:
@@ -1433,8 +1433,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
/* Use IRET because user could have changed frame */
/*
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/head64-xen.c 2011-08-09 10:49:01.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/head64-xen.c 2011-08-09 10:53:20.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/head64-xen.c 2011-08-09 10:49:01.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/head64-xen.c 2011-08-09 10:53:20.000000000 +0200
@@ -17,6 +17,7 @@
#include <linux/string.h>
#include <linux/percpu.h>
@@ -1586,8 +1586,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
/*
* At this point everything still needed from the boot loader
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/head_32-xen.S 2011-08-09 10:48:56.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/head_32-xen.S 2011-08-09 10:53:18.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/head_32-xen.S 2011-08-09 10:48:56.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/head_32-xen.S 2011-08-09 10:53:18.000000000 +0200
@@ -70,7 +70,7 @@ ENTRY(startup_32)
cld # gcc2 wants the direction flag cleared at all times
@@ -1597,8 +1597,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
#define HYPERCALL_PAGE_OFFSET 0x1000
.org HYPERCALL_PAGE_OFFSET
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 18:07:35.000000000 +0100
@@ -88,6 +88,16 @@ int sis_apic_bug = -1;
*/
int nr_ioapic_registers[MAX_IO_APICS];
@@ -1927,8 +1927,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
return 0;
}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 18:07:35.000000000 +0100
@@ -43,13 +43,15 @@
#include <asm/smp.h>
#include <asm/desc.h>
@@ -2127,7 +2127,7 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
for (i = 0; i < nr_ioapics; i++) {
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2-2011-08-22/arch/x86/kernel/apic/ipi-xen.c 2011-02-21 13:56:33.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/apic/ipi-xen.c 2011-02-21 13:56:33.000000000 +0100
@@ -0,0 +1,63 @@
+#include <linux/cpumask.h>
+#include <linux/interrupt.h>
@@ -2192,8 +2192,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
+#include <mach_ipi.h>
+
+#endif
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/machine_kexec_64.c 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/machine_kexec_64.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/machine_kexec_64.c 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/machine_kexec_64.c 2011-01-31 18:07:35.000000000 +0100
@@ -114,8 +114,6 @@ int __init machine_kexec_setup_resources
return 0;
}
@@ -2203,8 +2203,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
#else /* CONFIG_XEN */
#define x__pmd(x) __pmd(x)
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/microcode-xen.c 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/microcode-xen.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/microcode-xen.c 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/microcode-xen.c 2011-01-31 18:07:35.000000000 +0100
@@ -162,7 +162,7 @@ static int request_microcode(void)
c->x86, c->x86_model, c->x86_mask);
error = request_firmware(&firmware, name, &microcode_pdev->dev);
@@ -2214,8 +2214,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
return error;
}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/mmconf-fam10h_64.c 2011-01-05 01:50:19.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/mmconf-fam10h_64.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/mmconf-fam10h_64.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/mmconf-fam10h_64.c 2011-01-31 18:07:35.000000000 +0100
@@ -205,12 +205,20 @@ void __cpuinit fam10h_check_enable_mmcfg
return;
}
@@ -2238,7 +2238,7 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
static int __init set_check_enable_amd_mmconf(const struct dmi_system_id *d)
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2-2011-08-22/arch/x86/kernel/mpparse-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/mpparse-xen.c 2011-01-31 18:07:35.000000000 +0100
@@ -0,0 +1,1117 @@
+/*
+ * Intel Multiprocessor Specification 1.1 and 1.4
@@ -3357,7 +3357,7 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
+
+#endif /* CONFIG_X86_IO_APIC */
+#endif /* CONFIG_ACPI */
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/mpparse_32-xen.c 2011-01-31 18:01:51.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,1163 +0,0 @@
-/*
@@ -4523,7 +4523,7 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
-
-#endif /* CONFIG_X86_IO_APIC */
-#endif /* CONFIG_ACPI */
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/mpparse_64-xen.c 2011-01-31 18:01:51.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,880 +0,0 @@
-/*
@@ -5406,8 +5406,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
- return gsi;
-}
-#endif /*CONFIG_ACPI*/
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/pci-dma-xen.c 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/pci-dma-xen.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/pci-dma-xen.c 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/pci-dma-xen.c 2011-01-31 18:07:35.000000000 +0100
@@ -1,280 +1,251 @@
-/*
- * Dynamic DMA mapping support.
@@ -6248,7 +6248,7 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_ANY_ID, via_no_dac);
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2-2011-08-22/arch/x86/kernel/pci-nommu-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/pci-nommu-xen.c 2011-01-31 18:07:35.000000000 +0100
@@ -0,0 +1,108 @@
+#include <linux/dma-mapping.h>
+#include <linux/dmar.h>
@@ -6359,7 +6359,7 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
+ dma_ops = &nommu_dma_ops;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2-2011-08-22/arch/x86/kernel/process-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/process-xen.c 2011-01-31 18:07:35.000000000 +0100
@@ -0,0 +1,188 @@
+#include <linux/errno.h>
+#include <linux/kernel.h>
@@ -6549,8 +6549,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
+}
+early_param("idle", idle_setup);
+
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/process_32-xen.c 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/process_32-xen.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/process_32-xen.c 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/process_32-xen.c 2011-01-31 18:07:35.000000000 +0100
@@ -36,6 +36,7 @@
#include <linux/personality.h>
#include <linux/tick.h>
@@ -6830,8 +6830,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
math_state_restore();
/*
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/process_64-xen.c 2011-02-02 08:32:11.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/process_64-xen.c 2011-02-02 08:32:46.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/process_64-xen.c 2011-02-02 08:32:11.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/process_64-xen.c 2011-02-02 08:32:46.000000000 +0100
@@ -39,6 +39,7 @@
#include <linux/kprobes.h>
#include <linux/kdebug.h>
@@ -7072,8 +7072,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
math_state_restore();
return prev_p;
}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/rtc.c 2011-07-11 12:50:41.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/rtc.c 2011-07-11 12:44:11.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/rtc.c 2011-07-11 12:50:41.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/rtc.c 2011-07-11 12:44:11.000000000 +0200
@@ -201,6 +201,7 @@ unsigned long long native_read_tsc(void)
EXPORT_SYMBOL(native_read_tsc);
@@ -7100,7 +7100,7 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
device_initcall(add_rtc_cmos);
+#endif /* CONFIG_XEN_UNPRIVILEGED_GUEST */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2-2011-08-22/arch/x86/kernel/setup-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/setup-xen.c 2011-01-31 18:07:35.000000000 +0100
@@ -0,0 +1,143 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
@@ -7245,8 +7245,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
+}
+
+#endif
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/setup64-xen.c 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/setup64-xen.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/setup64-xen.c 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/setup64-xen.c 2011-01-31 18:07:35.000000000 +0100
@@ -15,6 +15,7 @@
#include <linux/bootmem.h>
#include <linux/bitops.h>
@@ -7396,8 +7396,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
+ if (is_uv_system())
+ uv_cpu_init();
}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/setup_32-xen.c 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/setup_32-xen.c 2011-03-04 15:07:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/setup_32-xen.c 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/setup_32-xen.c 2011-03-04 15:07:31.000000000 +0100
@@ -39,6 +39,7 @@
#include <linux/efi.h>
#include <linux/init.h>
@@ -7671,8 +7671,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
#ifdef CONFIG_X86_GENERICARCH
generic_apic_probe();
#endif
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/setup_64-xen.c 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/setup_64-xen.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/setup_64-xen.c 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/setup_64-xen.c 2011-01-31 18:07:35.000000000 +0100
@@ -29,18 +29,22 @@
#include <linux/crash_dump.h>
#include <linux/root_dev.h>
@@ -8235,7 +8235,7 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
- .show = show_cpuinfo,
-};
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2-2011-08-22/arch/x86/kernel/smp-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/smp-xen.c 2011-01-31 18:07:35.000000000 +0100
@@ -0,0 +1,327 @@
+/*
+ * Intel SMP support routines.
@@ -8564,7 +8564,7 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
+
+ return IRQ_HANDLED;
+}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/smp_32-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/smp_32-xen.c 2011-01-31 18:01:51.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,647 +0,0 @@
-/*
@@ -9214,7 +9214,7 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
-
- return IRQ_HANDLED;
-}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/smp_64-xen.c 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/smp_64-xen.c 2011-01-31 18:01:51.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,554 +0,0 @@
-/*
@@ -9771,8 +9771,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
- return IRQ_HANDLED;
-#endif
-}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/time-xen.c 2011-07-11 11:37:23.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/time-xen.c 2011-07-11 11:49:22.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/time-xen.c 2011-08-23 13:48:43.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/time-xen.c 2011-07-11 11:49:22.000000000 +0200
@@ -738,8 +738,6 @@ static void init_missing_ticks_accountin
runstate->time[RUNSTATE_offline];
}
@@ -9791,8 +9791,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
{
BUG_ON(cpu == 0);
unbind_from_irqhandler(per_cpu(timer_irq, cpu), NULL);
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/traps_32-xen.c 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/traps_32-xen.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/traps_32-xen.c 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/traps_32-xen.c 2011-01-31 18:07:35.000000000 +0100
@@ -9,26 +9,28 @@
* 'Traps.c' handles hardware traps and faults after we have saved some
* state in 'asm.s'.
@@ -10877,8 +10877,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
return 1;
}
__setup("kstack=", kstack_setup);
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/traps_64-xen.c 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/traps_64-xen.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/traps_64-xen.c 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/traps_64-xen.c 2011-01-31 18:07:35.000000000 +0100
@@ -33,6 +33,8 @@
#include <linux/kdebug.h>
#include <linux/utsname.h>
@@ -10987,8 +10987,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
* Should be a barrier for any external CPU state.
*/
cpu_init();
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 18:07:35.000000000 +0100
@@ -216,7 +216,7 @@ vgetcpu(unsigned *cpu, unsigned *node, s
return 0;
}
@@ -10998,8 +10998,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
{
return -ENOSYS;
}
---- sle11sp2-2011-08-22.orig/arch/x86/mach-xen/setup.c 2011-08-22 10:33:23.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/mach-xen/setup.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mach-xen/setup.c 2011-08-22 10:33:23.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/mach-xen/setup.c 2011-01-31 18:07:35.000000000 +0100
@@ -56,11 +56,7 @@ char * __init machine_specific_memory_se
{
int rc;
@@ -11014,7 +11014,7 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
memmap.nr_entries = E820MAX;
set_xen_guest_handle(memmap.buffer, map);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2-2011-08-22/arch/x86/mm/dump_pagetables-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/dump_pagetables-xen.c 2011-01-31 18:07:35.000000000 +0100
@@ -0,0 +1,371 @@
+/*
+ * Debug helper to dump the current kernel pagetables of the system
@@ -11387,8 +11387,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Arjan van de Ven <arjan@linux.intel.com>");
+MODULE_DESCRIPTION("Kernel debugging helper that dumps pagetables");
---- sle11sp2-2011-08-22.orig/arch/x86/mm/fault-xen.c 2011-08-15 10:46:15.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/mm/fault-xen.c 2011-07-26 09:29:47.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/fault-xen.c 2011-08-15 10:46:15.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/mm/fault-xen.c 2011-07-26 09:29:47.000000000 +0200
@@ -511,6 +511,11 @@ static int vmalloc_fault(unsigned long a
unsigned long pgd_paddr;
pmd_t *pmd_k;
@@ -11420,8 +11420,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
- (__START_KERNEL & PGDIR_MASK)));
#endif
}
---- sle11sp2-2011-08-22.orig/arch/x86/mm/highmem_32-xen.c 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/highmem_32-xen.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/highmem_32-xen.c 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/highmem_32-xen.c 2011-01-31 18:07:35.000000000 +0100
@@ -200,6 +200,8 @@ EXPORT_SYMBOL(kmap);
EXPORT_SYMBOL(kunmap);
EXPORT_SYMBOL(kmap_atomic);
@@ -11431,8 +11431,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
+#endif
EXPORT_SYMBOL(clear_highpage);
EXPORT_SYMBOL(copy_highpage);
---- sle11sp2-2011-08-22.orig/arch/x86/mm/init_32-xen.c 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/init_32-xen.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/init_32-xen.c 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/init_32-xen.c 2011-01-31 18:07:35.000000000 +0100
@@ -1,5 +1,4 @@
/*
- * linux/arch/i386/mm/init.c
@@ -11675,8 +11675,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
#endif
start += size;
size = (unsigned long)__end_rodata - start;
---- sle11sp2-2011-08-22.orig/arch/x86/mm/init_64-xen.c 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/init_64-xen.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/init_64-xen.c 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/init_64-xen.c 2011-01-31 18:07:35.000000000 +0100
@@ -52,9 +52,6 @@
#include <xen/features.h>
@@ -12167,8 +12167,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
+ }
+}
#endif
---- sle11sp2-2011-08-22.orig/arch/x86/mm/ioremap-xen.c 2011-02-07 15:38:58.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/ioremap-xen.c 2011-02-07 15:39:13.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/ioremap-xen.c 2011-02-07 15:38:58.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/ioremap-xen.c 2011-02-07 15:39:13.000000000 +0100
@@ -20,14 +20,11 @@
#include <asm/pgtable.h>
#include <asm/tlbflush.h>
@@ -12604,8 +12604,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
if (early_ioremap_debug) {
printk(KERN_INFO "early_iounmap(%p, %08lx) [%d]\n", addr,
---- sle11sp2-2011-08-22.orig/arch/x86/mm/pageattr-xen.c 2011-03-23 09:46:36.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/pageattr-xen.c 2011-03-23 09:53:18.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/pageattr-xen.c 2011-03-23 09:46:36.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/pageattr-xen.c 2011-03-23 09:53:18.000000000 +0100
@@ -9,6 +9,8 @@
#include <linux/slab.h>
#include <linux/mm.h>
@@ -13187,7 +13187,7 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
bool kernel_page_present(struct page *page)
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2-2011-08-22/arch/x86/mm/pat-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/pat-xen.c 2011-01-31 18:07:35.000000000 +0100
@@ -0,0 +1,602 @@
+/*
+ * Handle caching attributes in page tables (PAT)
@@ -13792,7 +13792,7 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
+}
+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2-2011-08-22/arch/x86/mm/pgtable-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/pgtable-xen.c 2011-01-31 18:07:35.000000000 +0100
@@ -0,0 +1,713 @@
+#include <linux/mm.h>
+#include <linux/module.h>
@@ -14507,8 +14507,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
+
+ return young;
+}
---- sle11sp2-2011-08-22.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/pgtable_32-xen.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/pgtable_32-xen.c 2011-01-31 18:07:35.000000000 +0100
@@ -1,7 +1,3 @@
-/*
- * linux/arch/i386/mm/pgtable.c
@@ -14772,8 +14772,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
void make_lowmem_page_readonly(void *va, unsigned int feature)
{
pte_t *pte;
---- sle11sp2-2011-08-22.orig/arch/x86/vdso/vdso32-setup-xen.c 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/vdso/vdso32-setup-xen.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/vdso/vdso32-setup-xen.c 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/vdso/vdso32-setup-xen.c 2011-01-31 18:07:35.000000000 +0100
@@ -164,7 +164,7 @@ static __init void relocate_vdso(Elf32_E
Elf32_Shdr *shdr;
int i;
@@ -14817,8 +14817,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
down_write(&mm->mmap_sem);
/* Test compat mode once here, in case someone
---- sle11sp2-2011-08-22.orig/drivers/acpi/processor_driver.c 2011-04-13 11:25:29.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/acpi/processor_driver.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/acpi/processor_driver.c 2011-04-13 11:25:29.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/acpi/processor_driver.c 2011-01-31 18:07:35.000000000 +0100
@@ -371,7 +371,7 @@ static int acpi_processor_get_info(struc
* of /proc/cpuinfo
*/
@@ -14828,8 +14828,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
arch_fix_phys_package_id(pr->id, object.integer.value);
return 0;
---- sle11sp2-2011-08-22.orig/drivers/firmware/Kconfig 2011-07-22 04:17:23.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/firmware/Kconfig 2011-04-13 12:52:07.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/firmware/Kconfig 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/firmware/Kconfig 2011-04-13 12:52:07.000000000 +0200
@@ -126,7 +126,7 @@ config DMI_SYSFS
config ISCSI_IBFT_FIND
@@ -14839,8 +14839,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
default n
help
This option enables the kernel to find the region of memory
---- sle11sp2-2011-08-22.orig/drivers/input/misc/xen-kbdfront.c 2011-05-19 06:06:34.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/input/misc/xen-kbdfront.c 2011-04-28 11:11:14.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/input/misc/xen-kbdfront.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/input/misc/xen-kbdfront.c 2011-04-28 11:11:14.000000000 +0200
@@ -363,7 +363,6 @@ static const struct xenbus_device_id xen
static struct xenbus_driver xenkbd_driver = {
@@ -14849,8 +14849,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
.ids = xenkbd_ids,
.probe = xenkbd_probe,
.remove = xenkbd_remove,
---- sle11sp2-2011-08-22.orig/drivers/oprofile/cpu_buffer.c 2011-04-13 12:44:01.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/oprofile/cpu_buffer.c 2011-04-13 12:53:16.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/oprofile/cpu_buffer.c 2011-04-13 12:44:01.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/oprofile/cpu_buffer.c 2011-04-13 12:53:16.000000000 +0200
@@ -485,7 +485,7 @@ fail:
#ifdef CONFIG_XEN
int oprofile_add_domain_switch(int32_t domain_id)
@@ -14860,8 +14860,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
/* should have space for switching into and out of domain
(2 slots each) plus one sample and one cpu mode switch */
---- sle11sp2-2011-08-22.orig/drivers/pci/msi-xen.c 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/pci/msi-xen.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/pci/msi-xen.c 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/pci/msi-xen.c 2011-01-31 18:07:35.000000000 +0100
@@ -504,7 +504,7 @@ int pci_enable_msi(struct pci_dev* dev)
EXPORT_SYMBOL(pci_enable_msi);
@@ -14902,8 +14902,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
EXPORT_SYMBOL(pci_disable_msix);
/**
---- sle11sp2-2011-08-22.orig/drivers/video/Kconfig 2011-08-22 09:47:20.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/video/Kconfig 2011-06-30 16:35:51.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/video/Kconfig 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/video/Kconfig 2011-06-30 16:35:51.000000000 +0200
@@ -2237,7 +2237,7 @@ config FB_VIRTUAL
config XEN_FBDEV_FRONTEND
@@ -14913,8 +14913,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
select FB_SYS_FILLRECT
select FB_SYS_COPYAREA
select FB_SYS_IMAGEBLIT
---- sle11sp2-2011-08-22.orig/drivers/video/xen-fbfront.c 2011-07-22 04:17:23.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/video/xen-fbfront.c 2011-06-30 16:35:45.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/video/xen-fbfront.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/video/xen-fbfront.c 2011-06-30 16:35:45.000000000 +0200
@@ -678,7 +678,6 @@ static struct xenbus_device_id xenfb_ids
static struct xenbus_driver xenfb_driver = {
@@ -14923,8 +14923,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
.ids = xenfb_ids,
.probe = xenfb_probe,
.remove = xenfb_remove,
---- sle11sp2-2011-08-22.orig/drivers/xen/Kconfig 2011-01-31 17:49:31.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/Kconfig 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/Kconfig 2011-01-31 17:49:31.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/Kconfig 2011-01-31 18:07:35.000000000 +0100
@@ -2,8 +2,6 @@
# This Kconfig describe xen options
#
@@ -14934,8 +14934,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
config XEN
bool
---- sle11sp2-2011-08-22.orig/drivers/xen/Makefile 2011-01-31 17:49:31.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/Makefile 2011-02-28 15:13:33.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/Makefile 2011-01-31 17:49:31.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/Makefile 2011-02-28 15:13:33.000000000 +0100
@@ -1,5 +1,7 @@
-obj-$(CONFIG_PARAVIRT_XEN) += grant-table.o
+obj-$(CONFIG_PARAVIRT_XEN) += grant-table.o features.o events.o
@@ -14957,8 +14957,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
obj-$(CONFIG_XEN_BLKDEV_BACKEND) += blkback/
obj-$(CONFIG_XEN_BLKDEV_TAP) += blktap/
obj-$(CONFIG_XEN_BLKDEV_TAP2) += blktap2/ blktap2-new/
---- sle11sp2-2011-08-22.orig/drivers/xen/blkfront/blkfront.c 2011-07-21 12:17:10.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/blkfront/blkfront.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/blkfront/blkfront.c 2011-07-21 12:17:10.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/blkfront/blkfront.c 2011-01-31 18:07:35.000000000 +0100
@@ -285,7 +285,11 @@ static void backend_changed(struct xenbu
break;
@@ -14972,8 +14972,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
if (bd == NULL) {
xenbus_dev_fatal(dev, -ENODEV, "bdget failed");
break;
---- sle11sp2-2011-08-22.orig/drivers/xen/blkfront/block.h 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/blkfront/block.h 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/blkfront/block.h 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/blkfront/block.h 2011-01-31 18:07:35.000000000 +0100
@@ -97,7 +97,6 @@ struct blk_shadow {
struct blkfront_info
{
@@ -14982,8 +14982,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
struct gendisk *gd;
int vdevice;
blkif_vdev_t handle;
---- sle11sp2-2011-08-22.orig/drivers/xen/blkfront/vbd.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/blkfront/vbd.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/blkfront/vbd.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/blkfront/vbd.c 2011-01-31 18:07:35.000000000 +0100
@@ -328,17 +328,33 @@ xlvbd_init_blk_queue(struct gendisk *gd,
return 0;
}
@@ -15065,8 +15065,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
void
xlvbd_del(struct blkfront_info *info)
{
---- sle11sp2-2011-08-22.orig/drivers/xen/blktap/blktap.c 2011-04-11 15:02:02.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/blktap/blktap.c 2011-06-30 16:35:35.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/blktap/blktap.c 2011-04-11 15:02:02.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/blktap/blktap.c 2011-06-30 16:35:35.000000000 +0200
@@ -112,6 +112,7 @@ typedef struct tap_blkif {
unsigned long mode; /*current switching mode */
int minor; /*Minor number for tapdisk device */
@@ -15148,8 +15148,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
} else {
/* this is bad, but not fatal */
WPRINTK("blktap: sysfs xen_class not created\n");
---- sle11sp2-2011-08-22.orig/drivers/xen/blktap2/blktap.h 2011-01-31 17:49:31.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/blktap2/blktap.h 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/blktap2/blktap.h 2011-01-31 17:49:31.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/blktap2/blktap.h 2011-01-31 18:07:35.000000000 +0100
@@ -127,7 +127,7 @@ struct blktap_ring {
wait_queue_head_t poll_wait;
@@ -15159,8 +15159,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
atomic_t sysfs_refcnt;
struct mutex sysfs_mutex;
};
---- sle11sp2-2011-08-22.orig/drivers/xen/blktap2/device.c 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/blktap2/device.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/blktap2/device.c 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/blktap2/device.c 2011-01-31 18:07:35.000000000 +0100
@@ -567,7 +567,8 @@ blktap_map(struct blktap *tap,
if (!xen_feature(XENFEAT_auto_translated_physmap)) {
@@ -15171,8 +15171,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
flush_tlb_page(ring->vma, uvaddr);
blktap_map_uaddr(NULL, kvaddr, mk_pte(page, PAGE_KERNEL));
flush_tlb_kernel_page(kvaddr);
---- sle11sp2-2011-08-22.orig/drivers/xen/blktap2/ring.c 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/blktap2/ring.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/blktap2/ring.c 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/blktap2/ring.c 2011-01-31 18:07:35.000000000 +0100
@@ -66,16 +66,15 @@ blktap_read_ring(struct blktap *tap)
return 0;
}
@@ -15203,8 +15203,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
.zap_pte = blktap_ring_clear_pte,
};
---- sle11sp2-2011-08-22.orig/drivers/xen/blktap2/sysfs.c 2011-01-31 17:49:31.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/blktap2/sysfs.c 2011-03-11 10:58:58.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/blktap2/sysfs.c 2011-01-31 17:49:31.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/blktap2/sysfs.c 2011-03-11 10:58:58.000000000 +0100
@@ -36,16 +36,21 @@ blktap_sysfs_exit(struct blktap *tap)
blktap_sysfs_put(tap);
}
@@ -15459,8 +15459,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
}
static ssize_t
---- sle11sp2-2011-08-22.orig/drivers/xen/char/mem.c 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/char/mem.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/char/mem.c 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/char/mem.c 2011-01-31 18:07:35.000000000 +0100
@@ -33,6 +33,27 @@ static inline int uncached_access(struct
return 0;
}
@@ -15549,8 +15549,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
/* We want to return the real error code, not EAGAIN. */
return direct_remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,
size, vma->vm_page_prot, DOMID_IO);
---- sle11sp2-2011-08-22.orig/drivers/xen/console/console.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/console/console.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/console/console.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/console/console.c 2011-01-31 18:07:35.000000000 +0100
@@ -551,16 +551,18 @@ static int xencons_write(
return i;
}
@@ -15592,8 +15592,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
if (tty->ldisc.flush_buffer != NULL)
tty->ldisc.flush_buffer(tty);
tty->closing = 0;
---- sle11sp2-2011-08-22.orig/drivers/xen/core/Makefile 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/core/Makefile 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/core/Makefile 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/core/Makefile 2011-01-31 18:07:35.000000000 +0100
@@ -2,7 +2,7 @@
# Makefile for the linux kernel.
#
@@ -15608,8 +15608,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
obj-$(CONFIG_X86_SMP) += spinlock.o
obj-$(CONFIG_KEXEC) += machine_kexec.o
-obj-$(CONFIG_XEN_XENCOMM) += xencomm.o
---- sle11sp2-2011-08-22.orig/drivers/xen/core/machine_kexec.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/core/machine_kexec.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/core/machine_kexec.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/core/machine_kexec.c 2011-01-31 18:07:35.000000000 +0100
@@ -5,6 +5,7 @@
#include <linux/kexec.h>
@@ -15681,8 +15681,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
/*
* Local variables:
---- sle11sp2-2011-08-22.orig/drivers/xen/core/smpboot.c 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/core/smpboot.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/core/smpboot.c 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/core/smpboot.c 2011-01-31 18:07:35.000000000 +0100
@@ -120,7 +120,7 @@ static int __cpuinit xen_smp_intr_init(u
}
@@ -15710,8 +15710,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
{
while (HYPERVISOR_vcpu_op(VCPUOP_is_up, cpu, NULL)) {
current->state = TASK_UNINTERRUPTIBLE;
---- sle11sp2-2011-08-22.orig/drivers/xen/core/xen_proc.c 2011-04-01 13:07:57.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/core/xen_proc.c 2011-04-04 08:44:27.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/core/xen_proc.c 2011-04-01 13:07:57.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/core/xen_proc.c 2011-04-04 08:44:27.000000000 +0200
@@ -12,7 +12,7 @@ __init
create_xen_proc_entry(const char *name, mode_t mode)
{
@@ -15721,8 +15721,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
panic("Couldn't create /proc/xen");
return create_proc_entry(name, mode, xen_base);
}
---- sle11sp2-2011-08-22.orig/drivers/xen/fbfront/xenfb.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/fbfront/xenfb.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/fbfront/xenfb.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/fbfront/xenfb.c 2011-01-31 18:07:35.000000000 +0100
@@ -93,7 +93,7 @@ struct xenfb_info
* only mappings. The former creates unfaulted pages. Preserves
* invariant. The latter removes pages. Preserves invariant.
@@ -15792,8 +15792,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
};
static int xenfb_mmap(struct fb_info *fb_info, struct vm_area_struct *vma)
---- sle11sp2-2011-08-22.orig/drivers/xen/features.c 2009-03-24 00:12:14.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/features.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/features.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/features.c 2011-01-31 18:07:35.000000000 +0100
@@ -9,14 +9,21 @@
#include <linux/cache.h>
#include <linux/module.h>
@@ -15817,8 +15817,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
void xen_setup_features(void)
{
---- sle11sp2-2011-08-22.orig/drivers/xen/gntdev/gntdev.c 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/gntdev/gntdev.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/gntdev/gntdev.c 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/gntdev/gntdev.c 2011-01-31 18:07:35.000000000 +0100
@@ -375,7 +375,7 @@ nomem_out:
static int __init gntdev_init(void)
{
@@ -15848,8 +15848,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
unregister_chrdev(gntdev_major, GNTDEV_NAME);
}
---- sle11sp2-2011-08-22.orig/drivers/xen/netfront/netfront.c 2011-06-30 16:32:46.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/netfront/netfront.c 2011-06-30 16:35:25.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/netfront/netfront.c 2011-06-30 16:32:46.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/netfront/netfront.c 2011-06-30 16:35:25.000000000 +0200
@@ -1454,8 +1454,7 @@ err:
}
}
@@ -15870,8 +15870,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
spin_unlock_bh(&np->rx_lock);
}
---- sle11sp2-2011-08-22.orig/drivers/xen/pciback/pci_stub.c 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/pciback/pci_stub.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/pciback/pci_stub.c 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/pciback/pci_stub.c 2011-01-31 18:07:35.000000000 +0100
@@ -5,7 +5,9 @@
* Chris Bookholt <hap10@epoch.ncsc.mil>
*/
@@ -15949,8 +15949,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
}
/* For each aer recovery step error_detected, mmio_enabled, etc, front_end and
---- sle11sp2-2011-08-22.orig/drivers/xen/privcmd/privcmd.c 2011-01-31 17:29:16.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/privcmd/privcmd.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/privcmd/privcmd.c 2011-01-31 17:29:16.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/privcmd/privcmd.c 2011-01-31 18:07:35.000000000 +0100
@@ -401,15 +401,13 @@ static long privcmd_ioctl(struct file *f
}
@@ -15970,8 +15970,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
};
static int privcmd_mmap(struct file * file, struct vm_area_struct * vma)
---- sle11sp2-2011-08-22.orig/drivers/xen/xenbus/xenbus_client.c 2011-06-30 16:10:27.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/xenbus/xenbus_client.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/xenbus/xenbus_client.c 2011-06-30 16:10:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/xenbus/xenbus_client.c 2011-01-31 18:07:35.000000000 +0100
@@ -437,7 +437,7 @@ int xenbus_map_ring_valloc(struct xenbus
*vaddr = NULL;
@@ -15999,8 +15999,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
else
xenbus_dev_error(dev, op.status,
"unmapping page at handle %d error %d",
---- sle11sp2-2011-08-22.orig/drivers/xen/xenbus/xenbus_probe.c 2011-06-30 16:33:16.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/xenbus/xenbus_probe.c 2011-06-10 11:53:57.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/xenbus/xenbus_probe.c 2011-06-30 16:33:16.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/xenbus/xenbus_probe.c 2011-06-10 11:53:57.000000000 +0200
@@ -175,7 +175,7 @@ static int read_backend_details(struct x
return read_otherend_details(xendev, "backend-id", "backend");
}
@@ -16067,8 +16067,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
device_remove_file(&xendev->dev, &dev_attr_nodename);
fail_unregister:
device_unregister(&xendev->dev);
---- sle11sp2-2011-08-22.orig/fs/aio.c 2011-04-13 12:31:48.000000000 +0200
-+++ sle11sp2-2011-08-22/fs/aio.c 2011-04-13 12:51:57.000000000 +0200
+--- sle11sp2-2011-09-06.orig/fs/aio.c 2011-04-13 12:31:48.000000000 +0200
++++ sle11sp2-2011-09-06/fs/aio.c 2011-04-13 12:51:57.000000000 +0200
@@ -1232,6 +1232,7 @@ static void io_destroy(struct kioctx *io
#ifdef CONFIG_EPOLL
/* forget the poll file, but it's up to the user to close it */
@@ -16109,8 +16109,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
file->private_data = ioctx;
ioctx->file = file;
init_waitqueue_head(&ioctx->poll_wait);
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/desc.h 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/desc.h 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/desc.h 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/desc.h 2011-01-31 18:07:35.000000000 +0100
@@ -64,8 +64,8 @@ static inline struct desc_struct *get_cp
}
@@ -16253,8 +16253,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
#endif /* __ASSEMBLY__ */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/dma-mapping.h 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/dma-mapping.h 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/dma-mapping.h 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/dma-mapping.h 2011-01-31 18:07:35.000000000 +0100
@@ -1,5 +1,17 @@
-#ifdef CONFIG_X86_32
-# include "dma-mapping_32.h"
@@ -16278,8 +16278,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
+extern int range_straddles_page_boundary(paddr_t p, size_t size);
+
+#endif /* _ASM_DMA_MAPPING_H_ */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/fixmap.h 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/fixmap.h 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/fixmap.h 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/fixmap.h 2011-01-31 18:07:35.000000000 +0100
@@ -1,5 +1,13 @@
+#ifndef _ASM_FIXMAP_H
+#define _ASM_FIXMAP_H
@@ -16294,8 +16294,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
+ __set_fixmap(idx, 0, __pgprot(0))
+
+#endif
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 18:07:35.000000000 +0100
@@ -10,8 +10,8 @@
* Support of BIGMEM added by Gerhard Wichert, Siemens AG, July 1999
*/
@@ -16351,8 +16351,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
}
static inline unsigned long virt_to_fix(const unsigned long vaddr)
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 18:07:35.000000000 +0100
@@ -8,8 +8,8 @@
* Copyright (C) 1998 Ingo Molnar
*/
@@ -16415,8 +16415,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
#define FIXADDR_TOP (VSYSCALL_END-PAGE_SIZE)
#define FIXADDR_SIZE (__end_of_fixed_addresses << PAGE_SHIFT)
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 18:07:35.000000000 +0100
@@ -8,7 +8,7 @@
* Gerhard.Wichert@pdb.siemens.de
*
@@ -16426,8 +16426,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
* up to 16 Terabyte physical memory. With current x86 CPUs
* we now support up to 64 Gigabytes physical RAM.
*
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/io.h 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/io.h 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/io.h 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/io.h 2011-01-31 18:07:35.000000000 +0100
@@ -1,5 +1,22 @@
+#ifndef _ASM_X86_IO_H
+#define _ASM_X86_IO_H
@@ -16451,8 +16451,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
+extern void __iomem *ioremap_wc(unsigned long offset, unsigned long size);
+
+#endif /* _ASM_X86_IO_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/irqflags.h 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/irqflags.h 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/irqflags.h 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/irqflags.h 2011-01-31 18:07:35.000000000 +0100
@@ -139,11 +139,11 @@ sysexit_ecrit: /**** END OF SYSEXIT CRIT
#endif /* __ASSEMBLY__ */
@@ -16469,8 +16469,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
static inline int raw_irqs_disabled_flags(unsigned long flags)
{
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 18:07:35.000000000 +0100
@@ -94,7 +94,7 @@ static inline void switch_mm(struct mm_s
BUG_ON(per_cpu(cpu_tlbstate, cpu).active_mm != next);
@@ -16496,8 +16496,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
+} while (0)
#endif
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 18:07:35.000000000 +0100
@@ -21,7 +21,7 @@ void destroy_context(struct mm_struct *m
static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
{
@@ -16541,8 +16541,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
static inline void activate_mm(struct mm_struct *prev, struct mm_struct *next)
{
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pci.h 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pci.h 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pci.h 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/pci.h 2011-01-31 18:07:35.000000000 +0100
@@ -8,14 +8,13 @@
#include <asm/scatterlist.h>
#include <asm/io.h>
@@ -16595,8 +16595,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
#ifdef CONFIG_PCI
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgalloc.h 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgalloc.h 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pgalloc.h 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/pgalloc.h 2011-01-31 18:07:35.000000000 +0100
@@ -1,5 +1,149 @@
-#ifdef CONFIG_X86_32
-# include "pgalloc_32.h"
@@ -16751,7 +16751,7 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
+#endif /* PAGETABLE_LEVELS > 2 */
+
+#endif /* _ASM_X86_PGALLOC_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pgalloc_32.h 2011-01-31 18:01:51.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,111 +0,0 @@
-#ifndef _I386_PGALLOC_H
@@ -16865,7 +16865,7 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
-#endif /* CONFIG_X86_PAE */
-
-#endif /* _I386_PGALLOC_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pgalloc_64.h 2011-01-31 18:01:51.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,182 +0,0 @@
-#ifndef _X86_64_PGALLOC_H
@@ -17050,8 +17050,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
-#define __pud_free_tlb(tlb,x) tlb_remove_page((tlb),virt_to_page(x))
-
-#endif /* _X86_64_PGALLOC_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgtable.h 2011-03-23 09:14:47.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgtable.h 2011-03-23 09:52:33.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pgtable.h 2011-03-23 09:14:47.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/pgtable.h 2011-03-23 09:52:33.000000000 +0100
@@ -1,17 +1,15 @@
#ifndef _ASM_X86_PGTABLE_H
#define _ASM_X86_PGTABLE_H
@@ -17459,8 +17459,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
#define arch_change_pte_range(mm, pmd, addr, end, newprot, dirty_accountable) \
xen_change_pte_range(mm, pmd, addr, end, newprot, dirty_accountable)
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-03-23 09:14:16.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-03-23 09:52:36.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-03-23 09:14:16.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-03-23 09:52:36.000000000 +0100
@@ -8,25 +8,28 @@
* Copyright (C) 1999 Ingo Molnar <mingo@redhat.com>
*/
@@ -17545,8 +17545,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
#define PTE_FILE_MAX_BITS 32
/* Encode and de-code a swap entry */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:38:52.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-07 15:38:52.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-01-31 18:07:35.000000000 +0100
@@ -38,16 +38,13 @@ void paging_init(void);
#ifdef CONFIG_X86_PAE
# include <asm/pgtable-3level-defs.h>
@@ -17757,8 +17757,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
+ direct_remap_pfn_range(vma, from, pfn, size, prot, DOMID_IO)
#endif /* _I386_PGTABLE_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 09:14:24.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 09:52:37.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 09:14:24.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 09:52:37.000000000 +0100
@@ -31,7 +31,7 @@ extern void paging_init(void);
#endif /* !__ASSEMBLY__ */
@@ -18030,8 +18030,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
#define __HAVE_ARCH_PTE_SAME
#endif /* !__ASSEMBLY__ */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/processor.h 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/processor.h 2011-03-03 16:42:13.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/processor.h 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/processor.h 2011-03-03 16:42:13.000000000 +0100
@@ -3,10 +3,6 @@
#include <asm/processor-flags.h>
@@ -19063,8 +19063,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
+extern int set_tsc_mode(unsigned int val);
#endif
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/smp.h 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/smp.h 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/smp.h 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/smp.h 2011-01-31 18:07:35.000000000 +0100
@@ -1,5 +1,225 @@
-#ifdef CONFIG_X86_32
-# include "smp_32.h"
@@ -19294,7 +19294,7 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
+extern void unlock_ipi_call_lock(void);
+#endif /* __ASSEMBLY__ */
#endif
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/smp_32.h 2011-01-31 18:01:51.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,173 +0,0 @@
-#ifndef __ASM_SMP_H
@@ -19470,7 +19470,7 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
-
-#endif /* !ASSEMBLY */
-#endif
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 18:01:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/smp_64.h 2011-01-31 18:01:51.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,101 +0,0 @@
-#ifndef __ASM_SMP_H
@@ -19574,8 +19574,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
-
-#endif
-
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/spinlock.h 2011-07-12 10:55:12.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/spinlock.h 2011-07-12 11:14:18.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/spinlock.h 2011-07-12 10:55:12.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/spinlock.h 2011-07-12 11:14:18.000000000 +0200
@@ -99,7 +99,7 @@ void xen_spin_kick(raw_spinlock_t *, uns
: \
: "memory", "cc")
@@ -19637,8 +19637,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
{
unsigned int token;
bool kick;
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/swiotlb.h 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/swiotlb.h 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/swiotlb.h 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/swiotlb.h 2011-01-31 18:07:35.000000000 +0100
@@ -1,5 +1,4 @@
-#ifdef CONFIG_X86_32
-# include "swiotlb_32.h"
@@ -19649,8 +19649,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
+
+dma_addr_t swiotlb_map_single_phys(struct device *, phys_addr_t, size_t size,
+ int dir);
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/system.h 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/system.h 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/system.h 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/system.h 2011-01-31 18:07:35.000000000 +0100
@@ -28,22 +28,44 @@ struct task_struct *__switch_to(struct t
* Saving eflags is important. It switches not only IOPL between tasks,
* it also protects other tasks from NT leaking through sysenter etc.
@@ -19849,8 +19849,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
#else
#define smp_mb() barrier()
#define smp_rmb() barrier()
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/tlbflush.h 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/tlbflush.h 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/tlbflush.h 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/tlbflush.h 2011-01-31 18:07:35.000000000 +0100
@@ -86,8 +86,7 @@ static inline void flush_tlb_range(struc
#define TLBSTATE_LAZY 2
@@ -19861,8 +19861,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
struct mm_struct *active_mm;
int state;
char __cacheline_padding[L1_CACHE_BYTES-8];
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/vga.h 2007-06-12 13:14:02.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/vga.h 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/vga.h 2007-06-12 13:14:02.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/vga.h 2011-01-31 18:07:35.000000000 +0100
@@ -12,9 +12,9 @@
* access the videoram directly without any black magic.
*/
@@ -19875,8 +19875,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
+#define vga_writeb(x, y) (*(y) = (x))
#endif
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/xor_64.h 2007-06-12 13:14:13.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/xor_64.h 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/xor_64.h 2007-06-12 13:14:13.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/xor_64.h 2011-01-31 18:07:35.000000000 +0100
@@ -1,20 +1,23 @@
/*
- * x86-64 changes / gcc fixes from Andi Kleen.
@@ -20339,9 +20339,9 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
/* We force the use of the SSE xor block because it can write around L2.
We may also be able to load into the L1 only depending on how the cpu
---- sle11sp2-2011-08-22.orig/include/linux/page-flags.h 2011-08-22 10:33:10.000000000 +0200
-+++ sle11sp2-2011-08-22/include/linux/page-flags.h 2011-08-22 10:33:31.000000000 +0200
-@@ -345,28 +345,27 @@ static inline void SetPageUptodate(struc
+--- sle11sp2-2011-09-06.orig/include/linux/page-flags.h 2011-09-06 09:16:42.000000000 +0200
++++ sle11sp2-2011-09-06/include/linux/page-flags.h 2011-09-06 09:17:12.000000000 +0200
+@@ -347,28 +347,27 @@ static inline void SetPageUptodate(struc
CLEARPAGEFLAG(Uptodate, uptodate)
@@ -20391,8 +20391,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
extern void cancel_dirty_page(struct page *page, unsigned int account_size);
---- sle11sp2-2011-08-22.orig/include/xen/balloon.h 2007-06-12 13:14:19.000000000 +0200
-+++ sle11sp2-2011-08-22/include/xen/balloon.h 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/include/xen/balloon.h 2007-06-12 13:14:19.000000000 +0200
++++ sle11sp2-2011-09-06/include/xen/balloon.h 2011-01-31 18:07:35.000000000 +0100
@@ -31,9 +31,12 @@
* IN THE SOFTWARE.
*/
@@ -20416,8 +20416,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
-#endif /* __ASM_BALLOON_H__ */
+#endif /* __XEN_BALLOON_H__ */
---- sle11sp2-2011-08-22.orig/include/xen/interface/grant_table.h 2011-01-31 15:14:12.000000000 +0100
-+++ sle11sp2-2011-08-22/include/xen/interface/grant_table.h 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/include/xen/interface/grant_table.h 2011-01-31 15:14:12.000000000 +0100
++++ sle11sp2-2011-09-06/include/xen/interface/grant_table.h 2011-01-31 18:07:35.000000000 +0100
@@ -288,6 +288,7 @@ struct gnttab_map_grant_ref {
grant_handle_t handle;
uint64_t dev_bus_addr;
@@ -20474,8 +20474,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
typedef struct gnttab_query_size gnttab_query_size_t;
DEFINE_XEN_GUEST_HANDLE(gnttab_query_size_t);
---- sle11sp2-2011-08-22.orig/include/xen/interface/io/fbif.h 2011-01-31 15:14:12.000000000 +0100
-+++ sle11sp2-2011-08-22/include/xen/interface/io/fbif.h 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/include/xen/interface/io/fbif.h 2011-01-31 15:14:12.000000000 +0100
++++ sle11sp2-2011-09-06/include/xen/interface/io/fbif.h 2011-01-31 18:07:35.000000000 +0100
@@ -150,7 +150,12 @@ struct xenfb_page
* framebuffer with a max resolution of 12,800x10,240. Should
* be enough for a while with room leftover for expansion.
@@ -20489,8 +20489,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
};
/*
---- sle11sp2-2011-08-22.orig/include/xen/interface/memory.h 2011-01-31 17:49:31.000000000 +0100
-+++ sle11sp2-2011-08-22/include/xen/interface/memory.h 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/include/xen/interface/memory.h 2011-01-31 17:49:31.000000000 +0100
++++ sle11sp2-2011-09-06/include/xen/interface/memory.h 2011-01-31 18:07:35.000000000 +0100
@@ -88,7 +88,6 @@ struct xen_memory_reservation {
*/
domid_t domid;
@@ -20527,8 +20527,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
typedef struct xen_add_to_physmap xen_add_to_physmap_t;
DEFINE_XEN_GUEST_HANDLE(xen_add_to_physmap_t);
---- sle11sp2-2011-08-22.orig/include/xen/interface/vcpu.h 2011-03-17 13:50:24.000000000 +0100
-+++ sle11sp2-2011-08-22/include/xen/interface/vcpu.h 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/include/xen/interface/vcpu.h 2011-03-17 13:50:24.000000000 +0100
++++ sle11sp2-2011-09-06/include/xen/interface/vcpu.h 2011-01-31 18:07:35.000000000 +0100
@@ -87,6 +87,7 @@ struct vcpu_runstate_info {
*/
uint64_t time[4];
@@ -20561,9 +20561,9 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
typedef struct vcpu_register_vcpu_info vcpu_register_vcpu_info_t;
DEFINE_XEN_GUEST_HANDLE(vcpu_register_vcpu_info_t);
---- sle11sp2-2011-08-22.orig/init/Kconfig 2011-08-22 09:47:10.000000000 +0200
-+++ sle11sp2-2011-08-22/init/Kconfig 2011-08-22 10:33:38.000000000 +0200
-@@ -1066,6 +1066,7 @@ config ELF_CORE
+--- sle11sp2-2011-09-06.orig/init/Kconfig 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/init/Kconfig 2011-09-06 09:17:17.000000000 +0200
+@@ -1065,6 +1065,7 @@ config ELF_CORE
config PCSPKR_PLATFORM
bool "Enable PC-Speaker support" if EXPERT
depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
@@ -20571,8 +20571,8 @@ Automatically created from "patches.kernel.org/patch-2.6.26" by xen-port-patches
default y
help
This option allows to disable the internal PC-Speaker
---- sle11sp2-2011-08-22.orig/lib/swiotlb-xen.c 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/lib/swiotlb-xen.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/lib/swiotlb-xen.c 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/lib/swiotlb-xen.c 2011-01-31 18:07:35.000000000 +0100
@@ -20,6 +20,7 @@
#include <linux/ctype.h>
#include <linux/init.h>
diff --git a/patches.xen/xen3-patch-2.6.27 b/patches.xen/xen3-patch-2.6.27
index 15abe040d1..cdd9912322 100644
--- a/patches.xen/xen3-patch-2.6.27
+++ b/patches.xen/xen3-patch-2.6.27
@@ -11,8 +11,8 @@ Removed adjustments NO_HZ -> NO_HZ || NO_IDLE_HZ from kernel/{hr,}timer.c,
as they would get removed again by xen-clockevents (and really shouldn't
have been needed - see SLE11 SPn).
---- sle11sp2-2011-08-22.orig/arch/x86/Kconfig 2011-08-22 10:33:47.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/Kconfig 2011-08-22 10:34:18.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/Kconfig 2011-08-22 10:33:47.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/Kconfig 2011-08-22 10:34:18.000000000 +0200
@@ -720,7 +720,7 @@ config AMD_IOMMU
select SWIOTLB
select PCI_MSI
@@ -31,8 +31,8 @@ have been needed - see SLE11 SPn).
---help---
Convert MTRR layout from continuous to discrete, so X drivers can
add writeback entries.
---- sle11sp2-2011-08-22.orig/arch/x86/Kconfig.debug 2011-06-30 16:33:56.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/Kconfig.debug 2011-06-30 16:39:08.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/Kconfig.debug 2011-06-30 16:33:56.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/Kconfig.debug 2011-06-30 16:39:08.000000000 +0200
@@ -25,6 +25,7 @@ config STRICT_DEVMEM
config X86_VERBOSE_BOOTUP
bool "Enable verbose x86 bootup info messages"
@@ -49,8 +49,8 @@ have been needed - see SLE11 SPn).
config X86_DECODER_SELFTEST
bool "x86 instruction decoder selftest"
---- sle11sp2-2011-08-22.orig/arch/x86/Makefile 2011-02-01 14:11:04.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/Makefile 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/Makefile 2011-02-01 14:11:04.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/Makefile 2011-02-01 14:38:38.000000000 +0100
@@ -117,8 +117,8 @@ endif
KBUILD_CFLAGS += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,)
@@ -62,8 +62,8 @@ have been needed - see SLE11 SPn).
KBUILD_CFLAGS += $(mflags-y)
KBUILD_AFLAGS += $(mflags-y)
---- sle11sp2-2011-08-22.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/ia32/ia32entry-xen.S 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/ia32/ia32entry-xen.S 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/ia32/ia32entry-xen.S 2011-02-01 14:38:38.000000000 +0100
@@ -15,6 +15,16 @@
#include <asm/irqflags.h>
#include <linux/linkage.h>
@@ -305,8 +305,8 @@ have been needed - see SLE11 SPn).
+ .quad sys_pipe2
+ .quad sys_inotify_init1
ia32_syscall_end:
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/Makefile 2011-06-30 16:36:14.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/Makefile 2011-06-30 16:39:13.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/Makefile 2011-06-30 16:36:14.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/Makefile 2011-06-30 16:39:13.000000000 +0200
@@ -131,9 +131,11 @@ ifeq ($(CONFIG_X86_64),y)
obj-$(CONFIG_PCI_MMCONFIG) += mmconf-fam10h_64.o
obj-y += vsmp_64.o
@@ -322,8 +322,8 @@ have been needed - see SLE11 SPn).
+ i8259.o irqinit_$(BITS).o pci-swiotlb_64.o reboot.o smpboot.o \
+ tlb_$(BITS).o tsc.o tsc_sync.o vsmp_64.o
+disabled-obj-$(CONFIG_XEN_UNPRIVILEGED_GUEST) += probe_roms_32.o
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/acpi/boot.c 2011-03-11 10:59:02.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/acpi/boot.c 2011-04-13 13:47:31.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/acpi/boot.c 2011-03-11 10:59:02.000000000 +0100
++++ sle11sp2-2011-09-06/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
return 0;
}
@@ -367,26 +367,8 @@ have been needed - see SLE11 SPn).
/*
* If acpi_disabled, bail out
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/acpi/processor_extcntl_xen.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/acpi/processor_extcntl_xen.c 2011-08-15 10:58:57.000000000 +0200
-@@ -206,3 +206,15 @@ void arch_acpi_processor_init_extcntl(co
- *ops = &xen_extcntl_ops;
- }
- EXPORT_SYMBOL(arch_acpi_processor_init_extcntl);
-+
-+bool processor_extcntl_has_mwait(void)
-+{
-+ u32 eax, ecx;
-+
-+ if (!(xen_start_info->flags & (XEN_PROCESSOR_PM_CX << 8)))
-+ return false;
-+
-+ asm("cpuid" : "=a" (eax), "=c" (ecx) : "0" (1) : "edx", "ebx");
-+
-+ return ecx & (1 << (X86_FEATURE_MWAIT % 32));
-+}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/amd_nb.c 2011-08-22 11:12:52.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/amd_nb.c 2011-04-13 13:47:56.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/amd_nb.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/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[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB_MISC) },
@@ -398,8 +380,8 @@ have been needed - see SLE11 SPn).
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F3) },
{}
};
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/apic/apic-xen.c 2011-02-24 15:45:13.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/apic/apic-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/apic/apic-xen.c 2011-02-24 15:45:13.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/apic/apic-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -59,7 +59,10 @@ static cpumask_t timer_bcast_ipi;
/*
* Debug level, exported for io_apic.c
@@ -412,8 +394,8 @@ have been needed - see SLE11 SPn).
#ifndef CONFIG_XEN
static int modern_apic(void)
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/cpu/amd.c 2011-08-22 11:12:52.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/cpu/amd.c 2011-06-30 16:40:20.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/cpu/amd.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/cpu/amd.c 2011-06-30 16:40:20.000000000 +0200
@@ -592,6 +592,7 @@ static void __cpuinit init_amd(struct cp
fam10h_check_enable_mmcfg();
}
@@ -430,8 +412,8 @@ have been needed - see SLE11 SPn).
/*
* Family 0x12 and above processors have APIC timer
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/cpu/bugs_64.c 2011-08-22 11:12:52.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/cpu/bugs_64.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/cpu/bugs_64.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/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
alternative_instructions();
@@ -446,8 +428,8 @@ have been needed - see SLE11 SPn).
set_memory_4k((unsigned long)__va(0), 1);
+#endif
}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/cpu/common-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/cpu/common-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/cpu/common-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/cpu/common-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -13,6 +13,7 @@
#include <asm/mtrr.h>
#include <asm/mce.h>
@@ -511,7 +493,7 @@ have been needed - see SLE11 SPn).
if (!have_cpuid_p()) {
/*
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2-2011-08-22/arch/x86/kernel/cpu/common_64-xen.c 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/cpu/common_64-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -0,0 +1,777 @@
+#include <linux/init.h>
+#include <linux/kernel.h>
@@ -1291,7 +1273,7 @@ have been needed - see SLE11 SPn).
+ uv_cpu_init();
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2-2011-08-22/arch/x86/kernel/e820-xen.c 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/e820-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -0,0 +1,1553 @@
+/*
+ * Handle the memory map.
@@ -2846,7 +2828,7 @@ have been needed - see SLE11 SPn).
+ printk(KERN_INFO "Xen-provided physical RAM map:\n");
+ _e820_print_map(&e820, who);
+}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/e820_32-xen.c 2011-01-31 18:07:35.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,860 +0,0 @@
-#include <linux/kernel.h>
@@ -3709,7 +3691,7 @@ have been needed - see SLE11 SPn).
- print_memory_map("modified");
-}
-#endif
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/e820_64-xen.c 2011-01-31 18:07:35.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,1052 +0,0 @@
-/*
@@ -4764,8 +4746,8 @@ have been needed - see SLE11 SPn).
- max_pfn << PAGE_SHIFT) - *addr;
- return i + 1;
-}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/early_printk-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/early_printk-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/early_printk-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/early_printk-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -225,7 +225,7 @@ static struct console simnow_console = {
static struct console *early_console = &early_vga_console;
static int early_console_initialized;
@@ -4775,8 +4757,8 @@ have been needed - see SLE11 SPn).
{
char buf[512];
int n;
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/entry_32-xen.S 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:10:27.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/entry_32-xen.S 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:10:27.000000000 +0200
@@ -51,15 +51,26 @@
#include <asm/percpu.h>
#include <asm/dwarf2.h>
@@ -5074,8 +5056,8 @@ have been needed - see SLE11 SPn).
cmpl $nr_syscalls,%eax
jb syscall_call
jmp syscall_exit
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/entry_64.S 2011-04-13 10:12:30.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/entry_64.S 2011-08-22 11:15:30.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/entry_64.S 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/entry_64.S 2011-08-22 11:15:30.000000000 +0200
@@ -1258,7 +1258,7 @@ ENTRY(arch_unwind_init_running)
END(arch_unwind_init_running)
#endif
@@ -5094,8 +5076,8 @@ have been needed - see SLE11 SPn).
/*
* Some functions should be protected against kprobes
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/entry_64-xen.S 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/entry_64-xen.S 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/entry_64-xen.S 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/entry_64-xen.S 2011-02-01 14:38:38.000000000 +0100
@@ -53,12 +53,124 @@
#include <asm/hw_irq.h>
#include <asm/page.h>
@@ -5533,8 +5515,8 @@ have been needed - see SLE11 SPn).
paranoidentry do_stack_segment */
errorentry do_stack_segment
/* jmp paranoid_exit1
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/fixup.c 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/fixup.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/fixup.c 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/fixup.c 2011-02-01 14:38:38.000000000 +0100
@@ -33,6 +33,7 @@
#include <linux/kernel.h>
#include <linux/delay.h>
@@ -5544,7 +5526,7 @@ have been needed - see SLE11 SPn).
#define DP(_f, _args...) pr_alert(" " _f "\n" , ## _args )
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2-2011-08-22/arch/x86/kernel/head-xen.c 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/head-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -0,0 +1,57 @@
+#include <linux/kernel.h>
+#include <linux/init.h>
@@ -5604,7 +5586,7 @@ have been needed - see SLE11 SPn).
+#endif
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2-2011-08-22/arch/x86/kernel/head32-xen.c 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/head32-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -0,0 +1,56 @@
+/*
+ * linux/arch/i386/kernel/head32.c -- prepare to run common code
@@ -5662,8 +5644,8 @@ have been needed - see SLE11 SPn).
+
+ start_kernel();
+}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/head64-xen.c 2011-08-09 10:53:20.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/head64-xen.c 2011-08-09 10:54:49.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/head64-xen.c 2011-08-09 10:53:20.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/head64-xen.c 2011-08-09 10:54:49.000000000 +0200
@@ -32,7 +32,26 @@
#include <asm/e820.h>
#include <asm/bios_ebda.h>
@@ -5823,8 +5805,8 @@ have been needed - see SLE11 SPn).
/*
* At this point everything still needed from the boot loader
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/head_32-xen.S 2011-08-09 10:53:18.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/head_32-xen.S 2011-08-09 10:54:53.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/head_32-xen.S 2011-08-09 10:53:18.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/head_32-xen.S 2011-08-09 10:54:53.000000000 +0200
@@ -62,8 +62,6 @@ ENTRY(startup_32)
movb %cl,X86_MASK
movl %edx,X86_CAPABILITY
@@ -5834,8 +5816,8 @@ have been needed - see SLE11 SPn).
xorl %eax,%eax # Clear GS
movl %eax,%gs
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/head_64-xen.S 2011-08-09 10:41:44.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/head_64-xen.S 2011-08-09 10:54:52.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/head_64-xen.S 2011-08-09 10:41:44.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/head_64-xen.S 2011-08-09 10:54:52.000000000 +0200
@@ -93,53 +93,6 @@ NEXT_PAGE(hypercall_page)
#undef NEXT_PAGE
@@ -5890,8 +5872,8 @@ have been needed - see SLE11 SPn).
.section .bss.page_aligned, "aw", @nobits
.align PAGE_SIZE
ENTRY(empty_zero_page)
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/io_apic_32-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/io_apic_32-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/io_apic_32-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -25,6 +25,7 @@
#include <linux/init.h>
#include <linux/delay.h>
@@ -7516,8 +7498,8 @@ have been needed - see SLE11 SPn).
+ }
+}
+#endif
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/io_apic_64-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/io_apic_64-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/io_apic_64-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -45,6 +45,7 @@
#include <asm/proto.h>
#include <asm/acpi.h>
@@ -8281,8 +8263,8 @@ have been needed - see SLE11 SPn).
} else {
ioapic_phys = (unsigned long)
alloc_bootmem_pages(PAGE_SIZE);
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/ldt-xen.c 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/ldt-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/ldt-xen.c 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/ldt-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -20,9 +20,9 @@
#include <asm/mmu_context.h>
@@ -8317,8 +8299,8 @@ have been needed - see SLE11 SPn).
preempt_enable();
#endif
}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/machine_kexec_32.c 2011-01-31 14:54:00.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/machine_kexec_32.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/machine_kexec_32.c 2011-01-31 14:54:00.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/machine_kexec_32.c 2011-02-01 14:38:38.000000000 +0100
@@ -131,6 +131,8 @@ void machine_kexec_setup_load_arg(xen_ke
xki->page_list[PA_PTE_0] = __ma(kexec_pte0);
xki->page_list[PA_PTE_1] = __ma(kexec_pte1);
@@ -8328,8 +8310,8 @@ have been needed - see SLE11 SPn).
}
int __init machine_kexec_setup_resources(struct resource *hypervisor,
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/microcode-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/microcode-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/microcode-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/microcode-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -5,13 +5,14 @@
* 2006 Shaohua Li <shaohua.li@intel.com>
*
@@ -8394,8 +8376,8 @@ have been needed - see SLE11 SPn).
return 0;
}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/mpparse-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/mpparse-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/mpparse-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/mpparse-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -25,6 +25,9 @@
#include <asm/proto.h>
#include <asm/acpi.h>
@@ -9605,8 +9587,8 @@ have been needed - see SLE11 SPn).
-#endif /* CONFIG_X86_IO_APIC */
-#endif /* CONFIG_ACPI */
+late_initcall(update_mp_table);
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/pci-dma-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/pci-dma-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/pci-dma-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/pci-dma-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -5,13 +5,13 @@
#include <asm/proto.h>
@@ -9962,8 +9944,8 @@ have been needed - see SLE11 SPn).
no_iommu_init();
return 0;
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/pci-nommu-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/pci-nommu-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/pci-nommu-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/pci-nommu-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -84,18 +84,12 @@ static int nommu_dma_supported(struct de
return 1;
}
@@ -9984,8 +9966,8 @@ have been needed - see SLE11 SPn).
};
void __init no_iommu_init(void)
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/probe_roms.c 2011-08-22 11:12:52.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/probe_roms.c 2011-06-30 16:40:28.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/probe_roms.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/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;
@@ -9995,8 +9977,8 @@ have been needed - see SLE11 SPn).
if (romsignature(rom)) {
length = extension_rom_resource.end - extension_rom_resource.start + 1;
if (romchecksum(rom, length)) {
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/process-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/process-xen.c 2011-03-03 15:59:49.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/process-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/process-xen.c 2011-03-03 15:59:49.000000000 +0100
@@ -6,6 +6,13 @@
#include <linux/sched.h>
#include <linux/module.h>
@@ -10258,8 +10240,8 @@ have been needed - see SLE11 SPn).
return -1;
boot_option_idle_override = 1;
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/process_32-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/process_32-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/process_32-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/process_32-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -59,15 +59,11 @@
#include <asm/tlbflush.h>
#include <asm/cpu.h>
@@ -10363,8 +10345,8 @@ have been needed - see SLE11 SPn).
}
tick_nohz_restart_sched_tick();
preempt_enable_no_resched();
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/process_64-xen.c 2011-02-02 08:32:46.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/process_64-xen.c 2011-02-02 08:34:01.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/process_64-xen.c 2011-02-02 08:32:46.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/process_64-xen.c 2011-02-02 08:34:01.000000000 +0100
@@ -64,15 +64,6 @@ asmlinkage extern void ret_from_fork(voi
unsigned long kernel_thread_flags = CLONE_VM | CLONE_UNTRACED;
@@ -10547,8 +10529,8 @@ have been needed - see SLE11 SPn).
if (gsindex)
rdmsrl(MSR_KERNEL_GS_BASE, base);
else
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/setup-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/setup-xen.c 2011-06-10 11:59:07.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/setup-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/setup-xen.c 2011-06-10 11:59:07.000000000 +0200
@@ -1,143 +1,1126 @@
-#include <linux/kernel.h>
+/*
@@ -11766,7 +11748,7 @@ have been needed - see SLE11 SPn).
+ return NOTIFY_DONE;
+}
+#endif /* !CONFIG_XEN */
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/setup64-xen.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/setup64-xen.c 2011-01-31 18:07:35.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,370 +0,0 @@
-/*
@@ -12139,7 +12121,7 @@ have been needed - see SLE11 SPn).
- if (is_uv_system())
- uv_cpu_init();
-}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/setup_32-xen.c 2011-03-04 15:07:31.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/setup_32-xen.c 2011-03-04 15:07:31.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,1153 +0,0 @@
-/*
@@ -13295,7 +13277,7 @@ have been needed - see SLE11 SPn).
-}
-
-subsys_initcall(request_standard_resources);
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/setup_64-xen.c 2011-01-31 18:07:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/setup_64-xen.c 2011-01-31 18:07:35.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,1442 +0,0 @@
-/*
@@ -14740,8 +14722,8 @@ have been needed - see SLE11 SPn).
- return 1;
-}
-__setup("clearcpuid=", setup_disablecpuid);
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/smp-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/smp-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/smp-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/smp-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -121,132 +121,14 @@ void xen_smp_send_reschedule(int cpu)
send_IPI_mask(cpumask_of_cpu(cpu), RESCHEDULE_VECTOR);
}
@@ -14939,8 +14921,8 @@ have been needed - see SLE11 SPn).
return IRQ_HANDLED;
}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/time-xen.c 2011-07-11 11:49:22.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/time-xen.c 2011-07-11 11:50:40.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/time-xen.c 2011-07-11 11:49:22.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/time-xen.c 2011-07-11 11:50:40.000000000 +0200
@@ -522,7 +522,7 @@ irqreturn_t timer_interrupt(int irq, voi
/* Keep nmi watchdog up to date */
@@ -14970,8 +14952,8 @@ have been needed - see SLE11 SPn).
cpu_clear(cpu, nohz_cpu_mask);
j = jiffies + 1;
}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/traps_32-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/traps_32-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/traps_32-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/traps_32-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -1,5 +1,6 @@
/*
* Copyright (C) 1991, 1992 Linus Torvalds
@@ -15548,8 +15530,8 @@ have been needed - see SLE11 SPn).
unsigned long base = (kesp - uesp) & -THREAD_SIZE;
unsigned long new_kesp = kesp - base;
unsigned long lim_pages = (new_kesp | (THREAD_SIZE - 1)) >> PAGE_SHIFT;
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/traps_64-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/traps_64-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/traps_64-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/traps_64-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -10,73 +10,56 @@
* 'Traps.c' handles hardware traps and faults after we have saved some
* state in 'entry.S'.
@@ -16510,8 +16492,8 @@ have been needed - see SLE11 SPn).
static int __init code_bytes_setup(char *s)
{
code_bytes = simple_strtoul(s, NULL, 0);
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/vsyscall_64-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/vsyscall_64-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/vsyscall_64-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -42,7 +42,8 @@
#include <asm/topology.h>
#include <asm/vgtod.h>
@@ -16552,8 +16534,8 @@ have been needed - see SLE11 SPn).
hotcpu_notifier(cpu_vsyscall_notifier, 0);
return 0;
}
---- sle11sp2-2011-08-22.orig/arch/x86/mach-xen/setup.c 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mach-xen/setup.c 2011-08-22 10:34:21.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/mach-xen/setup.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mach-xen/setup.c 2011-08-22 10:34:21.000000000 +0200
@@ -17,6 +17,8 @@
#include <xen/interface/callback.h>
#include <xen/interface/memory.h>
@@ -16717,8 +16699,8 @@ have been needed - see SLE11 SPn).
}
+#endif
}
---- sle11sp2-2011-08-22.orig/arch/x86/mm/Makefile 2011-06-30 15:40:00.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/mm/Makefile 2011-04-13 13:48:19.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/Makefile 2011-06-30 15:40:00.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/mm/Makefile 2011-04-13 13:48:19.000000000 +0200
@@ -28,6 +28,7 @@ obj-$(CONFIG_ACPI_NUMA) += srat.o
obj-$(CONFIG_NUMA_EMU) += numa_emulation.o
@@ -16727,8 +16709,8 @@ have been needed - see SLE11 SPn).
obj-$(CONFIG_HAVE_MEMBLOCK) += memblock.o
---- sle11sp2-2011-08-22.orig/arch/x86/mm/dump_pagetables-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/dump_pagetables-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/dump_pagetables-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/dump_pagetables-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -45,7 +45,7 @@ static struct addr_marker address_marker
{ 0, "User Space" },
#ifdef CONFIG_X86_64
@@ -16776,8 +16758,8 @@ have been needed - see SLE11 SPn).
if (pgd_large(*start) || !pgd_present(*start))
note_page(m, &st, __pgprot(prot), 1);
---- sle11sp2-2011-08-22.orig/arch/x86/mm/fault-xen.c 2011-07-26 09:29:47.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/mm/fault-xen.c 2011-07-26 09:29:55.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/fault-xen.c 2011-07-26 09:29:47.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/mm/fault-xen.c 2011-07-26 09:29:55.000000000 +0200
@@ -10,6 +10,7 @@
#include <linux/string.h>
#include <linux/types.h>
@@ -16978,8 +16960,8 @@ have been needed - see SLE11 SPn).
}
#endif
}
---- sle11sp2-2011-08-22.orig/arch/x86/mm/hypervisor.c 2011-08-09 10:50:48.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/mm/hypervisor.c 2011-08-09 10:57:04.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/hypervisor.c 2011-08-09 10:50:48.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/mm/hypervisor.c 2011-08-09 10:57:04.000000000 +0200
@@ -502,7 +502,7 @@ static int __init init_contig_order(void
return 0;
@@ -17109,8 +17091,8 @@ have been needed - see SLE11 SPn).
+ maddr_t mach_gp = virt_to_machine(gdt + entry);
+ return HYPERVISOR_update_descriptor(mach_gp, *(const u64*)desc);
}
---- sle11sp2-2011-08-22.orig/arch/x86/mm/init_32-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/init_32-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/init_32-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/init_32-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -54,6 +54,7 @@
unsigned int __VMALLOC_RESERVE = 128 << 20;
@@ -17940,8 +17922,8 @@ have been needed - see SLE11 SPn).
+{
+ return reserve_bootmem(phys, len, flags);
+}
---- sle11sp2-2011-08-22.orig/arch/x86/mm/init_64-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/init_64-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/init_64-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/init_64-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -21,6 +21,7 @@
#include <linux/swap.h>
#include <linux/smp.h>
@@ -19310,8 +19292,8 @@ have been needed - see SLE11 SPn).
}
return 0;
}
---- sle11sp2-2011-08-22.orig/arch/x86/mm/ioremap-xen.c 2011-02-07 15:39:13.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/ioremap-xen.c 2011-02-07 15:40:39.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/ioremap-xen.c 2011-02-07 15:39:13.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/ioremap-xen.c 2011-02-07 15:40:39.000000000 +0100
@@ -13,6 +13,7 @@
#include <linux/pfn.h>
#include <linux/slab.h>
@@ -19484,8 +19466,8 @@ have been needed - see SLE11 SPn).
return 1;
}
---- sle11sp2-2011-08-22.orig/arch/x86/mm/pageattr-xen.c 2011-03-23 09:53:18.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/pageattr-xen.c 2011-03-23 09:54:23.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/pageattr-xen.c 2011-03-23 09:53:18.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/pageattr-xen.c 2011-03-23 09:54:23.000000000 +0100
@@ -34,6 +34,47 @@ struct cpa_data {
unsigned force_split : 1;
};
@@ -19700,8 +19682,8 @@ have been needed - see SLE11 SPn).
return _set_memory_wb(addr, numpages);
}
---- sle11sp2-2011-08-22.orig/arch/x86/mm/pat-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/pat-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/pat-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/pat-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -12,6 +12,8 @@
#include <linux/gfp.h>
#include <linux/fs.h>
@@ -20411,8 +20393,8 @@ have been needed - see SLE11 SPn).
+late_initcall(pat_memtype_list_init);
+
+#endif /* CONFIG_DEBUG_FS */
---- sle11sp2-2011-08-22.orig/arch/x86/mm/pgtable-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/pgtable-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/pgtable-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/pgtable-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -4,6 +4,7 @@
#include <asm/pgalloc.h>
#include <asm/pgtable.h>
@@ -20780,8 +20762,8 @@ have been needed - see SLE11 SPn).
+ set_pte_vaddr(address, pte);
+ fixmaps_set++;
+}
---- sle11sp2-2011-08-22.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/pgtable_32-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/pgtable_32-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/pgtable_32-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -25,51 +25,49 @@
#include <xen/features.h>
#include <asm/hypervisor.h>
@@ -20962,8 +20944,8 @@ have been needed - see SLE11 SPn).
void make_lowmem_page_readonly(void *va, unsigned int feature)
{
pte_t *pte;
---- sle11sp2-2011-08-22.orig/arch/x86/pci/amd_bus.c 2011-08-22 11:12:52.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/pci/amd_bus.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/pci/amd_bus.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/pci/amd_bus.c 2011-02-01 14:38:38.000000000 +0100
@@ -350,6 +350,7 @@ static int __init early_fill_mp_bus_info
#define ENABLE_CF8_EXT_CFG (1ULL << 46)
@@ -21011,8 +20993,8 @@ have been needed - see SLE11 SPn).
if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD)
return 0;
---- sle11sp2-2011-08-22.orig/arch/x86/vdso/Makefile 2011-06-30 16:34:12.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/vdso/Makefile 2011-06-30 16:40:55.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/vdso/Makefile 2011-06-30 16:34:12.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/vdso/Makefile 2011-06-30 16:40:55.000000000 +0200
@@ -78,9 +78,7 @@ obj-$(VDSO32-y) += vdso32-syms.lds
vdso32.so-$(VDSO32-y) += int80
vdso32.so-$(CONFIG_COMPAT) += syscall
@@ -21024,8 +21006,8 @@ have been needed - see SLE11 SPn).
vdso32-images = $(vdso32.so-y:%=vdso32-%.so)
---- sle11sp2-2011-08-22.orig/arch/x86/vdso/vdso32.S 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/vdso/vdso32.S 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/vdso/vdso32.S 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/vdso/vdso32.S 2011-02-01 14:38:38.000000000 +0100
@@ -9,7 +9,7 @@ vdso32_int80_end:
.globl vdso32_syscall_start, vdso32_syscall_end
@@ -21052,8 +21034,8 @@ have been needed - see SLE11 SPn).
-#endif
-
__FINIT
---- sle11sp2-2011-08-22.orig/arch/x86/vdso/vdso32-setup-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/vdso/vdso32-setup-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/vdso/vdso32-setup-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/vdso/vdso32-setup-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -195,50 +195,28 @@ static __init void relocate_vdso(Elf32_E
}
}
@@ -21187,8 +21169,8 @@ have been needed - see SLE11 SPn).
}
memcpy(syscall_page, vsyscall, vsyscall_len);
---- sle11sp2-2011-08-22.orig/arch/x86/xen/Kconfig 2011-01-31 17:49:31.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/xen/Kconfig 2011-04-28 11:12:57.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/xen/Kconfig 2011-01-31 17:49:31.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/xen/Kconfig 2011-04-28 11:12:57.000000000 +0200
@@ -31,14 +31,14 @@ config XEN_PVHVM
config XEN_MAX_DOMAIN_MEMORY
int
@@ -21206,8 +21188,43 @@ have been needed - see SLE11 SPn).
select HIBERNATE_CALLBACKS
default y
---- sle11sp2-2011-08-22.orig/drivers/acpi/processor_driver.c 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/acpi/processor_driver.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/acpi/processor_core.c 2011-06-30 16:32:20.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/acpi/processor_core.c 2011-09-06 09:24:07.000000000 +0200
+@@ -299,19 +299,31 @@ acpi_processor_eval_pdc(acpi_handle hand
+ {
+ acpi_status status = AE_OK;
+
++#ifndef CONFIG_XEN
+ if (boot_option_idle_override == IDLE_NOMWAIT) {
+ /*
+ * If mwait is disabled for CPU C-states, the C2C3_FFH access
+ * mode will be disabled in the parameter of _PDC object.
+ * Of course C1_FFH access mode will also be disabled.
+ */
++#else
++ {
++ struct xen_platform_op op;
++#endif
+ union acpi_object *obj;
+ u32 *buffer = NULL;
+
+ obj = pdc_in->pointer;
+ buffer = (u32 *)(obj->buffer.pointer);
++#ifndef CONFIG_XEN
+ buffer[2] &= ~(ACPI_PDC_C_C2C3_FFH | ACPI_PDC_C_C1_FFH);
+-
++#else
++ op.cmd = XENPF_set_processor_pminfo;
++ op.u.set_pminfo.id = -1;
++ op.u.set_pminfo.type = XEN_PM_PDC;
++ set_xen_guest_handle(op.u.set_pminfo.u.pdc, buffer);
++ VOID(HYPERVISOR_platform_op(&op));
++#endif
+ }
+ status = acpi_evaluate_object(handle, "_PDC", pdc_in, NULL);
+
+--- sle11sp2-2011-09-06.orig/drivers/acpi/processor_driver.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/acpi/processor_driver.c 2011-02-01 14:38:38.000000000 +0100
@@ -512,10 +512,12 @@ static int __cpuinit acpi_processor_add(
per_cpu(processors, pr->id) = pr;
#endif
@@ -21235,8 +21252,8 @@ have been needed - see SLE11 SPn).
if (pr->cdev) {
sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
---- sle11sp2-2011-08-22.orig/drivers/acpi/processor_perflib.c 2011-06-30 16:02:05.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/acpi/processor_perflib.c 2011-06-30 16:41:01.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/acpi/processor_perflib.c 2011-06-30 16:02:05.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/acpi/processor_perflib.c 2011-06-30 16:41:01.000000000 +0200
@@ -183,6 +183,12 @@ int acpi_processor_ppc_has_changed(struc
{
int ret;
@@ -21250,8 +21267,8 @@ have been needed - see SLE11 SPn).
if (ignore_ppc) {
/*
* Only when it is notification event, the _OST object
---- sle11sp2-2011-08-22.orig/drivers/char/tpm/tpm_vtpm.c 2011-01-31 14:53:38.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/char/tpm/tpm_vtpm.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/char/tpm/tpm_vtpm.c 2011-01-31 14:53:38.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/char/tpm/tpm_vtpm.c 2011-02-01 14:38:38.000000000 +0100
@@ -347,7 +347,7 @@ static int _vtpm_send_queued(struct tpm_
{
int rc;
@@ -21261,8 +21278,8 @@ have been needed - see SLE11 SPn).
unsigned char buffer[1];
struct vtpm_state *vtpms;
vtpms = (struct vtpm_state *)chip_get_private(chip);
---- sle11sp2-2011-08-22.orig/drivers/dma/ioat/dma.h 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/dma/ioat/dma.h 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/dma/ioat/dma.h 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/dma/ioat/dma.h 2011-02-01 14:38:38.000000000 +0100
@@ -363,6 +363,7 @@ __ioat_dca_init(struct pci_dev *pdev, vo
}
#define ioat_dca_init __ioat_dca_init
@@ -21271,8 +21288,8 @@ have been needed - see SLE11 SPn).
#endif
#endif /* IOATDMA_H */
---- sle11sp2-2011-08-22.orig/drivers/hwmon/coretemp-xen.c 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/hwmon/coretemp-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/hwmon/coretemp-xen.c 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/hwmon/coretemp-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -360,10 +360,11 @@ static int coretemp_device_add(unsigned
if (err)
goto exit_entry_free;
@@ -21287,8 +21304,8 @@ have been needed - see SLE11 SPn).
/* supported CPU not found, but report the unknown
family 6 CPU */
---- sle11sp2-2011-08-22.orig/drivers/pci/msi-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/pci/msi-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/pci/msi-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/pci/msi-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -53,12 +53,10 @@ arch_msi_check_device(struct pci_dev *de
return 0;
}
@@ -21391,16 +21408,16 @@ have been needed - see SLE11 SPn).
return -EINVAL;
}
---- sle11sp2-2011-08-22.orig/drivers/xen/Makefile 2011-02-28 15:13:33.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/Makefile 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/Makefile 2011-02-28 15:13:33.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/Makefile 2011-02-01 14:38:38.000000000 +0100
@@ -1,4 +1,4 @@
-obj-$(CONFIG_PARAVIRT_XEN) += grant-table.o features.o events.o
+obj-$(CONFIG_PARAVIRT_XEN) += grant-table.o features.o events.o manage.o
xen-balloon-$(CONFIG_PARAVIRT_XEN) := balloon.o
xen-balloon-$(CONFIG_XEN) := balloon/
---- sle11sp2-2011-08-22.orig/drivers/xen/balloon/balloon.c 2011-03-23 08:52:11.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/balloon/balloon.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/balloon/balloon.c 2011-03-23 08:52:11.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/balloon/balloon.c 2011-02-01 14:38:38.000000000 +0100
@@ -82,7 +82,7 @@ struct balloon_stats balloon_stats;
/* We increase/decrease in batches which fit in a page */
static unsigned long frame_list[PAGE_SIZE / sizeof(unsigned long)];
@@ -21410,8 +21427,8 @@ have been needed - see SLE11 SPn).
#define inc_totalhigh_pages() (totalhigh_pages++)
#define dec_totalhigh_pages() (totalhigh_pages--)
#else
---- sle11sp2-2011-08-22.orig/drivers/xen/balloon/sysfs.c 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/balloon/sysfs.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/balloon/sysfs.c 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/balloon/sysfs.c 2011-02-01 14:38:38.000000000 +0100
@@ -45,6 +45,7 @@
#define BALLOON_SHOW(name, format, args...) \
@@ -21439,8 +21456,8 @@ have been needed - see SLE11 SPn).
{
char memstring[64], *endchar;
unsigned long long target_bytes;
---- sle11sp2-2011-08-22.orig/drivers/xen/blktap/blktap.c 2011-06-30 16:35:35.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/blktap/blktap.c 2011-06-30 16:41:05.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/blktap/blktap.c 2011-06-30 16:35:35.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/blktap/blktap.c 2011-06-30 16:41:05.000000000 +0200
@@ -56,6 +56,7 @@
#include <linux/gfp.h>
#include <linux/poll.h>
@@ -21468,8 +21485,8 @@ have been needed - see SLE11 SPn).
} else {
/* this is bad, but not fatal */
WPRINTK("blktap: sysfs xen_class not created\n");
---- sle11sp2-2011-08-22.orig/drivers/xen/blktap2/device.c 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/blktap2/device.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/blktap2/device.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/blktap2/device.c 2011-02-01 14:38:38.000000000 +0100
@@ -3,6 +3,7 @@
#include <linux/cdrom.h>
#include <linux/hdreg.h>
@@ -21478,8 +21495,8 @@ have been needed - see SLE11 SPn).
#include <asm/tlbflush.h>
#include <scsi/scsi.h>
---- sle11sp2-2011-08-22.orig/drivers/xen/blktap2/sysfs.c 2011-03-11 10:58:58.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/blktap2/sysfs.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/blktap2/sysfs.c 2011-03-11 10:58:58.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/blktap2/sysfs.c 2011-02-01 14:38:38.000000000 +0100
@@ -307,8 +307,8 @@ blktap_sysfs_create(struct blktap *tap)
ring = &tap->ring;
@@ -21491,8 +21508,8 @@ have been needed - see SLE11 SPn).
if (IS_ERR(dev))
return PTR_ERR(dev);
---- sle11sp2-2011-08-22.orig/drivers/xen/char/mem.c 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/char/mem.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/char/mem.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/char/mem.c 2011-02-01 14:38:38.000000000 +0100
@@ -35,7 +35,7 @@ static inline int uncached_access(struct
static inline int range_is_allowed(unsigned long pfn, unsigned long size)
@@ -21514,8 +21531,8 @@ have been needed - see SLE11 SPn).
};
static int xen_mmap_mem(struct file * file, struct vm_area_struct * vma)
---- sle11sp2-2011-08-22.orig/drivers/xen/console/console.c 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/console/console.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/console/console.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/console/console.c 2011-02-01 14:38:38.000000000 +0100
@@ -431,9 +431,7 @@ static void __xencons_tx_flush(void)
if (work_done && (xencons_tty != NULL)) {
@@ -21538,8 +21555,8 @@ have been needed - see SLE11 SPn).
tty->closing = 0;
spin_lock_irqsave(&xencons_lock, flags);
xencons_tty = NULL;
---- sle11sp2-2011-08-22.orig/drivers/xen/core/evtchn.c 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/core/evtchn.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/core/evtchn.c 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/core/evtchn.c 2011-02-01 14:38:38.000000000 +0100
@@ -126,7 +126,11 @@ static int irq_bindcount[NR_IRQS];
#ifdef CONFIG_SMP
@@ -21636,8 +21653,8 @@ have been needed - see SLE11 SPn).
/* No event channels are 'live' right now. */
for (i = 0; i < NR_EVENT_CHANNELS; i++)
---- sle11sp2-2011-08-22.orig/drivers/xen/core/gnttab.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/core/gnttab.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/core/gnttab.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/core/gnttab.c 2011-02-01 14:38:38.000000000 +0100
@@ -448,6 +448,7 @@ static int map_pte_fn(pte_t *pte, struct
return 0;
}
@@ -21765,8 +21782,8 @@ have been needed - see SLE11 SPn).
return 0;
ini_nomem:
---- sle11sp2-2011-08-22.orig/drivers/xen/core/machine_kexec.c 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/core/machine_kexec.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/core/machine_kexec.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/core/machine_kexec.c 2011-02-01 14:38:38.000000000 +0100
@@ -57,8 +57,7 @@ void __init xen_machine_kexec_setup_reso
/* allocate xen_phys_cpus */
@@ -21821,8 +21838,8 @@ have been needed - see SLE11 SPn).
void __init xen_machine_kexec_register_resources(struct resource *res)
{
int k;
---- sle11sp2-2011-08-22.orig/drivers/xen/core/machine_reboot.c 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/core/machine_reboot.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/core/machine_reboot.c 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/core/machine_reboot.c 2011-02-01 14:38:38.000000000 +0100
@@ -52,6 +52,7 @@ void machine_power_off(void)
HYPERVISOR_shutdown(SHUTDOWN_poweroff);
}
@@ -21862,8 +21879,8 @@ have been needed - see SLE11 SPn).
return 0;
}
+#endif
---- sle11sp2-2011-08-22.orig/drivers/xen/core/reboot.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/core/reboot.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/core/reboot.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/core/reboot.c 2011-02-01 14:38:38.000000000 +0100
@@ -28,17 +28,12 @@ MODULE_LICENSE("Dual BSD/GPL");
/* Ignore multiple shutdown requests. */
static int shutting_down = SHUTDOWN_INVALID;
@@ -21936,8 +21953,8 @@ have been needed - see SLE11 SPn).
static int setup_shutdown_watcher(void)
{
---- sle11sp2-2011-08-22.orig/drivers/xen/core/smpboot.c 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/core/smpboot.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/core/smpboot.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/core/smpboot.c 2011-02-01 14:38:38.000000000 +0100
@@ -27,6 +27,7 @@
extern irqreturn_t smp_reschedule_interrupt(int, void *);
@@ -22073,8 +22090,8 @@ have been needed - see SLE11 SPn).
prefill_possible_map();
}
---- sle11sp2-2011-08-22.orig/drivers/xen/core/spinlock.c 2011-03-15 16:52:48.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/core/spinlock.c 2011-03-15 16:51:35.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/core/spinlock.c 2011-03-15 16:52:48.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/core/spinlock.c 2011-03-15 16:51:35.000000000 +0100
@@ -5,6 +5,10 @@
* portions of this file.
*/
@@ -22209,8 +22226,8 @@ have been needed - see SLE11 SPn).
EXPORT_SYMBOL(xen_spin_kick);
+
+#endif /* TICKET_SHIFT */
---- sle11sp2-2011-08-22.orig/drivers/xen/fbfront/xenfb.c 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/fbfront/xenfb.c 2011-02-17 10:11:23.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/fbfront/xenfb.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/fbfront/xenfb.c 2011-02-17 10:11:23.000000000 +0100
@@ -18,6 +18,7 @@
* frame buffer.
*/
@@ -22262,16 +22279,16 @@ have been needed - see SLE11 SPn).
+MODULE_DESCRIPTION("Xen virtual framebuffer device frontend");
MODULE_LICENSE("GPL");
---- sle11sp2-2011-08-22.orig/drivers/xen/fbfront/xenkbd.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/fbfront/xenkbd.c 2011-05-23 11:10:58.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/fbfront/xenkbd.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/fbfront/xenkbd.c 2011-05-23 11:10:58.000000000 +0200
@@ -363,4 +363,5 @@ static void __exit xenkbd_cleanup(void)
module_init(xenkbd_init);
module_exit(xenkbd_cleanup);
+MODULE_DESCRIPTION("Xen virtual keyboard/pointer device frontend");
MODULE_LICENSE("GPL");
---- sle11sp2-2011-08-22.orig/drivers/xen/gntdev/gntdev.c 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/gntdev/gntdev.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/gntdev/gntdev.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/gntdev/gntdev.c 2011-02-01 14:38:38.000000000 +0100
@@ -400,7 +400,7 @@ static int __init gntdev_init(void)
}
@@ -22281,8 +22298,8 @@ have been needed - see SLE11 SPn).
if (IS_ERR(device)) {
pr_err("Error creating gntdev device in xen_class\n");
pr_err("gntdev created, major number = %d\n", gntdev_major);
---- sle11sp2-2011-08-22.orig/drivers/xen/netback/netback.c 2011-04-11 15:01:12.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/netback/netback.c 2011-04-11 15:03:06.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/netback/netback.c 2011-04-11 15:01:12.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/netback/netback.c 2011-04-11 15:03:06.000000000 +0200
@@ -36,7 +36,7 @@
#include "common.h"
@@ -22301,8 +22318,8 @@ have been needed - see SLE11 SPn).
static struct pending_tx_info {
netif_tx_request_t req;
---- sle11sp2-2011-08-22.orig/drivers/xen/netfront/accel.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/netfront/accel.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/netfront/accel.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/netfront/accel.c 2011-02-01 14:38:38.000000000 +0100
@@ -28,6 +28,7 @@
* IN THE SOFTWARE.
*/
@@ -22311,8 +22328,8 @@ have been needed - see SLE11 SPn).
#include <linux/netdevice.h>
#include <linux/skbuff.h>
#include <linux/list.h>
---- sle11sp2-2011-08-22.orig/drivers/xen/netfront/netfront.c 2011-06-30 16:35:25.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/netfront/netfront.c 2011-06-30 16:41:13.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/netfront/netfront.c 2011-06-30 16:35:25.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/netfront/netfront.c 2011-06-30 16:41:13.000000000 +0200
@@ -639,7 +639,7 @@ static int network_open(struct net_devic
}
spin_unlock_bh(&np->rx_lock);
@@ -22322,8 +22339,8 @@ have been needed - see SLE11 SPn).
return 0;
}
---- sle11sp2-2011-08-22.orig/drivers/xen/pciback/conf_space_header.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/pciback/conf_space_header.c 2011-08-09 10:54:33.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/pciback/conf_space_header.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/pciback/conf_space_header.c 2011-08-09 10:54:33.000000000 +0200
@@ -179,7 +179,7 @@ static inline void read_dev_bar(struct p
bar_info->val = res[pos].start |
@@ -22333,8 +22350,8 @@ have been needed - see SLE11 SPn).
}
static void *bar_init(struct pci_dev *dev, int offset)
---- sle11sp2-2011-08-22.orig/drivers/xen/sfc_netback/accel.h 2010-01-18 15:23:12.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/sfc_netback/accel.h 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/sfc_netback/accel.h 2010-01-18 15:23:12.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/sfc_netback/accel.h 2011-02-01 14:38:38.000000000 +0100
@@ -25,6 +25,7 @@
#ifndef NETBACK_ACCEL_H
#define NETBACK_ACCEL_H
@@ -22343,8 +22360,8 @@ have been needed - see SLE11 SPn).
#include <linux/slab.h>
#include <linux/ip.h>
#include <linux/tcp.h>
---- sle11sp2-2011-08-22.orig/drivers/xen/sfc_netfront/accel.h 2011-01-31 17:29:16.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/sfc_netfront/accel.h 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/sfc_netfront/accel.h 2011-01-31 17:29:16.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/sfc_netfront/accel.h 2011-02-01 14:38:38.000000000 +0100
@@ -35,6 +35,7 @@
#include <xen/evtchn.h>
@@ -22353,8 +22370,8 @@ have been needed - see SLE11 SPn).
#include <linux/list.h>
enum netfront_accel_post_status {
---- sle11sp2-2011-08-22.orig/drivers/xen/xenbus/xenbus_client.c 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/xenbus/xenbus_client.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/xenbus/xenbus_client.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/xenbus/xenbus_client.c 2011-02-01 14:38:38.000000000 +0100
@@ -149,7 +149,7 @@ int xenbus_watch_pathfmt(struct xenbus_d
char *path;
@@ -22364,8 +22381,8 @@ have been needed - see SLE11 SPn).
va_end(ap);
if (!path) {
---- sle11sp2-2011-08-22.orig/drivers/xen/xenbus/xenbus_comms.c 2011-04-11 15:00:27.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/xenbus/xenbus_comms.c 2011-04-11 15:03:17.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/xenbus/xenbus_comms.c 2011-04-11 15:00:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/xenbus/xenbus_comms.c 2011-04-11 15:03:17.000000000 +0200
@@ -250,14 +250,11 @@ int xb_init_comms(void)
intf->rsp_cons = intf->rsp_prod;
}
@@ -22403,8 +22420,8 @@ have been needed - see SLE11 SPn).
return 0;
}
---- sle11sp2-2011-08-22.orig/drivers/xen/xenbus/xenbus_dev.c 2011-06-30 16:10:32.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/xenbus/xenbus_dev.c 2011-06-30 16:41:18.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/xenbus/xenbus_dev.c 2011-06-30 16:10:32.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/xenbus/xenbus_dev.c 2011-06-30 16:41:18.000000000 +0200
@@ -158,8 +158,7 @@ static void queue_flush(struct xenbus_de
int err)
{
@@ -22415,8 +22432,8 @@ have been needed - see SLE11 SPn).
wake_up(&u->read_waitq);
} else
while (!list_empty(queue)) {
---- sle11sp2-2011-08-22.orig/drivers/xen/xenbus/xenbus_probe.c 2011-06-10 11:53:57.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/xenbus/xenbus_probe.c 2011-06-10 11:54:17.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/xenbus/xenbus_probe.c 2011-06-10 11:53:57.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/xenbus/xenbus_probe.c 2011-06-10 11:54:17.000000000 +0200
@@ -36,6 +36,7 @@
__FUNCTION__, __LINE__, ##args)
@@ -22425,8 +22442,8 @@ have been needed - see SLE11 SPn).
#include <linux/err.h>
#include <linux/string.h>
#include <linux/ctype.h>
---- sle11sp2-2011-08-22.orig/fs/aio.c 2011-04-13 12:51:57.000000000 +0200
-+++ sle11sp2-2011-08-22/fs/aio.c 2011-04-13 13:48:30.000000000 +0200
+--- sle11sp2-2011-09-06.orig/fs/aio.c 2011-04-13 12:51:57.000000000 +0200
++++ sle11sp2-2011-09-06/fs/aio.c 2011-04-13 13:48:30.000000000 +0200
@@ -1296,7 +1296,7 @@ static int make_aio_fd(struct kioctx *io
int fd;
struct file *file;
@@ -22436,8 +22453,8 @@ have been needed - see SLE11 SPn).
if (fd < 0)
return fd;
---- sle11sp2-2011-08-22.orig/include/Kbuild 2011-08-22 11:12:52.000000000 +0200
-+++ sle11sp2-2011-08-22/include/Kbuild 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/include/Kbuild 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/include/Kbuild 2011-02-01 14:38:38.000000000 +0100
@@ -8,5 +8,6 @@ header-y += mtd/
header-y += rdma/
header-y += video/
@@ -22445,8 +22462,8 @@ have been needed - see SLE11 SPn).
+header-y += xen/public/
header-y += xen/
header-y += scsi/
---- sle11sp2-2011-08-22.orig/include/asm-generic/pgtable.h 2011-03-11 10:54:24.000000000 +0100
-+++ sle11sp2-2011-08-22/include/asm-generic/pgtable.h 2011-03-11 10:59:22.000000000 +0100
+--- sle11sp2-2011-09-06.orig/include/asm-generic/pgtable.h 2011-03-11 10:54:24.000000000 +0100
++++ sle11sp2-2011-09-06/include/asm-generic/pgtable.h 2011-03-11 10:59:22.000000000 +0100
@@ -156,10 +156,6 @@ static inline void pmdp_set_wrprotect(st
#endif /* CONFIG_TRANSPARENT_HUGEPAGE */
#endif
@@ -22458,33 +22475,8 @@ have been needed - see SLE11 SPn).
#ifndef __HAVE_ARCH_PMDP_SPLITTING_FLUSH
extern pmd_t pmdp_splitting_flush(struct vm_area_struct *vma,
unsigned long address,
---- sle11sp2-2011-08-22.orig/arch/x86/include/asm/acpi.h 2011-06-30 16:33:29.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/include/asm/acpi.h 2011-08-15 10:53:00.000000000 +0200
-@@ -99,6 +99,10 @@ extern u8 acpi_sci_flags;
- extern int acpi_sci_override_gsi;
- void acpi_pic_sci_set_trigger(unsigned int, u16);
-
-+#ifdef CONFIG_PROCESSOR_EXTERNAL_CONTROL
-+bool processor_extcntl_has_mwait(void);
-+#endif
-+
- extern int (*__acpi_register_gsi)(struct device *dev, u32 gsi,
- int trigger, int polarity);
-
-@@ -194,7 +198,11 @@ static inline void arch_acpi_set_pdc_bit
- /*
- * If mwait/monitor is unsupported, C2/C3_FFH will be disabled
- */
-+#ifndef CONFIG_PROCESSOR_EXTERNAL_CONTROL
- if (!cpu_has(c, X86_FEATURE_MWAIT))
-+#else
-+ if (!processor_extcntl_has_mwait())
-+#endif
- buf[2] &= ~(ACPI_PDC_C_C2C3_FFH);
- }
-
---- sle11sp2-2011-08-22.orig/arch/x86/include/asm/kexec.h 2011-04-13 11:31:41.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/include/asm/kexec.h 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/asm/kexec.h 2011-04-13 11:31:41.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/include/asm/kexec.h 2011-02-01 14:38:38.000000000 +0100
@@ -5,8 +5,21 @@
# define PA_CONTROL_PAGE 0
# define VA_CONTROL_PAGE 1
@@ -22507,8 +22499,8 @@ have been needed - see SLE11 SPn).
#else
# define PA_CONTROL_PAGE 0
# define VA_CONTROL_PAGE 1
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/desc.h 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/desc.h 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/desc.h 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/desc.h 2011-02-01 14:38:38.000000000 +0100
@@ -31,11 +31,17 @@ extern struct desc_ptr idt_descr;
extern gate_desc idt_table[];
#endif
@@ -22577,8 +22569,8 @@ have been needed - see SLE11 SPn).
/*
* This routine sets up an interrupt gate at directory privilege level 3.
*/
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/fixmap.h 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/fixmap.h 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/fixmap.h 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/fixmap.h 2011-02-01 14:38:38.000000000 +0100
@@ -7,7 +7,58 @@
# include "fixmap_64.h"
#endif
@@ -22638,8 +22630,8 @@ have been needed - see SLE11 SPn).
+ return __virt_to_fix(vaddr);
+}
#endif
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-02-01 14:38:38.000000000 +0100
@@ -58,10 +58,17 @@ enum fixed_addresses {
#ifdef CONFIG_X86_LOCAL_APIC
FIX_APIC_BASE, /* local (CPU) APIC) -- required for SMP or not */
@@ -22757,8 +22749,8 @@ have been needed - see SLE11 SPn).
-
#endif /* !__ASSEMBLY__ */
#endif
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-02-01 14:38:38.000000000 +0100
@@ -12,6 +12,7 @@
#define _ASM_FIXMAP_64_H
@@ -22858,8 +22850,8 @@ have been needed - see SLE11 SPn).
-}
-
#endif
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/highmem.h 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/highmem.h 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/highmem.h 2011-02-01 14:38:38.000000000 +0100
@@ -73,6 +73,9 @@ struct page *kmap_atomic_to_page(void *p
#define flush_cache_kmaps() do { } while (0)
@@ -22870,9 +22862,9 @@ have been needed - see SLE11 SPn).
void clear_highpage(struct page *);
static inline void clear_user_highpage(struct page *page, unsigned long vaddr)
{
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/hypercall.h 2011-07-20 15:39:42.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/hypercall.h 2011-07-21 12:17:27.000000000 +0200
-@@ -334,9 +334,19 @@ static inline int __must_check
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/hypercall.h 2011-08-23 13:29:27.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/hypercall.h 2011-08-23 15:19:12.000000000 +0200
+@@ -339,9 +339,19 @@ static inline int __must_check
HYPERVISOR_grant_table_op(
unsigned int cmd, void *uop, unsigned int count)
{
@@ -22893,8 +22885,8 @@ have been needed - see SLE11 SPn).
}
static inline int __must_check
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-07-21 12:16:58.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/hypervisor.h 2011-07-21 12:17:26.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-08-23 15:15:35.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/hypervisor.h 2011-08-23 15:19:11.000000000 +0200
@@ -35,7 +35,6 @@
#include <linux/types.h>
@@ -22902,8 +22894,8 @@ have been needed - see SLE11 SPn).
-#include <linux/version.h>
#include <linux/errno.h>
#include <xen/interface/xen.h>
- #include <xen/interface/platform.h>
-@@ -115,6 +114,8 @@ int xen_create_contiguous_region(
+ #include <xen/interface/sched.h>
+@@ -113,6 +112,8 @@ int xen_create_contiguous_region(
unsigned long vstart, unsigned int order, unsigned int address_bits);
void xen_destroy_contiguous_region(
unsigned long vstart, unsigned int order);
@@ -22912,7 +22904,7 @@ have been needed - see SLE11 SPn).
struct page;
-@@ -186,6 +187,29 @@ static inline void xen_multicall_flush(b
+@@ -184,6 +185,29 @@ static inline void xen_multicall_flush(b
#endif /* CONFIG_XEN && !MODULE */
@@ -22942,8 +22934,8 @@ have been needed - see SLE11 SPn).
#if defined(CONFIG_X86_64)
#define MULTI_UVMFLAGS_INDEX 2
#define MULTI_UVMDOMID_INDEX 3
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/io.h 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/io.h 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/io.h 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/io.h 2011-02-01 14:38:38.000000000 +0100
@@ -3,20 +3,140 @@
#define ARCH_HAS_IOREMAP_WC
@@ -23091,7 +23083,7 @@ have been needed - see SLE11 SPn).
+
#endif /* _ASM_X86_IO_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/irq_vectors.h 2011-02-15 17:27:18.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/irq_vectors.h 2011-02-15 17:27:18.000000000 +0100
@@ -0,0 +1,52 @@
+#ifndef _ASM_IRQ_VECTORS_H
+#define _ASM_IRQ_VECTORS_H
@@ -23145,8 +23137,8 @@ have been needed - see SLE11 SPn).
+#define NR_IRQ_VECTORS NR_IRQS
+
+#endif /* _ASM_IRQ_VECTORS_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/irqflags.h 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/irqflags.h 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/irqflags.h 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/irqflags.h 2011-02-01 14:38:38.000000000 +0100
@@ -118,7 +118,7 @@ static inline void halt(void)
#ifndef CONFIG_X86_64
@@ -23211,8 +23203,8 @@ have been needed - see SLE11 SPn).
#else
# define TRACE_IRQS_ON
# define TRACE_IRQS_OFF
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/mmu_context.h 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/mmu_context.h 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/mmu_context.h 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/mmu_context.h 2011-02-01 14:38:38.000000000 +0100
@@ -1,5 +1,42 @@
+#ifndef __ASM_X86_MMU_CONTEXT_H
+#define __ASM_X86_MMU_CONTEXT_H
@@ -23256,8 +23248,8 @@ have been needed - see SLE11 SPn).
+
+
+#endif /* __ASM_X86_MMU_CONTEXT_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-02-01 14:38:38.000000000 +0100
@@ -1,32 +1,6 @@
#ifndef __I386_SCHED_H
#define __I386_SCHED_H
@@ -23302,8 +23294,8 @@ have been needed - see SLE11 SPn).
-} while (0)
-
#endif
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-02-01 14:38:38.000000000 +0100
@@ -1,23 +1,6 @@
#ifndef __X86_64_MMU_CONTEXT_H
#define __X86_64_MMU_CONTEXT_H
@@ -23351,8 +23343,8 @@ have been needed - see SLE11 SPn).
-}
-
#endif
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pci.h 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pci.h 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pci.h 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/pci.h 2011-02-01 14:38:38.000000000 +0100
@@ -21,6 +21,8 @@ struct pci_sysdata {
#endif
};
@@ -23362,8 +23354,8 @@ have been needed - see SLE11 SPn).
/* scan a bus after allocating a pci_sysdata for it */
extern struct pci_bus *pci_scan_bus_on_node(int busno, struct pci_ops *ops,
int node);
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgalloc.h 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgalloc.h 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pgalloc.h 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/pgalloc.h 2011-02-01 14:38:38.000000000 +0100
@@ -7,6 +7,9 @@
#include <asm/io.h> /* for phys_to_virt and page_to_pseudophys */
@@ -23374,8 +23366,8 @@ have been needed - see SLE11 SPn).
static inline void paravirt_alloc_pte(struct mm_struct *mm, unsigned long pfn) {}
static inline void paravirt_alloc_pmd(struct mm_struct *mm, unsigned long pfn) {}
static inline void paravirt_alloc_pmd_clone(unsigned long pfn, unsigned long clonepfn,
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgtable.h 2011-03-23 09:52:33.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgtable.h 2011-03-23 09:54:13.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pgtable.h 2011-03-23 09:52:33.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/pgtable.h 2011-03-23 09:54:13.000000000 +0100
@@ -13,11 +13,12 @@
#define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
#define _PAGE_BIT_PAT 7 /* on 4KB pages */
@@ -23799,8 +23791,8 @@ have been needed - see SLE11 SPn).
#endif /* __ASSEMBLY__ */
#endif /* _ASM_X86_PGTABLE_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-03-23 09:52:36.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-03-23 09:54:10.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-03-23 09:52:36.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-03-23 09:54:10.000000000 +0100
@@ -14,11 +14,11 @@
#define pmd_ERROR(e) \
printk("%s:%d: bad pmd %p(%016Lx pfn %08Lx).\n", \
@@ -23836,8 +23828,8 @@ have been needed - see SLE11 SPn).
/* Find an entry in the second-level page table.. */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-01 14:38:38.000000000 +0100
@@ -89,10 +89,10 @@ extern unsigned long pg0[];
/* pmd_present doesn't just test the _PAGE_PRESENT bit since wr.p.t.
can temporarily clear it. */
@@ -23887,8 +23879,8 @@ have been needed - see SLE11 SPn).
#if defined(CONFIG_HIGHPTE)
#define pte_offset_map(dir, address) \
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 09:52:37.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 09:54:07.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 09:52:37.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 09:54:07.000000000 +0100
@@ -23,6 +23,8 @@ extern void xen_init_pt(void);
extern pud_t level3_kernel_pgt[512];
extern pud_t level3_ident_pgt[512];
@@ -23969,8 +23961,8 @@ have been needed - see SLE11 SPn).
#define pmd_page(pmd) (pfn_to_page(pmd_val((pmd)) >> PAGE_SHIFT))
#define pmd_index(address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD - 1))
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/processor.h 2011-03-03 16:42:13.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/processor.h 2011-03-03 16:44:23.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/processor.h 2011-03-03 16:42:13.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/processor.h 2011-03-03 16:44:23.000000000 +0100
@@ -144,7 +144,7 @@ extern __u32 cleared_cpu_caps[NCAPINTS
#ifdef CONFIG_SMP
DECLARE_PER_CPU(struct cpuinfo_x86, cpu_info);
@@ -24045,8 +24037,8 @@ have been needed - see SLE11 SPn).
extern void enable_sep_cpu(void);
extern int sysenter_setup(void);
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/smp.h 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/smp.h 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/smp.h 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/smp.h 2011-02-01 14:38:38.000000000 +0100
@@ -25,25 +25,18 @@ extern cpumask_t cpu_initialized;
extern void (*mtrr_hook)(void);
extern void zap_low_mappings(void);
@@ -24166,8 +24158,8 @@ have been needed - see SLE11 SPn).
-extern void unlock_ipi_call_lock(void);
#endif /* __ASSEMBLY__ */
#endif
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/spinlock.h 2011-07-12 11:14:18.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/spinlock.h 2011-07-12 11:14:29.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/spinlock.h 2011-07-12 11:14:18.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/spinlock.h 2011-07-12 11:14:29.000000000 +0200
@@ -42,6 +42,8 @@
# define UNLOCK_LOCK_PREFIX
#endif
@@ -24445,8 +24437,8 @@ have been needed - see SLE11 SPn).
static inline void __raw_spin_unlock_wait(raw_spinlock_t *lock)
{
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/spinlock_types.h 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/spinlock_types.h 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/spinlock_types.h 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/spinlock_types.h 2011-02-01 14:38:38.000000000 +0100
@@ -11,6 +11,10 @@ typedef union {
unsigned int slock;
struct {
@@ -24466,8 +24458,8 @@ have been needed - see SLE11 SPn).
};
} raw_spinlock_t;
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/system.h 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/system.h 2011-03-03 15:58:55.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/system.h 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/system.h 2011-03-03 15:58:55.000000000 +0100
@@ -68,10 +68,12 @@ do { \
[next] "d" (next)); \
} while (0)
@@ -24530,8 +24522,8 @@ have been needed - see SLE11 SPn).
/*
* Force strict CPU ordering.
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/xor_64.h 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/xor_64.h 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/xor_64.h 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/xor_64.h 2011-02-01 14:38:38.000000000 +0100
@@ -1,3 +1,6 @@
+#ifndef ASM_X86__XOR_64_H
+#define ASM_X86__XOR_64_H
@@ -24545,7 +24537,7 @@ have been needed - see SLE11 SPn).
#define XOR_SELECT_TEMPLATE(FASTEST) (&xor_block_sse)
+
+#endif /* ASM_X86__XOR_64_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/irq_vectors.h 2008-09-25 13:55:32.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/irq_vectors.h 2008-09-25 13:55:32.000000000 +0200
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,125 +0,0 @@
-/*
@@ -24673,7 +24665,7 @@ have been needed - see SLE11 SPn).
-#define NR_IRQ_VECTORS NR_IRQS
-
-#endif /* _ASM_IRQ_VECTORS_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/setup_arch_post.h 2007-06-12 13:14:13.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/setup_arch_post.h 2007-06-12 13:14:13.000000000 +0200
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-/**
@@ -24739,7 +24731,7 @@ have been needed - see SLE11 SPn).
-#endif
-#endif
-}
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/setup_arch_pre.h 2007-06-12 13:14:13.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/setup_arch_pre.h 2007-06-12 13:14:13.000000000 +0200
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-/* Hook to call BIOS initialisation function */
@@ -24747,8 +24739,8 @@ have been needed - see SLE11 SPn).
-#define ARCH_SETUP machine_specific_arch_setup();
-
-static void __init machine_specific_arch_setup(void);
---- sle11sp2-2011-08-22.orig/arch/x86/include/asm/traps.h 2011-08-22 11:12:52.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/include/asm/traps.h 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/asm/traps.h 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/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);
#endif /* CONFIG_X86_MCE */
@@ -24769,9 +24761,9 @@ have been needed - see SLE11 SPn).
#endif
static inline int get_si_code(unsigned long condition)
---- sle11sp2-2011-08-22.orig/include/linux/page-flags.h 2011-08-22 10:33:31.000000000 +0200
-+++ sle11sp2-2011-08-22/include/linux/page-flags.h 2011-08-22 10:34:04.000000000 +0200
-@@ -125,12 +125,12 @@ enum pageflags {
+--- sle11sp2-2011-09-06.orig/include/linux/page-flags.h 2011-09-06 09:17:12.000000000 +0200
++++ sle11sp2-2011-09-06/include/linux/page-flags.h 2011-09-06 09:17:38.000000000 +0200
+@@ -126,12 +126,12 @@ enum pageflags {
PG_fscache = PG_private_2, /* page backed by cache */
/* XEN */
@@ -24786,7 +24778,7 @@ have been needed - see SLE11 SPn).
PG_pinned = PG_owner_priv_1,
PG_savepinned = PG_dirty,
#endif
-@@ -225,8 +225,12 @@ PAGEFLAG(Active, active) __CLEARPAGEFLAG
+@@ -227,8 +227,12 @@ PAGEFLAG(Active, active) __CLEARPAGEFLAG
TESTCLEARFLAG(Active, active)
__PAGEFLAG(Slab, slab)
PAGEFLAG(Checked, checked) /* Used by some filesystems */
@@ -24799,8 +24791,8 @@ have been needed - see SLE11 SPn).
PAGEFLAG(Reserved, reserved) __CLEARPAGEFLAG(Reserved, reserved)
PAGEFLAG(SwapBacked, swapbacked) __CLEARPAGEFLAG(SwapBacked, swapbacked)
---- sle11sp2-2011-08-22.orig/include/xen/interface/memory.h 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/include/xen/interface/memory.h 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/include/xen/interface/memory.h 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/include/xen/interface/memory.h 2011-02-01 14:38:38.000000000 +0100
@@ -88,6 +88,7 @@ struct xen_memory_reservation {
*/
domid_t domid;
@@ -24837,16 +24829,34 @@ 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-2011-08-22.orig/include/xen/public/Kbuild 2011-01-31 14:31:28.000000000 +0100
-+++ sle11sp2-2011-08-22/include/xen/public/Kbuild 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/include/xen/interface/platform.h 2011-08-08 12:54:10.000000000 +0200
++++ sle11sp2-2011-09-06/include/xen/interface/platform.h 2011-08-19 11:46:44.000000000 +0200
+@@ -304,6 +304,7 @@ DEFINE_XEN_GUEST_HANDLE(xenpf_getidletim
+ #define XEN_PM_CX 0
+ #define XEN_PM_PX 1
+ #define XEN_PM_TX 2
++#define XEN_PM_PDC 3
+
+ /* Px sub info type */
+ #define XEN_PX_PCT 1
+@@ -401,6 +402,7 @@ struct xenpf_set_processor_pminfo {
+ union {
+ struct xen_processor_power power;/* Cx: _CST/_CSD */
+ struct xen_processor_performance perf; /* Px: _PPC/_PCT/_PSS/_PSD */
++ XEN_GUEST_HANDLE(uint32) pdc; /* _PDC */
+ } u;
+ };
+ typedef struct xenpf_set_processor_pminfo xenpf_set_processor_pminfo_t;
+--- sle11sp2-2011-09-06.orig/include/xen/public/Kbuild 2011-01-31 14:31:28.000000000 +0100
++++ sle11sp2-2011-09-06/include/xen/public/Kbuild 2011-02-01 14:38:38.000000000 +0100
@@ -1 +1,5 @@
+header-y += evtchn.h
+header-y += gntdev.h
header-y += iomulti.h
+header-y += privcmd.h
+header-y += xenbus.h
---- sle11sp2-2011-08-22.orig/include/xen/public/privcmd.h 2010-01-18 15:23:12.000000000 +0100
-+++ sle11sp2-2011-08-22/include/xen/public/privcmd.h 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/include/xen/public/privcmd.h 2010-01-18 15:23:12.000000000 +0100
++++ sle11sp2-2011-09-06/include/xen/public/privcmd.h 2011-02-01 14:38:38.000000000 +0100
@@ -35,10 +35,6 @@
#include <linux/types.h>
@@ -24858,8 +24868,8 @@ have been needed - see SLE11 SPn).
typedef struct privcmd_hypercall
{
__u64 op;
---- sle11sp2-2011-08-22.orig/include/xen/public/xenbus.h 2009-05-29 10:25:53.000000000 +0200
-+++ sle11sp2-2011-08-22/include/xen/public/xenbus.h 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/include/xen/public/xenbus.h 2009-05-29 10:25:53.000000000 +0200
++++ sle11sp2-2011-09-06/include/xen/public/xenbus.h 2011-02-01 14:38:38.000000000 +0100
@@ -35,10 +35,6 @@
#include <linux/types.h>
@@ -24871,8 +24881,8 @@ have been needed - see SLE11 SPn).
typedef struct xenbus_alloc {
domid_t dom;
__u32 port;
---- sle11sp2-2011-08-22.orig/kernel/kexec.c 2011-08-22 10:32:47.000000000 +0200
-+++ sle11sp2-2011-08-22/kernel/kexec.c 2011-08-22 10:34:10.000000000 +0200
+--- sle11sp2-2011-09-06.orig/kernel/kexec.c 2011-08-22 10:32:47.000000000 +0200
++++ sle11sp2-2011-09-06/kernel/kexec.c 2011-08-22 10:34:10.000000000 +0200
@@ -52,7 +52,7 @@ int dump_after_notifier;
static unsigned char vmcoreinfo_data[VMCOREINFO_BYTES];
u32
@@ -24882,8 +24892,8 @@ have been needed - see SLE11 SPn).
#endif
vmcoreinfo_note[VMCOREINFO_NOTE_SIZE/4];
size_t vmcoreinfo_size;
---- sle11sp2-2011-08-22.orig/lib/swiotlb-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/lib/swiotlb-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/lib/swiotlb-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/lib/swiotlb-xen.c 2011-02-01 14:38:38.000000000 +0100
@@ -788,7 +788,7 @@ swiotlb_sync_sg_for_device(struct device
}
@@ -24893,8 +24903,8 @@ have been needed - see SLE11 SPn).
{
return (dma_addr == virt_to_bus(io_tlb_overflow_buffer));
}
---- sle11sp2-2011-08-22.orig/mm/mprotect.c 2011-01-31 17:29:16.000000000 +0100
-+++ sle11sp2-2011-08-22/mm/mprotect.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/mm/mprotect.c 2011-01-31 17:29:16.000000000 +0100
++++ sle11sp2-2011-09-06/mm/mprotect.c 2011-02-01 14:38:38.000000000 +0100
@@ -97,8 +97,6 @@ static inline void change_pmd_range(stru
}
if (pmd_none_or_clear_bad(pmd))
diff --git a/patches.xen/xen3-patch-2.6.28 b/patches.xen/xen3-patch-2.6.28
index f99bcf299b..12ad5589ef 100644
--- a/patches.xen/xen3-patch-2.6.28
+++ b/patches.xen/xen3-patch-2.6.28
@@ -7,8 +7,8 @@ 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-2011-08-22.orig/arch/ia64/Kconfig 2011-08-22 09:47:21.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/ia64/Kconfig 2011-06-30 16:47:27.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/ia64/Kconfig 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/arch/ia64/Kconfig 2011-06-30 16:47:27.000000000 +0200
@@ -227,7 +227,7 @@ config IA64_HP_SIM
config IA64_XEN_GUEST
bool "Xen guest"
@@ -18,8 +18,8 @@ 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-2011-08-22.orig/arch/ia64/Makefile 2010-10-20 22:30:22.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/ia64/Makefile 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/ia64/Makefile 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/arch/ia64/Makefile 2011-02-01 14:39:24.000000000 +0100
@@ -55,7 +55,7 @@ core-$(CONFIG_IA64_XEN_GUEST) += arch/ia
core-$(CONFIG_IA64_SGI_SN2) += arch/ia64/sn/
core-$(CONFIG_IA64_SGI_UV) += arch/ia64/uv/
@@ -29,8 +29,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
drivers-$(CONFIG_PCI) += arch/ia64/pci/
drivers-$(CONFIG_IA64_HP_SIM) += arch/ia64/hp/sim/
---- sle11sp2-2011-08-22.orig/arch/ia64/include/asm/xen/hypervisor.h 2010-02-24 19:52:17.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/ia64/include/asm/xen/hypervisor.h 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/ia64/include/asm/xen/hypervisor.h 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/arch/ia64/include/asm/xen/hypervisor.h 2011-02-01 14:39:24.000000000 +0100
@@ -40,7 +40,7 @@
#include <xen/xen.h>
#include <asm/xen/hypercall.h>
@@ -40,8 +40,8 @@ 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-2011-08-22.orig/arch/ia64/include/asm/xen/interface.h 2009-06-10 05:05:27.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/ia64/include/asm/xen/interface.h 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/ia64/include/asm/xen/interface.h 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/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
#define _ASM_IA64_XEN_INTERFACE_H
@@ -88,8 +88,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
#ifndef __ASSEMBLY__
---- sle11sp2-2011-08-22.orig/arch/ia64/kernel/asm-offsets.c 2009-06-10 05:05:27.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/ia64/kernel/asm-offsets.c 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/ia64/kernel/asm-offsets.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/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,
offsetof (struct itc_jitter_data_t, itc_lastcycle));
@@ -99,8 +99,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
BLANK();
DEFINE(XEN_NATIVE_ASM, XEN_NATIVE);
---- sle11sp2-2011-08-22.orig/arch/ia64/xen/Kconfig 2009-03-24 00:12:14.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/ia64/xen/Kconfig 2011-02-02 15:36:46.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/ia64/xen/Kconfig 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/arch/ia64/xen/Kconfig 2011-02-02 15:36:46.000000000 +0100
@@ -2,7 +2,7 @@
# This Kconfig describes xen/ia64 options
#
@@ -122,8 +122,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
- depends on XEN
+ depends on PARAVIRT_XEN
bool
---- sle11sp2-2011-08-22.orig/arch/ia64/xen/xcom_hcall.c 2008-12-25 00:26:37.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/ia64/xen/xcom_hcall.c 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/ia64/xen/xcom_hcall.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/arch/ia64/xen/xcom_hcall.c 2011-02-01 14:39:24.000000000 +0100
@@ -343,7 +343,7 @@ xencommize_memory_reservation(struct xen
int
xencomm_hypercall_memory_op(unsigned int cmd, void *arg)
@@ -133,8 +133,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
struct xen_memory_reservation *xmr = NULL;
int rc;
struct xencomm_handle *desc;
---- sle11sp2-2011-08-22.orig/arch/x86/Kconfig 2011-08-22 10:34:18.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/Kconfig 2011-08-22 10:34:52.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/Kconfig 2011-08-22 10:34:18.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/Kconfig 2011-08-22 10:34:52.000000000 +0200
@@ -1026,7 +1026,7 @@ config MICROCODE
config MICROCODE_INTEL
@@ -189,8 +189,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
---help---
Supports Interrupt remapping for IO-APIC and MSI devices.
To use x2apic mode in the CPU's which support x2APIC enhancements or
---- sle11sp2-2011-08-22.orig/arch/x86/Kconfig.cpu 2011-06-30 16:00:44.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/Kconfig.cpu 2011-06-30 16:47:34.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/Kconfig.cpu 2011-06-30 16:00:44.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/Kconfig.cpu 2011-06-30 16:47:34.000000000 +0200
@@ -445,7 +445,7 @@ config CPU_SUP_INTEL
config CPU_SUP_CYRIX_32
default y
@@ -209,8 +209,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
---help---
This enables detection, tunings and quirks for UMC processors
---- sle11sp2-2011-08-22.orig/arch/x86/Makefile 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/Makefile 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/Makefile 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/Makefile 2011-02-01 14:39:24.000000000 +0100
@@ -117,7 +117,7 @@ endif
KBUILD_CFLAGS += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,)
@@ -229,8 +229,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
ifdef CONFIG_X86_64
LDFLAGS_vmlinux := -e startup_64
---- sle11sp2-2011-08-22.orig/arch/x86/ia32/ia32entry-xen.S 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/ia32/ia32entry-xen.S 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/ia32/ia32entry-xen.S 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/ia32/ia32entry-xen.S 2011-02-01 14:39:24.000000000 +0100
@@ -39,11 +39,11 @@
.endm
@@ -339,8 +339,8 @@ 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-2011-08-22.orig/arch/x86/include/asm/agp.h 2009-12-03 04:51:21.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/asm/agp.h 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/asm/agp.h 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/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)
#define unmap_page_from_agp(page) set_pages_wb(page, 1)
@@ -351,8 +351,8 @@ 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-2011-08-22.orig/arch/x86/include/asm/cpufeature.h 2011-07-22 04:17:23.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/include/asm/cpufeature.h 2011-06-30 16:47:42.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/include/asm/cpufeature.h 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/include/asm/cpufeature.h 2011-06-30 16:47:42.000000000 +0200
@@ -284,7 +284,11 @@ extern const char * const x86_power_flag
#define cpu_has_xmm4_1 boot_cpu_has(X86_FEATURE_XMM4_1)
#define cpu_has_xmm4_2 boot_cpu_has(X86_FEATURE_XMM4_2)
@@ -365,8 +365,8 @@ 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-2011-08-22.orig/arch/x86/include/asm/hw_irq.h 2011-05-19 06:06:34.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/include/asm/hw_irq.h 2011-04-13 13:50:37.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/include/asm/hw_irq.h 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/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);
#endif
@@ -388,8 +388,8 @@ 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-2011-08-22.orig/arch/x86/include/asm/mc146818rtc.h 2008-12-25 00:26:37.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/asm/mc146818rtc.h 2011-07-15 12:38:27.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/include/asm/mc146818rtc.h 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/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 */
#endif
@@ -399,8 +399,8 @@ 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-2011-08-22.orig/arch/x86/include/asm/segment.h 2011-05-19 06:06:34.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/include/asm/segment.h 2011-04-13 13:50:26.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/include/asm/segment.h 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/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)
#define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8+3)
@@ -412,8 +412,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
#define get_kernel_rpl() 0
#endif
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/agp.h 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/agp.h 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/agp.h 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/agp.h 2011-02-01 14:39:24.000000000 +0100
@@ -21,6 +21,23 @@
/* only a fallback: xen_destroy_contiguous_region uses PAGE_KERNEL */ \
set_pages_wb(page, 1))
@@ -444,8 +444,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif
+#endif /* _ASM_X86_AGP_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/desc.h 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/desc.h 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/desc.h 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/desc.h 2011-02-01 14:39:24.000000000 +0100
@@ -1,5 +1,5 @@
-#ifndef _ASM_DESC_H_
-#define _ASM_DESC_H_
@@ -521,8 +521,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif
+#endif /* _ASM_X86_DESC_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/dma-mapping.h 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/dma-mapping.h 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/dma-mapping.h 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/dma-mapping.h 2011-02-01 14:39:24.000000000 +0100
@@ -1,17 +1,12 @@
-#ifndef _ASM_DMA_MAPPING_H_
+#ifndef _ASM_X86_DMA_MAPPING_H_
@@ -547,8 +547,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif /* _ASM_DMA_MAPPING_H_ */
+#endif /* _ASM_X86_DMA_MAPPING_H_ */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/fixmap.h 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/fixmap.h 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/fixmap.h 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/fixmap.h 2011-02-01 14:39:24.000000000 +0100
@@ -1,5 +1,5 @@
-#ifndef _ASM_FIXMAP_H
-#define _ASM_FIXMAP_H
@@ -574,8 +574,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
}
-#endif
+#endif /* _ASM_X86_FIXMAP_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/fixmap_32.h 2011-02-01 14:39:24.000000000 +0100
@@ -10,8 +10,8 @@
* Support of BIGMEM added by Gerhard Wichert, Siemens AG, July 1999
*/
@@ -628,8 +628,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
#endif /* !__ASSEMBLY__ */
-#endif
+#endif /* _ASM_X86_FIXMAP_32_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-02-01 14:39:24.000000000 +0100
@@ -8,8 +8,8 @@
* Copyright (C) 1998 Ingo Molnar
*/
@@ -694,8 +694,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif
+#endif /* _ASM_X86_FIXMAP_64_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/highmem.h 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/highmem.h 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/highmem.h 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/highmem.h 2011-02-01 14:39:24.000000000 +0100
@@ -15,8 +15,8 @@
* Copyright (C) 1999 Ingo Molnar <mingo@redhat.com>
*/
@@ -729,8 +729,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif /* _ASM_HIGHMEM_H */
+#endif /* _ASM_X86_HIGHMEM_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/io.h 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/io.h 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/io.h 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/io.h 2011-02-01 14:39:24.000000000 +0100
@@ -5,20 +5,6 @@
#include <linux/compiler.h>
@@ -790,8 +790,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
extern void __iomem *fix_ioremap(unsigned idx, unsigned long phys);
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/irq_vectors.h 2011-02-15 17:27:18.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/irq_vectors.h 2011-02-15 17:31:50.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/irq_vectors.h 2011-02-15 17:27:18.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/irq_vectors.h 2011-02-15 17:31:50.000000000 +0100
@@ -1,5 +1,5 @@
-#ifndef _ASM_IRQ_VECTORS_H
-#define _ASM_IRQ_VECTORS_H
@@ -808,8 +808,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif /* _ASM_IRQ_VECTORS_H */
+#endif /* _ASM_X86_IRQ_VECTORS_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/irqflags.h 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/irqflags.h 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/irqflags.h 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/irqflags.h 2011-02-01 14:39:24.000000000 +0100
@@ -157,23 +157,6 @@ static inline int raw_irqs_disabled_flag
raw_irqs_disabled_flags(flags); \
})
@@ -834,8 +834,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
#else
#ifdef CONFIG_X86_64
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/maddr.h 2011-08-09 10:52:22.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/maddr.h 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/maddr.h 2011-08-09 10:52:22.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/maddr.h 2011-02-01 14:39:24.000000000 +0100
@@ -59,10 +59,10 @@ static inline unsigned long mfn_to_pfn(u
/* The array access can fail (e.g., device space beyond end of RAM). */
@@ -849,8 +849,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
" jmp 2b\n"
".previous\n"
_ASM_EXTABLE(1b,3b)
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/mmu_context.h 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/mmu_context.h 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/mmu_context.h 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/mmu_context.h 2011-02-01 14:39:24.000000000 +0100
@@ -1,5 +1,5 @@
-#ifndef __ASM_X86_MMU_CONTEXT_H
-#define __ASM_X86_MMU_CONTEXT_H
@@ -865,8 +865,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif /* __ASM_X86_MMU_CONTEXT_H */
+#endif /* _ASM_X86_MMU_CONTEXT_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-02-01 14:39:24.000000000 +0100
@@ -1,5 +1,5 @@
-#ifndef __I386_SCHED_H
-#define __I386_SCHED_H
@@ -881,8 +881,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif
+#endif /* _ASM_X86_MMU_CONTEXT_32_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/mmu_context_64.h 2011-02-01 14:39:24.000000000 +0100
@@ -1,5 +1,5 @@
-#ifndef __X86_64_MMU_CONTEXT_H
-#define __X86_64_MMU_CONTEXT_H
@@ -897,8 +897,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif
+#endif /* _ASM_X86_MMU_CONTEXT_64_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pci.h 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pci.h 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pci.h 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/pci.h 2011-02-01 14:39:24.000000000 +0100
@@ -1,5 +1,5 @@
-#ifndef __x86_PCI_H
-#define __x86_PCI_H
@@ -922,16 +922,16 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif
+#endif /* _ASM_X86_PCI_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgalloc.h 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgalloc.h 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pgalloc.h 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/pgalloc.h 2011-02-01 14:39:24.000000000 +0100
@@ -149,4 +149,4 @@ extern void __pud_free_tlb(struct mmu_ga
#endif /* PAGETABLE_LEVELS > 3 */
#endif /* PAGETABLE_LEVELS > 2 */
-#endif /* _ASM_X86_PGALLOC_H */
+#endif /* _ASM_X86_PGALLOC_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgtable.h 2011-03-23 09:54:13.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgtable.h 2011-03-23 09:56:09.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pgtable.h 2011-03-23 09:54:13.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/pgtable.h 2011-03-23 09:56:09.000000000 +0100
@@ -14,11 +14,11 @@
#define _PAGE_BIT_PAT 7 /* on 4KB pages */
#define _PAGE_BIT_GLOBAL 8 /* Global TLB entry PPro+ */
@@ -1050,8 +1050,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif /* _ASM_X86_PGTABLE_H */
+#endif /* _ASM_X86_PGTABLE_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-03-23 09:54:10.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-03-23 09:56:12.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-03-23 09:54:10.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-03-23 09:56:12.000000000 +0100
@@ -1,5 +1,5 @@
-#ifndef _I386_PGTABLE_3LEVEL_H
-#define _I386_PGTABLE_3LEVEL_H
@@ -1104,8 +1104,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif /* _I386_PGTABLE_3LEVEL_H */
+#endif /* _ASM_X86_PGTABLE_3LEVEL_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgtable-3level-defs.h 2011-01-31 17:32:29.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgtable-3level-defs.h 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pgtable-3level-defs.h 2011-01-31 17:32:29.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/pgtable-3level-defs.h 2011-02-01 14:39:24.000000000 +0100
@@ -1,5 +1,5 @@
-#ifndef _I386_PGTABLE_3LEVEL_DEFS_H
-#define _I386_PGTABLE_3LEVEL_DEFS_H
@@ -1120,8 +1120,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif /* _I386_PGTABLE_3LEVEL_DEFS_H */
+#endif /* _ASM_X86_PGTABLE_3LEVEL_DEFS_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-01 14:39:24.000000000 +0100
@@ -1,5 +1,5 @@
-#ifndef _I386_PGTABLE_H
-#define _I386_PGTABLE_H
@@ -1163,8 +1163,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif /* _I386_PGTABLE_H */
+#endif /* _ASM_X86_PGTABLE_32_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 09:54:07.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 09:56:14.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 09:54:07.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 09:56:14.000000000 +0100
@@ -1,5 +1,5 @@
-#ifndef _X86_64_PGTABLE_H
-#define _X86_64_PGTABLE_H
@@ -1212,8 +1212,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif /* _X86_64_PGTABLE_H */
+#endif /* _ASM_X86_PGTABLE_64_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/processor.h 2011-03-03 16:44:23.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/processor.h 2011-03-03 16:45:14.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/processor.h 2011-03-03 16:44:23.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/processor.h 2011-03-03 16:45:14.000000000 +0100
@@ -1,5 +1,5 @@
-#ifndef __ASM_X86_PROCESSOR_H
-#define __ASM_X86_PROCESSOR_H
@@ -1389,8 +1389,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif
+#endif /* _ASM_X86_PROCESSOR_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/smp.h 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/smp.h 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/smp.h 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/smp.h 2011-02-01 14:39:24.000000000 +0100
@@ -1,5 +1,5 @@
-#ifndef _ASM_X86_SMP_H_
-#define _ASM_X86_SMP_H_
@@ -1568,8 +1568,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
#endif /* __ASSEMBLY__ */
-#endif
+#endif /* _ASM_X86_SMP_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/spinlock.h 2011-07-12 11:14:29.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/spinlock.h 2011-07-12 11:14:42.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/spinlock.h 2011-07-12 11:14:29.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/spinlock.h 2011-07-12 11:14:42.000000000 +0200
@@ -1,5 +1,5 @@
-#ifndef _X86_SPINLOCK_H_
-#define _X86_SPINLOCK_H_
@@ -1584,8 +1584,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif
+#endif /* _ASM_X86_SPINLOCK_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/spinlock_types.h 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/spinlock_types.h 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/spinlock_types.h 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/spinlock_types.h 2011-02-01 14:39:24.000000000 +0100
@@ -1,5 +1,5 @@
-#ifndef __ASM_SPINLOCK_TYPES_H
-#define __ASM_SPINLOCK_TYPES_H
@@ -1600,8 +1600,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif
+#endif /* _ASM_X86_SPINLOCK_TYPES_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/system.h 2011-03-03 15:58:55.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/system.h 2011-03-03 16:01:23.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/system.h 2011-03-03 15:58:55.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/system.h 2011-03-03 16:01:23.000000000 +0100
@@ -1,5 +1,5 @@
-#ifndef _ASM_X86_SYSTEM_H_
-#define _ASM_X86_SYSTEM_H_
@@ -1628,8 +1628,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif
+#endif /* _ASM_X86_SYSTEM_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/tlbflush.h 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/tlbflush.h 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/tlbflush.h 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/tlbflush.h 2011-02-01 14:39:24.000000000 +0100
@@ -63,6 +63,10 @@ static inline void flush_tlb_range(struc
__flush_tlb();
}
@@ -1654,8 +1654,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
#endif
#endif /* SMP */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/vga.h 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/vga.h 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/vga.h 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/vga.h 2011-02-01 14:39:24.000000000 +0100
@@ -4,8 +4,8 @@
* (c) 1998 Martin Mares <mj@ucw.cz>
*/
@@ -1673,8 +1673,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif
+#endif /* _ASM_X86_VGA_H */
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/xor.h 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/xor.h 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/xor.h 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/xor.h 2011-02-01 14:39:24.000000000 +0100
@@ -1,5 +1,5 @@
#ifdef CONFIG_X86_32
-# include "../../xor_32.h"
@@ -1682,8 +1682,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
#else
# include "xor_64.h"
#endif
---- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/xor_64.h 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/xor_64.h 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/include/mach-xen/asm/xor_64.h 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/include/mach-xen/asm/xor_64.h 2011-02-01 14:39:24.000000000 +0100
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__XOR_64_H
-#define ASM_X86__XOR_64_H
@@ -1698,8 +1698,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif /* ASM_X86__XOR_64_H */
+#endif /* _ASM_X86_XOR_64_H */
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/Makefile 2011-06-30 16:39:13.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/Makefile 2011-06-30 16:47:51.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/Makefile 2011-06-30 16:39:13.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/Makefile 2011-06-30 16:47:51.000000000 +0200
@@ -135,7 +135,7 @@ ifeq ($(CONFIG_X86_64),y)
time_64-$(CONFIG_XEN) += time_32.o
endif
@@ -1711,8 +1711,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
+ hpet.o i8253.o i8259.o irqinit_$(BITS).o pci-swiotlb_64.o reboot.o \
+ smpboot.o tlb_$(BITS).o tsc.o tsc_sync.o uv_%.o vsmp_64.o
disabled-obj-$(CONFIG_XEN_UNPRIVILEGED_GUEST) += probe_roms_32.o
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/apic/apic-xen.c 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/apic/apic-xen.c 2011-02-24 15:49:32.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/apic/apic-xen.c 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/apic/apic-xen.c 2011-02-24 15:49:32.000000000 +0100
@@ -1,60 +1,13 @@
/*
- * Local APIC handling, local APIC timers
@@ -1835,8 +1835,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
#endif
return 0;
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/cpu/topology.c 2010-10-20 22:30:22.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/cpu/topology.c 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/cpu/topology.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/cpu/topology.c 2011-02-01 14:39:24.000000000 +0100
@@ -28,7 +28,7 @@
*/
void __cpuinit detect_extended_topology(struct cpuinfo_x86 *c)
@@ -1846,8 +1846,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
unsigned int eax, ebx, ecx, edx, sub_index;
unsigned int ht_mask_width, core_plus_mask_width;
unsigned int core_select_mask, core_level_siblings;
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/cpu/common-xen.c 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/cpu/common-xen.c 2011-03-17 14:40:32.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/cpu/common-xen.c 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/cpu/common-xen.c 2011-03-17 14:40:32.000000000 +0100
@@ -1,33 +1,73 @@
#include <linux/init.h>
+#include <linux/kernel.h>
@@ -3240,7 +3240,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
+
+
#endif
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/cpu/common_64-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/cpu/common_64-xen.c 2011-02-01 14:38:38.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,777 +0,0 @@
-#include <linux/init.h>
@@ -4020,8 +4020,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
- if (is_uv_system())
- uv_cpu_init();
-}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/dumpstack_64.c 2011-08-22 09:47:21.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/dumpstack_64.c 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/dumpstack_64.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/dumpstack_64.c 2011-02-01 14:39:24.000000000 +0100
@@ -21,6 +21,7 @@
#define N_EXCEPTION_STACKS_END \
(N_EXCEPTION_STACKS + DEBUG_STKSZ/EXCEPTION_STKSZ - 2)
@@ -4051,8 +4051,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
return NULL;
}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/e820-xen.c 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/e820-xen.c 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/e820-xen.c 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/e820-xen.c 2011-02-01 14:39:24.000000000 +0100
@@ -167,6 +167,9 @@ static void __init _e820_print_map(const
case E820_NVS:
printk(KERN_CONT "(ACPI NVS)\n");
@@ -4133,8 +4133,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
#undef e820
#ifndef CONFIG_XEN
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/early_printk-xen.c 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/early_printk-xen.c 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/early_printk-xen.c 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/early_printk-xen.c 2011-02-01 14:39:24.000000000 +0100
@@ -3,10 +3,18 @@
#include <linux/init.h>
#include <linux/string.h>
@@ -4965,8 +4965,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
}
+
early_param("earlyprintk", setup_early_printk);
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:10:27.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:10:36.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:10:27.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:10:36.000000000 +0200
@@ -700,7 +700,7 @@ ENTRY(interrupt)
ENTRY(irq_entries_start)
RING0_INT_FRAME
@@ -5076,8 +5076,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
#include <asm/alternative-asm.h>
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/entry_64-xen.S 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/entry_64-xen.S 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/entry_64-xen.S 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/entry_64-xen.S 2011-02-01 14:39:24.000000000 +0100
@@ -66,35 +66,9 @@
.code64
@@ -5167,8 +5167,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
#ifdef CONFIG_X86_MCE
/* runs on exception stack */
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/fixup.c 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/fixup.c 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/fixup.c 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/fixup.c 2011-02-01 14:39:24.000000000 +0100
@@ -37,7 +37,7 @@
#define DP(_f, _args...) pr_alert(" " _f "\n" , ## _args )
@@ -5178,8 +5178,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
{
static unsigned long printed = 0;
char info[100];
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/head-xen.c 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/head-xen.c 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/head-xen.c 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/head-xen.c 2011-02-01 14:39:24.000000000 +0100
@@ -36,6 +36,7 @@ void __init reserve_ebda_region(void)
/* start of EBDA area */
@@ -5188,8 +5188,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
/* Fixup: bios puts an EBDA in the top 64K segment */
/* of conventional memory, but does not adjust lowmem. */
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/head64-xen.c 2011-08-09 10:54:49.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/head64-xen.c 2011-08-09 10:57:40.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/head64-xen.c 2011-08-09 10:54:49.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/head64-xen.c 2011-08-09 10:57:40.000000000 +0200
@@ -148,12 +148,11 @@ void __init x86_64_start_kernel(char * r
load_idt((const struct desc_ptr *)&idt_descr);
#endif
@@ -5206,7 +5206,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2-2011-08-22/arch/x86/kernel/apic/io_apic-xen.c 2011-02-01 14:39:24.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/apic/io_apic-xen.c 2011-02-01 14:39:24.000000000 +0100
@@ -0,0 +1,3937 @@
+/*
+ * Intel IO-APIC support for multi-Pentium hosts.
@@ -9145,7 +9145,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
+ * IO APICS that are mapped in on a BAR in PCI space. */
+late_initcall(ioapic_insert_resources);
+#endif /* !CONFIG_XEN */
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/io_apic_32-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/io_apic_32-xen.c 2011-02-01 14:38:38.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,2985 +0,0 @@
-/*
@@ -12133,7 +12133,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
- }
-}
-#endif
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/io_apic_64-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/io_apic_64-xen.c 2011-02-01 14:38:38.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,2448 +0,0 @@
-/*
@@ -14584,8 +14584,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
- * IO APICS that are mapped in on a BAR in PCI space. */
-late_initcall(ioapic_insert_resources);
-#endif /* !CONFIG_XEN */
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/ioport-xen.c 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/ioport-xen.c 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/ioport-xen.c 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/ioport-xen.c 2011-02-01 14:39:24.000000000 +0100
@@ -14,6 +14,7 @@
#include <linux/slab.h>
#include <linux/thread_info.h>
@@ -14594,8 +14594,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
#include <xen/interface/physdev.h>
/* Set EXTENT bits starting at BASE in BITMAP to value TURN_ON. */
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/apic/ipi-xen.c 2011-02-21 13:56:33.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/apic/ipi-xen.c 2011-02-21 13:56:51.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/apic/ipi-xen.c 2011-02-21 13:56:33.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/apic/ipi-xen.c 2011-02-21 13:56:51.000000000 +0100
@@ -57,7 +57,4 @@ void send_IPI_mask_sequence(cpumask_t ma
send_IPI_mask_bitmask(mask, vector);
}
@@ -14605,7 +14605,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-
#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2-2011-08-22/arch/x86/kernel/irq-xen.c 2011-02-01 14:39:24.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/irq-xen.c 2011-02-01 14:39:24.000000000 +0100
@@ -0,0 +1,200 @@
+/*
+ * Common interrupt code for 32 and 64 bit
@@ -14807,8 +14807,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
+#endif
+ return sum;
+}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/ldt-xen.c 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/ldt-xen.c 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/ldt-xen.c 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/ldt-xen.c 2011-02-01 14:39:24.000000000 +0100
@@ -18,6 +18,7 @@
#include <asm/ldt.h>
#include <asm/desc.h>
@@ -14817,7 +14817,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
#ifdef CONFIG_SMP
static void flush_ldt(void *current_mm)
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/microcode-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/microcode-xen.c 2011-02-01 14:38:38.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,214 +0,0 @@
-/*
@@ -15035,7 +15035,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-module_init(microcode_init)
-module_exit(microcode_exit)
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2-2011-08-22/arch/x86/kernel/microcode_core-xen.c 2011-02-01 14:39:24.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/microcode_core-xen.c 2011-02-01 14:39:24.000000000 +0100
@@ -0,0 +1,225 @@
+/*
+ * Intel CPU Microcode Update Driver for Linux
@@ -15262,8 +15262,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
+
+module_init(microcode_init);
+module_exit(microcode_exit);
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/mpparse-xen.c 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/mpparse-xen.c 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/mpparse-xen.c 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/mpparse-xen.c 2011-02-01 14:39:24.000000000 +0100
@@ -410,7 +410,9 @@ static int __init smp_read_mpc(struct mp
generic_bigsmp_probe();
#endif
@@ -15284,8 +15284,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
printk(KERN_INFO "Intel MultiProcessor Specification v1.%d\n",
mpf->mpf_specification);
#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86_32) && !defined(CONFIG_XEN)
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/pci-dma-xen.c 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/pci-dma-xen.c 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/pci-dma-xen.c 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/pci-dma-xen.c 2011-02-01 14:39:24.000000000 +0100
@@ -41,11 +41,12 @@ EXPORT_SYMBOL(bad_dma_address);
/* Dummy device used for NULL arguments (normally ISA). Better would
be probably a smaller DMA mask, but this is bug-to-bug compatible
@@ -15564,8 +15564,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
static int __init pci_iommu_init(void)
{
calgary_iommu_init();
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/pci-nommu-xen.c 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/pci-nommu-xen.c 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/pci-nommu-xen.c 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/pci-nommu-xen.c 2011-02-01 14:39:24.000000000 +0100
@@ -5,6 +5,7 @@
#include <xen/gnttab.h>
@@ -15603,8 +15603,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
.map_single = gnttab_map_single,
.unmap_single = gnttab_unmap_single,
.map_sg = gnttab_map_sg,
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/process-xen.c 2011-03-03 15:59:49.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/process-xen.c 2011-03-03 16:00:33.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/process-xen.c 2011-03-03 15:59:49.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/process-xen.c 2011-03-03 16:00:33.000000000 +0100
@@ -151,7 +151,8 @@ static void mwait_idle(void)
static void poll_idle(void)
{
@@ -15615,8 +15615,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
}
#ifndef CONFIG_XEN
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/process_32-xen.c 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/process_32-xen.c 2011-02-02 08:34:28.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/process_32-xen.c 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/process_32-xen.c 2011-02-02 08:34:28.000000000 +0100
@@ -37,6 +37,7 @@
#include <linux/tick.h>
#include <linux/percpu.h>
@@ -15813,8 +15813,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
}
/*
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/process_64-xen.c 2011-02-02 08:34:01.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/kernel/process_64-xen.c 2011-02-02 08:34:22.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/process_64-xen.c 2011-02-02 08:34:01.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/process_64-xen.c 2011-02-02 08:34:22.000000000 +0100
@@ -40,25 +40,23 @@
#include <linux/kdebug.h>
#include <linux/tick.h>
@@ -16223,8 +16223,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
base = task->thread.gs;
ret = put_user(base, (unsigned long __user *)addr);
break;
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/setup-xen.c 2011-06-10 11:59:07.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/setup-xen.c 2011-03-03 16:22:12.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/setup-xen.c 2011-06-10 11:59:07.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/setup-xen.c 2011-03-03 16:22:12.000000000 +0100
@@ -261,6 +261,9 @@ unsigned long saved_video_mode;
#define RAMDISK_LOAD_FLAG 0x4000
@@ -16599,8 +16599,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
kvm_guest_init();
e820_reserve_resources();
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/time-xen.c 2011-07-11 11:50:40.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/kernel/time-xen.c 2011-07-11 11:52:03.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/time-xen.c 2011-07-11 11:50:40.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/kernel/time-xen.c 2011-07-11 11:52:03.000000000 +0200
@@ -41,6 +41,7 @@
#include <asm/delay.h>
@@ -16645,7 +16645,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
time_before_eq(j, jiffies))) {
cpu_clear(cpu, nohz_cpu_mask);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2-2011-08-22/arch/x86/kernel/traps-xen.c 2011-02-01 14:39:24.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/kernel/traps-xen.c 2011-02-01 14:39:24.000000000 +0100
@@ -0,0 +1,1022 @@
+/*
+ * Copyright (C) 1991, 1992 Linus Torvalds
@@ -17669,7 +17669,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
+ trap_ctxt[t->vector].address = t->address;
+ }
+}
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/traps_32-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.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 @@
-/*
@@ -18894,7 +18894,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
- return 1;
-}
-__setup("code_bytes=", code_bytes_setup);
---- sle11sp2-2011-08-22.orig/arch/x86/kernel/traps_64-xen.c 2011-02-01 14:38:38.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/kernel/traps_64-xen.c 2011-02-01 14:38:38.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,1238 +0,0 @@
-/*
@@ -20135,8 +20135,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
- return 1;
-}
-__setup("code_bytes=", code_bytes_setup);
---- sle11sp2-2011-08-22.orig/arch/x86/mm/dump_pagetables-xen.c 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/dump_pagetables-xen.c 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/dump_pagetables-xen.c 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/dump_pagetables-xen.c 2011-02-01 14:39:24.000000000 +0100
@@ -160,8 +160,8 @@ static void note_page(struct seq_file *m
* we have now. "break" is either changing perms, levels or
* address space marker.
@@ -20148,8 +20148,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
if (!st->level) {
/* First entry */
---- sle11sp2-2011-08-22.orig/arch/x86/mm/fault-xen.c 2011-07-26 09:29:55.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/mm/fault-xen.c 2011-07-26 09:30:04.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/fault-xen.c 2011-07-26 09:29:55.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/mm/fault-xen.c 2011-07-26 09:30:04.000000000 +0200
@@ -35,6 +35,7 @@
#include <asm/tlbflush.h>
#include <asm/proto.h>
@@ -20293,8 +20293,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
const pgd_t *pgd_ref = pgd_offset_k(address);
unsigned long flags;
struct page *page;
---- sle11sp2-2011-08-22.orig/arch/x86/mm/highmem_32-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/highmem_32-xen.c 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/highmem_32-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/highmem_32-xen.c 2011-02-01 14:39:24.000000000 +0100
@@ -137,6 +137,7 @@ void *kmap_atomic_pfn(unsigned long pfn,
return (void*) vaddr;
@@ -20303,8 +20303,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
struct page *kmap_atomic_to_page(void *ptr)
{
---- sle11sp2-2011-08-22.orig/arch/x86/mm/init_32-xen.c 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/init_32-xen.c 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/init_32-xen.c 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/init_32-xen.c 2011-02-01 14:39:24.000000000 +0100
@@ -34,6 +34,7 @@
#include <linux/scatterlist.h>
@@ -20524,8 +20524,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
save_pg_dir();
zap_low_mappings();
---- sle11sp2-2011-08-22.orig/arch/x86/mm/init_64-xen.c 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/init_64-xen.c 2011-06-30 16:48:00.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/init_64-xen.c 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/init_64-xen.c 2011-06-30 16:48:00.000000000 +0200
@@ -34,6 +34,7 @@
#include <linux/nmi.h>
@@ -21034,7 +21034,7 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
void free_init_pages(char *what, unsigned long begin, unsigned long end)
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sle11sp2-2011-08-22/arch/x86/mm/iomap_32-xen.c 2011-02-01 14:39:24.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/iomap_32-xen.c 2011-02-01 14:39:24.000000000 +0100
@@ -0,0 +1,61 @@
+/*
+ * Copyright © 2008 Ingo Molnar
@@ -21097,8 +21097,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
+ pagefault_enable();
+}
+EXPORT_SYMBOL_GPL(iounmap_atomic);
---- sle11sp2-2011-08-22.orig/arch/x86/mm/ioremap-xen.c 2011-02-07 15:40:39.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/ioremap-xen.c 2011-02-07 15:41:07.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/ioremap-xen.c 2011-02-07 15:40:39.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/ioremap-xen.c 2011-02-07 15:41:07.000000000 +0100
@@ -25,20 +25,51 @@
#ifdef CONFIG_X86_64
@@ -21481,8 +21481,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
}
void __this_fixmap_does_not_exist(void)
---- sle11sp2-2011-08-22.orig/arch/x86/mm/pageattr-xen.c 2011-03-23 09:54:23.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/pageattr-xen.c 2011-03-23 09:56:00.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/pageattr-xen.c 2011-03-23 09:54:23.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/pageattr-xen.c 2011-03-23 09:56:00.000000000 +0100
@@ -25,15 +25,27 @@
* The current flushing context - we pass it instead of 5 arguments:
*/
@@ -22251,8 +22251,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
#ifdef CONFIG_HIBERNATION
bool kernel_page_present(struct page *page)
---- sle11sp2-2011-08-22.orig/arch/x86/mm/pat-xen.c 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/pat-xen.c 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/pat-xen.c 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/pat-xen.c 2011-02-01 14:39:24.000000000 +0100
@@ -7,24 +7,24 @@
* Loosely based on earlier PAT patchset from Eric Biederman and Andi Kleen.
*/
@@ -22552,8 +22552,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
-#endif /* CONFIG_DEBUG_FS */
+#endif /* CONFIG_DEBUG_FS && CONFIG_X86_PAT */
---- sle11sp2-2011-08-22.orig/arch/x86/mm/pgtable-xen.c 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/pgtable-xen.c 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/pgtable-xen.c 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/pgtable-xen.c 2011-02-01 14:39:24.000000000 +0100
@@ -129,7 +129,7 @@ void __pud_free_tlb(struct mmu_gather *t
static void _pin_lock(struct mm_struct *mm, int lock) {
if (lock)
@@ -22584,8 +22584,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
{
unsigned long flags; /* can be called from interrupt context */
---- sle11sp2-2011-08-22.orig/arch/x86/mm/pgtable_32-xen.c 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/arch/x86/mm/pgtable_32-xen.c 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/arch/x86/mm/pgtable_32-xen.c 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/arch/x86/mm/pgtable_32-xen.c 2011-02-01 14:39:24.000000000 +0100
@@ -122,7 +122,6 @@ void __init reserve_top_address(unsigned
printk(KERN_INFO "Reserving virtual address space above 0x%08x\n",
(int)-reserve);
@@ -22604,8 +22604,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
return 0;
}
early_param("vmalloc", parse_vmalloc);
---- sle11sp2-2011-08-22.orig/arch/x86/xen/Kconfig 2011-04-28 11:12:57.000000000 +0200
-+++ sle11sp2-2011-08-22/arch/x86/xen/Kconfig 2011-04-28 11:13:15.000000000 +0200
+--- sle11sp2-2011-09-06.orig/arch/x86/xen/Kconfig 2011-04-28 11:12:57.000000000 +0200
++++ sle11sp2-2011-09-06/arch/x86/xen/Kconfig 2011-04-28 11:13:15.000000000 +0200
@@ -44,7 +44,7 @@ config XEN_SAVE_RESTORE
config XEN_DEBUG_FS
@@ -22615,8 +22615,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
default n
help
Enable statistics output and various tuning options in debugfs.
---- sle11sp2-2011-08-22.orig/drivers/acpi/acpica/hwsleep.c 2011-01-31 17:01:49.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/acpi/acpica/hwsleep.c 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/acpi/acpica/hwsleep.c 2011-01-31 17:01:49.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/acpi/acpica/hwsleep.c 2011-02-01 14:39:24.000000000 +0100
@@ -396,8 +396,7 @@ acpi_status asmlinkage acpi_enter_sleep_
err = acpi_notify_hypervisor_state(sleep_state,
PM1Acontrol, PM1Bcontrol);
@@ -22627,8 +22627,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
return_ACPI_STATUS(AE_ERROR);
}
#endif
---- sle11sp2-2011-08-22.orig/drivers/acpi/processor_core.c 2011-06-30 16:32:20.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/acpi/processor_core.c 2011-08-10 11:19:02.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/acpi/processor_core.c 2011-09-06 09:24:07.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/acpi/processor_core.c 2011-08-10 11:19:02.000000000 +0200
@@ -164,15 +164,19 @@ exit:
int acpi_get_cpuid(acpi_handle handle, int type, u32 acpi_id)
@@ -22654,8 +22654,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
return apic_id;
#ifdef CONFIG_SMP
---- sle11sp2-2011-08-22.orig/drivers/acpi/processor_driver.c 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/acpi/processor_driver.c 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/acpi/processor_driver.c 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/acpi/processor_driver.c 2011-02-01 14:39:24.000000000 +0100
@@ -326,7 +326,8 @@ static int acpi_processor_get_info(struc
if (pr->id == -1) {
if (ACPI_FAILURE
@@ -22666,8 +22666,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
return -ENODEV;
}
}
---- sle11sp2-2011-08-22.orig/drivers/acpi/processor_extcntl.c 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/acpi/processor_extcntl.c 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/acpi/processor_extcntl.c 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/acpi/processor_extcntl.c 2011-02-01 14:39:24.000000000 +0100
@@ -30,7 +30,6 @@
#include <acpi/processor.h>
@@ -22676,8 +22676,8 @@ 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-2011-08-22.orig/drivers/char/agp/generic.c 2011-05-19 06:06:34.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/char/agp/generic.c 2011-04-28 11:13:24.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/char/agp/generic.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/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
}
@@ -22696,8 +22696,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
#endif
for (i = 0; i < mem->page_count; i++) {
---- sle11sp2-2011-08-22.orig/drivers/firmware/dmi_scan.c 2011-03-15 02:20:32.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/firmware/dmi_scan.c 2011-02-17 10:11:37.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/firmware/dmi_scan.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/firmware/dmi_scan.c 2011-02-17 10:11:37.000000000 +0100
@@ -482,6 +482,11 @@ static bool dmi_matches(const struct dmi
{
int i;
@@ -22710,8 +22710,8 @@ 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-2011-08-22.orig/drivers/idle/Kconfig 2010-10-20 22:30:22.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/idle/Kconfig 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/idle/Kconfig 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/idle/Kconfig 2011-02-01 14:39:24.000000000 +0100
@@ -10,7 +10,7 @@ config INTEL_IDLE
processors intel_idle does not support.
@@ -22721,8 +22721,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
config I7300_IDLE_IOAT_CHANNEL
bool
---- sle11sp2-2011-08-22.orig/drivers/pci/msi-xen.c 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/pci/msi-xen.c 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/pci/msi-xen.c 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/pci/msi-xen.c 2011-02-01 14:39:24.000000000 +0100
@@ -266,8 +266,16 @@ static int msi_map_vector(struct pci_dev
* dev->irq in dom0 will be 'Xen pirq' if this device belongs to
* to another domain, and will be 'Linux irq' if it belongs to dom0.
@@ -22767,9 +22767,9 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
+ return;
+ msi_acpi_init();
+}
---- sle11sp2-2011-08-22.orig/drivers/pci/probe.c 2011-07-22 04:17:23.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/pci/probe.c 2011-06-30 16:48:14.000000000 +0200
-@@ -1180,6 +1180,11 @@ static void pci_init_capabilities(struct
+--- sle11sp2-2011-09-06.orig/drivers/pci/probe.c 2011-09-06 08:34:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/pci/probe.c 2011-09-06 09:32:13.000000000 +0200
+@@ -1182,6 +1182,11 @@ static void pci_init_capabilities(struct
/* Vital Product Data */
pci_vpd_pci22_init(dev);
@@ -22781,8 +22781,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
/* Alternative Routing-ID Forwarding */
pci_enable_ari(dev);
---- sle11sp2-2011-08-22.orig/drivers/xen/Kconfig 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/Kconfig 2011-04-13 13:49:00.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/Kconfig 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/Kconfig 2011-04-13 13:49:00.000000000 +0200
@@ -344,9 +344,6 @@ config XEN_SMPBOOT
def_bool y
depends on SMP && !PPC_XEN
@@ -22801,8 +22801,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
+ bool
+
endmenu
---- sle11sp2-2011-08-22.orig/drivers/xen/Makefile 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/Makefile 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/Makefile 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/Makefile 2011-02-01 14:39:24.000000000 +0100
@@ -1,4 +1,5 @@
obj-$(CONFIG_PARAVIRT_XEN) += grant-table.o features.o events.o manage.o
+xen-hotplug-$(CONFIG_PARAVIRT_XEN) := cpu_hotplug.o
@@ -22817,8 +22817,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
obj-$(CONFIG_XEN_XENCOMM) += xencomm.o
obj-$(CONFIG_XEN_BALLOON) += $(xen-balloon-y)
obj-$(CONFIG_XEN_BLKDEV_BACKEND) += blkback/
---- sle11sp2-2011-08-22.orig/drivers/xen/blkback/vbd.c 2011-06-30 16:32:27.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/blkback/vbd.c 2011-06-30 16:48:21.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/blkback/vbd.c 2011-06-30 16:32:27.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/blkback/vbd.c 2011-06-30 16:48:21.000000000 +0200
@@ -96,7 +96,8 @@ int vbd_create(blkif_t *blkif, blkif_vde
void vbd_free(struct vbd *vbd)
{
@@ -22829,8 +22829,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
vbd->bdev = NULL;
}
---- sle11sp2-2011-08-22.orig/drivers/xen/blkfront/blkfront.c 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/blkfront/blkfront.c 2011-07-21 12:17:38.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/blkfront/blkfront.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/blkfront/blkfront.c 2011-07-21 12:17:38.000000000 +0200
@@ -342,6 +342,7 @@ static void connect(struct blkfront_info
return;
pr_info("Setting capacity to %Lu\n", sectors);
@@ -22917,8 +22917,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
#endif
}
}
---- sle11sp2-2011-08-22.orig/drivers/xen/blkfront/block.h 2011-01-31 18:07:35.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/blkfront/block.h 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/blkfront/block.h 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/blkfront/block.h 2011-02-01 14:39:24.000000000 +0100
@@ -123,10 +123,17 @@ struct blkfront_info
extern spinlock_t blkif_io_lock;
@@ -22937,8 +22937,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
extern int blkif_getgeo(struct block_device *, struct hd_geometry *);
extern int blkif_check(dev_t dev);
extern int blkif_revalidate(dev_t dev);
---- sle11sp2-2011-08-22.orig/drivers/xen/blktap2/device.c 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/blktap2/device.c 2011-02-07 14:14:26.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/blktap2/device.c 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/blktap2/device.c 2011-02-07 14:14:26.000000000 +0100
@@ -36,10 +36,10 @@ dev_to_blktap(struct blktap_device *dev)
}
@@ -23004,8 +23004,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
return -ENOENT;
}
---- sle11sp2-2011-08-22.orig/drivers/xen/core/evtchn.c 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/core/evtchn.c 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/core/evtchn.c 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/core/evtchn.c 2011-02-01 14:39:24.000000000 +0100
@@ -149,7 +149,7 @@ static void bind_evtchn_to_cpu(unsigned
BUG_ON(!test_bit(chn, s->evtchn_mask));
@@ -23076,8 +23076,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
set_irq_chip_and_handler_name(i, &dynirq_chip,
handle_fasteoi_irq, "fasteoi");
}
---- sle11sp2-2011-08-22.orig/drivers/xen/core/smpboot.c 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/core/smpboot.c 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/core/smpboot.c 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/core/smpboot.c 2011-02-01 14:39:24.000000000 +0100
@@ -25,10 +25,6 @@
#include <xen/cpu_hotplug.h>
#include <xen/xenbus.h>
@@ -23119,8 +23119,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
void __init smp_cpus_done(unsigned int max_cpus)
{
}
---- sle11sp2-2011-08-22.orig/drivers/xen/netfront/netfront.c 2011-06-30 16:41:13.000000000 +0200
-+++ sle11sp2-2011-08-22/drivers/xen/netfront/netfront.c 2011-06-30 16:48:32.000000000 +0200
+--- sle11sp2-2011-09-06.orig/drivers/xen/netfront/netfront.c 2011-06-30 16:41:13.000000000 +0200
++++ sle11sp2-2011-09-06/drivers/xen/netfront/netfront.c 2011-06-30 16:48:32.000000000 +0200
@@ -954,7 +954,7 @@ static int network_start_xmit(struct sk_
return 0;
}
@@ -23130,8 +23130,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
if (unlikely(frags > MAX_SKB_FRAGS + 1)) {
pr_alert("xennet: skb rides the rocket: %d frags\n", frags);
dump_stack();
---- sle11sp2-2011-08-22.orig/drivers/xen/scsifront/scsifront.c 2011-01-31 18:01:51.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/scsifront/scsifront.c 2011-02-08 10:04:41.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/scsifront/scsifront.c 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/scsifront/scsifront.c 2011-02-08 10:04:41.000000000 +0100
@@ -352,7 +352,7 @@ static int scsifront_queuecommand(struct
memset(ring_req->cmnd, 0, VSCSIIF_MAX_COMMAND_SIZE);
@@ -23150,8 +23150,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
ring_req->nr_segments = 0;
scsifront_do_request(info);
---- sle11sp2-2011-08-22.orig/drivers/xen/xenbus/xenbus_probe.h 2011-01-31 17:49:31.000000000 +0100
-+++ sle11sp2-2011-08-22/drivers/xen/xenbus/xenbus_probe.h 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/drivers/xen/xenbus/xenbus_probe.h 2011-01-31 17:49:31.000000000 +0100
++++ sle11sp2-2011-09-06/drivers/xen/xenbus/xenbus_probe.h 2011-02-01 14:39:24.000000000 +0100
@@ -40,6 +40,11 @@
#define XEN_BUS_ID_SIZE BUS_ID_SIZE
#endif
@@ -23164,8 +23164,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
#if defined(CONFIG_XEN_BACKEND) || defined(CONFIG_XEN_BACKEND_MODULE)
extern void xenbus_backend_suspend(int (*fn)(struct device *, void *));
extern void xenbus_backend_resume(int (*fn)(struct device *, void *));
---- sle11sp2-2011-08-22.orig/include/xen/cpu_hotplug.h 2011-01-31 17:56:27.000000000 +0100
-+++ sle11sp2-2011-08-22/include/xen/cpu_hotplug.h 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/include/xen/cpu_hotplug.h 2011-01-31 17:56:27.000000000 +0100
++++ sle11sp2-2011-09-06/include/xen/cpu_hotplug.h 2011-02-01 14:39:24.000000000 +0100
@@ -15,8 +15,6 @@ void init_xenbus_allowed_cpumask(void);
int smp_suspend(void);
void smp_resume(void);
@@ -23175,8 +23175,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
#else /* !defined(CONFIG_HOTPLUG_CPU) */
#define cpu_up_check(cpu) (0)
---- sle11sp2-2011-08-22.orig/lib/swiotlb-xen.c 2011-02-01 14:38:38.000000000 +0100
-+++ sle11sp2-2011-08-22/lib/swiotlb-xen.c 2011-02-01 14:39:24.000000000 +0100
+--- sle11sp2-2011-09-06.orig/lib/swiotlb-xen.c 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-09-06/lib/swiotlb-xen.c 2011-02-01 14:39:24.000000000 +0100
@@ -57,7 +57,6 @@ enum dma_sync_target {
int swiotlb_force;
@@ -23385,8 +23385,8 @@ Automatically created from "patches.kernel.org/patch-2.6.28" by xen-port-patches
sync_single(hwdev, bus_to_virt(sg->dma_address),
sg->dma_length, dir, target);
}
---- sle11sp2-2011-08-22.orig/mm/vmalloc.c 2011-08-22 10:31:50.000000000 +0200
-+++ sle11sp2-2011-08-22/mm/vmalloc.c 2011-08-22 10:34:44.000000000 +0200
+--- sle11sp2-2011-09-06.orig/mm/vmalloc.c 2011-08-22 10:31:50.000000000 +0200
++++ sle11sp2-2011-09-06/mm/vmalloc.c 2011-08-22 10:34:44.000000000 +0200
@@ -533,6 +533,8 @@ static void vmap_debug_free_range(unsign
#ifdef CONFIG_DEBUG_PAGEALLOC
vunmap_page_range(start, end);
diff --git a/patches.xen/xen3-patch-2.6.29 b/patches.xen/xen3-patch-2.6.29
index af8ad2d17e..c1a107b213 100644
--- a/patches.xen/xen3-patch-2.6.29
+++ b/patches.xen/xen3-patch-2.6.29
@@ -7,8 +7,8 @@ Patch-mainline: 2.6.29
Acked-by: Jeff Mahoney <jeffm@suse.com>
Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches.py
---- head-2011-08-09.orig/arch/x86/Kconfig 2011-06-30 16:47:31.000000000 +0200
-+++ head-2011-08-09/arch/x86/Kconfig 2011-06-30 16:48:48.000000000 +0200
+--- sle11sp2-2011-08-22.orig/arch/x86/Kconfig 2011-08-22 10:34:52.000000000 +0200
++++ sle11sp2-2011-08-22/arch/x86/Kconfig 2011-06-30 16:48:48.000000000 +0200
@@ -316,7 +316,6 @@ config X86_XEN
select X86_PAE
select X86_UP_APIC if !SMP && XEN_PRIVILEGED_GUEST
@@ -43,8 +43,8 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
---help---
This option enables a workaround that fixes a source of
spurious interrupts. This is recommended when threaded
---- head-2011-08-09.orig/arch/x86/Makefile 2011-02-01 14:39:24.000000000 +0100
-+++ head-2011-08-09/arch/x86/Makefile 2011-02-01 14:42:26.000000000 +0100
+--- sle11sp2-2011-08-22.orig/arch/x86/Makefile 2011-02-01 14:39:24.000000000 +0100
++++ sle11sp2-2011-08-22/arch/x86/Makefile 2011-02-01 14:42:26.000000000 +0100
@@ -158,8 +158,8 @@ BOOT_TARGETS = bzlilo bzdisk fdimage fdi
PHONY += bzImage vmlinuz $(BOOT_TARGETS)
@@ -56,8 +56,8 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
ifdef CONFIG_X86_64
LDFLAGS_vmlinux := -e startup_64
---- head-2011-08-09.orig/arch/x86/ia32/ia32entry-xen.S 2011-02-01 14:39:24.000000000 +0100
-+++ head-2011-08-09/arch/x86/ia32/ia32entry-xen.S 2011-02-01 14:42:26.000000000 +0100
+--- sle11sp2-2011-08-22.orig/arch/x86/ia32/ia32entry-xen.S 2011-02-01 14:39:24.000000000 +0100
++++ sle11sp2-2011-08-22/arch/x86/ia32/ia32entry-xen.S 2011-02-01 14:42:26.000000000 +0100
@@ -363,9 +363,9 @@ ENTRY(ia32_syscall)
orl $TS_COMPAT,TI_status(%r10)
testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
@@ -81,8 +81,8 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
END(ia32_syscall)
ia32_badsys:
---- head-2011-08-09.orig/arch/x86/include/asm/hw_irq.h 2011-04-13 13:50:37.000000000 +0200
-+++ head-2011-08-09/arch/x86/include/asm/hw_irq.h 2011-04-13 13:52:09.000000000 +0200
+--- sle11sp2-2011-08-22.orig/arch/x86/include/asm/hw_irq.h 2011-04-13 13:50:37.000000000 +0200
++++ sle11sp2-2011-08-22/arch/x86/include/asm/hw_irq.h 2011-04-13 13:52:09.000000000 +0200
@@ -169,7 +169,9 @@ extern irqreturn_t smp_call_function_sin
#endif
#endif
@@ -93,8 +93,8 @@ 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);
---- head-2011-08-09.orig/arch/x86/include/asm/hypervisor.h 2011-08-10 11:17:41.000000000 +0200
-+++ head-2011-08-09/arch/x86/include/asm/hypervisor.h 2011-04-13 13:52:09.000000000 +0200
+--- sle11sp2-2011-08-22.orig/arch/x86/include/asm/hypervisor.h 2011-08-23 15:04:07.000000000 +0200
++++ sle11sp2-2011-08-22/arch/x86/include/asm/hypervisor.h 2011-04-13 13:52:09.000000000 +0200
@@ -60,3 +60,7 @@ static inline bool hypervisor_x2apic_ava
}
@@ -103,8 +103,8 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
+#ifdef HAVE_XEN_PLATFORM_COMPAT_H
+#include_next <asm/hypervisor.h>
+#endif
---- head-2011-08-09.orig/arch/x86/include/asm/kexec.h 2011-02-01 14:38:38.000000000 +0100
-+++ head-2011-08-09/arch/x86/include/asm/kexec.h 2011-02-01 14:42:26.000000000 +0100
+--- sle11sp2-2011-08-22.orig/arch/x86/include/asm/kexec.h 2011-02-01 14:38:38.000000000 +0100
++++ sle11sp2-2011-08-22/arch/x86/include/asm/kexec.h 2011-02-01 14:42:26.000000000 +0100
@@ -12,13 +12,10 @@
/*
* The hypervisor interface implicitly requires that all entries (except
@@ -122,8 +122,8 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
# endif /* CONFIG_XEN */
#else
# define PA_CONTROL_PAGE 0
---- head-2011-08-09.orig/arch/x86/include/mach-xen/asm/desc.h 2011-02-01 14:39:24.000000000 +0100
-+++ head-2011-08-09/arch/x86/include/mach-xen/asm/desc.h 2011-02-01 14:42:26.000000000 +0100
+--- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/desc.h 2011-02-01 14:39:24.000000000 +0100
++++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/desc.h 2011-02-01 14:42:26.000000000 +0100
@@ -342,16 +342,14 @@ static inline void set_intr_gate(unsigne
_set_gate(n, GATE_INTERRUPT, addr, 0, 0, __KERNEL_CS);
}
@@ -145,8 +145,8 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
if (first_system_vector > vector)
first_system_vector = vector;
} else
---- head-2011-08-09.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-02-01 14:39:24.000000000 +0100
-+++ head-2011-08-09/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-02-01 14:42:26.000000000 +0100
+--- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-02-01 14:39:24.000000000 +0100
++++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/fixmap_64.h 2011-02-01 14:42:26.000000000 +0100
@@ -16,7 +16,6 @@
#include <asm/apicdef.h>
#include <asm/page.h>
@@ -167,8 +167,8 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
#ifdef CONFIG_PARAVIRT
FIX_PARAVIRT_BOOTMAP,
#else
---- head-2011-08-09.orig/arch/x86/include/mach-xen/asm/highmem.h 2011-02-01 14:39:24.000000000 +0100
-+++ head-2011-08-09/arch/x86/include/mach-xen/asm/highmem.h 2011-02-01 14:42:26.000000000 +0100
+--- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/highmem.h 2011-02-01 14:39:24.000000000 +0100
++++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/highmem.h 2011-02-01 14:42:26.000000000 +0100
@@ -79,6 +79,7 @@ static inline void clear_user_highpage(s
clear_highpage(page);
}
@@ -177,9 +177,9 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
#define __HAVE_ARCH_CLEAR_USER_HIGHPAGE
void copy_highpage(struct page *to, struct page *from);
---- head-2011-08-09.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-07-21 12:17:26.000000000 +0200
-+++ head-2011-08-09/arch/x86/include/mach-xen/asm/hypervisor.h 2011-07-21 12:18:05.000000000 +0200
-@@ -65,6 +65,8 @@ extern start_info_t *xen_start_info;
+--- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2011-08-23 15:19:11.000000000 +0200
++++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/hypervisor.h 2011-08-23 15:19:32.000000000 +0200
+@@ -63,6 +63,8 @@ extern start_info_t *xen_start_info;
#define is_initial_xendomain() 0
#endif
@@ -188,7 +188,7 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
struct vcpu_runstate_info *setup_runstate_area(unsigned int cpu);
/* arch/xen/kernel/evtchn.c */
-@@ -137,7 +139,7 @@ void scrub_pages(void *, unsigned int);
+@@ -135,7 +137,7 @@ void scrub_pages(void *, unsigned int);
DECLARE_PER_CPU(bool, xen_lazy_mmu);
@@ -197,8 +197,8 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
int __must_check xen_multi_update_va_mapping(unsigned long va, pte_t,
unsigned long flags);
---- head-2011-08-09.orig/arch/x86/include/mach-xen/asm/io.h 2011-02-01 14:39:24.000000000 +0100
-+++ head-2011-08-09/arch/x86/include/mach-xen/asm/io.h 2011-02-01 14:42:26.000000000 +0100
+--- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/io.h 2011-02-01 14:39:24.000000000 +0100
++++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/io.h 2011-02-01 14:42:26.000000000 +0100
@@ -4,6 +4,7 @@
#define ARCH_HAS_IOREMAP_WC
@@ -265,8 +265,8 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
extern void early_ioremap_reset(void);
extern void __iomem *early_ioremap(unsigned long offset, unsigned long size);
extern void __iomem *early_memremap(unsigned long offset, unsigned long size);
---- head-2011-08-09.orig/arch/x86/include/mach-xen/asm/irq_vectors.h 2011-02-15 17:31:50.000000000 +0100
-+++ head-2011-08-09/arch/x86/include/mach-xen/asm/irq_vectors.h 2011-02-15 17:32:00.000000000 +0100
+--- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/irq_vectors.h 2011-02-15 17:31:50.000000000 +0100
++++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/irq_vectors.h 2011-02-15 17:32:00.000000000 +0100
@@ -24,6 +24,8 @@
#define LAST_VM86_IRQ 15
#define invalid_vm86_irq(irq) ((irq) < 3 || (irq) > 15)
@@ -288,8 +288,8 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
# else
# define NR_PIRQS (NR_VECTORS + 32 * MAX_IO_APICS)
# endif
---- head-2011-08-09.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-02-01 14:39:24.000000000 +0100
-+++ head-2011-08-09/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-02-01 14:42:26.000000000 +0100
+--- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-02-01 14:39:24.000000000 +0100
++++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/mmu_context_32.h 2011-02-01 14:42:26.000000000 +0100
@@ -3,10 +3,9 @@
static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
@@ -331,8 +331,8 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
if (!cpu_test_and_set(cpu, next->cpu_vm_mask)) {
/* We were in lazy tlb mode and leave_mm disabled
---- head-2011-08-09.orig/arch/x86/include/mach-xen/asm/pci.h 2011-02-01 14:39:24.000000000 +0100
-+++ head-2011-08-09/arch/x86/include/mach-xen/asm/pci.h 2011-02-01 14:42:26.000000000 +0100
+--- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pci.h 2011-02-01 14:39:24.000000000 +0100
++++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pci.h 2011-02-01 14:42:26.000000000 +0100
@@ -22,6 +22,8 @@ struct pci_sysdata {
};
@@ -376,8 +376,8 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
#endif
#endif /* _ASM_X86_PCI_H */
---- head-2011-08-09.orig/arch/x86/include/mach-xen/asm/pgtable.h 2011-03-23 09:56:09.000000000 +0100
-+++ head-2011-08-09/arch/x86/include/mach-xen/asm/pgtable.h 2011-03-23 09:56:52.000000000 +0100
+--- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgtable.h 2011-03-23 09:56:09.000000000 +0100
++++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgtable.h 2011-03-23 09:56:52.000000000 +0100
@@ -22,12 +22,10 @@
#define _PAGE_BIT_NX 63 /* No execute: only valid after cpuid check */
@@ -513,8 +513,8 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
#define __HAVE_PHYS_MEM_ACCESS_PROT
struct file;
pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,
---- head-2011-08-09.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-03-23 09:56:12.000000000 +0100
-+++ head-2011-08-09/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-03-23 09:56:49.000000000 +0100
+--- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-03-23 09:56:12.000000000 +0100
++++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgtable-3level.h 2011-03-23 09:56:49.000000000 +0100
@@ -146,6 +146,7 @@ static inline int pte_none(pte_t pte)
#define PTE_FILE_MAX_BITS 32
@@ -523,8 +523,8 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
#define __swp_type(x) (((x).val) & 0x1f)
#define __swp_offset(x) ((x).val >> 5)
#define __swp_entry(type, offset) ((swp_entry_t){(type) | (offset) << 5})
---- head-2011-08-09.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-01 14:39:24.000000000 +0100
-+++ head-2011-08-09/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-01 14:42:26.000000000 +0100
+--- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-01 14:39:24.000000000 +0100
++++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgtable_32.h 2011-02-01 14:42:26.000000000 +0100
@@ -107,15 +107,6 @@ extern unsigned long pg0[];
#endif
@@ -541,8 +541,8 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
* Conversion functions: convert a page and protection to a page entry,
* and a page entry and page directory to the page they refer to.
*/
---- head-2011-08-09.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 09:56:14.000000000 +0100
-+++ head-2011-08-09/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 09:56:46.000000000 +0100
+--- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 09:56:14.000000000 +0100
++++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/pgtable_64.h 2011-03-23 09:56:46.000000000 +0100
@@ -144,8 +144,8 @@ static inline void xen_pgd_clear(pgd_t *
#define PGDIR_SIZE (_AC(1, UL) << PGDIR_SHIFT)
#define PGDIR_MASK (~(PGDIR_SIZE - 1))
@@ -576,8 +576,8 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
#define __swp_type(x) (((x).val >> (_PAGE_BIT_PRESENT + 1)) \
& ((1U << SWP_TYPE_BITS) - 1))
#define __swp_offset(x) ((x).val >> SWP_OFFSET_SHIFT)
---- head-2011-08-09.orig/arch/x86/include/mach-xen/asm/processor.h 2011-03-03 16:45:14.000000000 +0100
-+++ head-2011-08-09/arch/x86/include/mach-xen/asm/processor.h 2011-03-03 16:45:38.000000000 +0100
+--- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/processor.h 2011-03-03 16:45:14.000000000 +0100
++++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/processor.h 2011-03-03 16:45:38.000000000 +0100
@@ -121,6 +121,7 @@ struct cpuinfo_x86 {
/* Index into per_cpu list: */
u16 cpu_index;
@@ -626,8 +626,8 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
static inline void update_debugctlmsr(unsigned long debugctlmsr)
{
#ifndef CONFIG_X86_DEBUGCTLMSR
---- head-2011-08-09.orig/arch/x86/include/mach-xen/asm/smp.h 2011-02-01 14:39:24.000000000 +0100
-+++ head-2011-08-09/arch/x86/include/mach-xen/asm/smp.h 2011-02-01 14:42:26.000000000 +0100
+--- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/smp.h 2011-02-01 14:39:24.000000000 +0100
++++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/smp.h 2011-02-01 14:42:26.000000000 +0100
@@ -18,9 +18,26 @@
#include <asm/pda.h>
#include <asm/thread_info.h>
@@ -724,8 +724,8 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
}
#else
static inline void prefill_possible_map(void)
---- head-2011-08-09.orig/arch/x86/include/mach-xen/asm/spinlock.h 2011-07-12 11:14:42.000000000 +0200
-+++ head-2011-08-09/arch/x86/include/mach-xen/asm/spinlock.h 2011-07-12 11:14:50.000000000 +0200
+--- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/spinlock.h 2011-07-12 11:14:42.000000000 +0200
++++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/spinlock.h 2011-07-12 11:14:50.000000000 +0200
@@ -341,6 +341,7 @@ static inline int __raw_spin_is_contende
{
return __raw_spin(is_contended)(lock);
@@ -734,8 +734,8 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
static __always_inline void __raw_spin_lock(raw_spinlock_t *lock)
{
---- head-2011-08-09.orig/arch/x86/include/mach-xen/asm/system.h 2011-03-03 16:01:23.000000000 +0100
-+++ head-2011-08-09/arch/x86/include/mach-xen/asm/system.h 2011-03-03 16:05:49.000000000 +0100
+--- sle11sp2-2011-08-22.orig/arch/x86/include/mach-xen/asm/system.h 2011-03-03 16:01:23.000000000 +0100
++++ sle11sp2-2011-08-22/arch/x86/include/mach-xen/asm/system.h 2011-03-03 16:05:49.000000000 +0100
@@ -18,12 +18,12 @@
# define AT_VECTOR_SIZE_ARCH 1
#endif
@@ -760,8 +760,8 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
/*
* Force strict CPU ordering.
* And yes, this is required on UP too when we're talking
---- head-2011-08-09.orig/arch/x86/include/asm/thread_info.h 2011-01-31 18:01:51.000000000 +0100
-+++ head-2011-08-09/arch/x86/include/asm/thread_info.h 2011-02-01 14:42:26.000000000 +0100
+--- sle11sp2-2011-08-22.orig/arch/x86/include/asm/thread_info.h 2011-01-31 18:01:51.000000000 +0100
++++ sle11sp2-2011-08-22/arch/x86/include/asm/thread_info.h 2011-02-01 14:42:26.000000000 +0100
@@ -154,7 +154,7 @@ struct thread_info {
#else
@@ -771,8 +771,8 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
#endif
#define _TIF_WORK_CTXSW_PREV (_TIF_WORK_CTXSW|_TIF_USER_RETURN_NOTIFY)
#define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW|_TIF_DEBUG)
---- head-2011-08-09.orig/arch/x86/kernel/apic/apic-xen.c 2011-02-24 15:49:32.000000000 +0100
-+++ head-2011-08-09/arch/x86/kernel/apic/apic-xen.c 2011-02-01 14:42:26.000000000 +0100
+--- sle11sp2-2011-08-22.orig/arch/x86/kernel/apic/apic-xen.c 2011-02-24 15:49:32.000000000 +0100
++++ sle11sp2-2011-08-22/arch/x86/kernel/apic/apic-xen.c 2011-02-01 14:42:26.000000000 +0100
@@ -32,7 +32,7 @@ static int __init apic_set_verbosity(cha
else if (strcmp("verbose", arg) == 0)
apic_verbosity = APIC_VERBOSE;
@@ -782,8 +782,8 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
" use apic=verbose or apic=debug\n", arg);
return -EINVAL;
}
---- head-2011-08-09.orig/arch/x86/kernel/cpu/Makefile 2011-06-30 16:31:56.000000000 +0200
-+++ head-2011-08-09/arch/x86/kernel/cpu/Makefile 2011-06-30 16:48:54.000000000 +0200
+--- sle11sp2-2011-08-22.orig/arch/x86/kernel/cpu/Makefile 2011-06-30 16:31:56.000000000 +0200
++++ sle11sp2-2011-08-22/arch/x86/kernel/cpu/Makefile 2011-06-30 16:48:54.000000000 +0200
@@ -33,7 +33,7 @@ obj-$(CONFIG_MTRR) += mtrr/
obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o
@@ -793,8 +793,8 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
quiet_cmd_mkcapflags = MKCAP $@
cmd_mkcapflags = $(PERL) $(srctree)/$(src)/mkcapflags.pl $< $@
---- head-2011-08-09.orig/arch/x86/kernel/cpu/common-xen.c 2011-03-17 14:40:32.000000000 +0100
-+++ head-2011-08-09/arch/x86/kernel/cpu/common-xen.c 2011-03-17 14:41:35.000000000 +0100
+--- sle11sp2-2011-08-22.orig/arch/x86/kernel/cpu/common-xen.c 2011-03-17 14:40:32.000000000 +0100
++++ sle11sp2-2011-08-22/arch/x86/kernel/cpu/common-xen.c 2011-03-17 14:41:35.000000000 +0100
@@ -38,17 +38,45 @@
#include <asm/proto.h>
#include <asm/sections.h>
@@ -906,8 +906,8 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
printk(KERN_WARNING "CPU#%d already initialized!\n", cpu);
for (;;) local_irq_enable();
}
---- head-2011-08-09.orig/arch/x86/kernel/cpu/intel.c 2011-06-30 16:32:02.000000000 +0200
-+++ head-2011-08-09/arch/x86/kernel/cpu/intel.c 2011-04-13 13:52:09.000000000 +0200
+--- sle11sp2-2011-08-22.orig/arch/x86/kernel/cpu/intel.c 2011-06-30 16:32:02.000000000 +0200
++++ sle11sp2-2011-08-22/arch/x86/kernel/cpu/intel.c 2011-04-13 13:52:09.000000000 +0200
@@ -36,10 +36,15 @@ static void __cpuinit early_init_intel(s
rdmsrl(MSR_IA32_MISC_ENABLE, misc_enable);
@@ -924,8 +924,8 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
}
}
---- head-2011-08-09.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 18:07:35.000000000 +0100
-+++ head-2011-08-09/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-02-01 14:42:26.000000000 +0100
+--- sle11sp2-2011-08-22.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-01-31 18:07:35.000000000 +0100
++++ sle11sp2-2011-08-22/arch/x86/kernel/cpu/mtrr/main-xen.c 2011-02-01 14:42:26.000000000 +0100
@@ -33,7 +33,7 @@ struct mtrr_ops generic_mtrr_ops = {
struct mtrr_ops *mtrr_if = &generic_mtrr_ops;
@@ -935,8 +935,8 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
static u64 tom2;
---- head-2011-08-09.orig/arch/x86/kernel/e820-xen.c 2011-02-01 14:39:24.000000000 +0100
-+++ head-2011-08-09/arch/x86/kernel/e820-xen.c 2011-02-01 14:42:26.000000000 +0100
+--- sle11sp2-2011-08-22.orig/arch/x86/kernel/e820-xen.c 2011-02-01 14:39:24.000000000 +0100
++++ sle11sp2-2011-08-22/arch/x86/kernel/e820-xen.c 2011-02-01 14:42:26.000000000 +0100
@@ -719,6 +719,27 @@ void __init e820_mark_nosave_regions(uns
}
}
@@ -988,8 +988,8 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
#endif
{}
};
---- head-2011-08-09.orig/arch/x86/kernel/early_printk-xen.c 2011-02-01 14:39:24.000000000 +0100
-+++ head-2011-08-09/arch/x86/kernel/early_printk-xen.c 2011-02-01 14:42:26.000000000 +0100
+--- sle11sp2-2011-08-22.orig/arch/x86/kernel/early_printk-xen.c 2011-02-01 14:39:24.000000000 +0100
++++ sle11sp2-2011-08-22/arch/x86/kernel/early_printk-xen.c 2011-02-01 14:42:26.000000000 +0100
@@ -904,49 +904,6 @@ static struct console early_dbgp_console
};
#endif
@@ -1060,8 +1060,8 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
#ifdef CONFIG_EARLY_PRINTK_DBGP
} else if (!strncmp(buf, "dbgp", 4)) {
if (early_dbgp_init(buf+4) < 0)
---- head-2011-08-09.orig/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:10:36.000000000 +0200
-+++ head-2011-08-09/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:10:43.000000000 +0200
+--- sle11sp2-2011-08-22.orig/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:10:36.000000000 +0200
++++ sle11sp2-2011-08-22/arch/x86/kernel/entry_32-xen.S 2011-04-26 09:10:43.000000000 +0200
@@ -690,28 +690,37 @@ END(syscall_badsys)
27:;
@@ -1720,8 +1720,8 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
+ * End of kprobes section
+ */
+ .popsection
---- head-2011-08-09.orig/arch/x86/kernel/entry_64-xen.S 2011-02-01 14:39:24.000000000 +0100
-+++ head-2011-08-09/arch/x86/kernel/entry_64-xen.S 2011-02-01 14:42:26.000000000 +0100
+--- sle11sp2-2011-08-22.orig/arch/x86/kernel/entry_64-xen.S 2011-02-01 14:39:24.000000000 +0100
++++ sle11sp2-2011-08-22/arch/x86/kernel/entry_64-xen.S 2011-02-01 14:42:26.000000000 +0100
@@ -14,15 +14,15 @@
*
* NOTE: This code handles signal-recognition, which happens every time
@@ -3362,8 +3362,8 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
+ * End of kprobes section
+ */
+ .popsection
---- head-2011-08-09.orig/arch/x86/kernel/head-xen.c