Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@novell.com>2010-05-12 10:43:46 +0200
committerJan Beulich <jbeulich@novell.com>2010-05-12 10:43:46 +0200
commita59c88c12d47282a909cb8acedb26181a9d03930 (patch)
tree5f53b739643a69b7deb4c7904c7eec48eaeb2823
parente917f51b31d5b966dc7a6ba04adeb694752daf09 (diff)
- Update Xen patches to 2.6.34-rc7 and c/s 1017.
-rw-r--r--kernel-source.changes5
-rw-r--r--patches.xen/tmem86
-rw-r--r--patches.xen/xen-blkif-protocol-fallback-hack21
-rw-r--r--patches.xen/xen-clockevents74
-rw-r--r--patches.xen/xen-dcdbas24
-rw-r--r--patches.xen/xen-kzalloc50
-rw-r--r--patches.xen/xen-netback-generalize185
-rw-r--r--patches.xen/xen-netback-kernel-threads40
-rw-r--r--patches.xen/xen-netback-multiple-tasklets87
-rw-r--r--patches.xen/xen-sections16
-rw-r--r--patches.xen/xen-sysdev-suspend34
-rw-r--r--patches.xen/xen-unpriv-build59
-rw-r--r--patches.xen/xen-virq-per-cpu-irq36
-rw-r--r--patches.xen/xen-x86-no-lapic38
-rw-r--r--patches.xen/xen-x86_64-note-init-p2m34
-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.diff212
-rw-r--r--patches.xen/xen3-auto-include-xen-interface.diff315
-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-xen146
-rw-r--r--patches.xen/xen3-patch-2.6.1853
-rw-r--r--patches.xen/xen3-patch-2.6.23464
-rw-r--r--patches.xen/xen3-patch-2.6.2724
-rw-r--r--patches.xen/xen3-patch-2.6.2916
-rw-r--r--patches.xen/xen3-patch-2.6.30446
-rw-r--r--patches.xen/xen3-patch-2.6.31516
-rw-r--r--patches.xen/xen3-patch-2.6.32393
-rw-r--r--patches.xen/xen3-patch-2.6.33288
-rw-r--r--patches.xen/xen3-patch-2.6.34-rc2208
-rw-r--r--patches.xen/xen3-patch-2.6.34-rc5-git831
-rw-r--r--patches.xen/xen3-patch-2.6.34-rc5-rc648
-rw-r--r--patches.xen/xen3-patch-2.6.34-rc6-rc766
-rw-r--r--series.conf3
37 files changed, 2195 insertions, 1835 deletions
diff --git a/kernel-source.changes b/kernel-source.changes
index 104f6359b0..45c5e4adec 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Wed May 12 10:43:19 CEST 2010 - jbeulich@novell.com
+
+- Update Xen patches to 2.6.34-rc7 and c/s 1017.
+
+-------------------------------------------------------------------
Tue May 11 20:40:38 CEST 2010 - jeffm@suse.com
- Update config files for vanilla.
diff --git a/patches.xen/tmem b/patches.xen/tmem
index 177c8a2690..9cb58df850 100644
--- a/patches.xen/tmem
+++ b/patches.xen/tmem
@@ -31,7 +31,7 @@ Signed-off-by: Dan Magenheimer <dan.magenheimer@oracle.com>
Acked-by: jbeulich@novell.com
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-04-15/Documentation/transcendent-memory.txt 2010-03-24 14:09:47.000000000 +0100
++++ head-2010-05-12/Documentation/transcendent-memory.txt 2010-03-24 14:09:47.000000000 +0100
@@ -0,0 +1,176 @@
+Normal memory is directly addressable by the kernel, of a known
+normally-fixed size, synchronously accessible, and persistent (though
@@ -209,8 +209,8 @@ Acked-by: jbeulich@novell.com
+- A tmem implementation provides no serialization guarantees (e.g. to
+ an SMP Linux). So if different Linux threads are putting and flushing
+ the same page, the results are indeterminate.
---- head-2010-04-15.orig/fs/btrfs/extent_io.c 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/fs/btrfs/extent_io.c 2010-04-15 09:41:13.000000000 +0200
+--- head-2010-05-12.orig/fs/btrfs/extent_io.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/fs/btrfs/extent_io.c 2010-04-15 09:41:13.000000000 +0200
@@ -10,6 +10,7 @@
#include <linux/swap.h>
#include <linux/writeback.h>
@@ -241,8 +241,8 @@ Acked-by: jbeulich@novell.com
if (!nr) {
if (!PageError(page))
SetPageUptodate(page);
---- head-2010-04-15.orig/fs/btrfs/super.c 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/fs/btrfs/super.c 2010-04-15 09:41:20.000000000 +0200
+--- head-2010-05-12.orig/fs/btrfs/super.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/fs/btrfs/super.c 2010-04-15 09:41:20.000000000 +0200
@@ -39,6 +39,7 @@
#include <linux/miscdevice.h>
#include <linux/magic.h>
@@ -259,8 +259,8 @@ Acked-by: jbeulich@novell.com
return 0;
fail_close:
---- head-2010-04-15.orig/fs/buffer.c 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/fs/buffer.c 2010-03-24 14:09:47.000000000 +0100
+--- head-2010-05-12.orig/fs/buffer.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/fs/buffer.c 2010-03-24 14:09:47.000000000 +0100
@@ -41,6 +41,7 @@
#include <linux/bitops.h>
#include <linux/mpage.h>
@@ -281,8 +281,8 @@ Acked-by: jbeulich@novell.com
}
EXPORT_SYMBOL(invalidate_bdev);
---- head-2010-04-15.orig/fs/ext3/super.c 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/fs/ext3/super.c 2010-03-24 14:09:47.000000000 +0100
+--- head-2010-05-12.orig/fs/ext3/super.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/fs/ext3/super.c 2010-03-24 14:09:47.000000000 +0100
@@ -38,6 +38,7 @@
#include <linux/seq_file.h>
#include <linux/nfs4acl.h>
@@ -299,8 +299,8 @@ Acked-by: jbeulich@novell.com
return res;
}
---- head-2010-04-15.orig/fs/ext4/super.c 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/fs/ext4/super.c 2010-04-15 09:41:30.000000000 +0200
+--- head-2010-05-12.orig/fs/ext4/super.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/fs/ext4/super.c 2010-04-15 09:41:30.000000000 +0200
@@ -39,6 +39,7 @@
#include <linux/ctype.h>
#include <linux/log2.h>
@@ -318,8 +318,8 @@ Acked-by: jbeulich@novell.com
return res;
}
---- head-2010-04-15.orig/fs/mpage.c 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/fs/mpage.c 2010-04-15 09:41:38.000000000 +0200
+--- head-2010-05-12.orig/fs/mpage.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/fs/mpage.c 2010-04-15 09:41:38.000000000 +0200
@@ -27,6 +27,7 @@
#include <linux/writeback.h>
#include <linux/backing-dev.h>
@@ -342,8 +342,8 @@ Acked-by: jbeulich@novell.com
/*
* This page will go to BIO. Do we need to send this BIO off first?
*/
---- head-2010-04-15.orig/fs/ocfs2/super.c 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/fs/ocfs2/super.c 2010-03-24 14:09:47.000000000 +0100
+--- head-2010-05-12.orig/fs/ocfs2/super.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/fs/ocfs2/super.c 2010-03-24 14:09:47.000000000 +0100
@@ -41,6 +41,7 @@
#include <linux/mount.h>
#include <linux/seq_file.h>
@@ -360,9 +360,9 @@ Acked-by: jbeulich@novell.com
bail:
mlog_exit(status);
---- head-2010-04-15.orig/fs/super.c 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/fs/super.c 2010-03-24 14:09:47.000000000 +0100
-@@ -37,6 +37,7 @@
+--- head-2010-05-12.orig/fs/super.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/fs/super.c 2010-05-12 08:57:07.000000000 +0200
+@@ -38,6 +38,7 @@
#include <linux/mutex.h>
#include <linux/file.h>
#include <linux/backing-dev.h>
@@ -370,7 +370,7 @@ Acked-by: jbeulich@novell.com
#include <asm/uaccess.h>
#include "internal.h"
-@@ -104,6 +105,9 @@ static struct super_block *alloc_super(s
+@@ -105,6 +106,9 @@ static struct super_block *alloc_super(s
s->s_qcop = sb_quotactl_ops;
s->s_op = &default_op;
s->s_time_gran = 1000000000;
@@ -380,7 +380,7 @@ Acked-by: jbeulich@novell.com
}
out:
return s;
-@@ -194,6 +198,7 @@ void deactivate_super(struct super_block
+@@ -195,6 +199,7 @@ void deactivate_super(struct super_block
vfs_dq_off(s, 0);
down_write(&s->s_umount);
fs->kill_sb(s);
@@ -388,7 +388,7 @@ Acked-by: jbeulich@novell.com
put_filesystem(fs);
put_super(s);
}
-@@ -220,6 +225,7 @@ void deactivate_locked_super(struct supe
+@@ -221,6 +226,7 @@ void deactivate_locked_super(struct supe
spin_unlock(&sb_lock);
vfs_dq_off(s, 0);
fs->kill_sb(s);
@@ -396,8 +396,8 @@ Acked-by: jbeulich@novell.com
put_filesystem(fs);
put_super(s);
} else {
---- head-2010-04-15.orig/include/linux/fs.h 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/include/linux/fs.h 2010-03-24 14:09:47.000000000 +0100
+--- head-2010-05-12.orig/include/linux/fs.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/include/linux/fs.h 2010-03-24 14:09:47.000000000 +0100
@@ -1377,6 +1377,9 @@ struct super_block {
/* Granularity of c/m/atime in ns.
Cannot be worse than a second */
@@ -409,7 +409,7 @@ Acked-by: jbeulich@novell.com
/*
* The next field is for VFS *only*. No filesystems have any business
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-04-15/include/linux/precache.h 2010-03-24 14:09:47.000000000 +0100
++++ head-2010-05-12/include/linux/precache.h 2010-03-24 14:09:47.000000000 +0100
@@ -0,0 +1,55 @@
+#ifndef _LINUX_PRECACHE_H
+
@@ -466,8 +466,8 @@ Acked-by: jbeulich@novell.com
+
+#define _LINUX_PRECACHE_H
+#endif /* _LINUX_PRECACHE_H */
---- head-2010-04-15.orig/include/linux/swap.h 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/include/linux/swap.h 2010-03-24 14:09:47.000000000 +0100
+--- head-2010-05-12.orig/include/linux/swap.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/include/linux/swap.h 2010-03-24 14:09:47.000000000 +0100
@@ -183,8 +183,61 @@ struct swap_info_struct {
struct block_device *bdev; /* swap device or bdev of swap file */
struct file *swap_file; /* seldom referenced */
@@ -530,8 +530,8 @@ Acked-by: jbeulich@novell.com
struct swap_list_t {
int head; /* head of priority-ordered swapfile list */
int next; /* swapfile to be used next */
---- head-2010-04-15.orig/kernel/sysctl.c 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/kernel/sysctl.c 2010-03-24 14:09:47.000000000 +0100
+--- head-2010-05-12.orig/kernel/sysctl.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/kernel/sysctl.c 2010-03-24 14:09:47.000000000 +0100
@@ -1274,6 +1274,17 @@ static struct ctl_table vm_table[] = {
.mode = 0644,
.proc_handler = proc_dointvec,
@@ -550,8 +550,8 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_MEMORY_FAILURE
{
.procname = "memory_failure_early_kill",
---- head-2010-04-15.orig/mm/Kconfig 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/mm/Kconfig 2010-03-24 14:09:47.000000000 +0100
+--- head-2010-05-12.orig/mm/Kconfig 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/mm/Kconfig 2010-03-24 14:09:47.000000000 +0100
@@ -287,3 +287,31 @@ config NOMMU_INITIAL_TRIM_EXCESS
of 1 says that all excess pages should be trimmed.
@@ -584,8 +584,8 @@ Acked-by: jbeulich@novell.com
+ Allows the transcendent memory pool to be used as a pseudo-swap
+ device which, under some circumstances, will greatly reduce
+ swapping and thus improve performance. If unsure, say Y.
---- head-2010-04-15.orig/mm/Makefile 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/mm/Makefile 2010-03-24 14:09:47.000000000 +0100
+--- head-2010-05-12.orig/mm/Makefile 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/mm/Makefile 2010-03-24 14:09:47.000000000 +0100
@@ -17,6 +17,9 @@ obj-y += init-mm.o
obj-$(CONFIG_BOUNCE) += bounce.o
@@ -596,8 +596,8 @@ Acked-by: jbeulich@novell.com
obj-$(CONFIG_HAS_DMA) += dmapool.o
obj-$(CONFIG_HUGETLBFS) += hugetlb.o
obj-$(CONFIG_NUMA) += mempolicy.o
---- head-2010-04-15.orig/mm/filemap.c 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/mm/filemap.c 2010-03-24 14:09:47.000000000 +0100
+--- head-2010-05-12.orig/mm/filemap.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/mm/filemap.c 2010-03-24 14:09:47.000000000 +0100
@@ -33,6 +33,7 @@
#include <linux/cpuset.h>
#include <linux/hardirq.h> /* for BUG_ON(!in_atomic()) only */
@@ -623,8 +623,8 @@ Acked-by: jbeulich@novell.com
radix_tree_delete(&mapping->page_tree, page->index);
page->mapping = NULL;
mapping->nrpages--;
---- head-2010-04-15.orig/mm/page_io.c 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/mm/page_io.c 2010-04-15 09:41:45.000000000 +0200
+--- head-2010-05-12.orig/mm/page_io.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/mm/page_io.c 2010-04-15 09:41:45.000000000 +0200
@@ -111,6 +111,13 @@ int swap_writepage(struct page *page, st
return ret;
}
@@ -653,7 +653,7 @@ Acked-by: jbeulich@novell.com
if (bio == NULL) {
unlock_page(page);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-04-15/mm/precache.c 2010-03-24 14:09:47.000000000 +0100
++++ head-2010-05-12/mm/precache.c 2010-03-24 14:09:47.000000000 +0100
@@ -0,0 +1,140 @@
+/*
+ * linux/mm/precache.c
@@ -796,7 +796,7 @@ Acked-by: jbeulich@novell.com
+}
+EXPORT_SYMBOL(shared_precache_init);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-04-15/mm/preswap.c 2010-03-24 14:09:47.000000000 +0100
++++ head-2010-05-12/mm/preswap.c 2010-03-24 14:09:47.000000000 +0100
@@ -0,0 +1,182 @@
+/*
+ * linux/mm/preswap.c
@@ -980,8 +980,8 @@ Acked-by: jbeulich@novell.com
+ return;
+ preswap_poolid = tmem_new_pool(0, 0, TMEM_POOL_PERSIST);
+}
---- head-2010-04-15.orig/mm/swapfile.c 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/mm/swapfile.c 2010-03-24 14:09:47.000000000 +0100
+--- head-2010-05-12.orig/mm/swapfile.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/mm/swapfile.c 2010-03-24 14:09:47.000000000 +0100
@@ -587,6 +587,7 @@ static unsigned char swap_entry_free(str
swap_list.next = p->type;
nr_swap_pages++;
@@ -1246,7 +1246,7 @@ Acked-by: jbeulich@novell.com
+#endif
+#endif /* CONFIG_PRESWAP */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-04-15/mm/tmem.h 2010-03-24 14:09:47.000000000 +0100
++++ head-2010-05-12/mm/tmem.h 2010-03-24 14:09:47.000000000 +0100
@@ -0,0 +1,84 @@
+/*
+ * linux/mm/tmem.h
@@ -1332,8 +1332,8 @@ Acked-by: jbeulich@novell.com
+ } u;
+};
+#endif
---- head-2010-04-15.orig/mm/truncate.c 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/mm/truncate.c 2010-04-15 09:41:48.000000000 +0200
+--- head-2010-05-12.orig/mm/truncate.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/mm/truncate.c 2010-04-15 09:41:48.000000000 +0200
@@ -16,6 +16,7 @@
#include <linux/pagemap.h>
#include <linux/highmem.h>
diff --git a/patches.xen/xen-blkif-protocol-fallback-hack b/patches.xen/xen-blkif-protocol-fallback-hack
index 5cb9c96666..ef35e69df9 100644
--- a/patches.xen/xen-blkif-protocol-fallback-hack
+++ b/patches.xen/xen-blkif-protocol-fallback-hack
@@ -89,8 +89,8 @@ 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-2010-04-29/drivers/xen/core/domctl.c 2010-03-25 14:37:59.000000000 +0100
-@@ -0,0 +1,120 @@
++++ head-2010-04-29/drivers/xen/core/domctl.c 2010-05-07 12:12:03.000000000 +0200
+@@ -0,0 +1,127 @@
+/*
+ * !!! dirty hack alert !!!
+ *
@@ -128,7 +128,7 @@ See the comment below. Oh well.
+typedef __attribute__((aligned(8))) uint64_t uint64_aligned_t;
+
+union xen_domctl {
-+ /* v4: sles10 sp1: xen 3.0.4 + 32-on-64 patches */
++ /* v4: sle10 sp1: xen 3.0.4 + 32-on-64 patches */
+ struct {
+ uint32_t cmd;
+ uint32_t interface_version;
@@ -141,7 +141,11 @@ See the comment below. Oh well.
+ };
+ } v4;
+
-+ /* v5: upstream: xen 3.1, v6: upstream: xen 4.0 */
++ /*
++ * v5: upstream: xen 3.1
++ * v6: upstream: xen 4.0
++ * v7: sle11 sp1: xen 4.0 + cpupools patches
++ */
+ struct {
+ uint32_t cmd;
+ uint32_t interface_version;
@@ -151,7 +155,7 @@ See the comment below. Oh well.
+ uint64_aligned_t dummy_align;
+ uint8_t dummy_pad[128];
+ };
-+ } v5, v6;
++ } v5, v6, v7;
+};
+
+/* The actual code comes here */
@@ -179,8 +183,11 @@ See the comment below. Oh well.
+ } \
+} while (0)
+
-+ BUILD_BUG_ON(XEN_DOMCTL_INTERFACE_VERSION > 6);
++ BUILD_BUG_ON(XEN_DOMCTL_INTERFACE_VERSION > 7);
++ guest_address_size(7);
++#if CONFIG_XEN_COMPAT < 0x040100
+ guest_address_size(6);
++#endif
+#if CONFIG_XEN_COMPAT < 0x040000
+ guest_address_size(5);
+#endif
@@ -189,7 +196,7 @@ See the comment below. Oh well.
+#endif
+
+ ret = BITS_PER_LONG;
-+ printk("v%d...6 domctls failed, assuming dom%d is native: %d\n",
++ printk("v%d...7 domctls failed, assuming dom%d is native: %d\n",
+ low, domid, ret);
+
+ return ret;
diff --git a/patches.xen/xen-clockevents b/patches.xen/xen-clockevents
index 208b3848e0..3e1de625b6 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-2010-04-15.orig/arch/x86/Kconfig 2010-03-25 16:41:03.000000000 +0100
-+++ head-2010-04-15/arch/x86/Kconfig 2010-03-25 14:39:15.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/Kconfig 2010-03-25 16:41:03.000000000 +0100
++++ head-2010-05-12/arch/x86/Kconfig 2010-03-25 14:39:15.000000000 +0100
@@ -80,7 +80,6 @@ config CLOCKSOURCE_WATCHDOG
config GENERIC_CLOCKEVENTS
@@ -14,8 +14,8 @@ Once validated this could be merged into the 2.6.?? patch.
config GENERIC_CLOCKEVENTS_BROADCAST
def_bool y
---- head-2010-04-15.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2009-11-23 10:45:08.000000000 +0100
-+++ head-2010-04-15/arch/x86/include/mach-xen/asm/hypervisor.h 2010-03-25 14:39:15.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2009-11-23 10:45:08.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/hypervisor.h 2010-03-25 14:39:15.000000000 +0100
@@ -72,8 +72,6 @@ extern start_info_t *xen_start_info;
#define init_hypervisor(c) ((void)((c)->x86_hyper_vendor = X86_HYPER_VENDOR_XEN))
#define init_hypervisor_platform() init_hypervisor(&boot_cpu_data)
@@ -25,8 +25,8 @@ Once validated this could be merged into the 2.6.?? patch.
/* arch/xen/kernel/evtchn.c */
/* Force a proper event-channel callback from Xen. */
void force_evtchn_callback(void);
---- head-2010-04-15.orig/arch/x86/kernel/time-xen.c 2010-02-24 12:38:57.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/time-xen.c 2010-03-25 14:39:15.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/time-xen.c 2010-05-12 09:14:09.000000000 +0200
++++ head-2010-05-12/arch/x86/kernel/time-xen.c 2010-05-12 09:14:39.000000000 +0200
@@ -25,7 +25,7 @@
#include <asm/time.h>
#include <asm/timer.h>
@@ -137,7 +137,7 @@ Once validated this could be merged into the 2.6.?? patch.
get_runstate_snapshot(&runstate);
-@@ -423,138 +429,6 @@ unsigned long profile_pc(struct pt_regs
+@@ -423,140 +429,6 @@ unsigned long profile_pc(struct pt_regs
}
EXPORT_SYMBOL(profile_pc);
@@ -245,15 +245,17 @@ Once validated this could be merged into the 2.6.?? patch.
-
- /* Account user/system ticks. */
- if (delta_cpu > 0) {
+- cputime_t ct;
+-
- do_div(delta_cpu, NS_PER_TICK);
- per_cpu(processed_system_time, cpu) += delta_cpu * NS_PER_TICK;
+- ct = jiffies_to_cputime(delta_cpu);
- if (user_mode_vm(get_irq_regs()))
-- account_user_time(current, (cputime_t)delta_cpu,
-- (cputime_t)delta_cpu);
-- else if (current != idle_task(cpu))
+- account_user_time(current, ct, cputime_to_scaled(ct));
+- else if (current != idle_task(cpu)
+- || irq_count() != HARDIRQ_OFFSET)
- account_system_time(current, HARDIRQ_OFFSET,
-- (cputime_t)delta_cpu,
-- (cputime_t)delta_cpu);
+- ct, cputime_to_scaled(ct));
- else
- account_idle_ticks(delta_cpu);
- }
@@ -276,7 +278,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. */
-@@ -563,24 +437,13 @@ void mark_tsc_unstable(char *reason)
+@@ -565,24 +437,13 @@ void mark_tsc_unstable(char *reason)
}
EXPORT_SYMBOL_GPL(mark_tsc_unstable);
@@ -302,7 +304,7 @@ Once validated this could be merged into the 2.6.?? patch.
if (unlikely((s64)(ret - last) < 0)) {
if (last - ret > permitted_clock_jitter
-@@ -606,37 +469,28 @@ static cycle_t xen_clocksource_read(stru
+@@ -608,37 +469,28 @@ static cycle_t xen_clocksource_read(stru
last = cur;
}
#else
@@ -349,7 +351,7 @@ Once validated this could be merged into the 2.6.?? patch.
}
static struct clocksource clocksource_xen = {
-@@ -681,7 +535,7 @@ void xen_read_persistent_clock(struct ti
+@@ -683,7 +535,7 @@ void xen_read_persistent_clock(struct ti
rmb();
} while ((s->wc_version & 1) | (version ^ s->wc_version));
@@ -358,7 +360,7 @@ Once validated this could be merged into the 2.6.?? patch.
do_div(delta, NSEC_PER_SEC);
ts->tv_sec = delta;
-@@ -696,42 +550,17 @@ int xen_update_persistent_clock(void)
+@@ -698,42 +550,17 @@ int xen_update_persistent_clock(void)
return 0;
}
@@ -404,7 +406,7 @@ Once validated this could be merged into the 2.6.?? patch.
clocksource_register(&clocksource_xen);
-@@ -740,7 +569,7 @@ void __init time_init(void)
+@@ -742,7 +569,7 @@ void __init time_init(void)
use_tsc_delay();
/* Cannot request_irq() until kmem is initialised. */
@@ -413,7 +415,7 @@ Once validated this could be merged into the 2.6.?? patch.
}
/* Convert jiffies to system time. */
-@@ -756,13 +585,13 @@ u64 jiffies_to_st(unsigned long j)
+@@ -758,13 +585,13 @@ u64 jiffies_to_st(unsigned long j)
if (delta < 1) {
/* Triggers in some wrap-around cases, but that's okay:
* we just end up with a shorter timeout. */
@@ -429,7 +431,7 @@ Once validated this could be merged into the 2.6.?? patch.
}
} while (read_seqretry(&xtime_lock, seq));
-@@ -770,73 +599,10 @@ u64 jiffies_to_st(unsigned long j)
+@@ -772,73 +599,10 @@ u64 jiffies_to_st(unsigned long j)
}
EXPORT_SYMBOL(jiffies_to_st);
@@ -503,7 +505,7 @@ Once validated this could be merged into the 2.6.?? patch.
}
EXPORT_SYMBOL(xen_safe_halt);
-@@ -847,47 +613,6 @@ void xen_halt(void)
+@@ -849,47 +613,6 @@ void xen_halt(void)
}
EXPORT_SYMBOL(xen_halt);
@@ -551,8 +553,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-2010-04-15.orig/drivers/xen/Kconfig 2010-03-31 14:10:55.000000000 +0200
-+++ head-2010-04-15/drivers/xen/Kconfig 2010-03-31 14:11:27.000000000 +0200
+--- head-2010-05-12.orig/drivers/xen/Kconfig 2010-03-31 14:10:55.000000000 +0200
++++ head-2010-05-12/drivers/xen/Kconfig 2010-03-31 14:11:27.000000000 +0200
@@ -355,9 +355,6 @@ config HAVE_IRQ_IGNORE_UNHANDLED
config IRQ_PER_CPU
bool
@@ -563,8 +565,8 @@ Once validated this could be merged into the 2.6.?? patch.
config ARCH_HAS_WALK_MEMORY
def_bool y
depends on X86
---- head-2010-04-15.orig/drivers/xen/core/Makefile 2010-03-25 14:37:59.000000000 +0100
-+++ head-2010-04-15/drivers/xen/core/Makefile 2010-03-25 14:39:15.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/core/Makefile 2010-04-19 14:55:02.000000000 +0200
++++ head-2010-05-12/drivers/xen/core/Makefile 2010-03-25 14:39:15.000000000 +0100
@@ -12,6 +12,7 @@ obj-$(CONFIG_XEN_SYSFS) += xen_sysfs.o
obj-$(CONFIG_XEN_SMPBOOT) += smpboot.o
obj-$(CONFIG_SMP) += spinlock.o
@@ -574,7 +576,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-2010-04-15/drivers/xen/core/clockevents.c 2010-03-25 14:39:15.000000000 +0100
++++ head-2010-05-12/drivers/xen/core/clockevents.c 2010-03-25 14:39:15.000000000 +0100
@@ -0,0 +1,298 @@
+/*
+ * Xen clockevent functions
@@ -874,8 +876,8 @@ Once validated this could be merged into the 2.6.?? patch.
+
+ xen_setup_cpu_clockevents();
+}
---- head-2010-04-15.orig/drivers/xen/core/machine_reboot.c 2009-12-18 14:19:13.000000000 +0100
-+++ head-2010-04-15/drivers/xen/core/machine_reboot.c 2010-03-25 14:39:15.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/core/machine_reboot.c 2009-12-18 14:19:13.000000000 +0100
++++ head-2010-05-12/drivers/xen/core/machine_reboot.c 2010-03-25 14:39:15.000000000 +0100
@@ -13,6 +13,7 @@
#include <asm/hypervisor.h>
#include <xen/xenbus.h>
@@ -899,8 +901,8 @@ Once validated this could be merged into the 2.6.?? patch.
if (!suspend_cancelled) {
#ifdef __x86_64__
/*
---- head-2010-04-15.orig/drivers/xen/core/smpboot.c 2010-03-19 15:20:27.000000000 +0100
-+++ head-2010-04-15/drivers/xen/core/smpboot.c 2010-03-25 14:39:15.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/core/smpboot.c 2010-03-19 15:20:27.000000000 +0100
++++ head-2010-05-12/drivers/xen/core/smpboot.c 2010-03-25 14:39:15.000000000 +0100
@@ -19,6 +19,7 @@
#include <linux/percpu.h>
#include <asm/desc.h>
@@ -917,8 +919,8 @@ Once validated this could be merged into the 2.6.?? patch.
local_irq_enable();
}
---- head-2010-04-15.orig/drivers/xen/core/spinlock.c 2010-02-24 12:38:54.000000000 +0100
-+++ head-2010-04-15/drivers/xen/core/spinlock.c 2010-03-25 14:39:15.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/core/spinlock.c 2010-02-24 12:38:54.000000000 +0100
++++ head-2010-05-12/drivers/xen/core/spinlock.c 2010-03-25 14:39:15.000000000 +0100
@@ -10,6 +10,7 @@
#include <linux/kernel.h>
#include <linux/kernel_stat.h>
@@ -928,7 +930,7 @@ Once validated this could be merged into the 2.6.?? patch.
#ifdef TICKET_SHIFT
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-04-15/include/xen/clock.h 2010-03-25 14:39:15.000000000 +0100
++++ head-2010-05-12/include/xen/clock.h 2010-03-25 14:39:15.000000000 +0100
@@ -0,0 +1,19 @@
+#ifndef __XEN_CPU_CLOCK_H__
+#define __XEN_CPU_CLOCK_H__
@@ -949,8 +951,8 @@ Once validated this could be merged into the 2.6.?? patch.
+#endif
+
+#endif /* __XEN_CPU_CLOCK_H__ */
---- head-2010-04-15.orig/kernel/hrtimer.c 2010-03-24 15:12:46.000000000 +0100
-+++ head-2010-04-15/kernel/hrtimer.c 2010-03-25 14:39:15.000000000 +0100
+--- head-2010-05-12.orig/kernel/hrtimer.c 2010-03-24 15:12:46.000000000 +0100
++++ head-2010-05-12/kernel/hrtimer.c 2010-03-25 14:39:15.000000000 +0100
@@ -1108,7 +1108,7 @@ ktime_t hrtimer_get_remaining(const stru
}
EXPORT_SYMBOL_GPL(hrtimer_get_remaining);
@@ -960,8 +962,8 @@ Once validated this could be merged into the 2.6.?? patch.
/**
* hrtimer_get_next_event - get the time until next expiry event
*
---- head-2010-04-15.orig/kernel/timer.c 2010-04-15 10:05:03.000000000 +0200
-+++ head-2010-04-15/kernel/timer.c 2010-04-15 11:42:54.000000000 +0200
+--- head-2010-05-12.orig/kernel/timer.c 2010-04-15 10:05:03.000000000 +0200
++++ head-2010-05-12/kernel/timer.c 2010-04-15 11:42:54.000000000 +0200
@@ -1044,7 +1044,7 @@ static inline void __run_timers(struct t
spin_unlock_irq(&base->lock);
}
diff --git a/patches.xen/xen-dcdbas b/patches.xen/xen-dcdbas
index 717022fd1b..9e9d0595b7 100644
--- a/patches.xen/xen-dcdbas
+++ b/patches.xen/xen-dcdbas
@@ -105,7 +105,7 @@ The only caveat is that this doesn't work when Dom0 has its vCPU-s pinned.
if (error)
return error;
--- head-2010-04-15.orig/drivers/xen/core/domctl.c 2010-03-25 14:37:59.000000000 +0100
-+++ head-2010-04-15/drivers/xen/core/domctl.c 2010-01-04 16:17:59.000000000 +0100
++++ head-2010-04-15/drivers/xen/core/domctl.c 2010-05-07 12:14:29.000000000 +0200
@@ -20,6 +20,8 @@
#undef __XEN_TOOLS__
#include <linux/kernel.h>
@@ -143,7 +143,7 @@ The only caveat is that this doesn't work when Dom0 has its vCPU-s pinned.
+};
+
union xen_domctl {
- /* v4: sles10 sp1: xen 3.0.4 + 32-on-64 patches */
+ /* v4: sle10 sp1: xen 3.0.4 + 32-on-64 patches */
struct {
@@ -43,6 +68,7 @@ union xen_domctl {
union {
@@ -153,7 +153,7 @@ The only caveat is that this doesn't work when Dom0 has its vCPU-s pinned.
uint64_t dummy_align;
uint8_t dummy_pad[128];
};
-@@ -55,6 +81,7 @@ union xen_domctl {
+@@ -59,6 +85,7 @@ union xen_domctl {
domid_t domain;
union {
struct xen_domctl_address_size address_size;
@@ -161,7 +161,7 @@ The only caveat is that this doesn't work when Dom0 has its vCPU-s pinned.
uint64_aligned_t dummy_align;
uint8_t dummy_pad[128];
};
-@@ -117,4 +144,110 @@ int xen_guest_blkif_protocol(int domid)
+@@ -124,4 +151,118 @@ int xen_guest_blkif_protocol(int domid)
}
EXPORT_SYMBOL_GPL(xen_guest_blkif_protocol);
@@ -184,8 +184,12 @@ The only caveat is that this doesn't work when Dom0 has its vCPU-s pinned.
+ union xen_domctl domctl;
+ int rc;
+
-+ BUILD_BUG_ON(XEN_DOMCTL_INTERFACE_VERSION > 6);
-+ rc = vcpuaffinity(get, 6);
++ BUILD_BUG_ON(XEN_DOMCTL_INTERFACE_VERSION > 7);
++ rc = vcpuaffinity(get, 7);
++#if CONFIG_XEN_COMPAT < 0x040100
++ if (rc)
++ rc = vcpuaffinity(get, 6);
++#endif
+#if CONFIG_XEN_COMPAT < 0x040000
+ if (rc)
+ rc = vcpuaffinity(get, 5);
@@ -202,8 +206,12 @@ The only caveat is that this doesn't work when Dom0 has its vCPU-s pinned.
+ union xen_domctl domctl;
+ int rc;
+
-+ BUILD_BUG_ON(XEN_DOMCTL_INTERFACE_VERSION > 6);
-+ rc = vcpuaffinity(set, 6);
++ BUILD_BUG_ON(XEN_DOMCTL_INTERFACE_VERSION > 7);
++ rc = vcpuaffinity(set, 7);
++#if CONFIG_XEN_COMPAT < 0x040100
++ if (rc)
++ rc = vcpuaffinity(set, 6);
++#endif
+#if CONFIG_XEN_COMPAT < 0x040000
+ if (rc)
+ rc = vcpuaffinity(set, 5);
diff --git a/patches.xen/xen-kzalloc b/patches.xen/xen-kzalloc
index 54fe41ca2b..351199ded6 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-2010-04-15.orig/drivers/xen/blkback/blkback.c 2010-03-25 14:38:05.000000000 +0100
-+++ head-2010-04-15/drivers/xen/blkback/blkback.c 2010-04-28 16:32:16.000000000 +0200
+--- head-2010-04-29.orig/drivers/xen/blkback/blkback.c 2010-03-25 14:38:05.000000000 +0100
++++ head-2010-04-29/drivers/xen/blkback/blkback.c 2010-04-28 16:32:16.000000000 +0200
@@ -671,7 +671,7 @@ static int __init blkif_init(void)
mmap_pages = blkif_reqs * BLKIF_MAX_SEGMENTS_PER_REQUEST;
@@ -23,8 +23,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-2010-04-15.orig/drivers/xen/blkback/interface.c 2010-03-24 15:09:22.000000000 +0100
-+++ head-2010-04-15/drivers/xen/blkback/interface.c 2010-04-28 16:37:43.000000000 +0200
+--- head-2010-04-29.orig/drivers/xen/blkback/interface.c 2010-03-24 15:09:22.000000000 +0100
++++ head-2010-04-29/drivers/xen/blkback/interface.c 2010-04-28 16:37:43.000000000 +0200
@@ -41,11 +41,10 @@ blkif_t *blkif_alloc(domid_t domid)
{
blkif_t *blkif;
@@ -38,8 +38,8 @@ Also use clear_page() in favor of memset(, 0, PAGE_SIZE).
blkif->domid = domid;
spin_lock_init(&blkif->blk_ring_lock);
atomic_set(&blkif->refcnt, 1);
---- head-2010-04-15.orig/drivers/xen/blktap/interface.c 2010-03-24 15:09:22.000000000 +0100
-+++ head-2010-04-15/drivers/xen/blktap/interface.c 2010-04-28 16:38:55.000000000 +0200
+--- head-2010-04-29.orig/drivers/xen/blktap/interface.c 2010-03-24 15:09:22.000000000 +0100
++++ head-2010-04-29/drivers/xen/blktap/interface.c 2010-04-28 16:38:55.000000000 +0200
@@ -41,11 +41,10 @@ blkif_t *tap_alloc_blkif(domid_t domid)
{
blkif_t *blkif;
@@ -53,8 +53,8 @@ Also use clear_page() in favor of memset(, 0, PAGE_SIZE).
blkif->domid = domid;
spin_lock_init(&blkif->blk_ring_lock);
atomic_set(&blkif->refcnt, 1);
---- head-2010-04-15.orig/drivers/xen/core/machine_reboot.c 2010-03-25 14:39:15.000000000 +0100
-+++ head-2010-04-15/drivers/xen/core/machine_reboot.c 2010-04-28 17:04:28.000000000 +0200
+--- head-2010-04-29.orig/drivers/xen/core/machine_reboot.c 2010-03-25 14:39:15.000000000 +0100
++++ head-2010-04-29/drivers/xen/core/machine_reboot.c 2010-04-28 17:04:28.000000000 +0200
@@ -102,7 +102,7 @@ static void post_suspend(int suspend_can
BUG();
HYPERVISOR_shared_info = (shared_info_t *)fix_to_virt(FIX_SHARED_INFO);
@@ -64,8 +64,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-2010-04-15.orig/drivers/xen/core/smpboot.c 2010-04-15 11:43:29.000000000 +0200
-+++ head-2010-04-15/drivers/xen/core/smpboot.c 2010-04-28 16:44:14.000000000 +0200
+--- head-2010-04-29.orig/drivers/xen/core/smpboot.c 2010-04-15 11:43:29.000000000 +0200
++++ head-2010-04-29/drivers/xen/core/smpboot.c 2010-04-28 16:44:14.000000000 +0200
@@ -218,17 +218,12 @@ static void __cpuinit cpu_initialize_con
ctxt.flags = VGCF_IN_KERNEL;
ctxt.user_regs.ds = __USER_DS;
@@ -84,9 +84,9 @@ 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-2010-04-15.orig/drivers/xen/netback/interface.c 2010-03-15 11:25:28.000000000 +0100
-+++ head-2010-04-15/drivers/xen/netback/interface.c 2010-04-28 16:48:47.000000000 +0200
-@@ -232,7 +232,6 @@ netif_t *netif_alloc(struct device *pare
+--- head-2010-04-29.orig/drivers/xen/netback/interface.c 2010-04-30 10:42:29.000000000 +0200
++++ head-2010-04-29/drivers/xen/netback/interface.c 2010-04-30 10:49:15.000000000 +0200
+@@ -227,7 +227,6 @@ netif_t *netif_alloc(struct device *pare
SET_NETDEV_DEV(dev, parent);
netif = netdev_priv(dev);
@@ -94,8 +94,8 @@ Also use clear_page() in favor of memset(, 0, PAGE_SIZE).
netif->domid = domid;
netif->group = UINT_MAX;
netif->handle = handle;
---- head-2010-04-15.orig/drivers/xen/scsiback/emulate.c 2010-03-24 15:10:29.000000000 +0100
-+++ head-2010-04-15/drivers/xen/scsiback/emulate.c 2010-04-28 16:51:05.000000000 +0200
+--- head-2010-04-29.orig/drivers/xen/scsiback/emulate.c 2010-03-24 15:10:29.000000000 +0100
++++ head-2010-04-29/drivers/xen/scsiback/emulate.c 2010-04-28 16:51:05.000000000 +0200
@@ -240,13 +240,11 @@ static void __report_luns(pending_req_t
alloc_len = sizeof(struct scsi_lun) * alloc_luns
+ VSCSI_REPORT_LUNS_HEADER;
@@ -111,8 +111,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-2010-04-15.orig/drivers/xen/scsiback/interface.c 2010-03-24 15:09:22.000000000 +0100
-+++ head-2010-04-15/drivers/xen/scsiback/interface.c 2010-04-28 16:51:29.000000000 +0200
+--- head-2010-04-29.orig/drivers/xen/scsiback/interface.c 2010-03-24 15:09:22.000000000 +0100
++++ head-2010-04-29/drivers/xen/scsiback/interface.c 2010-04-28 16:51:29.000000000 +0200
@@ -46,11 +46,10 @@ struct vscsibk_info *vscsibk_info_alloc(
{
struct vscsibk_info *info;
@@ -126,8 +126,8 @@ Also use clear_page() in favor of memset(, 0, PAGE_SIZE).
info->domid = domid;
spin_lock_init(&info->ring_lock);
atomic_set(&info->nr_unreplied_reqs, 0);
---- head-2010-04-15.orig/drivers/xen/scsiback/scsiback.c 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-15/drivers/xen/scsiback/scsiback.c 2010-04-28 16:52:02.000000000 +0200
+--- head-2010-04-29.orig/drivers/xen/scsiback/scsiback.c 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-04-29/drivers/xen/scsiback/scsiback.c 2010-04-28 16:52:02.000000000 +0200
@@ -676,7 +676,7 @@ static int __init scsiback_init(void)
mmap_pages = vscsiif_reqs * VSCSIIF_SG_TABLESIZE;
@@ -145,8 +145,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-2010-04-15.orig/drivers/xen/sfc_netutil/accel_cuckoo_hash.c 2010-04-15 11:11:11.000000000 +0200
-+++ head-2010-04-15/drivers/xen/sfc_netutil/accel_cuckoo_hash.c 2010-04-28 16:54:07.000000000 +0200
+--- head-2010-04-29.orig/drivers/xen/sfc_netutil/accel_cuckoo_hash.c 2010-04-15 11:11:11.000000000 +0200
++++ head-2010-04-29/drivers/xen/sfc_netutil/accel_cuckoo_hash.c 2010-04-28 16:54:07.000000000 +0200
@@ -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));
@@ -166,8 +166,8 @@ Also use clear_page() in favor of memset(, 0, PAGE_SIZE).
return 0;
}
EXPORT_SYMBOL_GPL(cuckoo_hash_init);
---- head-2010-04-15.orig/drivers/xen/tpmback/interface.c 2010-03-24 15:09:22.000000000 +0100
-+++ head-2010-04-15/drivers/xen/tpmback/interface.c 2010-04-28 16:55:39.000000000 +0200
+--- head-2010-04-29.orig/drivers/xen/tpmback/interface.c 2010-03-24 15:09:22.000000000 +0100
++++ head-2010-04-29/drivers/xen/tpmback/interface.c 2010-04-28 16:55:39.000000000 +0200
@@ -26,11 +26,10 @@ static tpmif_t *alloc_tpmif(domid_t domi
{
tpmif_t *tpmif;
@@ -190,8 +190,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-2010-04-15.orig/drivers/xen/usbback/usbback.c 2010-04-15 17:36:18.000000000 +0200
-+++ head-2010-04-15/drivers/xen/usbback/usbback.c 2010-04-28 16:56:36.000000000 +0200
+--- head-2010-04-29.orig/drivers/xen/usbback/usbback.c 2010-04-15 17:36:18.000000000 +0200
++++ head-2010-04-29/drivers/xen/usbback/usbback.c 2010-04-28 16:56:36.000000000 +0200
@@ -1149,7 +1149,7 @@ static int __init usbback_init(void)
return -ENODEV;
diff --git a/patches.xen/xen-netback-generalize b/patches.xen/xen-netback-generalize
index 43342e6012..857f50fbf8 100644
--- a/patches.xen/xen-netback-generalize
+++ b/patches.xen/xen-netback-generalize
@@ -11,9 +11,9 @@ Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
jb: various cleanups
Acked-by: jbeulich@novell.com
---- head-2010-01-07.orig/drivers/xen/netback/common.h 2010-01-15 09:35:31.000000000 +0100
-+++ head-2010-01-07/drivers/xen/netback/common.h 2010-01-14 08:39:00.000000000 +0100
-@@ -217,4 +217,81 @@ static inline int netbk_can_sg(struct ne
+--- head-2010-04-29.orig/drivers/xen/netback/common.h 2010-03-24 15:06:12.000000000 +0100
++++ head-2010-04-29/drivers/xen/netback/common.h 2010-04-30 11:11:33.000000000 +0200
+@@ -217,4 +217,74 @@ static inline int netbk_can_sg(struct ne
return netif->features & NETIF_F_SG;
}
@@ -23,11 +23,6 @@ Acked-by: jbeulich@novell.com
+};
+typedef unsigned int pending_ring_idx_t;
+
-+struct page_ext {
-+ unsigned int group;
-+ unsigned int idx;
-+};
-+
+struct netbk_rx_meta {
+ skb_frag_t frag;
+ int id;
@@ -67,8 +62,6 @@ Acked-by: jbeulich@novell.com
+
+ unsigned int alloc_index;
+
-+ struct page_ext page_extinfo[MAX_PENDING_REQS];
-+
+ struct pending_tx_info pending_tx_info[MAX_PENDING_REQS];
+ struct netbk_tx_pending_inuse pending_inuse[MAX_PENDING_REQS];
+ struct gnttab_unmap_grant_ref tx_unmap_ops[MAX_PENDING_REQS];
@@ -95,8 +88,8 @@ Acked-by: jbeulich@novell.com
+ unsigned long mfn_list[MAX_MFN_ALLOC];
+};
#endif /* __NETIF__BACKEND__COMMON_H__ */
---- head-2010-01-07.orig/drivers/xen/netback/netback.c 2010-01-15 09:35:31.000000000 +0100
-+++ head-2010-01-07/drivers/xen/netback/netback.c 2010-01-15 09:36:59.000000000 +0100
+--- head-2010-04-29.orig/drivers/xen/netback/netback.c 2010-01-04 13:31:57.000000000 +0100
++++ head-2010-04-29/drivers/xen/netback/netback.c 2010-04-30 11:49:12.000000000 +0200
@@ -35,23 +35,18 @@
*/
@@ -112,8 +105,8 @@ Acked-by: jbeulich@novell.com
- int id;
- u8 copy:1;
-};
-+static struct xen_netbk *xen_netbk;
-+static unsigned int netbk_nr_groups = 1;
++static struct xen_netbk *__read_mostly xen_netbk;
++static const unsigned int __read_mostly netbk_nr_groups = 1;
-struct netbk_tx_pending_inuse {
- struct list_head list;
@@ -126,7 +119,7 @@ Acked-by: jbeulich@novell.com
static void make_tx_response(netif_t *netif,
netif_tx_request_t *txp,
s8 st);
-@@ -62,81 +57,34 @@ static netif_rx_response_t *make_rx_resp
+@@ -62,81 +57,67 @@ static netif_rx_response_t *make_rx_resp
u16 size,
u16 flags);
@@ -162,23 +155,50 @@ Acked-by: jbeulich@novell.com
/* extra field used in struct page */
-static inline void netif_set_page_index(struct page *pg, unsigned int index)
--{
++union page_ext {
++ struct {
++#if BITS_PER_LONG < 64
++#define GROUP_WIDTH (BITS_PER_LONG - CONFIG_XEN_NETDEV_TX_SHIFT)
++#define MAX_GROUPS ((1U << GROUP_WIDTH) - 1)
++ unsigned int grp:GROUP_WIDTH;
++ unsigned int idx:CONFIG_XEN_NETDEV_TX_SHIFT;
++#else
++#define MAX_GROUPS UINT_MAX
++ unsigned int grp, idx;
++#endif
++ } e;
++ void *mapping;
++};
++
++static inline void netif_set_page_ext(struct page *pg, unsigned int group,
++ unsigned int idx)
+ {
- *(unsigned long *)&pg->mapping = index;
--}
--
++ union page_ext ext = { .e = { .grp = group + 1, .idx = idx } };
++
++ BUILD_BUG_ON(sizeof(ext) > sizeof(ext.mapping));
++ pg->mapping = ext.mapping;
+ }
+
-static inline int netif_page_index(struct page *pg)
-+static inline void netif_set_page_ext(struct page *pg, struct page_ext *ext)
++static inline unsigned int netif_page_group(const struct page *pg)
{
- unsigned long idx = (unsigned long)pg->mapping;
--
++ union page_ext ext = { .mapping = pg->mapping };
+
- if (!PageForeign(pg))
- return -1;
--
++ return ext.e.grp - 1;
++}
+
- if ((idx >= MAX_PENDING_REQS) || (mmap_pages[idx] != pg))
- return -1;
--
++static inline unsigned int netif_page_index(const struct page *pg)
++{
++ union page_ext ext = { .mapping = pg->mapping };
+
- return idx;
-+ pg->mapping = (void *)ext;
++ return ext.e.idx;
}
#define PKT_PROT_LEN 64
@@ -192,11 +212,11 @@ Acked-by: jbeulich@novell.com
#define MASK_PEND_IDX(_i) ((_i)&(MAX_PENDING_REQS-1))
-static PEND_RING_IDX pending_prod, pending_cons;
-#define NR_PENDING_REQS (MAX_PENDING_REQS - pending_prod + pending_cons)
--
+
-/* Freed TX SKBs get batched on this ring before return to pending_ring. */
-static u16 dealloc_ring[MAX_PENDING_REQS];
-static PEND_RING_IDX dealloc_prod, dealloc_cons;
-
+-
-/* Doubly-linked list of in-use pending entries. */
-static struct netbk_tx_pending_inuse pending_inuse[MAX_PENDING_REQS];
-static LIST_HEAD(pending_inuse_head);
@@ -221,7 +241,7 @@ Acked-by: jbeulich@novell.com
/* Setting this allows the safe use of this driver without netloop. */
static int MODPARM_copy_skb = 1;
-@@ -148,13 +96,13 @@ MODULE_PARM_DESC(permute_returns, "Rando
+@@ -148,13 +129,13 @@ MODULE_PARM_DESC(permute_returns, "Rando
int netbk_copy_skb_mode;
@@ -239,7 +259,7 @@ Acked-by: jbeulich@novell.com
{
struct xen_memory_reservation reservation = {
.extent_order = 0,
-@@ -162,24 +110,27 @@ static int check_mfn(int nr)
+@@ -162,24 +143,27 @@ static int check_mfn(int nr)
};
int rc;
@@ -276,7 +296,7 @@ Acked-by: jbeulich@novell.com
}
static struct sk_buff *netbk_copy_skb(struct sk_buff *skb)
-@@ -288,6 +239,7 @@ static void tx_queue_callback(unsigned l
+@@ -288,6 +272,7 @@ static void tx_queue_callback(unsigned l
int netif_be_start_xmit(struct sk_buff *skb, struct net_device *dev)
{
netif_t *netif = netdev_priv(dev);
@@ -284,7 +304,7 @@ Acked-by: jbeulich@novell.com
BUG_ON(skb->dev != dev);
-@@ -337,8 +289,9 @@ int netif_be_start_xmit(struct sk_buff *
+@@ -337,8 +322,9 @@ int netif_be_start_xmit(struct sk_buff *
}
}
@@ -296,7 +316,7 @@ Acked-by: jbeulich@novell.com
return NETDEV_TX_OK;
-@@ -393,19 +346,32 @@ static u16 netbk_gop_frag(netif_t *netif
+@@ -393,19 +379,29 @@ static u16 netbk_gop_frag(netif_t *netif
multicall_entry_t *mcl;
netif_rx_request_t *req;
unsigned long old_mfn, new_mfn;
@@ -307,7 +327,7 @@ Acked-by: jbeulich@novell.com
req = RING_GET_REQUEST(&netif->rx, netif->rx.req_cons + i);
if (netif->copying_receiver) {
-+ struct page_ext *ext;
++ unsigned int group, idx;
+
/* The fragment needs to be copied rather than
flipped. */
@@ -317,22 +337,19 @@ Acked-by: jbeulich@novell.com
- if (idx > -1) {
- struct pending_tx_info *src_pend = &pending_tx_info[idx];
+ if (PageForeign(page) &&
-+ (ext = (void *)page->mapping) != NULL &&
-+ ext->idx < MAX_PENDING_REQS &&
-+ ext->group < netbk_nr_groups) {
++ page->mapping != NULL &&
++ (idx = netif_page_index(page)) < MAX_PENDING_REQS &&
++ (group = netif_page_group(page)) < netbk_nr_groups) {
+ struct pending_tx_info *src_pend;
+
-+ netbk = &xen_netbk[ext->group];
-+ BUG_ON(ext < netbk->page_extinfo ||
-+ ext >= netbk->page_extinfo +
-+ ARRAY_SIZE(netbk->page_extinfo));
-+ BUG_ON(netbk->mmap_pages[ext->idx] != page);
-+ src_pend = &netbk->pending_tx_info[ext->idx];
-+ BUG_ON(ext->group != GET_GROUP_INDEX(src_pend->netif));
++ netbk = &xen_netbk[group];
++ BUG_ON(netbk->mmap_pages[idx] != page);
++ src_pend = &netbk->pending_tx_info[idx];
++ BUG_ON(group != GET_GROUP_INDEX(src_pend->netif));
copy_gop->source.domid = src_pend->netif->domid;
copy_gop->source.u.ref = src_pend->req.gref;
copy_gop->flags |= GNTCOPY_source_gref;
-@@ -421,7 +385,7 @@ static u16 netbk_gop_frag(netif_t *netif
+@@ -421,7 +417,7 @@ static u16 netbk_gop_frag(netif_t *netif
} else {
meta->copy = 0;
if (!xen_feature(XENFEAT_auto_translated_physmap)) {
@@ -341,7 +358,7 @@ Acked-by: jbeulich@novell.com
/*
* Set the new P2M table entry before
-@@ -566,7 +530,7 @@ static void netbk_add_frag_responses(net
+@@ -566,7 +562,7 @@ static void netbk_add_frag_responses(net
}
}
@@ -350,7 +367,7 @@ Acked-by: jbeulich@novell.com
{
netif_t *netif = NULL;
s8 status;
-@@ -576,52 +540,37 @@ static void net_rx_action(unsigned long
+@@ -576,52 +572,37 @@ static void net_rx_action(unsigned long
struct sk_buff_head rxq;
struct sk_buff *skb;
int notify_nr = 0;
@@ -415,7 +432,7 @@ Acked-by: jbeulich@novell.com
break;
}
-@@ -636,39 +585,39 @@ static void net_rx_action(unsigned long
+@@ -636,39 +617,39 @@ static void net_rx_action(unsigned long
break;
}
@@ -462,7 +479,7 @@ Acked-by: jbeulich@novell.com
mcl->args[2] = npo.copy_prod;
}
-@@ -676,7 +625,7 @@ static void net_rx_action(unsigned long
+@@ -676,7 +657,7 @@ static void net_rx_action(unsigned long
if (!npo.mcl_prod)
return;
@@ -471,7 +488,7 @@ Acked-by: jbeulich@novell.com
ret = HYPERVISOR_multicall(npo.mcl, npo.mcl_prod);
BUG_ON(ret != 0);
-@@ -707,7 +656,7 @@ static void net_rx_action(unsigned long
+@@ -707,7 +688,7 @@ static void net_rx_action(unsigned long
atomic_set(&(skb_shinfo(skb)->dataref), 1);
skb_shinfo(skb)->frag_list = NULL;
skb_shinfo(skb)->nr_frags = 0;
@@ -480,7 +497,7 @@ Acked-by: jbeulich@novell.com
}
if(!eagain)
-@@ -716,7 +665,7 @@ static void net_rx_action(unsigned long
+@@ -716,7 +697,7 @@ static void net_rx_action(unsigned long
netif->stats.tx_packets++;
}
@@ -489,7 +506,7 @@ Acked-by: jbeulich@novell.com
flags = nr_frags ? NETRXF_more_data : 0;
if (skb->ip_summed == CHECKSUM_PARTIAL) /* local packet? */
-@@ -724,14 +673,14 @@ static void net_rx_action(unsigned long
+@@ -724,14 +705,14 @@ static void net_rx_action(unsigned long
else if (skb->proto_data_valid) /* remote but checksummed? */
flags |= NETRXF_data_validated;
@@ -506,7 +523,7 @@ Acked-by: jbeulich@novell.com
struct netif_extra_info *gso =
(struct netif_extra_info *)
RING_GET_RESPONSE(&netif->rx,
-@@ -739,7 +688,7 @@ static void net_rx_action(unsigned long
+@@ -739,7 +720,7 @@ static void net_rx_action(unsigned long
resp->flags |= NETRXF_extra_info;
@@ -515,7 +532,7 @@ Acked-by: jbeulich@novell.com
gso->u.gso.type = XEN_NETIF_GSO_TYPE_TCPV4;
gso->u.gso.pad = 0;
gso->u.gso.features = 0;
-@@ -749,13 +698,13 @@ static void net_rx_action(unsigned long
+@@ -749,13 +730,13 @@ static void net_rx_action(unsigned long
}
netbk_add_frag_responses(netif, status,
@@ -532,7 +549,7 @@ Acked-by: jbeulich@novell.com
if (netif_queue_stopped(netif->dev) &&
netif_schedulable(netif) &&
-@@ -772,45 +721,46 @@ static void net_rx_action(unsigned long
+@@ -772,45 +753,46 @@ static void net_rx_action(unsigned long
{
netif->rx_req_cons_peek += skb_shinfo(skb)->nr_frags + 1 +
!!skb_shinfo(skb)->gso_size;
@@ -592,7 +609,7 @@ Acked-by: jbeulich@novell.com
}
struct net_device_stats *netif_be_get_stats(struct net_device *dev)
-@@ -826,27 +776,31 @@ static int __on_net_schedule_list(netif_
+@@ -826,27 +808,31 @@ static int __on_net_schedule_list(netif_
static void remove_from_net_schedule_list(netif_t *netif)
{
@@ -629,7 +646,7 @@ Acked-by: jbeulich@novell.com
}
/*
-@@ -869,7 +823,7 @@ void netif_schedule_work(netif_t *netif)
+@@ -869,7 +855,7 @@ void netif_schedule_work(netif_t *netif)
if (more_to_do) {
add_to_net_schedule_list_tail(netif);
@@ -638,7 +655,7 @@ Acked-by: jbeulich@novell.com
}
}
-@@ -906,17 +860,19 @@ static void tx_credit_callback(unsigned
+@@ -906,17 +892,19 @@ static void tx_credit_callback(unsigned
netif_schedule_work(netif);
}
@@ -663,7 +680,7 @@ Acked-by: jbeulich@novell.com
u16 tmp;
while (dc != dp) {
-@@ -931,62 +887,67 @@ static void permute_dealloc_ring(PEND_RI
+@@ -931,62 +919,67 @@ static void permute_dealloc_ring(PEND_RI
}
}
@@ -745,7 +762,7 @@ Acked-by: jbeulich@novell.com
case 0:
list_move_tail(&inuse->list, &list);
continue;
-@@ -999,26 +960,30 @@ inline static void net_tx_action_dealloc
+@@ -999,26 +992,30 @@ inline static void net_tx_action_dealloc
break;
}
@@ -782,7 +799,7 @@ Acked-by: jbeulich@novell.com
netif_put(netif);
-@@ -1095,9 +1060,14 @@ static gnttab_map_grant_ref_t *netbk_get
+@@ -1095,9 +1092,14 @@ static gnttab_map_grant_ref_t *netbk_get
start = ((unsigned long)shinfo->frags[0].page == pending_idx);
for (i = start; i < shinfo->nr_frags; i++, txp++) {
@@ -799,7 +816,7 @@ Acked-by: jbeulich@novell.com
GNTMAP_host_map | GNTMAP_readonly,
txp->gref, netif->domid);
-@@ -1110,11 +1080,12 @@ static gnttab_map_grant_ref_t *netbk_get
+@@ -1110,11 +1112,12 @@ static gnttab_map_grant_ref_t *netbk_get
return mop;
}
@@ -814,7 +831,7 @@ Acked-by: jbeulich@novell.com
netif_t *netif = pending_tx_info[pending_idx].netif;
netif_tx_request_t *txp;
struct skb_shared_info *shinfo = skb_shinfo(skb);
-@@ -1124,14 +1095,16 @@ static int netbk_tx_check_mop(struct sk_
+@@ -1124,14 +1127,16 @@ static int netbk_tx_check_mop(struct sk_
/* Check status of header. */
err = mop->status;
if (unlikely(err)) {
@@ -834,7 +851,7 @@ Acked-by: jbeulich@novell.com
}
/* Skip first skb fragment if it is on same page as header fragment. */
-@@ -1139,25 +1112,27 @@ static int netbk_tx_check_mop(struct sk_
+@@ -1139,25 +1144,27 @@ static int netbk_tx_check_mop(struct sk_
for (i = start; i < nr_frags; i++) {
int j, newerr;
@@ -866,7 +883,7 @@ Acked-by: jbeulich@novell.com
netif_put(netif);
/* Not the first error? Preceding frags already invalidated. */
-@@ -1166,10 +1141,10 @@ static int netbk_tx_check_mop(struct sk_
+@@ -1166,10 +1173,10 @@ static int netbk_tx_check_mop(struct sk_
/* First error: invalidate header and preceding fragments. */
pending_idx = *((u16 *)skb->data);
@@ -879,7 +896,7 @@ Acked-by: jbeulich@novell.com
}
/* Remember the error: invalidate all subsequent fragments. */
-@@ -1180,7 +1155,7 @@ static int netbk_tx_check_mop(struct sk_
+@@ -1180,7 +1187,7 @@ static int netbk_tx_check_mop(struct sk_
return err;
}
@@ -888,7 +905,7 @@ Acked-by: jbeulich@novell.com
{
struct skb_shared_info *shinfo = skb_shinfo(skb);
int nr_frags = shinfo->nr_frags;
-@@ -1193,12 +1168,12 @@ static void netbk_fill_frags(struct sk_b
+@@ -1193,12 +1200,12 @@ static void netbk_fill_frags(struct sk_b
pending_idx = (unsigned long)frag->page;
@@ -906,7 +923,7 @@ Acked-by: jbeulich@novell.com
frag->size = txp->size;
frag->page_offset = txp->offset;
-@@ -1260,9 +1235,9 @@ static int netbk_set_skb_gso(struct sk_b
+@@ -1260,9 +1267,9 @@ static int netbk_set_skb_gso(struct sk_b
}
/* Called after netfront has transmitted */
@@ -918,7 +935,7 @@ Acked-by: jbeulich@novell.com
struct sk_buff *skb;
netif_t *netif;
netif_tx_request_t txreq;
-@@ -1274,15 +1249,15 @@ static void net_tx_action(unsigned long
+@@ -1274,15 +1281,15 @@ static void net_tx_action(unsigned long
unsigned int data_len;
int ret, work_to_do;
@@ -940,7 +957,7 @@ Acked-by: jbeulich@novell.com
netif_get(netif);
remove_from_net_schedule_list(netif);
-@@ -1364,7 +1339,7 @@ static void net_tx_action(unsigned long
+@@ -1364,7 +1371,7 @@ static void net_tx_action(unsigned long
continue;
}
@@ -949,7 +966,7 @@ Acked-by: jbeulich@novell.com
data_len = (txreq.size > PKT_PROT_LEN &&
ret < MAX_SKB_FRAGS) ?
-@@ -1392,14 +1367,14 @@ static void net_tx_action(unsigned long
+@@ -1392,14 +1399,14 @@ static void net_tx_action(unsigned long
}
}
@@ -967,7 +984,7 @@ Acked-by: jbeulich@novell.com
*((u16 *)skb->data) = pending_idx;
__skb_put(skb, data_len);
-@@ -1414,20 +1389,20 @@ static void net_tx_action(unsigned long
+@@ -1414,20 +1421,20 @@ static void net_tx_action(unsigned long
skb_shinfo(skb)->frags[0].page = (void *)~0UL;
}
@@ -992,7 +1009,7 @@ Acked-by: jbeulich@novell.com
goto out;
/* NOTE: some maps may fail with GNTST_eagain, which could be successfully
-@@ -1435,20 +1410,21 @@ static void net_tx_action(unsigned long
+@@ -1435,20 +1442,21 @@ static void net_tx_action(unsigned long
* req and let the frontend resend the relevant packet again. This is fine
* because it is unlikely that a network buffer will be paged out or shared,
* and therefore it is unlikely to fail with GNTST_eagain. */
@@ -1021,7 +1038,7 @@ Acked-by: jbeulich@novell.com
DPRINTK("netback grant failed.\n");
skb_shinfo(skb)->nr_frags = 0;
kfree_skb(skb);
-@@ -1457,7 +1433,7 @@ static void net_tx_action(unsigned long
+@@ -1457,7 +1465,7 @@ static void net_tx_action(unsigned long
data_len = skb->len;
memcpy(skb->data,
@@ -1030,7 +1047,7 @@ Acked-by: jbeulich@novell.com
data_len);
if (data_len < txp->size) {
/* Append the packet payload as a fragment. */
-@@ -1465,7 +1441,7 @@ static void net_tx_action(unsigned long
+@@ -1465,7 +1473,7 @@ static void net_tx_action(unsigned long
txp->size -= data_len;
} else {
/* Schedule a response immediately. */
@@ -1039,7 +1056,7 @@ Acked-by: jbeulich@novell.com
}
/*
-@@ -1481,7 +1457,7 @@ static void net_tx_action(unsigned long
+@@ -1481,7 +1489,7 @@ static void net_tx_action(unsigned long
}
skb->proto_csum_blank = !!(txp->flags & NETTXF_csum_blank);
@@ -1048,7 +1065,7 @@ Acked-by: jbeulich@novell.com
skb->dev = netif->dev;
skb->protocol = eth_type_trans(skb, skb->dev);
-@@ -1502,36 +1478,40 @@ static void net_tx_action(unsigned long
+@@ -1502,36 +1510,39 @@ static void net_tx_action(unsigned long
out:
if (netbk_copy_skb_mode == NETBK_DELAYED_COPY_SKB &&
@@ -1088,9 +1105,8 @@ Acked-by: jbeulich@novell.com
static void netif_page_release(struct page *page, unsigned int order)
{
- int idx = netif_page_index(page);
-+ struct page_ext *ext = (void *)page->mapping;
-+ unsigned int idx = ext->idx;
-+ unsigned int group = ext->group;
++ unsigned int idx = netif_page_index(page);
++ unsigned int group = netif_page_group(page);
+ struct xen_netbk *netbk = &xen_netbk[group];
+
BUG_ON(order);
@@ -1102,7 +1118,7 @@ Acked-by: jbeulich@novell.com
}
irqreturn_t netif_be_int(int irq, void *dev_id)
-@@ -1539,7 +1519,7 @@ irqreturn_t netif_be_int(int irq, void *
+@@ -1539,7 +1550,7 @@ irqreturn_t netif_be_int(int irq, void *
netif_t *netif = dev_id;
add_to_net_schedule_list_tail(netif);
@@ -1111,7 +1127,7 @@ Acked-by: jbeulich@novell.com
if (netif_schedulable(netif) && !netbk_queue_full(netif))
netif_wake_queue(netif->dev);
-@@ -1605,29 +1585,35 @@ static irqreturn_t netif_be_dbg(int irq,
+@@ -1605,29 +1616,35 @@ static irqreturn_t netif_be_dbg(int irq,
{
struct list_head *ent;
netif_t *netif;
@@ -1165,7 +1181,7 @@ Acked-by: jbeulich@novell.com
printk(KERN_ALERT " ** End of netif_schedule_list **\n");
return IRQ_HANDLED;
-@@ -1642,7 +1628,8 @@ static struct irqaction netif_be_dbg_act
+@@ -1642,7 +1659,8 @@ static struct irqaction netif_be_dbg_act
static int __init netback_init(void)
{
@@ -1175,7 +1191,7 @@ Acked-by: jbeulich@novell.com
struct page *page;
if (!is_running_on_xen())
-@@ -1651,37 +1638,58 @@ static int __init netback_init(void)
+@@ -1651,37 +1669,55 @@ static int __init netback_init(void)
/* We can increase reservation by this much in net_rx_action(). */
balloon_update_driver_allowance(NET_RX_RING_SIZE);
@@ -1249,10 +1265,7 @@ Acked-by: jbeulich@novell.com
+ for (i = 0; i < MAX_PENDING_REQS; i++) {
+ page = netbk->mmap_pages[i];
+ SetPageForeign(page, netif_page_release);
-+ netbk->page_extinfo[i].group = group;
-+ netbk->page_extinfo[i].idx = i;
-+ netif_set_page_ext(page,
-+ &netbk->page_extinfo[i]);
++ netif_set_page_ext(page, group, i);
+ netbk->pending_ring[i] = i;
+ INIT_LIST_HEAD(&netbk->pending_inuse[i].list);
+ }
@@ -1260,7 +1273,7 @@ Acked-by: jbeulich@novell.com
netbk_copy_skb_mode = NETBK_DONT_COPY_SKB;
if (MODPARM_copy_skb) {
-@@ -1703,6 +1711,19 @@ static int __init netback_init(void)
+@@ -1703,6 +1739,19 @@ static int __init netback_init(void)
#endif
return 0;
diff --git a/patches.xen/xen-netback-kernel-threads b/patches.xen/xen-netback-kernel-threads
index d46534716b..319814e4eb 100644
--- a/patches.xen/xen-netback-kernel-threads
+++ b/patches.xen/xen-netback-kernel-threads
@@ -26,8 +26,8 @@ jb: changed write_seq{,un}lock_irq() to write_seq{,un}lock_bh(), and
made the use of kernel threads optional (but default)
Acked-by: jbeulich@novell.com
---- head-2010-04-15.orig/drivers/xen/core/gnttab.c 2010-04-15 11:42:34.000000000 +0200
-+++ head-2010-04-15/drivers/xen/core/gnttab.c 2010-04-15 11:44:26.000000000 +0200
+--- head-2010-04-29.orig/drivers/xen/core/gnttab.c 2010-04-15 11:42:34.000000000 +0200
++++ head-2010-04-29/drivers/xen/core/gnttab.c 2010-04-15 11:44:26.000000000 +0200
@@ -554,14 +554,14 @@ int gnttab_copy_grant_page(grant_ref_t r
mfn = pfn_to_mfn(pfn);
new_mfn = virt_to_mfn(new_addr);
@@ -54,9 +54,9 @@ Acked-by: jbeulich@novell.com
if (!xen_feature(XENFEAT_auto_translated_physmap)) {
set_phys_to_machine(page_to_pfn(new_page), INVALID_P2M_ENTRY);
---- head-2010-04-15.orig/drivers/xen/netback/common.h 2010-01-25 14:01:50.000000000 +0100
-+++ head-2010-04-15/drivers/xen/netback/common.h 2010-01-25 14:01:52.000000000 +0100
-@@ -245,8 +245,16 @@ struct netbk_tx_pending_inuse {
+--- head-2010-04-29.orig/drivers/xen/netback/common.h 2010-04-30 11:32:08.000000000 +0200
++++ head-2010-04-29/drivers/xen/netback/common.h 2010-04-30 11:32:26.000000000 +0200
+@@ -239,8 +239,16 @@ struct netbk_tx_pending_inuse {
#define MAX_MFN_ALLOC 64
struct xen_netbk {
@@ -75,8 +75,8 @@ Acked-by: jbeulich@novell.com
struct sk_buff_head rx_queue;
struct sk_buff_head tx_queue;
---- head-2010-04-15.orig/drivers/xen/netback/netback.c 2010-01-25 14:01:50.000000000 +0100
-+++ head-2010-04-15/drivers/xen/netback/netback.c 2010-04-28 15:02:02.000000000 +0200
+--- head-2010-04-29.orig/drivers/xen/netback/netback.c 2010-04-30 11:49:27.000000000 +0200
++++ head-2010-04-29/drivers/xen/netback/netback.c 2010-04-30 11:49:32.000000000 +0200
@@ -35,6 +35,7 @@
*/
@@ -87,14 +87,14 @@ Acked-by: jbeulich@novell.com
#include <xen/interface/memory.h>
@@ -43,6 +44,8 @@
- struct xen_netbk *xen_netbk;
- unsigned int netbk_nr_groups;
-+static bool use_kthreads = true;
+ struct xen_netbk *__read_mostly xen_netbk;
+ unsigned int __read_mostly netbk_nr_groups;
++static bool __read_mostly use_kthreads = true;
+static bool __initdata bind_threads;
#define GET_GROUP_INDEX(netif) ((netif)->group)
-@@ -94,7 +97,11 @@ static int MODPARM_permute_returns = 0;
+@@ -127,7 +130,11 @@ static int MODPARM_permute_returns = 0;
module_param_named(permute_returns, MODPARM_permute_returns, bool, S_IRUSR|S_IWUSR);
MODULE_PARM_DESC(permute_returns, "Randomly permute the order in which TX responses are sent to the frontend");
module_param_named(groups, netbk_nr_groups, uint, 0);
@@ -107,7 +107,7 @@ Acked-by: jbeulich@novell.com
int netbk_copy_skb_mode;
-@@ -131,8 +138,12 @@ static inline void maybe_schedule_tx_act
+@@ -164,8 +171,12 @@ static inline void maybe_schedule_tx_act
smp_mb();
if ((nr_pending_reqs(netbk) < (MAX_PENDING_REQS/2)) &&
@@ -122,7 +122,7 @@ Acked-by: jbeulich@novell.com
}
static struct sk_buff *netbk_copy_skb(struct sk_buff *skb)
-@@ -293,7 +304,10 @@ int netif_be_start_xmit(struct sk_buff *
+@@ -326,7 +337,10 @@ int netif_be_start_xmit(struct sk_buff *
netbk = &xen_netbk[GET_GROUP_INDEX(netif)];
skb_queue_tail(&netbk->rx_queue, skb);
@@ -134,7 +134,7 @@ Acked-by: jbeulich@novell.com
return NETDEV_TX_OK;
-@@ -749,8 +763,12 @@ static void net_rx_action(unsigned long
+@@ -779,8 +793,12 @@ static void net_rx_action(unsigned long
/* More work to do? */
if (!skb_queue_empty(&netbk->rx_queue) &&
@@ -149,7 +149,7 @@ Acked-by: jbeulich@novell.com
#if 0
else
xen_network_done_notify();
-@@ -759,12 +777,18 @@ static void net_rx_action(unsigned long
+@@ -789,12 +807,18 @@ static void net_rx_action(unsigned long
static void net_alarm(unsigned long group)
{
@@ -170,7 +170,7 @@ Acked-by: jbeulich@novell.com
}
struct net_device_stats *netif_be_get_stats(struct net_device *dev)
-@@ -1476,7 +1500,10 @@ static void net_tx_action(unsigned long
+@@ -1506,7 +1530,10 @@ static void net_tx_action(unsigned long
continue;
}
@@ -182,7 +182,7 @@ Acked-by: jbeulich@novell.com
netif->dev->last_rx = jiffies;
}
-@@ -1502,7 +1529,10 @@ static void netif_idx_release(struct xen
+@@ -1532,7 +1559,10 @@ static void netif_idx_release(struct xen
netbk->dealloc_prod++;
spin_unlock_irqrestore(&netbk->release_lock, flags);
@@ -194,7 +194,7 @@ Acked-by: jbeulich@novell.com
}
static void netif_page_release(struct page *page, unsigned int order)
-@@ -1641,6 +1671,46 @@ static struct irqaction netif_be_dbg_act
+@@ -1670,6 +1700,46 @@ static struct irqaction netif_be_dbg_act
};
#endif
@@ -241,7 +241,7 @@ Acked-by: jbeulich@novell.com
static int __init netback_init(void)
{
unsigned int i, group;
-@@ -1666,8 +1735,26 @@ static int __init netback_init(void)
+@@ -1697,8 +1767,26 @@ static int __init netback_init(void)
for (group = 0; group < netbk_nr_groups; group++) {
struct xen_netbk *netbk = &xen_netbk[group];
@@ -270,7 +270,7 @@ Acked-by: jbeulich@novell.com
skb_queue_head_init(&netbk->rx_queue);
skb_queue_head_init(&netbk->tx_queue);
-@@ -1736,8 +1823,11 @@ failed_init:
+@@ -1762,8 +1850,11 @@ failed_init:
while (group-- > 0) {
struct xen_netbk *netbk = &xen_netbk[group];
diff --git a/patches.xen/xen-netback-multiple-tasklets b/patches.xen/xen-netback-multiple-tasklets
index 869eff3741..d13758f08e 100644
--- a/patches.xen/xen-netback-multiple-tasklets
+++ b/patches.xen/xen-netback-multiple-tasklets
@@ -17,8 +17,8 @@ Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
jb: some cleanups
Acked-by: jbeulich@novell.com
---- head-2010-03-15.orig/drivers/xen/netback/common.h 2010-01-14 08:39:00.000000000 +0100
-+++ head-2010-03-15/drivers/xen/netback/common.h 2010-01-25 14:01:50.000000000 +0100
+--- head-2010-04-29.orig/drivers/xen/netback/common.h 2010-04-30 11:11:33.000000000 +0200
++++ head-2010-04-29/drivers/xen/netback/common.h 2010-04-30 11:32:08.000000000 +0200
@@ -58,6 +58,7 @@
typedef struct netif_st {
/* Unique identifier for this interface. */
@@ -27,31 +27,15 @@ Acked-by: jbeulich@novell.com
unsigned int handle;
u8 fe_dev_addr[6];
-@@ -99,6 +100,7 @@ typedef struct netif_st {
-
- /* Miscellaneous private stuff. */
- struct list_head list; /* scheduling list */
-+ struct list_head group_list;
- atomic_t refcnt;
- struct net_device *dev;
- struct net_device_stats stats;
-@@ -259,12 +261,15 @@ struct xen_netbk {
-
- struct list_head pending_inuse_head;
- struct list_head net_schedule_list;
-+ struct list_head group_domain_list;
-
- spinlock_t net_schedule_list_lock;
- spinlock_t release_lock;
-+ spinlock_t group_domain_list_lock;
+@@ -260,6 +261,7 @@ struct xen_netbk {
struct page **mmap_pages;
-+ unsigned int group_domain_nr;
++ atomic_t nr_groups;
unsigned int alloc_index;
- struct page_ext page_extinfo[MAX_PENDING_REQS];
-@@ -294,4 +299,8 @@ struct xen_netbk {
+ struct pending_tx_info pending_tx_info[MAX_PENDING_REQS];
+@@ -287,4 +289,8 @@ struct xen_netbk {
unsigned long mfn_list[MAX_MFN_ALLOC];
};
@@ -60,29 +44,27 @@ Acked-by: jbeulich@novell.com
+extern unsigned int netbk_nr_groups;
+
#endif /* __NETIF__BACKEND__COMMON_H__ */
---- head-2010-03-15.orig/drivers/xen/netback/interface.c 2010-01-26 09:03:24.000000000 +0100
-+++ head-2010-03-15/drivers/xen/netback/interface.c 2010-03-15 11:25:28.000000000 +0100
-@@ -54,14 +54,41 @@ module_param_named(queue_length, netbk_q
+--- head-2010-04-29.orig/drivers/xen/netback/interface.c 2010-01-26 09:03:24.000000000 +0100
++++ head-2010-04-29/drivers/xen/netback/interface.c 2010-04-30 10:42:29.000000000 +0200
+@@ -54,14 +54,36 @@ module_param_named(queue_length, netbk_q
static void __netif_up(netif_t *netif)
{
+ unsigned int group = 0;
-+ unsigned int min_domains = xen_netbk[0].group_domain_nr;
++ unsigned int min_groups = atomic_read(&xen_netbk[0].nr_groups);
+ unsigned int i;
+
+ /* Find the list which contains least number of domains. */
+ for (i = 1; i < netbk_nr_groups; i++) {
-+ if (xen_netbk[i].group_domain_nr < min_domains) {
++ unsigned int nr_groups = atomic_read(&xen_netbk[i].nr_groups);
++
++ if (nr_groups < min_groups) {
+ group = i;
-+ min_domains = xen_netbk[i].group_domain_nr;
++ min_groups = nr_groups;
+ }
+ }
+
-+ spin_lock(&xen_netbk[group].group_domain_list_lock);
-+ list_add_tail(&netif->group_list,
-+ &xen_netbk[group].group_domain_list);
-+ xen_netbk[group].group_domain_nr++;
-+ spin_unlock(&xen_netbk[group].group_domain_list_lock);
++ atomic_inc(&xen_netbk[group].nr_groups);
+ netif->group = group;
+
enable_irq(netif->irq);
@@ -97,14 +79,11 @@ Acked-by: jbeulich@novell.com
netif_deschedule_work(netif);
+
+ netif->group = UINT_MAX;
-+ spin_lock(&netbk->group_domain_list_lock);
-+ netbk->group_domain_nr--;
-+ list_del(&netif->group_list);
-+ spin_unlock(&netbk->group_domain_list_lock);
++ atomic_dec(&netbk->nr_groups);
}
static int net_open(struct net_device *dev)
-@@ -207,6 +234,7 @@ netif_t *netif_alloc(struct device *pare
+@@ -207,6 +229,7 @@ netif_t *netif_alloc(struct device *pare
netif = netdev_priv(dev);
memset(netif, 0, sizeof(*netif));
netif->domid = domid;
@@ -112,23 +91,23 @@ Acked-by: jbeulich@novell.com
netif->handle = handle;
atomic_set(&netif->refcnt, 1);
init_waitqueue_head(&netif->waiting_to_free);
---- head-2010-03-15.orig/drivers/xen/netback/netback.c 2010-01-15 09:36:59.000000000 +0100
-+++ head-2010-03-15/drivers/xen/netback/netback.c 2010-01-25 14:01:50.000000000 +0100
+--- head-2010-04-29.orig/drivers/xen/netback/netback.c 2010-04-30 11:49:12.000000000 +0200
++++ head-2010-04-29/drivers/xen/netback/netback.c 2010-04-30 11:49:27.000000000 +0200
@@ -41,10 +41,10 @@
/*define NETBE_DEBUG_INTERRUPT*/
--static struct xen_netbk *xen_netbk;
--static unsigned int netbk_nr_groups = 1;
-+struct xen_netbk *xen_netbk;
-+unsigned int netbk_nr_groups;
+-static struct xen_netbk *__read_mostly xen_netbk;
+-static const unsigned int __read_mostly netbk_nr_groups = 1;
++struct xen_netbk *__read_mostly xen_netbk;
++unsigned int __read_mostly netbk_nr_groups;
-#define GET_GROUP_INDEX(netif) (0)
+#define GET_GROUP_INDEX(netif) ((netif)->group)
static void netif_idx_release(struct xen_netbk *, u16 pending_idx);
static void make_tx_response(netif_t *netif,
-@@ -93,6 +93,8 @@ MODULE_PARM_DESC(copy_skb, "Copy data re
+@@ -126,6 +126,8 @@ MODULE_PARM_DESC(copy_skb, "Copy data re
static int MODPARM_permute_returns = 0;
module_param_named(permute_returns, MODPARM_permute_returns, bool, S_IRUSR|S_IWUSR);
MODULE_PARM_DESC(permute_returns, "Randomly permute the order in which TX responses are sent to the frontend");
@@ -137,7 +116,7 @@ Acked-by: jbeulich@novell.com
int netbk_copy_skb_mode;
-@@ -1519,9 +1521,20 @@ static void netif_page_release(struct pa
+@@ -1548,9 +1550,20 @@ static void netif_page_release(struct pa
irqreturn_t netif_be_int(int irq, void *dev_id)
{
netif_t *netif = dev_id;
@@ -159,12 +138,14 @@ Acked-by: jbeulich@novell.com
if (netif_schedulable(netif) && !netbk_queue_full(netif))
netif_wake_queue(netif->dev);
-@@ -1637,8 +1650,11 @@ static int __init netback_init(void)
+@@ -1666,8 +1679,13 @@ static int __init netback_init(void)
if (!is_running_on_xen())
return -ENODEV;
+ if (!netbk_nr_groups)
+ netbk_nr_groups = (num_online_cpus() + 1) / 2;
++ if (netbk_nr_groups > MAX_GROUPS)
++ netbk_nr_groups = MAX_GROUPS;
+
/* We can increase reservation by this much in net_rx_action(). */
- balloon_update_driver_allowance(NET_RX_RING_SIZE);
@@ -172,15 +153,3 @@ Acked-by: jbeulich@novell.com
xen_netbk = __vmalloc(netbk_nr_groups * sizeof(*xen_netbk),
GFP_KERNEL|__GFP_HIGHMEM|__GFP_ZERO, PAGE_KERNEL);
-@@ -1677,9 +1693,11 @@ static int __init netback_init(void)
-
- INIT_LIST_HEAD(&netbk->pending_inuse_head);
- INIT_LIST_HEAD(&netbk->net_schedule_list);
-+ INIT_LIST_HEAD(&netbk->group_domain_list);
-
- spin_lock_init(&netbk->net_schedule_list_lock);
- spin_lock_init(&netbk->release_lock);
-+ spin_lock_init(&netbk->group_domain_list_lock);
-
- for (i = 0; i < MAX_PENDING_REQS; i++) {
- page = netbk->mmap_pages[i];
diff --git a/patches.xen/xen-sections b/patches.xen/xen-sections
index 23564e17ce..a571e74c2e 100644
--- a/patches.xen/xen-sections
+++ b/patches.xen/xen-sections
@@ -2,9 +2,9 @@ From: jbeulich@novell.com
Subject: fix placement of some routines/data
Patch-mainline: obsolete
---- head-2010-03-15.orig/arch/x86/kernel/time-xen.c 2010-02-24 12:25:44.000000000 +0100
-+++ head-2010-03-15/arch/x86/kernel/time-xen.c 2010-02-24 12:34:37.000000000 +0100
-@@ -674,7 +674,7 @@ int xen_update_persistent_clock(void)
+--- head-2010-05-12.orig/arch/x86/kernel/time-xen.c 2010-05-12 09:03:15.000000000 +0200
++++ head-2010-05-12/arch/x86/kernel/time-xen.c 2010-05-12 09:13:55.000000000 +0200
+@@ -676,7 +676,7 @@ int xen_update_persistent_clock(void)
/* Dynamically-mapped IRQ. */
DEFINE_PER_CPU(int, timer_irq);
@@ -13,7 +13,7 @@ Patch-mainline: obsolete
{
per_cpu(timer_irq, 0) =
bind_virq_to_irqhandler(
-@@ -899,7 +899,7 @@ int __cpuinit local_setup_timer(unsigned
+@@ -901,7 +901,7 @@ int __cpuinit local_setup_timer(unsigned
return 0;
}
@@ -22,8 +22,8 @@ Patch-mainline: obsolete
{
BUG_ON(cpu == 0);
unbind_from_irqhandler(per_cpu(timer_irq, cpu), NULL);
---- head-2010-03-15.orig/drivers/xen/core/cpu_hotplug.c 2010-01-28 10:34:35.000000000 +0100
-+++ head-2010-03-15/drivers/xen/core/cpu_hotplug.c 2010-01-25 13:45:39.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/core/cpu_hotplug.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/drivers/xen/core/cpu_hotplug.c 2010-01-25 13:45:39.000000000 +0100
@@ -24,7 +24,7 @@ static int local_cpu_hotplug_request(voi
return (current->mm != NULL);
}
@@ -85,8 +85,8 @@ Patch-mainline: obsolete
{
unsigned int cpu;
---- head-2010-03-15.orig/drivers/xen/core/smpboot.c 2010-03-19 15:19:57.000000000 +0100
-+++ head-2010-03-15/drivers/xen/core/smpboot.c 2010-03-19 15:20:15.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/core/smpboot.c 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/drivers/xen/core/smpboot.c 2010-03-19 15:20:15.000000000 +0100
@@ -181,7 +181,7 @@ static int __cpuinit xen_smp_intr_init(u
}
diff --git a/patches.xen/xen-sysdev-suspend b/patches.xen/xen-sysdev-suspend
index 3d39b106e6..0b298a8780 100644
--- a/patches.xen/xen-sysdev-suspend
+++ b/patches.xen/xen-sysdev-suspend
@@ -4,8 +4,8 @@ Patch-mainline: obsolete
... rather than calling just a few functions explicitly.
---- head-2010-04-15.orig/arch/x86/kernel/time-xen.c 2010-02-24 12:34:37.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/time-xen.c 2010-02-24 12:34:52.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/time-xen.c 2010-05-12 09:13:55.000000000 +0200
++++ head-2010-05-12/arch/x86/kernel/time-xen.c 2010-05-12 09:14:03.000000000 +0200
@@ -69,6 +69,10 @@ static DEFINE_PER_CPU(struct vcpu_runsta
/* 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: obsolete
static void __clock_was_set(struct work_struct *unused)
{
clock_was_set();
-@@ -559,6 +563,17 @@ void mark_tsc_unstable(char *reason)
+@@ -561,6 +565,17 @@ void mark_tsc_unstable(char *reason)
}
EXPORT_SYMBOL_GPL(mark_tsc_unstable);
@@ -35,7 +35,7 @@ Patch-mainline: obsolete
static cycle_t cs_last;
static cycle_t xen_clocksource_read(struct clocksource *cs)
-@@ -595,11 +610,32 @@ static cycle_t xen_clocksource_read(stru
+@@ -597,11 +612,32 @@ static cycle_t xen_clocksource_read(stru
#endif
}
@@ -70,7 +70,7 @@ Patch-mainline: obsolete
cs_last = local_clock();
}
-@@ -631,17 +667,6 @@ struct vcpu_runstate_info *setup_runstat
+@@ -633,17 +669,6 @@ struct vcpu_runstate_info *setup_runstat
return rs;
}
@@ -88,7 +88,7 @@ Patch-mainline: obsolete
void xen_read_persistent_clock(struct timespec *ts)
{
const shared_info_t *s = HYPERVISOR_shared_info;
-@@ -687,10 +712,6 @@ static void __init setup_cpu0_timer_irq(
+@@ -689,10 +714,6 @@ static void __init setup_cpu0_timer_irq(
BUG_ON(per_cpu(timer_irq, 0) < 0);
}
@@ -99,7 +99,7 @@ Patch-mainline: obsolete
void __init time_init(void)
{
init_cpu_khz();
-@@ -828,35 +849,6 @@ void xen_halt(void)
+@@ -830,35 +851,6 @@ void xen_halt(void)
}
EXPORT_SYMBOL(xen_halt);
@@ -135,8 +135,8 @@ Patch-mainline: obsolete
#ifdef CONFIG_SMP
static char timer_name[NR_CPUS][15];
---- head-2010-04-15.orig/drivers/xen/core/evtchn.c 2010-04-15 11:03:28.000000000 +0200
-+++ head-2010-04-15/drivers/xen/core/evtchn.c 2010-04-23 15:20:28.000000000 +0200
+--- head-2010-05-12.orig/drivers/xen/core/evtchn.c 2010-04-15 11:03:28.000000000 +0200
++++ head-2010-05-12/drivers/xen/core/evtchn.c 2010-04-23 15:20:28.000000000 +0200
@@ -36,6 +36,7 @@
#include <linux/interrupt.h>
#include <linux/sched.h>
@@ -201,8 +201,8 @@ Patch-mainline: obsolete
#endif
int __init arch_early_irq_init(void)
---- head-2010-04-15.orig/drivers/xen/core/gnttab.c 2010-04-15 11:04:07.000000000 +0200
-+++ head-2010-04-15/drivers/xen/core/gnttab.c 2010-04-15 11:42:34.000000000 +0200
+--- head-2010-05-12.orig/drivers/xen/core/gnttab.c 2010-04-15 11:04:07.000000000 +0200
++++ head-2010-05-12/drivers/xen/core/gnttab.c 2010-04-15 11:42:34.000000000 +0200
@@ -36,6 +36,7 @@
#include <linux/sched.h>
#include <linux/mm.h>
@@ -271,8 +271,8 @@ Patch-mainline: obsolete
nr_grant_frames = 1;
boot_max_nr_grant_frames = __max_nr_grant_frames();
---- head-2010-04-15.orig/drivers/xen/core/machine_reboot.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/drivers/xen/core/machine_reboot.c 2009-12-18 14:19:13.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/core/machine_reboot.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/drivers/xen/core/machine_reboot.c 2009-12-18 14:19:13.000000000 +0100
@@ -17,6 +17,7 @@
#include <xen/xencons.h>
#include <xen/cpu_hotplug.h>
@@ -479,8 +479,8 @@ Patch-mainline: obsolete
+ return err;
}
#endif
---- head-2010-04-15.orig/include/xen/evtchn.h 2010-03-31 14:02:34.000000000 +0200
-+++ head-2010-04-15/include/xen/evtchn.h 2010-03-31 14:10:36.000000000 +0200
+--- head-2010-05-12.orig/include/xen/evtchn.h 2010-03-31 14:02:34.000000000 +0200
++++ head-2010-05-12/include/xen/evtchn.h 2010-03-31 14:10:36.000000000 +0200
@@ -108,7 +108,9 @@ int bind_ipi_to_irqhandler(
*/
void unbind_from_irqhandler(unsigned int irq, void *dev_id);
@@ -491,8 +491,8 @@ Patch-mainline: obsolete
/* Entry point for notifications into Linux subsystems. */
asmlinkage void evtchn_do_upcall(struct pt_regs *regs);
---- head-2010-04-15.orig/include/xen/gnttab.h 2008-11-04 11:13:10.000000000 +0100
-+++ head-2010-04-15/include/xen/gnttab.h 2009-11-06 11:10:15.000000000 +0100
+--- head-2010-05-12.orig/include/xen/gnttab.h 2008-11-04 11:13:10.000000000 +0100
++++ head-2010-05-12/include/xen/gnttab.h 2009-11-06 11:10:15.000000000 +0100
@@ -110,8 +110,9 @@ static inline void __gnttab_dma_unmap_pa
void gnttab_reset_grant_page(struct page *page);
diff --git a/patches.xen/xen-unpriv-build b/patches.xen/xen-unpriv-build
index d0bb542f53..eb729e3b1b 100644
--- a/patches.xen/xen-unpriv-build
+++ b/patches.xen/xen-unpriv-build
@@ -2,8 +2,8 @@ From: jbeulich@novell.com
Subject: no need to build certain bits when building non-privileged kernel
Patch-mainline: n/a
---- head-2010-04-15.orig/arch/x86/Kconfig 2010-03-25 14:39:15.000000000 +0100
-+++ head-2010-04-15/arch/x86/Kconfig 2010-03-25 14:39:33.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/Kconfig 2010-03-25 14:39:15.000000000 +0100
++++ head-2010-05-12/arch/x86/Kconfig 2010-05-06 16:05:14.000000000 +0200
@@ -737,6 +737,7 @@ config APB_TIMER
config DMI
default y
@@ -54,6 +54,15 @@ Patch-mainline: n/a
depends on PCI && XEN && (PCI_GOXEN_FE || PCI_GOANY || X86_64)
select HOTPLUG
help
+@@ -2213,7 +2218,7 @@ endif # X86_32
+
+ config K8_NB
+ def_bool y
+- depends on CPU_SUP_AMD && PCI
++ depends on CPU_SUP_AMD && PCI && !XEN_UNPRIVILEGED_GUEST
+
+ source "drivers/pcmcia/Kconfig"
+
@@ -2264,7 +2269,9 @@ source "net/Kconfig"
source "drivers/Kconfig"
@@ -64,8 +73,8 @@ Patch-mainline: n/a
source "fs/Kconfig"
---- head-2010-04-15.orig/arch/x86/include/mach-xen/asm/swiotlb.h 2010-03-24 16:00:05.000000000 +0100
-+++ head-2010-04-15/arch/x86/include/mach-xen/asm/swiotlb.h 2010-03-25 14:39:33.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/swiotlb.h 2010-03-24 16:00:05.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/swiotlb.h 2010-03-25 14:39:33.000000000 +0100
@@ -1,6 +1,10 @@
#include_next <asm/swiotlb.h>
@@ -77,8 +86,8 @@ Patch-mainline: n/a
dma_addr_t swiotlb_map_single_phys(struct device *, phys_addr_t, size_t size,
int dir);
---- head-2010-04-15.orig/drivers/firmware/Kconfig 2009-10-21 12:05:13.000000000 +0200
-+++ head-2010-04-15/drivers/firmware/Kconfig 2010-04-28 17:21:34.000000000 +0200
+--- head-2010-05-12.orig/drivers/firmware/Kconfig 2009-10-21 12:05:13.000000000 +0200
++++ head-2010-05-12/drivers/firmware/Kconfig 2010-04-28 17:21:34.000000000 +0200
@@ -115,7 +115,7 @@ config DMIID
config ISCSI_IBFT_FIND
@@ -88,8 +97,8 @@ Patch-mainline: n/a
default n
help
This option enables the kernel to find the region of memory
---- head-2010-04-15.orig/drivers/xen/Kconfig 2010-03-31 14:11:36.000000000 +0200
-+++ head-2010-04-15/drivers/xen/Kconfig 2010-03-31 14:12:07.000000000 +0200
+--- head-2010-05-12.orig/drivers/xen/Kconfig 2010-03-31 14:11:36.000000000 +0200
++++ head-2010-05-12/drivers/xen/Kconfig 2010-03-31 14:12:07.000000000 +0200
@@ -275,6 +275,7 @@ config XEN_USB_FRONTEND_HCD_PM
config XEN_GRANT_DEV
@@ -98,8 +107,8 @@ Patch-mainline: n/a
default XEN_PRIVILEGED_GUEST
help
Device for accessing (in user-space) pages that have been granted
---- head-2010-04-15.orig/drivers/xen/balloon/balloon.c 2010-02-03 11:56:18.000000000 +0100
-+++ head-2010-04-15/drivers/xen/balloon/balloon.c 2010-04-15 11:44:37.000000000 +0200
+--- head-2010-05-12.orig/drivers/xen/balloon/balloon.c 2010-02-03 11:56:18.000000000 +0100
++++ head-2010-05-12/drivers/xen/balloon/balloon.c 2010-04-15 11:44:37.000000000 +0200
@@ -663,6 +663,9 @@ void balloon_update_driver_allowance(lon
bs.driver_pages += delta;
balloon_unlock(flags);
@@ -139,8 +148,8 @@ Patch-mainline: n/a
EXPORT_SYMBOL_GPL(balloon_release_driver_page);
MODULE_LICENSE("Dual BSD/GPL");
---- head-2010-04-15.orig/drivers/xen/core/Makefile 2010-03-25 14:39:15.000000000 +0100
-+++ head-2010-04-15/drivers/xen/core/Makefile 2010-03-25 14:39:33.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/core/Makefile 2010-03-25 14:39:15.000000000 +0100
++++ head-2010-05-12/drivers/xen/core/Makefile 2010-03-25 14:39:33.000000000 +0100
@@ -2,9 +2,10 @@
# Makefile for the linux kernel.
#
@@ -154,8 +163,8 @@ Patch-mainline: n/a
obj-$(CONFIG_PROC_FS) += xen_proc.o
obj-$(CONFIG_SYS_HYPERVISOR) += hypervisor_sysfs.o
obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o
---- head-2010-04-15.orig/drivers/xen/core/gnttab.c 2010-04-15 11:44:26.000000000 +0200
-+++ head-2010-04-15/drivers/xen/core/gnttab.c 2010-04-15 11:44:35.000000000 +0200
+--- head-2010-05-12.orig/drivers/xen/core/gnttab.c 2010-04-15 11:44:26.000000000 +0200
++++ head-2010-05-12/drivers/xen/core/gnttab.c 2010-04-15 11:44:35.000000000 +0200
@@ -438,8 +438,6 @@ static inline unsigned int max_nr_grant_
#ifdef CONFIG_XEN
@@ -185,8 +194,8 @@ Patch-mainline: n/a
#ifdef __HAVE_ARCH_PTE_SPECIAL
static unsigned int GNTMAP_pte_special;
---- head-2010-04-15.orig/drivers/xen/privcmd/Makefile 2007-07-10 09:42:30.000000000 +0200
-+++ head-2010-04-15/drivers/xen/privcmd/Makefile 2010-03-25 14:39:33.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/privcmd/Makefile 2007-07-10 09:42:30.000000000 +0200
++++ head-2010-05-12/drivers/xen/privcmd/Makefile 2010-03-25 14:39:33.000000000 +0100
@@ -1,3 +1,3 @@
-
-obj-y += privcmd.o
@@ -194,8 +203,8 @@ Patch-mainline: n/a
+priv-$(CONFIG_COMPAT) := compat_privcmd.o
+obj-y := privcmd.o
+obj-$(CONFIG_XEN_PRIVILEGED_GUEST) += $(priv-y)
---- head-2010-04-15.orig/drivers/xen/privcmd/privcmd.c 2010-03-24 15:12:36.000000000 +0100
-+++ head-2010-04-15/drivers/xen/privcmd/privcmd.c 2010-03-25 14:39:33.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/privcmd/privcmd.c 2010-03-24 15:12:36.000000000 +0100
++++ head-2010-05-12/drivers/xen/privcmd/privcmd.c 2010-03-25 14:39:33.000000000 +0100
@@ -33,6 +33,9 @@
static struct proc_dir_entry *privcmd_intf;
static struct proc_dir_entry *capabilities_intf;
@@ -249,9 +258,9 @@ Patch-mainline: n/a
};
static int capabilities_read(char *page, char **start, off_t off,
---- head-2010-04-15.orig/fs/compat_ioctl.c 2010-03-24 16:00:05.000000000 +0100
-+++ head-2010-04-15/fs/compat_ioctl.c 2010-03-25 14:39:33.000000000 +0100
-@@ -1605,7 +1605,7 @@ static long do_ioctl_trans(int fd, unsig
+--- head-2010-05-12.orig/fs/compat_ioctl.c 2010-05-12 09:02:56.000000000 +0200
++++ head-2010-05-12/fs/compat_ioctl.c 2010-05-12 09:15:02.000000000 +0200
+@@ -1602,7 +1602,7 @@ static long do_ioctl_trans(int fd, unsig
return do_video_stillpicture(fd, cmd, argp);
case VIDEO_SET_SPU_PALETTE:
return do_video_set_spu_palette(fd, cmd, argp);
@@ -260,8 +269,8 @@ Patch-mainline: n/a
case IOCTL_PRIVCMD_MMAP_32:
case IOCTL_PRIVCMD_MMAPBATCH_32:
case IOCTL_PRIVCMD_MMAPBATCH_V2_32:
---- head-2010-04-15.orig/include/xen/firmware.h 2007-07-02 08:16:19.000000000 +0200
-+++ head-2010-04-15/include/xen/firmware.h 2010-03-25 14:39:33.000000000 +0100
+--- head-2010-05-12.orig/include/xen/firmware.h 2007-07-02 08:16:19.000000000 +0200
++++ head-2010-05-12/include/xen/firmware.h 2010-03-25 14:39:33.000000000 +0100
@@ -5,6 +5,10 @@
void copy_edd(void);
#endif
@@ -273,8 +282,8 @@ Patch-mainline: n/a
+#endif
#endif /* __XEN_FIRMWARE_H__ */
---- head-2010-04-15.orig/include/xen/gnttab.h 2009-11-06 11:10:15.000000000 +0100
-+++ head-2010-04-15/include/xen/gnttab.h 2010-03-25 14:39:33.000000000 +0100
+--- head-2010-05-12.orig/include/xen/gnttab.h 2009-11-06 11:10:15.000000000 +0100
++++ head-2010-05-12/include/xen/gnttab.h 2010-03-25 14:39:33.000000000 +0100
@@ -103,7 +103,11 @@ void gnttab_grant_foreign_transfer_ref(g
unsigned long pfn);
diff --git a/patches.xen/xen-virq-per-cpu-irq b/patches.xen/xen-virq-per-cpu-irq
index e833556f92..7e3279d9ef 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: obsolete
---- head-2010-04-15.orig/arch/x86/kernel/time-xen.c 2010-02-24 12:34:52.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/time-xen.c 2010-02-24 12:38:57.000000000 +0100
-@@ -697,19 +697,17 @@ int xen_update_persistent_clock(void)
+--- head-2010-05-12.orig/arch/x86/kernel/time-xen.c 2010-05-12 09:14:03.000000000 +0200
++++ head-2010-05-12/arch/x86/kernel/time-xen.c 2010-05-12 09:14:09.000000000 +0200
+@@ -699,19 +699,17 @@ int xen_update_persistent_clock(void)
}
/* Dynamically-mapped IRQ. */
@@ -32,7 +32,7 @@ Patch-mainline: obsolete
}
void __init time_init(void)
-@@ -850,8 +848,6 @@ void xen_halt(void)
+@@ -852,8 +850,6 @@ void xen_halt(void)
EXPORT_SYMBOL(xen_halt);
#ifdef CONFIG_SMP
@@ -41,7 +41,7 @@ Patch-mainline: obsolete
int __cpuinit local_setup_timer(unsigned int cpu)
{
int seq, irq;
-@@ -877,16 +873,10 @@ int __cpuinit local_setup_timer(unsigned
+@@ -879,16 +875,10 @@ int __cpuinit local_setup_timer(unsigned
init_missing_ticks_accounting(cpu);
} while (read_seqretry(&xtime_lock, seq));
@@ -60,7 +60,7 @@ Patch-mainline: obsolete
return 0;
}
-@@ -894,7 +884,7 @@ int __cpuinit local_setup_timer(unsigned
+@@ -896,7 +886,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: obsolete
}
#endif
---- head-2010-04-15.orig/drivers/xen/core/evtchn.c 2010-04-23 15:20:31.000000000 +0200
-+++ head-2010-04-15/drivers/xen/core/evtchn.c 2010-04-23 15:20:36.000000000 +0200
+--- head-2010-05-12.orig/drivers/xen/core/evtchn.c 2010-04-23 15:20:31.000000000 +0200
++++ head-2010-05-12/drivers/xen/core/evtchn.c 2010-04-23 15:20:36.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 };
@@ -497,8 +497,8 @@ Patch-mainline: obsolete
init_evtchn_cpu_bindings();
i = get_order(sizeof(unsigned long) * BITS_TO_LONGS(nr_pirqs));
---- head-2010-04-15.orig/drivers/xen/core/smpboot.c 2010-03-19 15:20:24.000000000 +0100
-+++ head-2010-04-15/drivers/xen/core/smpboot.c 2010-03-19 15:20:27.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/core/smpboot.c 2010-03-19 15:20:24.000000000 +0100
++++ head-2010-05-12/drivers/xen/core/smpboot.c 2010-03-19 15:20:27.000000000 +0100
@@ -176,13 +176,13 @@ static int __cpuinit xen_smp_intr_init(u
fail:
xen_spinlock_cleanup(cpu);
@@ -532,8 +532,8 @@ Patch-mainline: obsolete
xen_spinlock_cleanup(cpu);
}
#endif
---- head-2010-04-15.orig/drivers/xen/core/spinlock.c 2010-02-24 12:38:00.000000000 +0100
-+++ head-2010-04-15/drivers/xen/core/spinlock.c 2010-02-24 12:38:54.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/core/spinlock.c 2010-02-24 12:38:00.000000000 +0100
++++ head-2010-05-12/drivers/xen/core/spinlock.c 2010-02-24 12:38:54.000000000 +0100
@@ -55,7 +55,7 @@ int __cpuinit xen_spinlock_init(unsigned
void __cpuinit xen_spinlock_cleanup(unsigned int cpu)
@@ -543,8 +543,8 @@ Patch-mainline: obsolete
}
static unsigned int spin_adjust(struct spinning *spinning,
---- head-2010-04-15.orig/drivers/xen/netback/netback.c 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-15/drivers/xen/netback/netback.c 2010-01-04 13:31:26.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/netback/netback.c 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/drivers/xen/netback/netback.c 2010-01-04 13:31:26.000000000 +0100
@@ -1619,6 +1619,12 @@ static irqreturn_t netif_be_dbg(int irq,
return IRQ_HANDLED;
@@ -574,8 +574,8 @@ Patch-mainline: obsolete
#endif
return 0;
---- head-2010-04-15.orig/drivers/xen/xenoprof/xenoprofile.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/drivers/xen/xenoprof/xenoprofile.c 2010-01-07 11:04:10.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/xenoprof/xenoprofile.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/drivers/xen/xenoprof/xenoprofile.c 2010-01-07 11:04:10.000000000 +0100
@@ -210,6 +210,11 @@ static irqreturn_t xenoprof_ovf_interrup
return IRQ_HANDLED;
}
@@ -611,8 +611,8 @@ Patch-mainline: obsolete
if (result < 0) {
unbind_virq();
---- head-2010-04-15.orig/include/xen/evtchn.h 2010-03-31 14:41:42.000000000 +0200
-+++ head-2010-04-15/include/xen/evtchn.h 2010-03-31 14:11:09.000000000 +0200
+--- head-2010-05-12.orig/include/xen/evtchn.h 2010-03-31 14:41:42.000000000 +0200
++++ head-2010-05-12/include/xen/evtchn.h 2010-03-31 14:11:09.000000000 +0200
@@ -93,6 +93,17 @@ int bind_virq_to_irqhandler(
unsigned long irqflags,
const char *devname,
diff --git a/patches.xen/xen-x86-no-lapic b/patches.xen/xen-x86-no-lapic
index 7862bff346..a4d477d2e6 100644
--- a/patches.xen/xen-x86-no-lapic
+++ b/patches.xen/xen-x86-no-lapic
@@ -3,8 +3,8 @@ Subject: Disallow all accesses to the local APIC page
Patch-mainline: n/a
References: bnc#191115
---- head-2010-04-15.orig/arch/x86/include/asm/apic.h 2010-03-24 15:01:37.000000000 +0100
-+++ head-2010-04-15/arch/x86/include/asm/apic.h 2010-03-25 14:40:58.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/asm/apic.h 2010-03-24 15:01:37.000000000 +0100
++++ head-2010-05-12/arch/x86/include/asm/apic.h 2010-03-25 14:40:58.000000000 +0100
@@ -10,7 +10,9 @@
#include <asm/processor.h>
#include <asm/apicdef.h>
@@ -68,8 +68,8 @@ References: bnc#191115
#endif /* CONFIG_X86_LOCAL_APIC */
#ifdef CONFIG_X86_32
---- head-2010-04-15.orig/arch/x86/include/asm/apicdef.h 2010-04-28 15:44:02.000000000 +0200
-+++ head-2010-04-15/arch/x86/include/asm/apicdef.h 2010-03-25 14:40:58.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/asm/apicdef.h 2010-05-12 08:55:22.000000000 +0200
++++ head-2010-05-12/arch/x86/include/asm/apicdef.h 2010-03-25 14:40:58.000000000 +0100
@@ -17,6 +17,8 @@
*/
#define IO_APIC_SLOT_SIZE 1024
@@ -114,8 +114,8 @@ References: bnc#191115
#ifdef CONFIG_X86_32
#define BAD_APICID 0xFFu
#else
---- head-2010-04-15.orig/arch/x86/include/mach-xen/asm/fixmap.h 2010-04-15 10:29:09.000000000 +0200
-+++ head-2010-04-15/arch/x86/include/mach-xen/asm/fixmap.h 2010-04-15 11:47:12.000000000 +0200
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/fixmap.h 2010-04-15 10:29:09.000000000 +0200
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/fixmap.h 2010-04-15 11:47:12.000000000 +0200
@@ -17,7 +17,6 @@
#ifndef __ASSEMBLY__
#include <linux/kernel.h>
@@ -136,8 +136,8 @@ References: bnc#191115
#ifdef CONFIG_X86_IO_APIC
FIX_IO_APIC_BASE_0,
FIX_IO_APIC_BASE_END = FIX_IO_APIC_BASE_0 + MAX_IO_APICS - 1,
---- head-2010-04-15.orig/arch/x86/include/mach-xen/asm/smp.h 2010-04-26 11:32:06.000000000 +0200
-+++ head-2010-04-15/arch/x86/include/mach-xen/asm/smp.h 2010-04-28 17:21:52.000000000 +0200
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/smp.h 2010-04-26 11:32:06.000000000 +0200
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/smp.h 2010-04-28 17:21:52.000000000 +0200
@@ -15,7 +15,7 @@
# include <asm/io_apic.h>
# endif
@@ -156,8 +156,8 @@ References: bnc#191115
#ifndef CONFIG_X86_64
static inline int logical_smp_processor_id(void)
---- head-2010-04-15.orig/arch/x86/kernel/acpi/boot.c 2010-04-15 10:07:05.000000000 +0200
-+++ head-2010-04-15/arch/x86/kernel/acpi/boot.c 2010-04-15 11:47:20.000000000 +0200
+--- head-2010-05-12.orig/arch/x86/kernel/acpi/boot.c 2010-04-15 10:07:05.000000000 +0200
++++ head-2010-05-12/arch/x86/kernel/acpi/boot.c 2010-04-15 11:47:20.000000000 +0200
@@ -74,13 +74,13 @@ int acpi_sci_override_gsi __initdata;
#ifndef CONFIG_XEN
int acpi_skip_timer_override __initdata;
@@ -216,8 +216,8 @@ References: bnc#191115
if (ioapic_renumber_irq)
gsi = ioapic_renumber_irq(ioapic, gsi);
#endif
---- head-2010-04-15.orig/arch/x86/kernel/apic/io_apic-xen.c 2010-04-15 10:48:32.000000000 +0200
-+++ head-2010-04-15/arch/x86/kernel/apic/io_apic-xen.c 2010-04-15 11:47:27.000000000 +0200
+--- head-2010-05-12.orig/arch/x86/kernel/apic/io_apic-xen.c 2010-05-12 09:09:25.000000000 +0200
++++ head-2010-05-12/arch/x86/kernel/apic/io_apic-xen.c 2010-05-12 09:15:16.000000000 +0200
@@ -1071,7 +1071,9 @@ static inline int irq_trigger(int idx)
return MPBIOS_trigger(idx);
}
@@ -242,7 +242,7 @@ References: bnc#191115
}
#ifdef CONFIG_X86_32
-@@ -4103,10 +4107,12 @@ int io_apic_set_pci_routing(struct devic
+@@ -4106,10 +4110,12 @@ int io_apic_set_pci_routing(struct devic
u8 __init io_apic_unique_id(u8 id)
{
#ifdef CONFIG_X86_32
@@ -255,8 +255,8 @@ References: bnc#191115
return id;
#else
int i;
---- head-2010-04-15.orig/arch/x86/kernel/irq-xen.c 2010-01-25 13:46:29.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/irq-xen.c 2010-03-25 14:40:58.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/irq-xen.c 2010-01-25 13:46:29.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/irq-xen.c 2010-03-25 14:40:58.000000000 +0100
@@ -15,9 +15,9 @@
#include <asm/mce.h>
#include <asm/hw_irq.h>
@@ -307,8 +307,8 @@ References: bnc#191115
}
---- head-2010-04-15.orig/arch/x86/kernel/mpparse-xen.c 2010-04-15 10:48:32.000000000 +0200
-+++ head-2010-04-15/arch/x86/kernel/mpparse-xen.c 2010-03-25 14:40:58.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/mpparse-xen.c 2010-04-15 10:48:32.000000000 +0200
++++ head-2010-05-12/arch/x86/kernel/mpparse-xen.c 2010-03-25 14:40:58.000000000 +0100
@@ -288,7 +288,9 @@ static int __init smp_check_mpc(struct m
printk(KERN_INFO "MPTABLE: Product ID: %s\n", str);
@@ -361,8 +361,8 @@ References: bnc#191115
return;
}
---- head-2010-04-15.orig/drivers/xen/core/smpboot.c 2010-04-28 16:44:14.000000000 +0200
-+++ head-2010-04-15/drivers/xen/core/smpboot.c 2010-04-28 17:21:59.000000000 +0200
+--- head-2010-05-12.orig/drivers/xen/core/smpboot.c 2010-04-28 16:44:14.000000000 +0200
++++ head-2010-05-12/drivers/xen/core/smpboot.c 2010-04-28 17:21:59.000000000 +0200
@@ -341,7 +341,7 @@ void __init smp_prepare_cpus(unsigned in
* Here we can be sure that there is an IO-APIC in the system. Let's
* go and set it up:
diff --git a/patches.xen/xen-x86_64-note-init-p2m b/patches.xen/xen-x86_64-note-init-p2m
index 29c271467a..ba095f951c 100644
--- a/patches.xen/xen-x86_64-note-init-p2m
+++ b/patches.xen/xen-x86_64-note-init-p2m
@@ -18,8 +18,8 @@ shouldn't be as expensive (and hence can be viewed as an optimization
avoiding the spurious page fault on the local CPU), but is required
when the functions are used before the page fault handler gets set up.
---- head-2010-04-15.orig/arch/x86/kernel/head64-xen.c 2010-03-24 16:00:05.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/head64-xen.c 2010-03-25 14:48:29.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/head64-xen.c 2010-03-24 16:00:05.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/head64-xen.c 2010-03-25 14:48:29.000000000 +0100
@@ -121,6 +121,14 @@ void __init x86_64_start_reservations(ch
reserve_early(__pa_symbol(&_text), __pa_symbol(&__bss_stop), "TEXT DATA BSS");
@@ -35,8 +35,8 @@ when the functions are used before the page fault handler gets set up.
/*
* At this point everything still needed from the boot loader
* or BIOS or kernel text should be early reserved or marked not
---- head-2010-04-15.orig/arch/x86/kernel/head_64-xen.S 2010-03-25 14:46:03.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/head_64-xen.S 2010-03-25 14:48:29.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/head_64-xen.S 2010-03-25 14:46:03.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/head_64-xen.S 2010-03-25 14:48:29.000000000 +0100
@@ -17,6 +17,7 @@
#include <linux/elfnote.h>
#include <asm/segment.h>
@@ -53,8 +53,8 @@ when the functions are used before the page fault handler gets set up.
ELFNOTE(Xen, XEN_ELFNOTE_FEATURES, .asciz "writable_page_tables|writable_descriptor_tables|auto_translated_physmap|pae_pgdir_above_4gb|supervisor_mode_kernel")
ELFNOTE(Xen, XEN_ELFNOTE_LOADER, .asciz "generic")
ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long 1)
---- head-2010-04-15.orig/arch/x86/kernel/setup-xen.c 2010-04-15 11:48:03.000000000 +0200
-+++ head-2010-04-15/arch/x86/kernel/setup-xen.c 2010-04-15 11:49:47.000000000 +0200
+--- head-2010-05-12.orig/arch/x86/kernel/setup-xen.c 2010-04-15 11:48:03.000000000 +0200
++++ head-2010-05-12/arch/x86/kernel/setup-xen.c 2010-04-15 11:49:47.000000000 +0200
@@ -1152,7 +1152,7 @@ void __init setup_arch(char **cmdline_p)
difference = xen_start_info->nr_pages - max_pfn;
@@ -156,8 +156,8 @@ when the functions are used before the page fault handler gets set up.
/*
* Initialise the list of the frames that specify the list of
---- head-2010-04-15.orig/arch/x86/mm/init-xen.c 2010-04-15 10:48:32.000000000 +0200
-+++ head-2010-04-15/arch/x86/mm/init-xen.c 2010-04-15 11:49:33.000000000 +0200
+--- head-2010-05-12.orig/arch/x86/mm/init-xen.c 2010-04-15 10:48:32.000000000 +0200
++++ head-2010-05-12/arch/x86/mm/init-xen.c 2010-04-15 11:49:33.000000000 +0200
@@ -339,9 +339,22 @@ unsigned long __init_refok init_memory_m
__flush_tlb_all();
@@ -182,8 +182,8 @@ when the functions are used before the page fault handler gets set up.
if (!after_bootmem)
early_memtest(start, end);
---- head-2010-04-15.orig/arch/x86/mm/init_64-xen.c 2010-04-15 11:49:18.000000000 +0200
-+++ head-2010-04-15/arch/x86/mm/init_64-xen.c 2010-04-15 11:49:32.000000000 +0200
+--- head-2010-05-12.orig/arch/x86/mm/init_64-xen.c 2010-04-15 11:49:18.000000000 +0200
++++ head-2010-05-12/arch/x86/mm/init_64-xen.c 2010-04-15 11:49:32.000000000 +0200
@@ -183,6 +183,17 @@ static int __init nonx32_setup(char *str
}
__setup("noexec32=", nonx32_setup);
@@ -300,8 +300,8 @@ when the functions are used before the page fault handler gets set up.
/* Destroy the Xen-created mappings beyond the kernel image. */
start = PAGE_ALIGN(_brk_end);
end = __START_KERNEL_map + (e820_table_start << PAGE_SHIFT);
---- head-2010-04-15.orig/arch/x86/mm/pageattr-xen.c 2010-03-25 14:37:41.000000000 +0100
-+++ head-2010-04-15/arch/x86/mm/pageattr-xen.c 2010-03-25 14:48:29.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/pageattr-xen.c 2010-03-25 14:37:41.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/pageattr-xen.c 2010-03-25 14:48:29.000000000 +0100
@@ -1465,7 +1465,7 @@ static void __make_page_writable(unsigne
pte = lookup_address(va, &level);
@@ -311,8 +311,8 @@ when the functions are used before the page fault handler gets set up.
BUG();
if (in_secondary_range(va)) {
unsigned long pfn = pte_pfn(*pte);
---- head-2010-04-15.orig/arch/x86/mm/pgtable-xen.c 2010-04-15 11:49:15.000000000 +0200
-+++ head-2010-04-15/arch/x86/mm/pgtable-xen.c 2010-04-15 11:49:41.000000000 +0200
+--- head-2010-05-12.orig/arch/x86/mm/pgtable-xen.c 2010-04-15 11:49:15.000000000 +0200
++++ head-2010-05-12/arch/x86/mm/pgtable-xen.c 2010-04-15 11:49:41.000000000 +0200
@@ -344,7 +344,7 @@ void __init xen_init_pgd_pin(void)
if (PTRS_PER_PUD > 1) /* not folded */
SetPagePinned(virt_to_page(pud));
@@ -331,9 +331,9 @@ when the functions are used before the page fault handler gets set up.
continue;
SetPagePinned(pmd_page(*pmd));
}
---- head-2010-04-15.orig/arch/x86/mm/pgtable_32-xen.c 2010-04-15 10:48:32.000000000 +0200
-+++ head-2010-04-15/arch/x86/mm/pgtable_32-xen.c 2010-04-15 11:49:42.000000000 +0200
-@@ -174,6 +174,6 @@ void make_lowmem_page_writable(void *va,
+--- head-2010-05-12.orig/arch/x86/mm/pgtable_32-xen.c 2010-05-12 09:09:25.000000000 +0200
++++ head-2010-05-12/arch/x86/mm/pgtable_32-xen.c 2010-05-12 09:15:36.000000000 +0200
+@@ -175,6 +175,6 @@ void make_lowmem_page_writable(void *va,
pte = lookup_address((unsigned long)va, &level);
BUG_ON(!pte || level != PG_LEVEL_4K || !pte_present(*pte));
rc = HYPERVISOR_update_va_mapping(
diff --git a/patches.xen/xen3-auto-arch-i386.diff b/patches.xen/xen3-auto-arch-i386.diff
index d6fd599155..cb7ffdd784 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 1016:5bccfba3e847)
+From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1017:948c933f8839)
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 c977a1e993..ebface23dd 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 1016:5bccfba3e847)
+From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1017:948c933f8839)
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 a0d7e49eb0..0a3af92ff0 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 1016:5bccfba3e847)
+From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1017:948c933f8839)
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 706842d905..580e6ab9f4 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 1016:5bccfba3e847)
+From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1017:948c933f8839)
Patch-mainline: n/a
Acked-by: jbeulich@novell.com
@@ -12,9 +12,9 @@ take the forward porting patches:
2.6.25/mm/highmem.c
2.6.30/include/linux/pci_regs.h
---- head-2010-04-29.orig/drivers/Makefile 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/drivers/Makefile 2010-03-24 14:54:29.000000000 +0100
-@@ -33,6 +33,7 @@ obj-$(CONFIG_PARPORT) += parport/
+--- head-2010-05-12.orig/drivers/Makefile 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/drivers/Makefile 2010-05-12 08:58:07.000000000 +0200
+@@ -34,6 +34,7 @@ obj-$(CONFIG_PARPORT) += parport/
obj-y += base/ block/ misc/ mfd/
obj-$(CONFIG_NUBUS) += nubus/
obj-y += macintosh/
@@ -22,8 +22,8 @@ take the forward porting patches:
obj-$(CONFIG_IDE) += ide/
obj-$(CONFIG_SCSI) += scsi/
obj-$(CONFIG_ATA) += ata/
---- head-2010-04-29.orig/drivers/acpi/Makefile 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/drivers/acpi/Makefile 2010-03-24 14:53:41.000000000 +0100
+--- head-2010-05-12.orig/drivers/acpi/Makefile 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/drivers/acpi/Makefile 2010-03-24 14:53:41.000000000 +0100
@@ -64,5 +64,8 @@ obj-$(CONFIG_ACPI_POWER_METER) += power_
processor-y := processor_driver.o processor_throttling.o
processor-y += processor_idle.o processor_thermal.o
@@ -33,8 +33,8 @@ take the forward porting patches:
+endif
obj-$(CONFIG_ACPI_PROCESSOR_AGGREGATOR) += acpi_pad.o
---- head-2010-04-29.orig/drivers/acpi/acpica/hwsleep.c 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/drivers/acpi/acpica/hwsleep.c 2010-03-24 14:53:41.000000000 +0100
+--- head-2010-05-12.orig/drivers/acpi/acpica/hwsleep.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/drivers/acpi/acpica/hwsleep.c 2010-03-24 14:53:41.000000000 +0100
@@ -236,7 +236,11 @@ acpi_status asmlinkage acpi_enter_sleep_
u32 pm1b_control;
struct acpi_bit_register_info *sleep_type_reg_info;
@@ -72,8 +72,8 @@ take the forward porting patches:
return_ACPI_STATUS(AE_OK);
}
---- head-2010-04-29.orig/drivers/acpi/processor_driver.c 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/drivers/acpi/processor_driver.c 2010-04-15 09:42:55.000000000 +0200
+--- head-2010-05-12.orig/drivers/acpi/processor_driver.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/drivers/acpi/processor_driver.c 2010-04-15 09:42:55.000000000 +0200
@@ -443,7 +443,8 @@ static int acpi_processor_get_info(struc
*/
if (pr->id == -1) {
@@ -244,7 +244,7 @@ take the forward porting patches:
cpu_down(pr->id);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-04-29/drivers/acpi/processor_extcntl.c 2010-03-24 14:53:41.000000000 +0100
++++ head-2010-05-12/drivers/acpi/processor_extcntl.c 2010-03-24 14:53:41.000000000 +0100
@@ -0,0 +1,241 @@
+/*
+ * processor_extcntl.c - channel to external control logic
@@ -487,8 +487,8 @@ take the forward porting patches:
+ kfree(perf);
+ return ret;
+}
---- head-2010-04-29.orig/drivers/acpi/processor_idle.c 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/drivers/acpi/processor_idle.c 2010-04-15 09:43:01.000000000 +0200
+--- head-2010-05-12.orig/drivers/acpi/processor_idle.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/drivers/acpi/processor_idle.c 2010-04-15 09:43:01.000000000 +0200
@@ -456,7 +456,8 @@ static int acpi_processor_get_power_info
*/
cx.entry_method = ACPI_CSTATE_HALT;
@@ -524,8 +524,8 @@ take the forward porting patches:
return 0;
}
---- head-2010-04-29.orig/drivers/acpi/processor_perflib.c 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/drivers/acpi/processor_perflib.c 2010-04-15 09:43:05.000000000 +0200
+--- head-2010-05-12.orig/drivers/acpi/processor_perflib.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/drivers/acpi/processor_perflib.c 2010-04-15 09:43:05.000000000 +0200
@@ -79,6 +79,7 @@ MODULE_PARM_DESC(ignore_ppc, "If the fre
static int acpi_processor_ppc_status;
@@ -605,8 +605,8 @@ take the forward porting patches:
{
int result = 0;
acpi_status status = AE_OK;
---- head-2010-04-29.orig/drivers/acpi/sleep.c 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/drivers/acpi/sleep.c 2010-03-24 14:53:41.000000000 +0100
+--- head-2010-05-12.orig/drivers/acpi/sleep.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/drivers/acpi/sleep.c 2010-03-24 14:53:41.000000000 +0100
@@ -60,6 +60,7 @@ static struct notifier_block tts_notifie
static int acpi_sleep_prepare(u32 acpi_state)
{
@@ -638,8 +638,8 @@ take the forward porting patches:
break;
}
---- head-2010-04-29.orig/drivers/char/agp/intel-agp.c 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/drivers/char/agp/intel-agp.c 2010-04-15 09:43:13.000000000 +0200
+--- head-2010-05-12.orig/drivers/char/agp/intel-agp.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/drivers/char/agp/intel-agp.c 2010-04-15 09:43:13.000000000 +0200
@@ -443,6 +443,13 @@ static struct page *i8xx_alloc_pages(voi
if (page == NULL)
return NULL;
@@ -664,8 +664,8 @@ take the forward porting patches:
put_page(page);
__free_pages(page, 2);
atomic_dec(&agp_bridge->current_memory_agp);
---- head-2010-04-29.orig/drivers/char/mem.c 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/drivers/char/mem.c 2010-04-15 09:43:24.000000000 +0200
+--- head-2010-05-12.orig/drivers/char/mem.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/drivers/char/mem.c 2010-04-15 09:43:24.000000000 +0200
@@ -89,6 +89,7 @@ void __weak unxlate_dev_mem_ptr(unsigned
{
}
@@ -724,16 +724,16 @@ take the forward porting patches:
#ifdef CONFIG_DEVKMEM
static const struct file_operations kmem_fops = {
---- head-2010-04-29.orig/drivers/char/tpm/Makefile 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/drivers/char/tpm/Makefile 2010-03-24 14:53:41.000000000 +0100
+--- head-2010-05-12.orig/drivers/char/tpm/Makefile 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/drivers/char/tpm/Makefile 2010-03-24 14:53:41.000000000 +0100
@@ -9,3 +9,5 @@ obj-$(CONFIG_TCG_TIS) += tpm_tis.o
obj-$(CONFIG_TCG_NSC) += tpm_nsc.o
obj-$(CONFIG_TCG_ATMEL) += tpm_atmel.o
obj-$(CONFIG_TCG_INFINEON) += tpm_infineon.o
+obj-$(CONFIG_TCG_XEN) += tpm_xenu.o
+tpm_xenu-y = tpm_xen.o tpm_vtpm.o
---- head-2010-04-29.orig/drivers/char/tpm/tpm.h 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/drivers/char/tpm/tpm.h 2010-03-24 14:53:41.000000000 +0100
+--- head-2010-05-12.orig/drivers/char/tpm/tpm.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/drivers/char/tpm/tpm.h 2010-03-24 14:53:41.000000000 +0100
@@ -108,6 +108,9 @@ struct tpm_chip {
struct dentry **bios_dir;
@@ -764,7 +764,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
-+++ head-2010-04-29/drivers/char/tpm/tpm_vtpm.c 2010-03-24 14:53:41.000000000 +0100
++++ head-2010-05-12/drivers/char/tpm/tpm_vtpm.c 2010-03-24 14:53:41.000000000 +0100
@@ -0,0 +1,542 @@
+/*
+ * Copyright (C) 2006 IBM Corporation
@@ -1309,7 +1309,7 @@ take the forward porting patches:
+ kfree(vtpms);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-04-29/drivers/char/tpm/tpm_vtpm.h 2010-03-24 14:53:41.000000000 +0100
++++ head-2010-05-12/drivers/char/tpm/tpm_vtpm.h 2010-03-24 14:53:41.000000000 +0100
@@ -0,0 +1,55 @@
+#ifndef TPM_VTPM_H
+#define TPM_VTPM_H
@@ -1367,7 +1367,7 @@ take the forward porting patches:
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-04-29/drivers/char/tpm/tpm_xen.c 2010-03-24 14:53:41.000000000 +0100
++++ head-2010-05-12/drivers/char/tpm/tpm_xen.c 2010-03-24 14:53:41.000000000 +0100
@@ -0,0 +1,722 @@
+/*
+ * Copyright (c) 2005, IBM Corporation
@@ -2091,8 +2091,8 @@ take the forward porting patches:
+module_init(tpmif_init);
+
+MODULE_LICENSE("Dual BSD/GPL");
---- head-2010-04-29.orig/drivers/edac/edac_mc.c 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/drivers/edac/edac_mc.c 2010-03-24 14:53:41.000000000 +0100
+--- head-2010-05-12.orig/drivers/edac/edac_mc.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/drivers/edac/edac_mc.c 2010-03-24 14:53:41.000000000 +0100
@@ -602,6 +602,10 @@ static void edac_mc_scrub_block(unsigned
debugf3("%s()\n", __func__);
@@ -2104,8 +2104,8 @@ take the forward porting patches:
/* ECC error page was not in our memory. Ignore it. */
if (!pfn_valid(page))
return;
---- head-2010-04-29.orig/drivers/firmware/dell_rbu.c 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/drivers/firmware/dell_rbu.c 2010-04-15 09:43:35.000000000 +0200
+--- head-2010-05-12.orig/drivers/firmware/dell_rbu.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/drivers/firmware/dell_rbu.c 2010-04-15 09:43:35.000000000 +0200
@@ -170,9 +170,28 @@ static int create_packet(void *data, siz
spin_lock(&rbu_data.lock);
goto out_alloc_packet_array;
@@ -2212,8 +2212,8 @@ take the forward porting patches:
spin_lock_init(&rbu_data.lock);
init_packet_head();
---- head-2010-04-29.orig/drivers/ide/ide-lib.c 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/drivers/ide/ide-lib.c 2010-03-24 14:53:41.000000000 +0100
+--- head-2010-05-12.orig/drivers/ide/ide-lib.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/drivers/ide/ide-lib.c 2010-03-24 14:53:41.000000000 +0100
@@ -18,12 +18,12 @@ void ide_toggle_bounce(ide_drive_t *driv
{
u64 addr = BLK_BOUNCE_HIGH; /* dma64_addr_t */
@@ -2231,8 +2231,8 @@ take the forward porting patches:
addr = *dev->dma_mask;
}
---- head-2010-04-29.orig/drivers/oprofile/buffer_sync.c 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/drivers/oprofile/buffer_sync.c 2010-04-15 09:43:44.000000000 +0200
+--- head-2010-05-12.orig/drivers/oprofile/buffer_sync.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/drivers/oprofile/buffer_sync.c 2010-04-15 09:43:44.000000000 +0200
@@ -8,6 +8,10 @@
* @author Barry Kasindorf
* @author Robert Richter <robert.richter@amd.com>
@@ -2409,8 +2409,8 @@ take the forward porting patches:
mark_done(cpu);
mutex_unlock(&buffer_mutex);
---- head-2010-04-29.orig/drivers/oprofile/cpu_buffer.c 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/drivers/oprofile/cpu_buffer.c 2010-03-24 14:53:41.000000000 +0100
+--- head-2010-05-12.orig/drivers/oprofile/cpu_buffer.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/drivers/oprofile/cpu_buffer.c 2010-03-24 14:53:41.000000000 +0100
@@ -8,6 +8,10 @@
* @author Barry Kasindorf <barry.kasindorf@amd.com>
* @author Robert Richter <robert.richter@amd.com>
@@ -2526,8 +2526,8 @@ take the forward porting patches:
/*
* This serves to avoid cpu buffer overflow, and makes sure
* the task mortuary progresses
---- head-2010-04-29.orig/drivers/oprofile/cpu_buffer.h 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/drivers/oprofile/cpu_buffer.h 2010-03-24 14:53:41.000000000 +0100
+--- head-2010-05-12.orig/drivers/oprofile/cpu_buffer.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/drivers/oprofile/cpu_buffer.h 2010-03-24 14:53:41.000000000 +0100
@@ -40,7 +40,7 @@ struct op_entry;
struct oprofile_cpu_buffer {
unsigned long buffer_size;
@@ -2562,8 +2562,8 @@ take the forward porting patches:
+#define DOMAIN_SWITCH (1UL << 5)
#endif /* OPROFILE_CPU_BUFFER_H */
---- head-2010-04-29.orig/drivers/oprofile/event_buffer.h 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/drivers/oprofile/event_buffer.h 2010-03-24 14:53:41.000000000 +0100
+--- head-2010-05-12.orig/drivers/oprofile/event_buffer.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/drivers/oprofile/event_buffer.h 2010-03-24 14:53:41.000000000 +0100
@@ -30,6 +30,9 @@ void wake_up_buffer_waiter(void);
#define INVALID_COOKIE ~0UL
#define NO_COOKIE 0UL
@@ -2574,8 +2574,8 @@ take the forward porting patches:
extern const struct file_operations event_buffer_fops;
/* mutex between sync_cpu_buffers() and the
---- head-2010-04-29.orig/drivers/oprofile/oprof.c 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/drivers/oprofile/oprof.c 2010-03-24 14:53:41.000000000 +0100
+--- head-2010-05-12.orig/drivers/oprofile/oprof.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/drivers/oprofile/oprof.c 2010-03-24 14:53:41.000000000 +0100
@@ -5,6 +5,10 @@
* @remark Read the file COPYING
*
@@ -2620,8 +2620,8 @@ take the forward porting patches:
int oprofile_setup(void)
{
int err;
---- head-2010-04-29.orig/drivers/oprofile/oprof.h 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/drivers/oprofile/oprof.h 2010-03-24 14:53:41.000000000 +0100
+--- head-2010-05-12.orig/drivers/oprofile/oprof.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/drivers/oprofile/oprof.h 2010-03-24 14:53:41.000000000 +0100
@@ -39,4 +39,7 @@ void oprofile_timer_init(struct oprofile
int oprofile_set_backtrace(unsigned long depth);
int oprofile_set_timeout(unsigned long time);
@@ -2630,8 +2630,8 @@ take the forward porting patches:
+int oprofile_set_passive(int passive_domains[], unsigned int pdomains);
+
#endif /* OPROF_H */
---- head-2010-04-29.orig/drivers/oprofile/oprofile_files.c 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/drivers/oprofile/oprofile_files.c 2010-03-24 14:53:41.000000000 +0100
+--- head-2010-05-12.orig/drivers/oprofile/oprofile_files.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/drivers/oprofile/oprofile_files.c 2010-03-24 14:53:41.000000000 +0100
@@ -5,11 +5,17 @@
* @remark Read the file COPYING
*
@@ -2855,8 +2855,8 @@ take the forward porting patches:
oprofilefs_create_file(sb, root, "buffer", &event_buffer_fops);
oprofilefs_create_ulong(sb, root, "buffer_size", &oprofile_buffer_size);
oprofilefs_create_ulong(sb, root, "buffer_watershed", &oprofile_buffer_watershed);
---- head-2010-04-29.orig/fs/aio.c 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/fs/aio.c 2010-03-24 14:53:41.000000000 +0100
+--- head-2010-05-12.orig/fs/aio.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/fs/aio.c 2010-03-24 14:53:41.000000000 +0100
@@ -40,6 +40,11 @@
#include <asm/kmap_types.h>
#include <asm/uaccess.h>
@@ -3044,9 +3044,9 @@ take the forward porting patches:
get_ioctx(ioctx); /* io_destroy() expects us to hold a ref */
io_destroy(ioctx);
---- head-2010-04-29.orig/fs/compat_ioctl.c 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/fs/compat_ioctl.c 2010-03-24 14:53:41.000000000 +0100
-@@ -117,6 +117,13 @@
+--- head-2010-05-12.orig/fs/compat_ioctl.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/fs/compat_ioctl.c 2010-05-12 08:57:55.000000000 +0200
+@@ -116,6 +116,13 @@
#include <asm/fbio.h>
#endif
@@ -3060,7 +3060,7 @@ take the forward porting patches:
static int w_long(unsigned int fd, unsigned int cmd,
compat_ulong_t __user *argp)
{
-@@ -1521,6 +1528,19 @@ IGNORE_IOCTL(FBIOGETCMAP32)
+@@ -1518,6 +1525,19 @@ IGNORE_IOCTL(FBIOGETCMAP32)
IGNORE_IOCTL(FBIOSCURSOR32)
IGNORE_IOCTL(FBIOGCURSOR32)
#endif
@@ -3080,8 +3080,8 @@ take the forward porting patches:
};
/*
---- head-2010-04-29.orig/include/acpi/processor.h 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/include/acpi/processor.h 2010-03-24 14:53:41.000000000 +0100
+--- head-2010-05-12.orig/include/acpi/processor.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/include/acpi/processor.h 2010-03-24 14:53:41.000000000 +0100
@@ -17,6 +17,12 @@
#define ACPI_PROCESSOR_MAX_THROTTLE 250 /* 25% */
#define ACPI_PROCESSOR_MAX_DUTY_WIDTH 4
@@ -3265,8 +3265,8 @@ take the forward porting patches:
+#endif /* CONFIG_XEN */
+
#endif
---- head-2010-04-29.orig/include/asm-generic/pgtable.h 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/include/asm-generic/pgtable.h 2010-03-24 14:53:41.000000000 +0100
+--- head-2010-05-12.orig/include/asm-generic/pgtable.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/include/asm-generic/pgtable.h 2010-03-24 14:53:41.000000000 +0100
@@ -99,6 +99,10 @@ static inline void ptep_set_wrprotect(st
}
#endif
@@ -3278,8 +3278,8 @@ take the forward porting patches:
#ifndef __HAVE_ARCH_PTE_SAME
#define pte_same(A,B) (pte_val(A) == pte_val(B))
#endif
---- head-2010-04-29.orig/include/linux/aio.h 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/include/linux/aio.h 2010-03-24 14:53:41.000000000 +0100
+--- head-2010-05-12.orig/include/linux/aio.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/include/linux/aio.h 2010-03-24 14:53:41.000000000 +0100
@@ -199,6 +199,12 @@ struct kioctx {
struct delayed_work wq;
@@ -3293,8 +3293,8 @@ take the forward porting patches:
struct rcu_head rcu_head;
};
---- head-2010-04-29.orig/include/linux/highmem.h 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/include/linux/highmem.h 2010-03-24 14:53:41.000000000 +0100
+--- head-2010-05-12.orig/include/linux/highmem.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/include/linux/highmem.h 2010-03-24 14:53:41.000000000 +0100
@@ -136,12 +136,14 @@ alloc_zeroed_user_highpage_movable(struc
return __alloc_zeroed_user_highpage(__GFP_MOVABLE, vma, vaddr);
}
@@ -3326,8 +3326,8 @@ take the forward porting patches:
+#endif
+
#endif /* _LINUX_HIGHMEM_H */
---- head-2010-04-29.orig/include/linux/interrupt.h 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/include/linux/interrupt.h 2010-03-24 14:53:41.000000000 +0100
+--- head-2010-05-12.orig/include/linux/interrupt.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/include/linux/interrupt.h 2010-03-24 14:53:41.000000000 +0100
@@ -317,6 +317,12 @@ static inline int disable_irq_wake(unsig
}
#endif /* CONFIG_GENERIC_HARDIRQS */
@@ -3341,8 +3341,8 @@ take the forward porting patches:
#ifndef __ARCH_SET_SOFTIRQ_PENDING
#define set_softirq_pending(x) (local_softirq_pending() = (x))
#define or_softirq_pending(x) (local_softirq_pending() |= (x))
---- head-2010-04-29.orig/include/linux/kexec.h 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/include/linux/kexec.h 2010-03-24 14:53:41.000000000 +0100
+--- head-2010-05-12.orig/include/linux/kexec.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/include/linux/kexec.h 2010-03-24 14:53:41.000000000 +0100
@@ -46,6 +46,13 @@
KEXEC_CORE_NOTE_NAME_BYTES + \
KEXEC_CORE_NOTE_DESC_BYTES )
@@ -3370,8 +3370,8 @@ take the forward porting patches:
extern asmlinkage long sys_kexec_load(unsigned long entry,
unsigned long nr_segments,
struct kexec_segment __user *segments,
---- head-2010-04-29.orig/include/linux/mm.h 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/include/linux/mm.h 2010-03-24 14:53:41.000000000 +0100
+--- head-2010-05-12.orig/include/linux/mm.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/include/linux/mm.h 2010-03-24 14:53:41.000000000 +0100
@@ -103,7 +103,12 @@ extern unsigned int kobjsize(const void
#define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */
@@ -3414,8 +3414,8 @@ take the forward porting patches:
#ifdef CONFIG_NUMA
/*
* set_policy() op must add a reference to any non-NULL @new mempolicy
---- head-2010-04-29.orig/include/linux/oprofile.h 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/include/linux/oprofile.h 2010-03-24 14:53:41.000000000 +0100
+--- head-2010-05-12.orig/include/linux/oprofile.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/include/linux/oprofile.h 2010-03-24 14:53:41.000000000 +0100
@@ -16,6 +16,8 @@
#include <linux/types.h>
#include <linux/spinlock.h>
@@ -3467,8 +3467,8 @@ take the forward porting patches:
/**
* Create a file of the given name as a child of the given root, with
---- head-2010-04-29.orig/include/linux/page-flags.h 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/include/linux/page-flags.h 2010-03-24 14:53:41.000000000 +0100
+--- head-2010-05-12.orig/include/linux/page-flags.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/include/linux/page-flags.h 2010-03-24 14:53:41.000000000 +0100
@@ -109,6 +109,11 @@ enum pageflags {
#ifdef CONFIG_MEMORY_FAILURE
PG_hwpoison, /* hardware poisoned page. Don't touch */
@@ -3533,8 +3533,8 @@ take the forward porting patches:
/*
* Flags checked when a page is prepped for return by the page allocator.
---- head-2010-04-29.orig/include/linux/pci.h 2010-03-24 13:55:21.000000000 +0100
-+++ head-2010-04-29/include/linux/pci.h 2010-03-24 14:53:41.000000000 +0100
+--- head-2010-05-12.orig/include/linux/pci.h 2010-03-24 13:55:21.000000000 +0100
++++ head-2010-05-12/include/linux/pci.h 2010-03-24 14:53:41.000000000 +0100
@@ -962,6 +962,11 @@ static inline int pci_msi_enabled(void)
{
return 0;
@@ -3558,8 +3558,8 @@ take the forward porting patches:
#endif
#ifndef CONFIG_PCIEASPM
---- head-2010-04-29.orig/include/linux/skbuff.h 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/include/linux/skbuff.h 2010-04-15 09:43:55.000000000 +0200
+--- head-2010-05-12.orig/include/linux/skbuff.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/include/linux/skbuff.h 2010-04-15 09:43:55.000000000 +0200
@@ -272,6 +272,8 @@ typedef unsigned char *sk_buff_data_t;
* @local_df: allow local fragmentation
* @cloned: Head may be cloned (check refcnt to be sure)
@@ -3584,8 +3584,8 @@ take the forward porting patches:
#ifdef CONFIG_NET_DMA
dma_cookie_t dma_cookie;
---- head-2010-04-29.orig/include/linux/vermagic.h 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/include/linux/vermagic.h 2010-03-24 14:53:41.000000000 +0100
+--- head-2010-05-12.orig/include/linux/vermagic.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/include/linux/vermagic.h 2010-03-24 14:53:41.000000000 +0100
@@ -22,6 +22,11 @@
#else
#define MODULE_VERMAGIC_MODVERSIONS ""
@@ -3605,8 +3605,8 @@ take the forward porting patches:
- MODULE_ARCH_VERMAGIC
+ MODULE_VERMAGIC_XEN MODULE_ARCH_VERMAGIC
---- head-2010-04-29.orig/kernel/irq/spurious.c 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/kernel/irq/spurious.c 2010-03-24 14:53:41.000000000 +0100
+--- head-2010-05-12.orig/kernel/irq/spurious.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/kernel/irq/spurious.c 2010-03-24 14:53:41.000000000 +0100
@@ -233,7 +233,7 @@ void note_interrupt(unsigned int irq, st
*/
if (time_after(jiffies, desc->last_unhandled + HZ/10))
@@ -3616,8 +3616,8 @@ take the forward porting patches:
desc->irqs_unhandled++;
desc->last_unhandled = jiffies;
if (unlikely(action_ret != IRQ_NONE))
---- head-2010-04-29.orig/kernel/kexec.c 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/kernel/kexec.c 2010-03-24 14:53:41.000000000 +0100
+--- head-2010-05-12.orig/kernel/kexec.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/kernel/kexec.c 2010-03-24 14:53:41.000000000 +0100
@@ -360,13 +360,26 @@ static int kimage_is_destination_range(s
return 0;
}
@@ -3818,8 +3818,8 @@ take the forward porting patches:
/* Install the new kernel, and Uninstall the old */
image = xchg(dest_image, image);
---- head-2010-04-29.orig/kernel/sysctl.c 2010-03-24 14:09:47.000000000 +0100
-+++ head-2010-04-29/kernel/sysctl.c 2010-03-24 14:53:41.000000000 +0100
+--- head-2010-05-12.orig/kernel/sysctl.c 2010-03-24 14:09:47.000000000 +0100
++++ head-2010-05-12/kernel/sysctl.c 2010-03-24 14:53:41.000000000 +0100
@@ -776,7 +776,7 @@ static struct ctl_table kern_table[] = {
.proc_handler = proc_dointvec,
},
@@ -3829,8 +3829,8 @@ take the forward porting patches:
{
.procname = "acpi_video_flags",
.data = &acpi_realmode_flags,
---- head-2010-04-29.orig/mm/memory.c 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/mm/memory.c 2010-04-15 09:44:04.000000000 +0200
+--- head-2010-05-12.orig/mm/memory.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/mm/memory.c 2010-04-15 09:44:04.000000000 +0200
@@ -599,6 +599,12 @@ struct page *vm_normal_page(struct vm_ar
{
unsigned long pfn = pte_pfn(pte);
@@ -3906,8 +3906,8 @@ take the forward porting patches:
if (!vma ||
(vma->vm_flags & (VM_IO | VM_PFNMAP)) ||
!(vm_flags & vma->vm_flags))
---- head-2010-04-29.orig/mm/mmap.c 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/mm/mmap.c 2010-04-29 09:42:36.000000000 +0200
+--- head-2010-05-12.orig/mm/mmap.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/mm/mmap.c 2010-04-29 09:42:36.000000000 +0200
@@ -1944,6 +1944,12 @@ static void unmap_region(struct mm_struc
tlb_finish_mmu(tlb, start, end);
}
@@ -3939,8 +3939,8 @@ take the forward porting patches:
vma = mm->mmap;
if (!vma) /* Can happen if dup_mmap() received an OOM */
return;
---- head-2010-04-29.orig/mm/mprotect.c 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/mm/mprotect.c 2010-04-15 09:44:14.000000000 +0200
+--- head-2010-05-12.orig/mm/mprotect.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/mm/mprotect.c 2010-04-15 09:44:14.000000000 +0200
@@ -90,6 +90,8 @@ static inline void change_pmd_range(stru
next = pmd_addr_end(addr, end);
if (pmd_none_or_clear_bad(pmd))
@@ -3950,8 +3950,8 @@ take the forward porting patches:
change_pte_range(mm, pmd, addr, next, newprot, dirty_accountable);
} while (pmd++, addr = next, addr != end);
}
---- head-2010-04-29.orig/mm/page_alloc.c 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/mm/page_alloc.c 2010-03-24 14:59:37.000000000 +0100
+--- head-2010-05-12.orig/mm/page_alloc.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/mm/page_alloc.c 2010-03-24 14:59:37.000000000 +0100
@@ -609,6 +609,13 @@ static void __free_pages_ok(struct page
int bad = 0;
int wasMlocked = __TestClearPageMlocked(page);
@@ -3980,8 +3980,8 @@ take the forward porting patches:
trace_mm_page_free_direct(page, 0);
kmemcheck_free_shadow(page, 0);
---- head-2010-04-29.orig/net/core/dev.c 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/net/core/dev.c 2010-04-29 09:42:43.000000000 +0200
+--- head-2010-05-12.orig/net/core/dev.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/net/core/dev.c 2010-04-29 09:42:43.000000000 +0200
@@ -139,6 +139,12 @@
/* This should be increased if a protocol with a bigger head is added. */
#define GRO_MAX_HEAD (MAX_HEADER + 128)
@@ -4072,8 +4072,8 @@ take the forward porting patches:
if (skb_emergency(skb))
goto skip_taps;
---- head-2010-04-29.orig/net/core/skbuff.c 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/net/core/skbuff.c 2010-03-24 14:53:41.000000000 +0100
+--- head-2010-05-12.orig/net/core/skbuff.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/net/core/skbuff.c 2010-03-24 14:53:41.000000000 +0100
@@ -645,6 +645,10 @@ static struct sk_buff *__skb_clone(struc
n->hdr_len = skb->nohdr ? skb_headroom(skb) : skb->hdr_len;
n->cloned = 1;
@@ -4085,8 +4085,8 @@ take the forward porting patches:
n->destructor = NULL;
C(tail);
C(end);
---- head-2010-04-29.orig/net/ipv4/netfilter/nf_nat_proto_tcp.c 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/net/ipv4/netfilter/nf_nat_proto_tcp.c 2010-03-24 14:53:41.000000000 +0100
+--- head-2010-05-12.orig/net/ipv4/netfilter/nf_nat_proto_tcp.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/net/ipv4/netfilter/nf_nat_proto_tcp.c 2010-03-24 14:53:41.000000000 +0100
@@ -75,6 +75,9 @@ tcp_manip_pkt(struct sk_buff *skb,
if (hdrsize < sizeof(*hdr))
return true;
@@ -4097,8 +4097,8 @@ take the forward porting patches:
inet_proto_csum_replace4(&hdr->check, skb, oldip, newip, 1);
inet_proto_csum_replace2(&hdr->check, skb, oldport, newport, 0);
return true;
---- head-2010-04-29.orig/net/ipv4/netfilter/nf_nat_proto_udp.c 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/net/ipv4/netfilter/nf_nat_proto_udp.c 2010-03-24 14:53:41.000000000 +0100
+--- head-2010-05-12.orig/net/ipv4/netfilter/nf_nat_proto_udp.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/net/ipv4/netfilter/nf_nat_proto_udp.c 2010-03-24 14:53:41.000000000 +0100
@@ -60,6 +60,10 @@ udp_manip_pkt(struct sk_buff *skb,
newport = tuple->dst.u.udp.port;
portptr = &hdr->dest;
@@ -4110,8 +4110,8 @@ take the forward porting patches:
if (hdr->check || skb->ip_summed == CHECKSUM_PARTIAL) {
inet_proto_csum_replace4(&hdr->check, skb, oldip, newip, 1);
inet_proto_csum_replace2(&hdr->check, skb, *portptr, newport,
---- head-2010-04-29.orig/net/ipv4/xfrm4_output.c 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/net/ipv4/xfrm4_output.c 2010-03-24 14:53:41.000000000 +0100
+--- head-2010-05-12.orig/net/ipv4/xfrm4_output.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/net/ipv4/xfrm4_output.c 2010-03-24 14:53:41.000000000 +0100
@@ -81,7 +81,7 @@ static int xfrm4_output_finish(struct sk
#endif
@@ -4121,8 +4121,8 @@ take the forward porting patches:
}
int xfrm4_output(struct sk_buff *skb)
---- head-2010-04-29.orig/scripts/Makefile.build 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/scripts/Makefile.build 2010-03-24 14:53:41.000000000 +0100
+--- head-2010-05-12.orig/scripts/Makefile.build 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/scripts/Makefile.build 2010-03-24 14:53:41.000000000 +0100
@@ -76,6 +76,21 @@ ifndef obj
$(warning kbuild: Makefile.build is included improperly)
endif
@@ -4145,8 +4145,8 @@ take the forward porting patches:
# ===========================================================================
ifneq ($(strip $(lib-y) $(lib-m) $(lib-n) $(lib-)),)
---- head-2010-04-29.orig/scripts/Makefile.lib 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/scripts/Makefile.lib 2010-03-24 14:53:41.000000000 +0100
+--- head-2010-05-12.orig/scripts/Makefile.lib 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/scripts/Makefile.lib 2010-03-24 14:53:41.000000000 +0100
@@ -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 1355eee646..b377faef6f 100644
--- a/patches.xen/xen3-auto-include-xen-interface.diff
+++ b/patches.xen/xen3-auto-include-xen-interface.diff
@@ -1,10 +1,10 @@
Subject: xen3 include-xen-interface
-From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1016:5bccfba3e847)
+From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1017:948c933f8839)
Patch-mainline: n/a
Acked-by: jbeulich@novell.com
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-03-24/include/xen/interface/COPYING 2007-06-12 13:14:19.000000000 +0200
++++ head-2010-05-12/include/xen/interface/COPYING 2007-06-12 13:14:19.000000000 +0200
@@ -0,0 +1,38 @@
+XEN NOTICE
+==========
@@ -45,7 +45,7 @@ Acked-by: jbeulich@novell.com
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-03-24/include/xen/interface/arch-x86/cpuid.h 2008-01-21 11:15:27.000000000 +0100
++++ head-2010-05-12/include/xen/interface/arch-x86/cpuid.h 2008-01-21 11:15:27.000000000 +0100
@@ -0,0 +1,68 @@
+/******************************************************************************
+ * arch-x86/cpuid.h
@@ -116,7 +116,7 @@ Acked-by: jbeulich@novell.com
+
+#endif /* __XEN_PUBLIC_ARCH_X86_CPUID_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-03-24/include/xen/interface/arch-x86/hvm/save.h 2010-01-04 11:56:34.000000000 +0100
++++ head-2010-05-12/include/xen/interface/arch-x86/hvm/save.h 2010-01-04 11:56:34.000000000 +0100
@@ -0,0 +1,439 @@
+/*
+ * Structure definitions for HVM state that is held by Xen and must
@@ -558,8 +558,8 @@ Acked-by: jbeulich@novell.com
+
+#endif /* __XEN_PUBLIC_HVM_SAVE_X86_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-03-24/include/xen/interface/arch-x86/xen-mca.h 2009-05-19 09:16:41.000000000 +0200
-@@ -0,0 +1,422 @@
++++ head-2010-05-12/include/xen/interface/arch-x86/xen-mca.h 2010-05-07 11:10:48.000000000 +0200
+@@ -0,0 +1,423 @@
+/******************************************************************************
+ * arch-x86/mca.h
+ *
@@ -795,10 +795,11 @@ Acked-by: jbeulich@novell.com
+#define MCINFO_HYPERCALLSIZE 1024
+#define MCINFO_MAXSIZE 768
+
++#define MCINFO_FLAGS_UNCOMPLETE 0x1
+struct mc_info {
+ /* Number of mcinfo_* entries in mi_data */
+ uint32_t mi_nentries;
-+ uint32_t _pad0;
++ uint32_t flags;
+ uint64_t mi_data[(MCINFO_MAXSIZE - 1) / 8];
+};
+typedef struct mc_info mc_info_t;
@@ -983,7 +984,7 @@ Acked-by: jbeulich@novell.com
+
+#endif /* __XEN_PUBLIC_ARCH_X86_MCA_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-03-24/include/xen/interface/arch-x86/xen-x86_32.h 2008-07-21 11:00:33.000000000 +0200
++++ head-2010-05-12/include/xen/interface/arch-x86/xen-x86_32.h 2008-07-21 11:00:33.000000000 +0200
@@ -0,0 +1,180 @@
+/******************************************************************************
+ * xen-x86_32.h
@@ -1166,7 +1167,7 @@ Acked-by: jbeulich@novell.com
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-03-24/include/xen/interface/arch-x86/xen-x86_64.h 2008-04-02 12:34:02.000000000 +0200
++++ head-2010-05-12/include/xen/interface/arch-x86/xen-x86_64.h 2008-04-02 12:34:02.000000000 +0200
@@ -0,0 +1,212 @@
+/******************************************************************************
+ * xen-x86_64.h
@@ -1381,7 +1382,7 @@ Acked-by: jbeulich@novell.com
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-03-24/include/xen/interface/arch-x86/xen.h 2010-01-04 11:56:34.000000000 +0100
++++ head-2010-05-12/include/xen/interface/arch-x86/xen.h 2010-01-04 11:56:34.000000000 +0100
@@ -0,0 +1,200 @@
+/******************************************************************************
+ * arch-x86/xen.h
@@ -1584,7 +1585,7 @@ Acked-by: jbeulich@novell.com
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-03-24/include/xen/interface/arch-x86_32.h 2007-06-12 13:14:19.000000000 +0200
++++ head-2010-05-12/include/xen/interface/arch-x86_32.h 2007-06-12 13:14:19.000000000 +0200
@@ -0,0 +1,27 @@
+/******************************************************************************
+ * arch-x86_32.h
@@ -1614,7 +1615,7 @@ Acked-by: jbeulich@novell.com
+
+#include "arch-x86/xen.h"
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-03-24/include/xen/interface/arch-x86_64.h 2007-06-12 13:14:19.000000000 +0200
++++ head-2010-05-12/include/xen/interface/arch-x86_64.h 2007-06-12 13:14:19.000000000 +0200
@@ -0,0 +1,27 @@
+/******************************************************************************
+ * arch-x86_64.h
@@ -1644,7 +1645,7 @@ Acked-by: jbeulich@novell.com
+
+#include "arch-x86/xen.h"
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-03-24/include/xen/interface/dom0_ops.h 2007-06-12 13:14:19.000000000 +0200
++++ head-2010-05-12/include/xen/interface/dom0_ops.h 2007-06-12 13:14:19.000000000 +0200
@@ -0,0 +1,120 @@
+/******************************************************************************
+ * dom0_ops.h
@@ -1767,8 +1768,8 @@ Acked-by: jbeulich@novell.com
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-03-24/include/xen/interface/domctl.h 2010-01-07 09:38:29.000000000 +0100
-@@ -0,0 +1,904 @@
++++ head-2010-05-12/include/xen/interface/domctl.h 2010-05-07 11:10:48.000000000 +0200
+@@ -0,0 +1,919 @@
+/******************************************************************************
+ * domctl.h
+ *
@@ -1806,7 +1807,7 @@ Acked-by: jbeulich@novell.com
+#include "xen.h"
+#include "grant_table.h"
+
-+#define XEN_DOMCTL_INTERFACE_VERSION 0x00000006
++#define XEN_DOMCTL_INTERFACE_VERSION 0x00000007
+
+struct xenctl_cpumap {
+ XEN_GUEST_HANDLE_64(uint8) bitmap;
@@ -1831,10 +1832,10 @@ Acked-by: jbeulich@novell.com
+ /* Should domain memory integrity be verifed by tboot during Sx? */
+#define _XEN_DOMCTL_CDF_s3_integrity 2
+#define XEN_DOMCTL_CDF_s3_integrity (1U<<_XEN_DOMCTL_CDF_s3_integrity)
-+ uint32_t flags;
+ /* Disable out-of-sync shadow page tables? */
+#define _XEN_DOMCTL_CDF_oos_off 3
+#define XEN_DOMCTL_CDF_oos_off (1U<<_XEN_DOMCTL_CDF_oos_off)
++ uint32_t flags;
+};
+typedef struct xen_domctl_createdomain xen_domctl_createdomain_t;
+DEFINE_XEN_GUEST_HANDLE(xen_domctl_createdomain_t);
@@ -1877,6 +1878,7 @@ Acked-by: jbeulich@novell.com
+ uint32_t max_vcpu_id; /* Maximum VCPUID in use by this domain. */
+ uint32_t ssidref;
+ xen_domain_handle_t handle;
++ uint32_t cpupool;
+};
+typedef struct xen_domctl_getdomaininfo xen_domctl_getdomaininfo_t;
+DEFINE_XEN_GUEST_HANDLE(xen_domctl_getdomaininfo_t);
@@ -1932,6 +1934,14 @@ Acked-by: jbeulich@novell.com
+typedef struct xen_domctl_getpageframeinfo2 xen_domctl_getpageframeinfo2_t;
+DEFINE_XEN_GUEST_HANDLE(xen_domctl_getpageframeinfo2_t);
+
++/* XEN_DOMCTL_getpageframeinfo3 */
++struct xen_domctl_getpageframeinfo3 {
++ /* IN variables. */
++ uint64_aligned_t num;
++ /* IN/OUT variables. */
++ XEN_GUEST_HANDLE_64(xen_pfn_t) array;
++};
++
+
+/*
+ * Control shadow pagetables operation
@@ -2066,6 +2076,7 @@ Acked-by: jbeulich@novell.com
+/* Scheduler types. */
+#define XEN_SCHEDULER_SEDF 4
+#define XEN_SCHEDULER_CREDIT 5
++#define XEN_SCHEDULER_CREDIT2 6
+/* Set or get info? */
+#define XEN_DOMCTL_SCHEDOP_putinfo 0
+#define XEN_DOMCTL_SCHEDOP_getinfo 1
@@ -2084,6 +2095,9 @@ Acked-by: jbeulich@novell.com
+ uint16_t weight;
+ uint16_t cap;
+ } credit;
++ struct xen_domctl_sched_credit2 {
++ uint16_t weight;
++ } credit2;
+ } u;
+};
+typedef struct xen_domctl_scheduler_op xen_domctl_scheduler_op_t;
@@ -2202,6 +2216,7 @@ Acked-by: jbeulich@novell.com
+#define XEN_DOMCTL_SENDTRIGGER_RESET 1
+#define XEN_DOMCTL_SENDTRIGGER_INIT 2
+#define XEN_DOMCTL_SENDTRIGGER_POWER 3
++#define XEN_DOMCTL_SENDTRIGGER_SLEEP 4
+struct xen_domctl_sendtrigger {
+ uint32_t trigger; /* IN */
+ uint32_t vcpu; /* IN */
@@ -2543,7 +2558,6 @@ Acked-by: jbeulich@novell.com
+typedef struct xen_domctl_mem_sharing_op xen_domctl_mem_sharing_op_t;
+DEFINE_XEN_GUEST_HANDLE(xen_domctl_mem_sharing_op_t);
+
-+
+struct xen_domctl {
+ uint32_t cmd;
+#define XEN_DOMCTL_createdomain 1
@@ -2603,6 +2617,7 @@ Acked-by: jbeulich@novell.com
+#define XEN_DOMCTL_disable_migrate 58
+#define XEN_DOMCTL_gettscinfo 59
+#define XEN_DOMCTL_settscinfo 60
++#define XEN_DOMCTL_getpageframeinfo3 61
+#define XEN_DOMCTL_gdbsx_guestmemio 1000
+#define XEN_DOMCTL_gdbsx_pausevcpu 1001
+#define XEN_DOMCTL_gdbsx_unpausevcpu 1002
@@ -2615,6 +2630,7 @@ Acked-by: jbeulich@novell.com
+ struct xen_domctl_getmemlist getmemlist;
+ struct xen_domctl_getpageframeinfo getpageframeinfo;
+ struct xen_domctl_getpageframeinfo2 getpageframeinfo2;
++ struct xen_domctl_getpageframeinfo3 getpageframeinfo3;
+ struct xen_domctl_vcpuaffinity vcpuaffinity;
+ struct xen_domctl_shadow_op shadow_op;
+ struct xen_domctl_max_mem max_mem;
@@ -2674,7 +2690,7 @@ Acked-by: jbeulich@novell.com
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-03-24/include/xen/interface/hvm/e820.h 2007-06-12 13:14:19.000000000 +0200
++++ head-2010-05-12/include/xen/interface/hvm/e820.h 2007-06-12 13:14:19.000000000 +0200
@@ -0,0 +1,34 @@
+
+/*
@@ -2711,7 +2727,7 @@ Acked-by: jbeulich@novell.com
+
+#endif /* __XEN_PUBLIC_HVM_E820_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-03-24/include/xen/interface/hvm/hvm_info_table.h 2010-01-04 11:56:34.000000000 +0100
++++ head-2010-05-12/include/xen/interface/hvm/hvm_info_table.h 2010-05-07 11:10:48.000000000 +0200
@@ -0,0 +1,75 @@
+/******************************************************************************
+ * hvm/hvm_info_table.h
@@ -2784,12 +2800,12 @@ Acked-by: jbeulich@novell.com
+ uint32_t high_mem_pgend;
+
+ /* Bitmap of which CPUs are online at boot time. */
-+ uint8_t vcpu_online[HVM_MAX_VCPUS/8];
++ uint8_t vcpu_online[(HVM_MAX_VCPUS + 7)/8];
+};
+
+#endif /* __XEN_PUBLIC_HVM_HVM_INFO_TABLE_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-03-24/include/xen/interface/hvm/hvm_op.h 2009-06-23 09:28:21.000000000 +0200
++++ head-2010-05-12/include/xen/interface/hvm/hvm_op.h 2009-06-23 09:28:21.000000000 +0200
@@ -0,0 +1,133 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -2925,7 +2941,7 @@ Acked-by: jbeulich@novell.com
+
+#endif /* __XEN_PUBLIC_HVM_HVM_OP_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-03-24/include/xen/interface/hvm/ioreq.h 2010-01-04 11:56:34.000000000 +0100
++++ head-2010-05-12/include/xen/interface/hvm/ioreq.h 2010-01-04 11:56:34.000000000 +0100
@@ -0,0 +1,119 @@
+/*
+ * ioreq.h: I/O request definitions for device models
@@ -3047,7 +3063,7 @@ Acked-by: jbeulich@novell.com
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-03-24/include/xen/interface/hvm/params.h 2009-04-07 13:58:49.000000000 +0200
++++ head-2010-05-12/include/xen/interface/hvm/params.h 2009-04-07 13:58:49.000000000 +0200
@@ -0,0 +1,111 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -3161,7 +3177,7 @@ Acked-by: jbeulich@novell.com
+
+#endif /* __XEN_PUBLIC_HVM_PARAMS_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-03-24/include/xen/interface/hvm/save.h 2008-04-02 12:34:02.000000000 +0200
++++ head-2010-05-12/include/xen/interface/hvm/save.h 2008-04-02 12:34:02.000000000 +0200
@@ -0,0 +1,88 @@
+/*
+ * hvm/save.h
@@ -3252,7 +3268,7 @@ Acked-by: jbeulich@novell.com
+
+#endif /* __XEN_PUBLIC_HVM_SAVE_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-03-24/include/xen/interface/io/fsif.h 2009-06-23 09:28:21.000000000 +0200
++++ head-2010-05-12/include/xen/interface/io/fsif.h 2009-06-23 09:28:21.000000000 +0200
@@ -0,0 +1,192 @@
+/******************************************************************************
+ * fsif.h
@@ -3447,7 +3463,7 @@ Acked-by: jbeulich@novell.com
+
+#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-03-24/include/xen/interface/io/pciif.h 2009-04-07 13:58:49.000000000 +0200
++++ head-2010-05-12/include/xen/interface/io/pciif.h 2009-04-07 13:58:49.000000000 +0200
@@ -0,0 +1,124 @@
+/*
+ * PCI Backend/Frontend Common Data Structures & Macros
@@ -3574,7 +3590,7 @@ Acked-by: jbeulich@novell.com
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-03-24/include/xen/interface/io/tpmif.h 2007-06-12 13:14:19.000000000 +0200
++++ head-2010-05-12/include/xen/interface/io/tpmif.h 2007-06-12 13:14:19.000000000 +0200
@@ -0,0 +1,77 @@
+/******************************************************************************
+ * tpmif.h
@@ -3654,7 +3670,7 @@ Acked-by: jbeulich@novell.com
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-03-24/include/xen/interface/io/usbif.h 2010-02-24 13:13:46.000000000 +0100
++++ head-2010-05-12/include/xen/interface/io/usbif.h 2010-02-24 13:13:46.000000000 +0100
@@ -0,0 +1,151 @@
+/*
+ * usbif.h
@@ -3808,7 +3824,7 @@ Acked-by: jbeulich@novell.com
+
+#endif /* __XEN_PUBLIC_IO_USBIF_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-03-24/include/xen/interface/io/vscsiif.h 2008-07-21 11:00:33.000000000 +0200
++++ head-2010-05-12/include/xen/interface/io/vscsiif.h 2008-07-21 11:00:33.000000000 +0200
@@ -0,0 +1,105 @@
+/******************************************************************************
+ * vscsiif.h
@@ -3916,7 +3932,7 @@ Acked-by: jbeulich@novell.com
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-03-24/include/xen/interface/kexec.h 2008-11-25 12:22:34.000000000 +0100
++++ head-2010-05-12/include/xen/interface/kexec.h 2008-11-25 12:22:34.000000000 +0100
@@ -0,0 +1,168 @@
+/******************************************************************************
+ * kexec.h - Public portion
@@ -4087,7 +4103,7 @@ Acked-by: jbeulich@novell.com
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-03-24/include/xen/interface/mem_event.h 2010-01-04 11:56:34.000000000 +0100
++++ head-2010-05-12/include/xen/interface/mem_event.h 2010-01-04 11:56:34.000000000 +0100
@@ -0,0 +1,69 @@
+/******************************************************************************
+ * mem_event.h
@@ -4159,7 +4175,7 @@ Acked-by: jbeulich@novell.com
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-03-24/include/xen/interface/nmi.h 2009-06-23 09:28:21.000000000 +0200
++++ head-2010-05-12/include/xen/interface/nmi.h 2009-06-23 09:28:21.000000000 +0200
@@ -0,0 +1,80 @@
+/******************************************************************************
+ * nmi.h
@@ -4242,7 +4258,7 @@ Acked-by: jbeulich@novell.com
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-03-24/include/xen/interface/platform.h 2010-01-04 11:56:34.000000000 +0100
++++ head-2010-05-12/include/xen/interface/platform.h 2010-01-04 11:56:34.000000000 +0100
@@ -0,0 +1,393 @@
+/******************************************************************************
+ * platform.h
@@ -4638,8 +4654,8 @@ Acked-by: jbeulich@novell.com
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-03-24/include/xen/interface/sysctl.h 2010-01-18 15:23:12.000000000 +0100
-@@ -0,0 +1,523 @@
++++ head-2010-05-12/include/xen/interface/sysctl.h 2010-05-07 11:10:48.000000000 +0200
+@@ -0,0 +1,607 @@
+/******************************************************************************
+ * sysctl.h
+ *
@@ -4676,12 +4692,12 @@ Acked-by: jbeulich@novell.com
+#include "xen.h"
+#include "domctl.h"
+
-+#define XEN_SYSCTL_INTERFACE_VERSION 0x00000007
++#define XEN_SYSCTL_INTERFACE_VERSION 0x00000008
+
+/*
+ * Read console content from Xen buffer ring.
+ */
-+#define XEN_SYSCTL_readconsole 1
++/* XEN_SYSCTL_readconsole */
+struct xen_sysctl_readconsole {
+ /* IN: Non-zero -> clear after reading. */
+ uint8_t clear;
@@ -4702,7 +4718,7 @@ Acked-by: jbeulich@novell.com
+DEFINE_XEN_GUEST_HANDLE(xen_sysctl_readconsole_t);
+
+/* Get trace buffers machine base address */
-+#define XEN_SYSCTL_tbuf_op 2
++/* XEN_SYSCTL_tbuf_op */
+struct xen_sysctl_tbuf_op {
+ /* IN variables */
+#define XEN_SYSCTL_TBUFOP_get_info 0
@@ -4717,7 +4733,7 @@ Acked-by: jbeulich@novell.com
+ uint32_t evt_mask;
+ /* OUT variables */
+ uint64_aligned_t buffer_mfn;
-+ uint32_t size;
++ uint32_t size; /* Also an IN variable! */
+};
+typedef struct xen_sysctl_tbuf_op xen_sysctl_tbuf_op_t;
+DEFINE_XEN_GUEST_HANDLE(xen_sysctl_tbuf_op_t);
@@ -4725,7 +4741,7 @@ Acked-by: jbeulich@novell.com
+/*
+ * Get physical information about the host machine
+ */
-+#define XEN_SYSCTL_physinfo 3
++/* XEN_SYSCTL_physinfo */
+ /* (x86) The platform supports HVM guests. */
+#define _XEN_SYSCTL_PHYSCAP_hvm 0
+#define XEN_SYSCTL_PHYSCAP_hvm (1u<<_XEN_SYSCTL_PHYSCAP_hvm)
@@ -4735,30 +4751,14 @@ Acked-by: jbeulich@novell.com
+struct xen_sysctl_physinfo {
+ uint32_t threads_per_core;
+ uint32_t cores_per_socket;
-+ uint32_t nr_cpus;
-+ uint32_t max_node_id;
++ uint32_t nr_cpus, max_cpu_id;
++ uint32_t nr_nodes, max_node_id;
+ uint32_t cpu_khz;
+ uint64_aligned_t total_pages;
+ uint64_aligned_t free_pages;
+ uint64_aligned_t scrub_pages;
+ uint32_t hw_cap[8];
+
-+ /*
-+ * IN: maximum addressable entry in the caller-provided cpu_to_node array.
-+ * OUT: largest cpu identifier in the system.
-+ * If OUT is greater than IN then the cpu_to_node array is truncated!
-+ */
-+ uint32_t max_cpu_id;
-+ /*
-+ * If not NULL, this array is filled with node identifier for each cpu.
-+ * If a cpu has no node information (e.g., cpu not present) then the
-+ * sentinel value ~0u is written.
-+ * The size of this array is specified by the caller in @max_cpu_id.
-+ * If the actual @max_cpu_id is smaller than the array then the trailing
-+ * elements of the array will not be written by the sysctl.
-+ */
-+ XEN_GUEST_HANDLE_64(uint32) cpu_to_node;
-+
+ /* XEN_SYSCTL_PHYSCAP_??? */
+ uint32_t capabilities;
+};
@@ -4768,7 +4768,7 @@ Acked-by: jbeulich@novell.com
+/*
+ * Get the ID of the current scheduler.
+ */
-+#define XEN_SYSCTL_sched_id 4
++/* XEN_SYSCTL_sched_id */
+struct xen_sysctl_sched_id {
+ /* OUT variable */
+ uint32_t sched_id;
@@ -4777,7 +4777,7 @@ Acked-by: jbeulich@novell.com
+DEFINE_XEN_GUEST_HANDLE(xen_sysctl_sched_id_t);
+
+/* Interface for controlling Xen software performance counters. */
-+#define XEN_SYSCTL_perfc_op 5
++/* XEN_SYSCTL_perfc_op */
+/* Sub-operations: */
+#define XEN_SYSCTL_PERFCOP_reset 1 /* Reset all counters to zero. */
+#define XEN_SYSCTL_PERFCOP_query 2 /* Get perfctr information. */
@@ -4804,7 +4804,7 @@ Acked-by: jbeulich@novell.com
+typedef struct xen_sysctl_perfc_op xen_sysctl_perfc_op_t;
+DEFINE_XEN_GUEST_HANDLE(xen_sysctl_perfc_op_t);
+
-+#define XEN_SYSCTL_getdomaininfolist 6
++/* XEN_SYSCTL_getdomaininfolist */
+struct xen_sysctl_getdomaininfolist {
+ /* IN variables. */
+ domid_t first_domain;
@@ -4817,7 +4817,7 @@ Acked-by: jbeulich@novell.com
+DEFINE_XEN_GUEST_HANDLE(xen_sysctl_getdomaininfolist_t);
+
+/* Inject debug keys into Xen. */
-+#define XEN_SYSCTL_debug_keys 7
++/* XEN_SYSCTL_debug_keys */
+struct xen_sysctl_debug_keys {
+ /* IN variables. */
+ XEN_GUEST_HANDLE_64(char) keys;
@@ -4827,7 +4827,7 @@ Acked-by: jbeulich@novell.com
+DEFINE_XEN_GUEST_HANDLE(xen_sysctl_debug_keys_t);
+
+/* Get physical CPU information. */
-+#define XEN_SYSCTL_getcpuinfo 8
++/* XEN_SYSCTL_getcpuinfo */
+struct xen_sysctl_cpuinfo {
+ uint64_aligned_t idletime;
+};
@@ -4843,7 +4843,7 @@ Acked-by: jbeulich@novell.com
+typedef struct xen_sysctl_getcpuinfo xen_sysctl_getcpuinfo_t;
+DEFINE_XEN_GUEST_HANDLE(xen_sysctl_getcpuinfo_t);
+
-+#define XEN_SYSCTL_availheap 9
++/* XEN_SYSCTL_availheap */
+struct xen_sysctl_availheap {
+ /* IN variables. */
+ uint32_t min_bitwidth; /* Smallest address width (zero if don't care). */
@@ -4855,7 +4855,7 @@ Acked-by: jbeulich@novell.com
+typedef struct xen_sysctl_availheap xen_sysctl_availheap_t;
+DEFINE_XEN_GUEST_HANDLE(xen_sysctl_availheap_t);
+
-+#define XEN_SYSCTL_get_pmstat 10
++/* XEN_SYSCTL_get_pmstat */
+struct pm_px_val {
+ uint64_aligned_t freq; /* Px core frequency */
+ uint64_aligned_t residency; /* Px residency time */
@@ -4912,7 +4912,7 @@ Acked-by: jbeulich@novell.com
+#define XEN_CPU_HOTPLUG_STATUS_ONLINE 2
+#define XEN_CPU_HOTPLUG_STATUS_NEW 3
+
-+#define XEN_SYSCTL_cpu_hotplug 11
++/* XEN_SYSCTL_cpu_hotplug */
+struct xen_sysctl_cpu_hotplug {
+ /* IN variables */
+ uint32_t cpu; /* Physical cpu. */
@@ -4928,7 +4928,7 @@ Acked-by: jbeulich@novell.com
+ * Get/set xen power management, include
+ * 1. cpufreq governors and related parameters
+ */
-+#define XEN_SYSCTL_pm_op 12
++/* XEN_SYSCTL_pm_op */
+struct xen_userspace {
+ uint32_t scaling_setspeed;
+};
@@ -4975,6 +4975,8 @@ Acked-by: jbeulich@novell.com
+ struct xen_userspace userspace;
+ struct xen_ondemand ondemand;
+ } u;
++
++ int32_t turbo_enabled;
+};
+
+struct xen_set_cpufreq_gov {
@@ -4992,22 +4994,6 @@ Acked-by: jbeulich@novell.com
+ uint32_t ctrl_value;
+};
+
-+/* Get physical CPU topology information. */
-+#define INVALID_TOPOLOGY_ID (~0U)
-+struct xen_get_cputopo {
-+ /* IN: maximum addressable entry in
-+ * the caller-provided cpu_to_core/socket.
-+ */
-+ uint32_t max_cpus;
-+ XEN_GUEST_HANDLE_64(uint32) cpu_to_core;
-+ XEN_GUEST_HANDLE_64(uint32) cpu_to_socket;
-+
-+ /* OUT: number of cpus returned
-+ * If OUT is greater than IN then the cpu_to_core/socket is truncated!
-+ */
-+ uint32_t nr_cpus;
-+};
-+
+struct xen_sysctl_pm_op {
+ #define PM_PARA_CATEGORY_MASK 0xf0
+ #define CPUFREQ_PARA 0x10
@@ -5018,9 +5004,6 @@ Acked-by: jbeulich@novell.com
+ #define SET_CPUFREQ_PARA (CPUFREQ_PARA | 0x03)
+ #define GET_CPUFREQ_AVGFREQ (CPUFREQ_PARA | 0x04)
+
-+ /* get CPU topology */
-+ #define XEN_SYSCTL_pm_op_get_cputopo 0x20
-+
+ /* set/reset scheduler power saving option */
+ #define XEN_SYSCTL_pm_op_set_sched_opt_smt 0x21
+
@@ -5032,6 +5015,10 @@ Acked-by: jbeulich@novell.com
+ #define XEN_SYSCTL_pm_op_set_vcpu_migration_delay 0x24
+ #define XEN_SYSCTL_pm_op_get_vcpu_migration_delay 0x25
+
++ /* enable/disable turbo mode when in dbs governor */
++ #define XEN_SYSCTL_pm_op_enable_turbo 0x26
++ #define XEN_SYSCTL_pm_op_disable_turbo 0x27
++
+ uint32_t cmd;
+ uint32_t cpuid;
+ union {
@@ -5039,7 +5026,6 @@ Acked-by: jbeulich@novell.com
+ struct xen_set_cpufreq_gov set_gov;
+ struct xen_set_cpufreq_para set_para;
+ uint64_aligned_t get_avgfreq;
-+ struct xen_get_cputopo get_topo;
+ uint32_t set_sched_opt_smt;
+ uint32_t get_max_cstate;
+ uint32_t set_max_cstate;
@@ -5048,7 +5034,7 @@ Acked-by: jbeulich@novell.com
+ } u;
+};
+
-+#define XEN_SYSCTL_page_offline_op 14
++/* XEN_SYSCTL_page_offline_op */
+struct xen_sysctl_page_offline_op {
+ /* IN: range of page to be offlined */
+#define sysctl_page_offline 1
@@ -5096,7 +5082,7 @@ Acked-by: jbeulich@novell.com
+
+#define PG_OFFLINE_OWNER_SHIFT 16
+
-+#define XEN_SYSCTL_lockprof_op 15
++/* XEN_SYSCTL_lockprof_op */
+/* Sub-operations: */
+#define XEN_SYSCTL_LOCKPROF_reset 1 /* Reset all profile data to zero. */
+#define XEN_SYSCTL_LOCKPROF_query 2 /* Get lock profile information. */
@@ -5128,13 +5114,125 @@ Acked-by: jbeulich@novell.com
+typedef struct xen_sysctl_lockprof_op xen_sysctl_lockprof_op_t;
+DEFINE_XEN_GUEST_HANDLE(xen_sysctl_lockprof_op_t);
+
++/* XEN_SYSCTL_topologyinfo */
++#define INVALID_TOPOLOGY_ID (~0U)
++struct xen_sysctl_topologyinfo {
++ /*
++ * IN: maximum addressable entry in the caller-provided arrays.
++ * OUT: largest cpu identifier in the system.
++ * If OUT is greater than IN then the arrays are truncated!
++ */
++ uint32_t max_cpu_index;
++
++ /*
++ * If not NULL, this array is filled with core/socket/node identifier for
++ * each cpu.
++ * If a cpu has no core/socket/node information (e.g., cpu not present)
++ * then the sentinel value ~0u is written.
++ * The size of this array is specified by the caller in @max_cpu_index.
++ * If the actual @max_cpu_index is smaller than the array then the trailing
++ * elements of the array will not be written by the sysctl.
++ */
++ XEN_GUEST_HANDLE_64(uint32) cpu_to_core;
++ XEN_GUEST_HANDLE_64(uint32) cpu_to_socket;
++ XEN_GUEST_HANDLE_64(uint32) cpu_to_node;
++};
++typedef struct xen_sysctl_topologyinfo xen_sysctl_topologyinfo_t;
++DEFINE_XEN_GUEST_HANDLE(xen_sysctl_topologyinfo_t);
++
++/* XEN_SYSCTL_numainfo */
++struct xen_sysctl_numainfo {
++ /*
++ * IN: maximum addressable entry in the caller-provided arrays.
++ * OUT: largest node identifier in the system.
++ * If OUT is greater than IN then the arrays are truncated!
++ */
++ uint32_t max_node_index;
++
++ /* NB. Entries are 0 if node is not present. */
++ XEN_GUEST_HANDLE_64(uint64) node_to_memsize;
++ XEN_GUEST_HANDLE_64(uint64) node_to_memfree;
++
++ /*
++ * Array, of size (max_node_index+1)^2, listing memory access distances
++ * between nodes. If an entry has no node distance information (e.g., node
++ * not present) then the value ~0u is written.
++ *
++ * Note that the array rows must be indexed by multiplying by the minimum
++ * of the caller-provided max_node_index and the returned value of
++ * max_node_index. That is, if the largest node index in the system is
++ * smaller than the caller can handle, a smaller 2-d array is constructed
++ * within the space provided by the caller. When this occurs, trailing
++ * space provided by the caller is not modified. If the largest node index
++ * in the system is larger than the caller can handle, then a 2-d array of
++ * the maximum size handleable by the caller is constructed.
++ */
++ XEN_GUEST_HANDLE_64(uint32) node_to_node_distance;
++};
++typedef struct xen_sysctl_numainfo xen_sysctl_numainfo_t;
++DEFINE_XEN_GUEST_HANDLE(xen_sysctl_numainfo_t);
++
++/* XEN_SYSCTL_cpupool_op */
++#define XEN_SYSCTL_CPUPOOL_OP_CREATE 1 /* C */
++#define XEN_SYSCTL_CPUPOOL_OP_DESTROY 2 /* D */
++#define XEN_SYSCTL_CPUPOOL_OP_INFO 3 /* I */
++#define XEN_SYSCTL_CPUPOOL_OP_ADDCPU 4 /* A */
++#define XEN_SYSCTL_CPUPOOL_OP_RMCPU 5 /* R */
++#define XEN_SYSCTL_CPUPOOL_OP_MOVEDOMAIN 6 /* M */
++#define XEN_SYSCTL_CPUPOOL_OP_FREEINFO 7 /* F */
++#define XEN_SYSCTL_CPUPOOL_PAR_ANY 0xFFFFFFFF
++struct xen_sysctl_cpupool_op {
++ uint32_t op; /* IN */
++ uint32_t cpupool_id; /* IN: CDIARM OUT: CI */
++ uint32_t sched_id; /* IN: C OUT: I */
++ uint32_t domid; /* IN: M */
++ uint32_t cpu; /* IN: AR */
++ uint32_t n_dom; /* OUT: I */
++ struct xenctl_cpumap cpumap; /* OUT: IF */
++};
++typedef struct xen_sysctl_cpupool_op xen_sysctl_cpupool_op_t;
++DEFINE_XEN_GUEST_HANDLE(xen_sysctl_cpupool_op_t);
++
++/* XEN_SYSCTL_scheduler_op */
++/* Set or get info? */
++#define XEN_SYSCTL_SCHEDOP_putinfo 0
++#define XEN_SYSCTL_SCHEDOP_getinfo 1
++struct xen_sysctl_scheduler_op {
++ uint32_t sched_id; /* XEN_SCHEDULER_* (domctl.h) */
++ uint32_t cmd; /* XEN_SYSCTL_SCHEDOP_* */
++ union {
++ } u;
++};
++typedef struct xen_sysctl_scheduler_op xen_sysctl_scheduler_op_t;
++DEFINE_XEN_GUEST_HANDLE(xen_sysctl_scheduler_op_t);
++
+struct xen_sysctl {
+ uint32_t cmd;
++#define XEN_SYSCTL_readconsole 1
++#define XEN_SYSCTL_tbuf_op 2
++#define XEN_SYSCTL_physinfo 3
++#define XEN_SYSCTL_sched_id 4
++#define XEN_SYSCTL_perfc_op 5
++#define XEN_SYSCTL_getdomaininfolist 6
++#define XEN_SYSCTL_debug_keys 7
++#define XEN_SYSCTL_getcpuinfo 8
++#define XEN_SYSCTL_availheap 9
++#define XEN_SYSCTL_get_pmstat 10
++#define XEN_SYSCTL_cpu_hotplug 11
++#define XEN_SYSCTL_pm_op 12
++#define XEN_SYSCTL_page_offline_op 14
++#define XEN_SYSCTL_lockprof_op 15
++#define XEN_SYSCTL_topologyinfo 16
++#define XEN_SYSCTL_numainfo 17
++#define XEN_SYSCTL_cpupool_op 18
++#define XEN_SYSCTL_scheduler_op 19
+ uint32_t interface_version; /* XEN_SYSCTL_INTERFACE_VERSION */
+ union {
+ struct xen_sysctl_readconsole readconsole;
+ struct xen_sysctl_tbuf_op tbuf_op;
+ struct xen_sysctl_physinfo physinfo;
++ struct xen_sysctl_topologyinfo topologyinfo;
++ struct xen_sysctl_numainfo numainfo;
+ struct xen_sysctl_sched_id sched_id;
+ struct xen_sysctl_perfc_op perfc_op;
+ struct xen_sysctl_getdomaininfolist getdomaininfolist;
@@ -5146,6 +5244,8 @@ Acked-by: jbeulich@novell.com
+ struct xen_sysctl_pm_op pm_op;
+ struct xen_sysctl_page_offline_op page_offline;
+ struct xen_sysctl_lockprof_op lockprof_op;
++ struct xen_sysctl_cpupool_op cpupool_op;
++ struct xen_sysctl_scheduler_op scheduler_op;
+ uint8_t pad[128];
+ } u;
+};
@@ -5164,7 +5264,7 @@ Acked-by: jbeulich@novell.com
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-03-24/include/xen/interface/tmem.h 2010-01-04 11:56:34.000000000 +0100
++++ head-2010-05-12/include/xen/interface/tmem.h 2010-01-04 11:56:34.000000000 +0100
@@ -0,0 +1,144 @@
+/******************************************************************************
+ * tmem.h
@@ -5311,8 +5411,8 @@ Acked-by: jbeulich@novell.com
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-03-24/include/xen/interface/trace.h 2009-06-23 09:28:21.000000000 +0200
-@@ -0,0 +1,208 @@
++++ head-2010-05-12/include/xen/interface/trace.h 2010-05-07 11:10:48.000000000 +0200
+@@ -0,0 +1,227 @@
+/******************************************************************************
+ * include/public/trace.h
+ *
@@ -5368,6 +5468,7 @@ Acked-by: jbeulich@novell.com
+#define TRC_HVM_HANDLER 0x00082000 /* various HVM handlers */
+
+#define TRC_SCHED_MIN 0x00021000 /* Just runstate changes */
++#define TRC_SCHED_CLASS 0x00022000 /* Scheduler-specific */
+#define TRC_SCHED_VERBOSE 0x00028000 /* More inclusive scheduling */
+
+/* Trace events per class */
@@ -5397,6 +5498,12 @@ Acked-by: jbeulich@novell.com
+#define TRC_MEM_PAGE_GRANT_MAP (TRC_MEM + 1)
+#define TRC_MEM_PAGE_GRANT_UNMAP (TRC_MEM + 2)
+#define TRC_MEM_PAGE_GRANT_TRANSFER (TRC_MEM + 3)
++#define TRC_MEM_SET_P2M_ENTRY (TRC_MEM + 4)
++#define TRC_MEM_DECREASE_RESERVATION (TRC_MEM + 5)
++#define TRC_MEM_POD_POPULATE (TRC_MEM + 16)
++#define TRC_MEM_POD_ZERO_RECLAIM (TRC_MEM + 17)
++#define TRC_MEM_POD_SUPERPAGE_SPLINTER (TRC_MEM + 18)
++
+
+#define TRC_PV_HYPERCALL (TRC_PV + 1)
+#define TRC_PV_TRAP (TRC_PV + 3)
@@ -5464,6 +5571,8 @@ Acked-by: jbeulich@novell.com
+#define TRC_HVM_LMSW (TRC_HVM_HANDLER + 0x19)
+#define TRC_HVM_LMSW64 (TRC_HVM_HANDLER + TRC_64_FLAG + 0x19)
+#define TRC_HVM_INTR_WINDOW (TRC_HVM_HANDLER + 0x20)
++#define TRC_HVM_NPF (TRC_HVM_HANDLER + 0x21)
++
+#define TRC_HVM_IOPORT_WRITE (TRC_HVM_HANDLER + 0x216)
+#define TRC_HVM_IOMEM_WRITE (TRC_HVM_HANDLER + 0x217)
+
@@ -5510,6 +5619,16 @@ Acked-by: jbeulich@novell.com
+ /* Records follow immediately after the meta-data header. */
+};
+
++/* Structure used to pass MFNs to the trace buffers back to trace consumers.
++ * Offset is an offset into the mapped structure where the mfn list will be held.
++ * MFNs will be at ((unsigned long *)(t_info))+(t_info->cpu_offset[cpu]).
++ */
++struct t_info {
++ uint16_t tbuf_size; /* Size in pages of each trace buffer */
++ uint16_t mfn_offset[]; /* Offset within t_info structure of the page list per cpu */
++ /* MFN lists immediately after the header */
++};
++
+#endif /* __XEN_PUBLIC_TRACE_H__ */
+
+/*
@@ -5522,7 +5641,7 @@ Acked-by: jbeulich@novell.com
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-03-24/include/xen/interface/xen-compat.h 2010-01-04 11:56:34.000000000 +0100
++++ head-2010-05-12/include/xen/interface/xen-compat.h 2010-01-04 11:56:34.000000000 +0100
@@ -0,0 +1,44 @@
+/******************************************************************************
+ * xen-compat.h
@@ -5569,7 +5688,7 @@ Acked-by: jbeulich@novell.com
+
+#endif /* __XEN_PUBLIC_XEN_COMPAT_H__ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-03-24/include/xen/interface/xenoprof.h 2007-06-12 13:14:19.000000000 +0200
++++ head-2010-05-12/include/xen/interface/xenoprof.h 2007-06-12 13:14:19.000000000 +0200
@@ -0,0 +1,138 @@
+/******************************************************************************
+ * xenoprof.h
@@ -5710,7 +5829,7 @@ Acked-by: jbeulich@novell.com
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-03-24/include/xen/interface/xsm/acm.h 2010-01-04 11:56:34.000000000 +0100
++++ head-2010-05-12/include/xen/interface/xsm/acm.h 2010-01-04 11:56:34.000000000 +0100
@@ -0,0 +1,223 @@
+/*
+ * acm.h: Xen access control module interface defintions
@@ -5936,7 +6055,7 @@ Acked-by: jbeulich@novell.com
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-03-24/include/xen/interface/xsm/acm_ops.h 2007-10-22 13:39:15.000000000 +0200
++++ head-2010-05-12/include/xen/interface/xsm/acm_ops.h 2007-10-22 13:39:15.000000000 +0200
@@ -0,0 +1,159 @@
+/*
+ * acm_ops.h: Xen access control module hypervisor commands
@@ -6098,7 +6217,7 @@ Acked-by: jbeulich@novell.com
+ * End:
+ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-03-24/include/xen/interface/xsm/flask_op.h 2010-01-04 11:56:34.000000000 +0100
++++ head-2010-05-12/include/xen/interface/xsm/flask_op.h 2010-01-04 11:56:34.000000000 +0100
@@ -0,0 +1,47 @@
+/*
+ * This file contains the flask_op hypercall commands and definitions.
diff --git a/patches.xen/xen3-auto-xen-arch.diff b/patches.xen/xen3-auto-xen-arch.diff
index b926262086..0f096ae28f 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 1016:5bccfba3e847)
+From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1017:948c933f8839)
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 602f7f262a..bb0cdfe773 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 1016:5bccfba3e847)
+From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1017:948c933f8839)
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 68e0596645..6aa73c7177 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 1016:5bccfba3e847)
+From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1017:948c933f8839)
Patch-mainline: n/a
Acked-by: jbeulich@novell.com
diff --git a/patches.xen/xen3-fixup-xen b/patches.xen/xen3-fixup-xen
index 11dcef8aea..32e38468e9 100644
--- a/patches.xen/xen3-fixup-xen
+++ b/patches.xen/xen3-fixup-xen
@@ -1,11 +1,11 @@
Subject: Fix Xen build wrt. Xen files coming from mainline.
-From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1016:5bccfba3e847)
+From: http://xenbits.xensource.com/linux-2.6.18-xen.hg (tip 1017:948c933f8839)
Patch-mainline: n/a
Acked-by: jbeulich@novell.com
---- head-2010-04-15.orig/drivers/xen/Makefile 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/drivers/xen/Makefile 2010-01-19 16:01:03.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/Makefile 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/drivers/xen/Makefile 2010-01-19 16:01:03.000000000 +0100
@@ -1,12 +1,28 @@
-obj-y += grant-table.o features.o events.o manage.o
+obj-y += core/
@@ -46,8 +46,8 @@ Acked-by: jbeulich@novell.com
+obj-$(CONFIG_XEN_NETDEV_ACCEL_SFC_UTIL) += sfc_netutil/
+obj-$(CONFIG_XEN_NETDEV_ACCEL_SFC_FRONTEND) += sfc_netfront/
+obj-$(CONFIG_XEN_NETDEV_ACCEL_SFC_BACKEND) += sfc_netback/
---- head-2010-04-15.orig/drivers/xen/xenbus/Makefile 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/drivers/xen/xenbus/Makefile 2010-01-19 16:01:03.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/xenbus/Makefile 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/drivers/xen/xenbus/Makefile 2010-01-19 16:01:03.000000000 +0100
@@ -1,7 +1,9 @@
-obj-y += xenbus.o
+obj-y += xenbus_client.o xenbus_comms.o xenbus_xs.o xenbus_probe.o
@@ -64,8 +64,8 @@ Acked-by: jbeulich@novell.com
+xenbus-$(CONFIG_XEN_BACKEND) += xenbus_probe_backend.o
+obj-y += $(xenbus-y) $(xenbus-m)
+obj-$(CONFIG_XEN_XENBUS_DEV) += xenbus_dev.o
---- head-2010-04-15.orig/drivers/xen/xenbus/xenbus_client.c 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/drivers/xen/xenbus/xenbus_client.c 2010-01-19 16:01:03.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/xenbus/xenbus_client.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/drivers/xen/xenbus/xenbus_client.c 2010-01-19 16:01:03.000000000 +0100
@@ -31,14 +31,17 @@
*/
@@ -531,8 +531,8 @@ Acked-by: jbeulich@novell.com
enum xenbus_state xenbus_read_driver_state(const char *path)
{
enum xenbus_state result;
---- head-2010-04-15.orig/drivers/xen/xenbus/xenbus_comms.c 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/drivers/xen/xenbus/xenbus_comms.c 2010-01-19 16:01:03.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/xenbus/xenbus_comms.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/drivers/xen/xenbus/xenbus_comms.c 2010-01-19 16:01:03.000000000 +0100
@@ -34,25 +34,55 @@
#include <linux/interrupt.h>
#include <linux/sched.h>
@@ -657,8 +657,8 @@ Acked-by: jbeulich@novell.com
+
return 0;
}
---- head-2010-04-15.orig/drivers/xen/xenbus/xenbus_comms.h 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/drivers/xen/xenbus/xenbus_comms.h 2010-01-19 16:01:03.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/xenbus/xenbus_comms.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/drivers/xen/xenbus/xenbus_comms.h 2010-01-19 16:01:03.000000000 +0100
@@ -43,4 +43,20 @@ int xs_input_avail(void);
extern struct xenstore_domain_interface *xen_store_interface;
extern int xen_store_evtchn;
@@ -680,8 +680,8 @@ Acked-by: jbeulich@novell.com
+}
+
#endif /* _XENBUS_COMMS_H */
---- head-2010-04-15.orig/drivers/xen/xenbus/xenbus_probe.c 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/drivers/xen/xenbus/xenbus_probe.c 2010-01-26 09:08:16.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/xenbus/xenbus_probe.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/drivers/xen/xenbus/xenbus_probe.c 2010-01-26 09:08:16.000000000 +0100
@@ -4,6 +4,7 @@
* Copyright (C) 2005 Rusty Russell, IBM Corporation
* Copyright (C) 2005 Mike Wray, Hewlett-Packard
@@ -1633,8 +1633,8 @@ Acked-by: jbeulich@novell.com
+ return bus_for_each_dev(&xenbus_frontend.bus, NULL, arg, fn);
+}
+EXPORT_SYMBOL_GPL(xenbus_for_each_frontend);
---- head-2010-04-15.orig/drivers/xen/xenbus/xenbus_probe.h 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/drivers/xen/xenbus/xenbus_probe.h 2010-01-19 16:01:04.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/xenbus/xenbus_probe.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/drivers/xen/xenbus/xenbus_probe.h 2010-01-19 16:01:04.000000000 +0100
@@ -34,43 +34,47 @@
#ifndef _XENBUS_PROBE_H
#define _XENBUS_PROBE_H
@@ -1692,8 +1692,8 @@ Acked-by: jbeulich@novell.com
+extern void dev_changed(const char *node, struct xen_bus_type *bus);
#endif
---- head-2010-04-15.orig/drivers/xen/xenbus/xenbus_xs.c 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/drivers/xen/xenbus/xenbus_xs.c 2010-01-19 16:01:04.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/xenbus/xenbus_xs.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/drivers/xen/xenbus/xenbus_xs.c 2010-01-19 16:01:04.000000000 +0100
@@ -47,6 +47,14 @@
#include <xen/xenbus.h>
#include "xenbus_comms.h"
@@ -2021,8 +2021,8 @@ Acked-by: jbeulich@novell.com
task = kthread_run(xenwatch_thread, NULL, "xenwatch");
if (IS_ERR(task))
---- head-2010-04-15.orig/include/xen/evtchn.h 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/include/xen/evtchn.h 2010-01-19 16:01:04.000000000 +0100
+--- head-2010-05-12.orig/include/xen/evtchn.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/include/xen/evtchn.h 2010-01-19 16:01:04.000000000 +0100
@@ -1,7 +1,11 @@
+#if defined(CONFIG_PARAVIRT_XEN) || !defined(__KERNEL__)
+#include "public/evtchn.h"
@@ -2198,8 +2198,8 @@ Acked-by: jbeulich@novell.com
-#endif /* __LINUX_PUBLIC_EVTCHN_H__ */
+#endif /* __ASM_EVTCHN_H__ */
+#endif /* CONFIG_PARAVIRT_XEN */
---- head-2010-04-15.orig/include/xen/interface/callback.h 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/include/xen/interface/callback.h 2010-01-19 16:01:04.000000000 +0100
+--- head-2010-05-12.orig/include/xen/interface/callback.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/include/xen/interface/callback.h 2010-01-19 16:01:04.000000000 +0100
@@ -86,6 +86,8 @@ struct callback_register {
uint16_t flags;
xen_callback_t address;
@@ -2222,8 +2222,8 @@ Acked-by: jbeulich@novell.com
+#endif
#endif /* __XEN_PUBLIC_CALLBACK_H__ */
---- head-2010-04-15.orig/include/xen/interface/elfnote.h 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/include/xen/interface/elfnote.h 2010-01-19 16:01:04.000000000 +0100
+--- head-2010-05-12.orig/include/xen/interface/elfnote.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/include/xen/interface/elfnote.h 2010-01-19 16:01:04.000000000 +0100
@@ -3,6 +3,24 @@
*
* Definitions used for the Xen ELF notes.
@@ -2358,8 +2358,8 @@ Acked-by: jbeulich@novell.com
#endif /* __XEN_PUBLIC_ELFNOTE_H__ */
/*
---- head-2010-04-15.orig/include/xen/interface/event_channel.h 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/include/xen/interface/event_channel.h 2010-01-19 16:01:04.000000000 +0100
+--- head-2010-05-12.orig/include/xen/interface/event_channel.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/include/xen/interface/event_channel.h 2010-01-19 16:01:04.000000000 +0100
@@ -3,6 +3,24 @@
*
* Event channels between domains.
@@ -2689,8 +2689,8 @@ Acked-by: jbeulich@novell.com
+DEFINE_XEN_GUEST_HANDLE(evtchn_op_t);
#endif /* __XEN_PUBLIC_EVENT_CHANNEL_H__ */
---- head-2010-04-15.orig/include/xen/interface/features.h 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/include/xen/interface/features.h 2010-01-19 16:01:04.000000000 +0100
+--- head-2010-05-12.orig/include/xen/interface/features.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/include/xen/interface/features.h 2010-01-19 16:01:04.000000000 +0100
@@ -3,6 +3,24 @@
*
* Feature flags, reported by XENVER_get_features.
@@ -2732,8 +2732,8 @@ Acked-by: jbeulich@novell.com
#define XENFEAT_NR_SUBMAPS 1
#endif /* __XEN_PUBLIC_FEATURES_H__ */
---- head-2010-04-15.orig/include/xen/interface/grant_table.h 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/include/xen/interface/grant_table.h 2010-01-19 16:01:04.000000000 +0100
+--- head-2010-05-12.orig/include/xen/interface/grant_table.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/include/xen/interface/grant_table.h 2010-01-19 16:01:04.000000000 +0100
@@ -28,6 +28,7 @@
#ifndef __XEN_PUBLIC_GRANT_TABLE_H__
#define __XEN_PUBLIC_GRANT_TABLE_H__
@@ -3149,8 +3149,8 @@ Acked-by: jbeulich@novell.com
}
#endif /* __XEN_PUBLIC_GRANT_TABLE_H__ */
---- head-2010-04-15.orig/include/xen/interface/io/blkif.h 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/include/xen/interface/io/blkif.h 2010-01-19 16:01:04.000000000 +0100
+--- head-2010-05-12.orig/include/xen/interface/io/blkif.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/include/xen/interface/io/blkif.h 2010-01-19 16:01:04.000000000 +0100
@@ -3,6 +3,24 @@
*
* Unified block-device I/O interface for Xen guest OSes.
@@ -3271,8 +3271,8 @@ Acked-by: jbeulich@novell.com
/*
* STATUS RETURN CODES.
---- head-2010-04-15.orig/include/xen/interface/io/console.h 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/include/xen/interface/io/console.h 2010-01-19 16:01:04.000000000 +0100
+--- head-2010-05-12.orig/include/xen/interface/io/console.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/include/xen/interface/io/console.h 2010-01-19 16:01:04.000000000 +0100
@@ -3,6 +3,24 @@
*
* Console I/O interface for Xen guest OSes.
@@ -3298,8 +3298,8 @@ Acked-by: jbeulich@novell.com
* Copyright (c) 2005, Keir Fraser
*/
---- head-2010-04-15.orig/include/xen/interface/io/fbif.h 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/include/xen/interface/io/fbif.h 2010-01-19 16:01:04.000000000 +0100
+--- head-2010-05-12.orig/include/xen/interface/io/fbif.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/include/xen/interface/io/fbif.h 2010-01-19 16:01:04.000000000 +0100
@@ -41,12 +41,13 @@
*/
#define XENFB_TYPE_UPDATE 2
@@ -3464,8 +3464,8 @@ Acked-by: jbeulich@novell.com
};
/*
---- head-2010-04-15.orig/include/xen/interface/io/kbdif.h 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/include/xen/interface/io/kbdif.h 2010-01-19 16:01:04.000000000 +0100
+--- head-2010-05-12.orig/include/xen/interface/io/kbdif.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/include/xen/interface/io/kbdif.h 2010-01-19 16:01:04.000000000 +0100
@@ -45,34 +45,38 @@
*/
#define XENKBD_TYPE_POS 4
@@ -3573,8 +3573,8 @@ Acked-by: jbeulich@novell.com
};
#endif
---- head-2010-04-15.orig/include/xen/interface/io/netif.h 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/include/xen/interface/io/netif.h 2010-01-19 16:01:04.000000000 +0100
+--- head-2010-05-12.orig/include/xen/interface/io/netif.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/include/xen/interface/io/netif.h 2010-01-19 16:01:04.000000000 +0100
@@ -3,6 +3,24 @@
*
* Unified network-device I/O interface for Xen guest OSes.
@@ -3760,8 +3760,8 @@ Acked-by: jbeulich@novell.com
#define NETIF_RSP_DROPPED -2
#define NETIF_RSP_ERROR -1
---- head-2010-04-15.orig/include/xen/interface/io/protocols.h 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/include/xen/interface/io/protocols.h 2010-01-19 16:01:04.000000000 +0100
+--- head-2010-05-12.orig/include/xen/interface/io/protocols.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/include/xen/interface/io/protocols.h 2010-01-19 16:01:04.000000000 +0100
@@ -1,10 +1,31 @@
+/******************************************************************************
+ * protocols.h
@@ -3804,8 +3804,8 @@ Acked-by: jbeulich@novell.com
#else
# error arch fixup needed here
#endif
---- head-2010-04-15.orig/include/xen/interface/io/ring.h 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/include/xen/interface/io/ring.h 2010-02-24 13:13:46.000000000 +0100
+--- head-2010-05-12.orig/include/xen/interface/io/ring.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/include/xen/interface/io/ring.h 2010-02-24 13:13:46.000000000 +0100
@@ -3,16 +3,42 @@
*
* Shared producer-consumer ring macros.
@@ -4187,8 +4187,8 @@ Acked-by: jbeulich@novell.com
} while (0)
#endif /* __XEN_PUBLIC_IO_RING_H__ */
---- head-2010-04-15.orig/include/xen/interface/io/xenbus.h 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/include/xen/interface/io/xenbus.h 2010-01-19 16:01:04.000000000 +0100
+--- head-2010-05-12.orig/include/xen/interface/io/xenbus.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/include/xen/interface/io/xenbus.h 2010-01-19 16:01:04.000000000 +0100
@@ -3,42 +3,68 @@
*
* Xenbus protocol details.
@@ -4287,8 +4287,8 @@ Acked-by: jbeulich@novell.com
- * tab-width: 8
- * End:
- */
---- head-2010-04-15.orig/include/xen/interface/io/xs_wire.h 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/include/xen/interface/io/xs_wire.h 2010-01-19 16:01:04.000000000 +0100
+--- head-2010-05-12.orig/include/xen/interface/io/xs_wire.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/include/xen/interface/io/xs_wire.h 2010-01-19 16:01:04.000000000 +0100
@@ -1,6 +1,25 @@
/*
* Details of the "wire" protocol between Xen Store Daemon and client
@@ -4362,8 +4362,8 @@ Acked-by: jbeulich@novell.com
+#define XENSTORE_REL_PATH_MAX 2048
+
#endif /* _XS_WIRE_H */
---- head-2010-04-15.orig/include/xen/interface/memory.h 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/include/xen/interface/memory.h 2010-01-19 16:01:04.000000000 +0100
+--- head-2010-05-12.orig/include/xen/interface/memory.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/include/xen/interface/memory.h 2010-01-19 16:01:04.000000000 +0100
@@ -3,20 +3,57 @@
*
* Memory reservation and information.
@@ -4653,8 +4653,8 @@ Acked-by: jbeulich@novell.com
+#define XENMEM_get_sharing_freed_pages 18
#endif /* __XEN_PUBLIC_MEMORY_H__ */
---- head-2010-04-15.orig/include/xen/interface/physdev.h 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/include/xen/interface/physdev.h 2010-01-19 16:01:04.000000000 +0100
+--- head-2010-05-12.orig/include/xen/interface/physdev.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/include/xen/interface/physdev.h 2010-01-19 16:01:04.000000000 +0100
@@ -21,10 +21,12 @@
#ifndef __XEN_PUBLIC_PHYSDEV_H__
#define __XEN_PUBLIC_PHYSDEV_H__
@@ -4951,8 +4951,8 @@ Acked-by: jbeulich@novell.com
+#define PHYSDEVOP_IRQ_SHARED XENIRQSTAT_shared
#endif /* __XEN_PUBLIC_PHYSDEV_H__ */
---- head-2010-04-15.orig/include/xen/interface/sched.h 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/include/xen/interface/sched.h 2010-01-19 16:01:04.000000000 +0100
+--- head-2010-05-12.orig/include/xen/interface/sched.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/include/xen/interface/sched.h 2010-01-19 16:01:04.000000000 +0100
@@ -3,6 +3,24 @@
*
* Scheduler state interactions
@@ -5038,8 +5038,8 @@ Acked-by: jbeulich@novell.com
/*
* Reason codes for SCHEDOP_shutdown. These may be interpreted by control
---- head-2010-04-15.orig/include/xen/interface/vcpu.h 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/include/xen/interface/vcpu.h 2010-01-19 16:01:04.000000000 +0100
+--- head-2010-05-12.orig/include/xen/interface/vcpu.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/include/xen/interface/vcpu.h 2010-01-19 16:01:04.000000000 +0100
@@ -27,11 +27,13 @@
#ifndef __XEN_PUBLIC_VCPU_H__
#define __XEN_PUBLIC_VCPU_H__
@@ -5278,8 +5278,8 @@ Acked-by: jbeulich@novell.com
+DEFINE_XEN_GUEST_HANDLE(vcpu_register_time_memory_area_t);
#endif /* __XEN_PUBLIC_VCPU_H__ */
---- head-2010-04-15.orig/include/xen/interface/version.h 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/include/xen/interface/version.h 2010-01-19 16:01:04.000000000 +0100
+--- head-2010-05-12.orig/include/xen/interface/version.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/include/xen/interface/version.h 2010-01-19 16:01:04.000000000 +0100
@@ -3,6 +3,24 @@
*
* Xen version, type, and compile information.
@@ -5374,8 +5374,8 @@ Acked-by: jbeulich@novell.com
+typedef char xen_commandline_t[1024];
+
#endif /* __XEN_PUBLIC_VERSION_H__ */
---- head-2010-04-15.orig/include/xen/interface/xen.h 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/include/xen/interface/xen.h 2010-01-19 16:01:04.000000000 +0100
+--- head-2010-05-12.orig/include/xen/interface/xen.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/include/xen/interface/xen.h 2010-05-07 11:10:48.000000000 +0200
@@ -3,35 +3,69 @@
*
* Guest OS interface to Xen.
@@ -5597,7 +5597,14 @@ Acked-by: jbeulich@novell.com
#define MMU_PT_UPDATE_PRESERVE_AD 2 /* atomically: *ptr = val | (*ptr&(A|D)) */
/*
-@@ -166,6 +248,13 @@
+@@ -163,9 +245,20 @@
+ * cmd: MMUEXT_FLUSH_CACHE
+ * No additional arguments. Writes back and flushes cache contents.
+ *
++ * cmd: MMUEXT_FLUSH_CACHE_GLOBAL
++ * No additional arguments. Writes back and flushes cache contents
++ * on all CPUs in the system.
++ *
* cmd: MMUEXT_SET_LDT
* linear_addr: Linear address of LDT base (NB. must be page-aligned).
* nr_ents: Number of entries in LDT.
@@ -5611,12 +5618,13 @@ Acked-by: jbeulich@novell.com
*/
#define MMUEXT_PIN_L1_TABLE 0
#define MMUEXT_PIN_L2_TABLE 1
-@@ -182,24 +271,34 @@
+@@ -182,24 +275,35 @@
#define MMUEXT_FLUSH_CACHE 12
#define MMUEXT_SET_LDT 13
#define MMUEXT_NEW_USER_BASEPTR 15
+#define MMUEXT_CLEAR_PAGE 16
+#define MMUEXT_COPY_PAGE 17
++#define MMUEXT_FLUSH_CACHE_GLOBAL 18
#ifndef __ASSEMBLY__
struct mmuext_op {
@@ -5660,7 +5668,7 @@ Acked-by: jbeulich@novell.com
#endif
/* These are passed as 'flags' to update_va_mapping. They can be ORed. */
-@@ -224,11 +323,24 @@ DEFINE_GUEST_HANDLE_STRUCT(mmuext_op);
+@@ -224,11 +328,24 @@ DEFINE_GUEST_HANDLE_STRUCT(mmuext_op);
*/
#define VMASST_CMD_enable 0
#define VMASST_CMD_disable 1
@@ -5686,7 +5694,7 @@ Acked-by: jbeulich@novell.com
#ifndef __ASSEMBLY__
-@@ -260,6 +372,13 @@ typedef uint16_t domid_t;
+@@ -260,6 +377,13 @@ typedef uint16_t domid_t;
#define DOMID_XEN (0x7FF2U)
/*
@@ -5700,7 +5708,7 @@ Acked-by: jbeulich@novell.com
* Send an array of these to HYPERVISOR_mmu_update().
* NB. The fields are natural pointer/address size for this architecture.
*/
-@@ -267,18 +386,19 @@ struct mmu_update {
+@@ -267,18 +391,19 @@ struct mmu_update {
uint64_t ptr; /* Machine address of PTE. */
uint64_t val; /* New contents of PTE. */
};
@@ -5724,7 +5732,7 @@ Acked-by: jbeulich@novell.com
/*
* Event channel endpoints per domain:
-@@ -287,173 +407,271 @@ DEFINE_GUEST_HANDLE_STRUCT(multicall_ent
+@@ -287,173 +412,271 @@ DEFINE_GUEST_HANDLE_STRUCT(multicall_ent
#define NR_EVENT_CHANNELS (sizeof(unsigned long) * sizeof(unsigned long) * 64)
struct vcpu_time_info {
@@ -6126,7 +6134,7 @@ Acked-by: jbeulich@novell.com
typedef uint8_t xen_domain_handle_t[16];
-@@ -461,6 +679,11 @@ typedef uint8_t xen_domain_handle_t[16];
+@@ -461,6 +684,11 @@ typedef uint8_t xen_domain_handle_t[16];
#define __mk_unsigned_long(x) x ## UL
#define mk_unsigned_long(x) __mk_unsigned_long(x)
@@ -6138,7 +6146,7 @@ Acked-by: jbeulich@novell.com
#else /* __ASSEMBLY__ */
/* In assembly code we cannot use C numeric constant suffixes. */
-@@ -468,4 +691,14 @@ typedef uint8_t xen_domain_handle_t[16];
+@@ -468,4 +696,14 @@ typedef uint8_t xen_domain_handle_t[16];
#endif /* !__ASSEMBLY__ */
@@ -6153,8 +6161,8 @@ Acked-by: jbeulich@novell.com
+#endif
+
#endif /* __XEN_PUBLIC_XEN_H__ */
---- head-2010-04-15.orig/include/xen/xenbus.h 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/include/xen/xenbus.h 2010-01-19 16:01:04.000000000 +0100
+--- head-2010-05-12.orig/include/xen/xenbus.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/include/xen/xenbus.h 2010-01-19 16:01:04.000000000 +0100
@@ -39,7 +39,7 @@
#include <linux/mutex.h>
#include <linux/completion.h>
diff --git a/patches.xen/xen3-patch-2.6.18 b/patches.xen/xen3-patch-2.6.18
index 7b4447614d..61bc8f0d72 100644
--- a/patches.xen/xen3-patch-2.6.18
+++ b/patches.xen/xen3-patch-2.6.18
@@ -6,8 +6,8 @@ Automatically created from "patches.kernel.org/patch-2.6.18" by xen-port-patches
Acked-by: jbeulich@novell.com
---- head-2010-04-15.orig/arch/x86/Kconfig 2010-03-24 15:02:14.000000000 +0100
-+++ head-2010-04-15/arch/x86/Kconfig 2010-03-24 15:06:08.000000000 +0100
+--- head-2010-04-29.orig/arch/x86/Kconfig 2010-03-24 15:02:14.000000000 +0100
++++ head-2010-04-29/arch/x86/Kconfig 2010-03-24 15:06:08.000000000 +0100
@@ -70,7 +70,6 @@ config ARCH_DEFCONFIG
config GENERIC_TIME
@@ -25,8 +25,8 @@ Acked-by: jbeulich@novell.com
default "0x1000000"
---help---
This gives the physical address where the kernel is loaded.
---- head-2010-04-15.orig/arch/x86/kernel/Makefile 2010-03-24 15:01:37.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/Makefile 2010-03-24 15:06:08.000000000 +0100
+--- head-2010-04-29.orig/arch/x86/kernel/Makefile 2010-03-24 15:01:37.000000000 +0100
++++ head-2010-04-29/arch/x86/kernel/Makefile 2010-03-24 15:06:08.000000000 +0100
@@ -138,5 +138,5 @@ ifeq ($(CONFIG_X86_64),y)
pci-dma_64-$(CONFIG_XEN) += pci-dma_32.o
endif
@@ -34,8 +34,8 @@ Acked-by: jbeulich@novell.com
-disabled-obj-$(CONFIG_XEN) := i8259_$(BITS).o reboot.o smpboot_$(BITS).o
+disabled-obj-$(CONFIG_XEN) := i8253.o i8259_$(BITS).o reboot.o smpboot_$(BITS).o tsc_$(BITS).o
%/head_$(BITS).o %/head_$(BITS).s: $(if $(CONFIG_XEN),EXTRA_AFLAGS,dummy) :=
---- head-2010-04-15.orig/arch/x86/kernel/setup64-xen.c 2008-01-28 12:24:19.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/setup64-xen.c 2010-03-24 15:06:08.000000000 +0100
+--- head-2010-04-29.orig/arch/x86/kernel/setup64-xen.c 2008-01-28 12:24:19.000000000 +0100
++++ head-2010-04-29/arch/x86/kernel/setup64-xen.c 2010-03-24 15:06:08.000000000 +0100
@@ -363,5 +363,7 @@ void __cpuinit cpu_init (void)
fpu_init();
@@ -45,8 +45,8 @@ Acked-by: jbeulich@novell.com
+ if (raw_irqs_disabled())
+ kernel_eflags &= ~X86_EFLAGS_IF;
}
---- head-2010-04-15.orig/arch/x86/kernel/time-xen.c 2010-02-24 11:50:47.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/time-xen.c 2010-03-24 15:06:08.000000000 +0100
+--- head-2010-04-29.orig/arch/x86/kernel/time-xen.c 2010-02-24 11:50:47.000000000 +0100
++++ head-2010-04-29/arch/x86/kernel/time-xen.c 2010-03-24 15:06:08.000000000 +0100
@@ -45,7 +45,6 @@
#include <linux/sysdev.h>
#include <linux/bcd.h>
@@ -302,8 +302,25 @@ Acked-by: jbeulich@novell.com
timer_name[cpu],
NULL);
if (irq < 0)
---- head-2010-04-15.orig/drivers/char/agp/intel-agp.c 2010-04-15 09:43:13.000000000 +0200
-+++ head-2010-04-15/drivers/char/agp/intel-agp.c 2010-04-15 09:52:07.000000000 +0200
+--- head-2010-04-29.orig/drivers/acpi/processor_perflib.c 2010-04-15 09:43:05.000000000 +0200
++++ head-2010-04-29/drivers/acpi/processor_perflib.c 2010-05-06 14:22:32.000000000 +0200
+@@ -578,6 +578,8 @@ end:
+ return result;
+ }
+
++#ifndef CONFIG_PROCESSOR_EXTERNAL_CONTROL
++
+ int acpi_processor_preregister_performance(
+ struct acpi_processor_performance __percpu *performance)
+ {
+@@ -793,3 +795,5 @@ acpi_processor_unregister_performance(st
+ }
+
+ EXPORT_SYMBOL(acpi_processor_unregister_performance);
++
++#endif /* !CONFIG_PROCESSOR_EXTERNAL_CONTROL */
+--- head-2010-04-29.orig/drivers/char/agp/intel-agp.c 2010-04-15 09:43:13.000000000 +0200
++++ head-2010-04-29/drivers/char/agp/intel-agp.c 2010-04-15 09:52:07.000000000 +0200
@@ -452,6 +452,10 @@ static struct page *i8xx_alloc_pages(voi
if (set_pages_uc(page, 4) < 0) {
@@ -315,8 +332,8 @@ Acked-by: jbeulich@novell.com
__free_pages(page, 2);
return NULL;
}
---- head-2010-04-15.orig/drivers/xen/console/console.c 2009-03-18 10:39:31.000000000 +0100
-+++ head-2010-04-15/drivers/xen/console/console.c 2010-03-24 15:06:08.000000000 +0100
+--- head-2010-04-29.orig/drivers/xen/console/console.c 2009-03-18 10:39:31.000000000 +0100
++++ head-2010-04-29/drivers/xen/console/console.c 2010-03-24 15:06:08.000000000 +0100
@@ -94,7 +94,6 @@ static int __init xencons_setup(char *st
{
char *q;
@@ -325,8 +342,8 @@ Acked-by: jbeulich@novell.com
console_use_vt = 1;
if (!strncmp(str, "ttyS", 4)) {
---- head-2010-04-15.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2009-06-23 09:28:21.000000000 +0200
-+++ head-2010-04-15/arch/x86/include/mach-xen/asm/pgtable_64.h 2010-03-24 15:06:08.000000000 +0100
+--- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2009-06-23 09:28:21.000000000 +0200
++++ head-2010-04-29/arch/x86/include/mach-xen/asm/pgtable_64.h 2010-03-24 15:06:08.000000000 +0100
@@ -394,7 +394,6 @@ static inline int pmd_large(pmd_t pte) {
/*
@@ -335,8 +352,8 @@ Acked-by: jbeulich@novell.com
*/
#define pgd_page(pgd) ((unsigned long) __va(pgd_val(pgd) & PTE_MASK))
#define pgd_index(address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1))
---- head-2010-04-15.orig/arch/x86/include/mach-xen/asm/processor_32.h 2008-01-28 12:24:19.000000000 +0100
-+++ head-2010-04-15/arch/x86/include/mach-xen/asm/processor_32.h 2010-03-24 15:06:08.000000000 +0100
+--- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/processor_32.h 2008-01-28 12:24:19.000000000 +0100
++++ head-2010-04-29/arch/x86/include/mach-xen/asm/processor_32.h 2010-03-24 15:06:08.000000000 +0100
@@ -23,7 +23,7 @@
#include <xen/interface/physdev.h>
@@ -346,8 +363,8 @@ Acked-by: jbeulich@novell.com
struct desc_struct {
unsigned long a,b;
---- head-2010-04-15.orig/arch/x86/include/asm/thread_info.h 2010-04-15 09:37:46.000000000 +0200
-+++ head-2010-04-15/arch/x86/include/asm/thread_info.h 2010-03-24 15:06:08.000000000 +0100
+--- head-2010-04-29.orig/arch/x86/include/asm/thread_info.h 2010-05-06 14:21:27.000000000 +0200
++++ head-2010-04-29/arch/x86/include/asm/thread_info.h 2010-03-24 15:06:08.000000000 +0100
@@ -146,11 +146,15 @@ struct thread_info {
_TIF_USER_RETURN_NOTIFY)
diff --git a/patches.xen/xen3-patch-2.6.23 b/patches.xen/xen3-patch-2.6.23
index 517d32345b..856d8b10dc 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
---- head-2010-04-29.orig/arch/x86/Kbuild 2010-04-29 09:29:49.000000000 +0200
-+++ head-2010-04-29/arch/x86/Kbuild 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/Kbuild 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/arch/x86/Kbuild 2010-03-24 15:09:22.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/
---- head-2010-04-29.orig/arch/x86/kernel/acpi/sleep_32-xen.c 2008-04-15 09:29:41.000000000 +0200
-+++ head-2010-04-29/arch/x86/kernel/acpi/sleep_32-xen.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/acpi/sleep_32-xen.c 2008-04-15 09:29:41.000000000 +0200
++++ head-2010-05-12/arch/x86/kernel/acpi/sleep_32-xen.c 2010-03-24 15:09:22.000000000 +0100
@@ -15,7 +15,7 @@
#ifndef CONFIG_ACPI_PV_SLEEP
/* address in low memory of the wakeup routine. */
@@ -55,8 +55,8 @@ Acked-by: jbeulich@novell.com
return 0;
}
---- head-2010-04-29.orig/arch/x86/kernel/asm-offsets_32.c 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/asm-offsets_32.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/asm-offsets_32.c 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/asm-offsets_32.c 2010-03-24 15:09:22.000000000 +0100
@@ -20,7 +20,9 @@
#include <asm/elf.h>
#include <asm/suspend.h>
@@ -76,8 +76,8 @@ Acked-by: jbeulich@novell.com
BLANK();
OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
OFFSET(XEN_vcpu_info_pending, vcpu_info, evtchn_upcall_pending);
---- head-2010-04-29.orig/arch/x86/kernel/cpu/common-xen.c 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/cpu/common-xen.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/cpu/common-xen.c 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/cpu/common-xen.c 2010-03-24 15:09:22.000000000 +0100
@@ -362,6 +362,8 @@ static void __cpuinit generic_identify(s
if ( xlvl >= 0x80000004 )
get_model_name(c); /* Default name */
@@ -103,8 +103,8 @@ Acked-by: jbeulich@novell.com
nexgen_init_cpu();
umc_init_cpu();
early_cpu_detect();
---- head-2010-04-29.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/cpu/mtrr/main-xen.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/cpu/mtrr/main-xen.c 2010-03-24 15:09:22.000000000 +0100
@@ -167,7 +167,7 @@ mtrr_del(int reg, unsigned long base, un
EXPORT_SYMBOL(mtrr_add);
EXPORT_SYMBOL(mtrr_del);
@@ -114,8 +114,8 @@ Acked-by: jbeulich@novell.com
{
}
---- head-2010-04-29.orig/arch/x86/kernel/e820_32-xen.c 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/e820_32-xen.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/e820_32-xen.c 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/e820_32-xen.c 2010-03-24 15:09:22.000000000 +0100
@@ -10,6 +10,7 @@
#include <linux/efi.h>
#include <linux/pfn.h>
@@ -171,8 +171,8 @@ Acked-by: jbeulich@novell.com
break;
}
}
---- head-2010-04-29.orig/arch/x86/kernel/entry_32.S 2010-01-19 16:00:16.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/entry_32.S 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/entry_32.S 2010-01-19 16:00:16.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/entry_32.S 2010-03-24 15:09:22.000000000 +0100
@@ -1109,7 +1109,7 @@ ENTRY(kernel_thread_helper)
CFI_ENDPROC
ENDPROC(kernel_thread_helper)
@@ -191,8 +191,8 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_FUNCTION_TRACER
#ifdef CONFIG_DYNAMIC_FTRACE
---- head-2010-04-29.orig/arch/x86/kernel/entry_32-xen.S 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/entry_32-xen.S 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/entry_32-xen.S 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/entry_32-xen.S 2010-03-24 15:09:22.000000000 +0100
@@ -452,9 +452,6 @@ restore_nocheck_notrace:
1: INTERRUPT_RETURN
.section .fixup,"ax"
@@ -203,8 +203,8 @@ Acked-by: jbeulich@novell.com
pushl $0 # no error code
pushl $do_iret_error
jmp error_code
---- head-2010-04-29.orig/arch/x86/kernel/head_32-xen.S 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/head_32-xen.S 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/head_32-xen.S 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/head_32-xen.S 2010-03-24 15:09:22.000000000 +0100
@@ -86,7 +86,10 @@ ENTRY(_stext)
/*
* BSS section
@@ -259,8 +259,8 @@ Acked-by: jbeulich@novell.com
- ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long, 1)
+ ELFNOTE(Xen, XEN_ELFNOTE_LOADER, .asciz "generic")
+ ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long 1)
---- head-2010-04-29.orig/arch/x86/kernel/io_apic_32-xen.c 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/io_apic_32-xen.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/io_apic_32-xen.c 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/io_apic_32-xen.c 2010-03-24 15:09:22.000000000 +0100
@@ -402,14 +402,6 @@ static void set_ioapic_affinity_irq(unsi
# include <linux/slab.h> /* kmalloc() */
# include <linux/timer.h> /* time_after() */
@@ -374,8 +374,8 @@ Acked-by: jbeulich@novell.com
{
unsigned long t1 = jiffies;
---- head-2010-04-29.orig/arch/x86/kernel/microcode-xen.c 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/microcode-xen.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/microcode-xen.c 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/microcode-xen.c 2010-03-24 15:09:22.000000000 +0100
@@ -33,6 +33,7 @@
#include <linux/miscdevice.h>
#include <linux/spinlock.h>
@@ -384,8 +384,8 @@ Acked-by: jbeulich@novell.com
#include <linux/mutex.h>
#include <linux/cpu.h>
#include <linux/firmware.h>
---- head-2010-04-29.orig/arch/x86/kernel/pci-dma-xen.c 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/pci-dma-xen.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/pci-dma-xen.c 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/pci-dma-xen.c 2010-03-24 15:09:22.000000000 +0100
@@ -24,7 +24,7 @@
#include <asm/bug.h>
@@ -395,8 +395,8 @@ Acked-by: jbeulich@novell.com
int iommu_merge __read_mostly = 0;
EXPORT_SYMBOL(iommu_merge);
---- head-2010-04-29.orig/arch/x86/kernel/process_32-xen.c 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/process_32-xen.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/process_32-xen.c 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/process_32-xen.c 2010-03-24 15:09:22.000000000 +0100
@@ -241,6 +241,7 @@ early_param("idle", idle_setup);
void show_regs(struct pt_regs * regs)
{
@@ -512,8 +512,8 @@ Acked-by: jbeulich@novell.com
/*
* Leave lazy mode, flushing any hypercalls made here.
---- head-2010-04-29.orig/arch/x86/kernel/setup_32-xen.c 2010-03-24 15:09:08.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/setup_32-xen.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/setup_32-xen.c 2010-03-24 15:09:08.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/setup_32-xen.c 2010-03-24 15:09:22.000000000 +0100
@@ -114,19 +114,10 @@ static unsigned int highmem_pages = -1;
/*
* Setup options
@@ -600,8 +600,8 @@ Acked-by: jbeulich@novell.com
if (is_initial_xendomain()) {
#ifdef CONFIG_VT
---- head-2010-04-29.orig/arch/x86/kernel/smp_32-xen.c 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/smp_32-xen.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/smp_32-xen.c 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/smp_32-xen.c 2010-03-24 15:09:22.000000000 +0100
@@ -22,6 +22,7 @@
#include <asm/mtrr.h>
@@ -626,8 +626,8 @@ Acked-by: jbeulich@novell.com
{
if (per_cpu(cpu_tlbstate, cpu).state == TLBSTATE_OK)
BUG();
---- head-2010-04-29.orig/arch/x86/kernel/time-xen.c 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/time-xen.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/time-xen.c 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/time-xen.c 2010-03-24 15:09:22.000000000 +0100
@@ -75,11 +75,12 @@
#include <xen/evtchn.h>
#include <xen/interface/vcpu.h>
@@ -702,8 +702,8 @@ Acked-by: jbeulich@novell.com
}
extern void (*late_time_init)(void);
---- head-2010-04-29.orig/arch/x86/kernel/traps_32-xen.c 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/traps_32-xen.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/traps_32-xen.c 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/traps_32-xen.c 2010-03-24 15:09:22.000000000 +0100
@@ -41,6 +41,10 @@
#include <linux/mca.h>
#endif
@@ -910,8 +910,8 @@ Acked-by: jbeulich@novell.com
#ifndef CONFIG_MATH_EMULATION
---- head-2010-04-29.orig/arch/x86/mach-xen/setup.c 2010-03-24 15:06:12.000000000 +0100
-+++ head-2010-04-29/arch/x86/mach-xen/setup.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mach-xen/setup.c 2010-03-24 15:06:12.000000000 +0100
++++ head-2010-05-12/arch/x86/mach-xen/setup.c 2010-03-24 15:09:22.000000000 +0100
@@ -12,6 +12,7 @@
#include <asm/e820.h>
#include <asm/setup.h>
@@ -948,8 +948,8 @@ Acked-by: jbeulich@novell.com
+ set_pmd(pmd, __pmd(__pa_symbol(swapper_pg_pmd) | _PAGE_TABLE));
+ }
}
---- head-2010-04-29.orig/arch/x86/mm/fault_32-xen.c 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/mm/fault_32-xen.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/fault_32-xen.c 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/fault_32-xen.c 2010-03-24 15:09:22.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))
@@ -1035,8 +1035,8 @@ Acked-by: jbeulich@novell.com
tsk->thread.cr2 = address;
/* Kernel addresses are always protection faults */
tsk->thread.error_code = error_code | (address >= TASK_SIZE);
---- head-2010-04-29.orig/arch/x86/mm/highmem_32-xen.c 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/mm/highmem_32-xen.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/highmem_32-xen.c 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/highmem_32-xen.c 2010-03-24 15:09:22.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();
@@ -1058,8 +1058,8 @@ Acked-by: jbeulich@novell.com
}
void *kmap_atomic(struct page *page, enum km_type type)
---- head-2010-04-29.orig/arch/x86/mm/init_32-xen.c 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/mm/init_32-xen.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/init_32-xen.c 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/init_32-xen.c 2010-03-24 15:09:22.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);
@@ -1122,8 +1122,8 @@ Acked-by: jbeulich@novell.com
if (!SHARED_KERNEL_PMD) {
/* If we're in PAE mode and have a non-shared
kernel pmd, then the pgd size must be a
---- head-2010-04-29.orig/arch/x86/mm/ioremap_32-xen.c 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/mm/ioremap_32-xen.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/ioremap_32-xen.c 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/ioremap_32-xen.c 2010-03-24 15:09:22.000000000 +0100
@@ -363,9 +363,8 @@ void iounmap(volatile void __iomem *addr
/* Reset the direct mapping. Can block */
@@ -1135,8 +1135,8 @@ Acked-by: jbeulich@novell.com
PAGE_KERNEL);
global_flush_tlb();
}
---- head-2010-04-29.orig/arch/x86/mm/pgtable_32-xen.c 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/mm/pgtable_32-xen.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/pgtable_32-xen.c 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/pgtable_32-xen.c 2010-03-24 15:09:22.000000000 +0100
@@ -198,7 +198,7 @@ void pte_free(struct page *pte)
va, pfn_pte(pfn, PAGE_KERNEL), 0))
BUG();
@@ -1235,8 +1235,8 @@ Acked-by: jbeulich@novell.com
(atomic_read(&mm->mm_count) == 1) &&
!mm->context.has_foreign_mappings)
mm_unpin(mm);
---- head-2010-04-29.orig/arch/x86/pci/irq-xen.c 2010-03-24 15:08:58.000000000 +0100
-+++ head-2010-04-29/arch/x86/pci/irq-xen.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/pci/irq-xen.c 2010-03-24 15:08:58.000000000 +0100
++++ head-2010-05-12/arch/x86/pci/irq-xen.c 2010-03-24 15:09:22.000000000 +0100
@@ -142,8 +142,9 @@ static void __init pirq_peer_trick(void)
for(i = 1; i < 256; i++) {
if (!busmap[i] || pci_find_bus(0, i))
@@ -1257,8 +1257,8 @@ Acked-by: jbeulich@novell.com
r->name = "PIIX/ICH";
r->get = pirq_piix_get;
r->set = pirq_piix_set;
---- head-2010-04-29.orig/arch/x86/xen/Kconfig 2010-04-29 09:29:49.000000000 +0200
-+++ head-2010-04-29/arch/x86/xen/Kconfig 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/xen/Kconfig 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/arch/x86/xen/Kconfig 2010-03-24 15:09:22.000000000 +0100
@@ -2,7 +2,7 @@
# This Kconfig describes xen options
#
@@ -1268,8 +1268,8 @@ Acked-by: jbeulich@novell.com
bool "Xen guest support"
select PARAVIRT_ALL
select PARAVIRT_CLOCK
---- head-2010-04-29.orig/arch/x86/xen/xen-head.S 2010-04-29 09:29:49.000000000 +0200
-+++ head-2010-04-29/arch/x86/xen/xen-head.S 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/xen/xen-head.S 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/arch/x86/xen/xen-head.S 2010-03-24 15:09:22.000000000 +0100
@@ -1,7 +1,7 @@
/* Xen-specific pieces of head.S, intended to be included in the right
place in head.S */
@@ -1285,8 +1285,8 @@ Acked-by: jbeulich@novell.com
-#endif /*CONFIG_XEN */
+#endif /* CONFIG_PARAVIRT_XEN */
---- head-2010-04-29.orig/arch/x86/ia32/ia32entry-xen.S 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/ia32/ia32entry-xen.S 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/ia32/ia32entry-xen.S 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/ia32/ia32entry-xen.S 2010-03-24 15:09:22.000000000 +0100
@@ -105,7 +105,7 @@ ENTRY(ia32_sysenter_target)
movl $VSYSCALL32_SYSEXIT,8(%rsp)
movq %rax,(%rsp)
@@ -1328,8 +1328,8 @@ Acked-by: jbeulich@novell.com
.quad sys_eventfd
+ .quad sys32_fallocate
ia32_syscall_end:
---- head-2010-04-29.orig/arch/x86/kernel/acpi/sleep_64-xen.c 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/acpi/sleep_64-xen.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/acpi/sleep_64-xen.c 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/acpi/sleep_64-xen.c 2010-03-24 15:09:22.000000000 +0100
@@ -51,12 +51,10 @@
Low-Level Sleep Support
-------------------------------------------------------------------------- */
@@ -1367,8 +1367,8 @@ Acked-by: jbeulich@novell.com
void acpi_pci_link_exit(void)
{
}
---- head-2010-04-29.orig/arch/x86/kernel/e820_64-xen.c 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/e820_64-xen.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/e820_64-xen.c 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/e820_64-xen.c 2010-03-24 15:09:22.000000000 +0100
@@ -224,37 +224,6 @@ unsigned long __init e820_end_of_ram(voi
}
@@ -1552,8 +1552,8 @@ Acked-by: jbeulich@novell.com
(unsigned long long) e820.map[i].addr,
(unsigned long long) (e820.map[i].addr + e820.map[i].size));
switch (e820.map[i].type) {
---- head-2010-04-29.orig/arch/x86/kernel/early_printk-xen.c 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/early_printk-xen.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/early_printk-xen.c 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/early_printk-xen.c 2010-03-24 15:09:22.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.
*/
@@ -1588,8 +1588,8 @@ Acked-by: jbeulich@novell.com
}
if (keep_early)
---- head-2010-04-29.orig/arch/x86/kernel/entry_64-xen.S 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/entry_64-xen.S 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/entry_64-xen.S 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/entry_64-xen.S 2010-03-24 15:09:22.000000000 +0100
@@ -310,7 +310,7 @@ sysret_signal:
TRACE_IRQS_ON
/* sti */
@@ -1617,8 +1617,8 @@ Acked-by: jbeulich@novell.com
jz retint_restore_args
TRACE_IRQS_ON
XEN_UNBLOCK_EVENTS(%rsi)
---- head-2010-04-29.orig/arch/x86/kernel/head_64-xen.S 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/head_64-xen.S 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/head_64-xen.S 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/head_64-xen.S 2010-03-24 15:09:22.000000000 +0100
@@ -23,7 +23,7 @@
#include <asm/dwarf2.h>
#include <xen/interface/elfnote.h>
@@ -1681,8 +1681,8 @@ Acked-by: jbeulich@novell.com
+ ELFNOTE(Xen, XEN_ELFNOTE_FEATURES, .asciz "writable_page_tables|writable_descriptor_tables|auto_translated_physmap|pae_pgdir_above_4gb|supervisor_mode_kernel")
+ ELFNOTE(Xen, XEN_ELFNOTE_LOADER, .asciz "generic")
+ ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long 1)
---- head-2010-04-29.orig/arch/x86/kernel/head64-xen.c 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/head64-xen.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/head64-xen.c 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/head64-xen.c 2010-03-24 15:09:22.000000000 +0100
@@ -90,7 +90,7 @@ void __init x86_64_start_kernel(char * r
unsigned long machine_to_phys_nr_ents;
int i;
@@ -1692,8 +1692,8 @@ Acked-by: jbeulich@novell.com
xen_start_info = (struct start_info *)real_mode_data;
if (!xen_feature(XENFEAT_auto_translated_physmap))
---- head-2010-04-29.orig/arch/x86/kernel/io_apic_64-xen.c 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/io_apic_64-xen.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/io_apic_64-xen.c 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/io_apic_64-xen.c 2010-03-24 15:09:22.000000000 +0100
@@ -165,7 +165,9 @@ static inline void io_apic_write(unsigne
#endif
}
@@ -1816,8 +1816,8 @@ Acked-by: jbeulich@novell.com
}
static struct irq_chip ioapic_chip __read_mostly = {
---- head-2010-04-29.orig/arch/x86/kernel/ldt_64-xen.c 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/ldt_64-xen.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/ldt_64-xen.c 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/ldt_64-xen.c 2010-03-24 15:09:22.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);
@@ -1836,8 +1836,8 @@ Acked-by: jbeulich@novell.com
spin_lock(&mm_unpinned_lock);
list_del(&mm->context.unpinned);
spin_unlock(&mm_unpinned_lock);
---- head-2010-04-29.orig/arch/x86/kernel/mpparse_64-xen.c 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/mpparse_64-xen.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/mpparse_64-xen.c 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/mpparse_64-xen.c 2010-03-24 15:09:22.000000000 +0100
@@ -32,7 +32,6 @@
/* Have we found an MP table */
@@ -1894,8 +1894,8 @@ Acked-by: jbeulich@novell.com
}
void __init
---- head-2010-04-29.orig/arch/x86/kernel/process_64-xen.c 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/process_64-xen.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/process_64-xen.c 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/process_64-xen.c 2010-03-24 15:09:22.000000000 +0100
@@ -26,6 +26,7 @@
#include <linux/sched.h>
#include <linux/kernel.h>
@@ -1927,8 +1927,8 @@ Acked-by: jbeulich@novell.com
}
void show_regs(struct pt_regs *regs)
---- head-2010-04-29.orig/arch/x86/kernel/setup_64-xen.c 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/setup_64-xen.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/setup_64-xen.c 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/setup_64-xen.c 2010-03-24 15:09:22.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))
@@ -2011,8 +2011,8 @@ Acked-by: jbeulich@novell.com
};
static char *x86_power_flags[] = {
"ts", /* temperature sensor */
---- head-2010-04-29.orig/arch/x86/kernel/setup64-xen.c 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/setup64-xen.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/setup64-xen.c 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/setup64-xen.c 2010-03-24 15:09:22.000000000 +0100
@@ -125,11 +125,14 @@ void __init setup_per_cpu_areas(void)
}
@@ -2039,8 +2039,8 @@ Acked-by: jbeulich@novell.com
/* others are initialized in smpboot.c */
pda->pcurrent = &init_task;
pda->irqstackptr = boot_cpu_stack;
---- head-2010-04-29.orig/arch/x86/kernel/smp_64-xen.c 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/smp_64-xen.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/smp_64-xen.c 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/smp_64-xen.c 2010-03-24 15:09:22.000000000 +0100
@@ -362,7 +362,7 @@ __smp_call_function_single(int cpu, void
}
@@ -2077,8 +2077,8 @@ Acked-by: jbeulich@novell.com
put_cpu();
return 0;
}
---- head-2010-04-29.orig/arch/x86/kernel/traps_64-xen.c 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/traps_64-xen.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/traps_64-xen.c 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/traps_64-xen.c 2010-03-24 15:09:22.000000000 +0100
@@ -34,6 +34,10 @@
#include <linux/bug.h>
#include <linux/kdebug.h>
@@ -2149,8 +2149,8 @@ Acked-by: jbeulich@novell.com
if (panic_on_unrecovered_nmi)
panic("NMI: Not continuing");
---- head-2010-04-29.orig/arch/x86/kernel/vsyscall_64-xen.c 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/vsyscall_64-xen.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/vsyscall_64-xen.c 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/vsyscall_64-xen.c 2010-03-24 15:09:22.000000000 +0100
@@ -42,6 +42,7 @@
#include <asm/segment.h>
#include <asm/desc.h>
@@ -2196,8 +2196,8 @@ Acked-by: jbeulich@novell.com
write_sequnlock_irqrestore(&vsyscall_gtod_data.lock, flags);
}
---- head-2010-04-29.orig/arch/x86/mm/fault_64-xen.c 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/mm/fault_64-xen.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/fault_64-xen.c 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/fault_64-xen.c 2010-03-24 15:09:22.000000000 +0100
@@ -159,7 +159,9 @@ void dump_pagetable(unsigned long addres
pmd_t *pmd;
pte_t *pte;
@@ -2319,8 +2319,8 @@ Acked-by: jbeulich@novell.com
goto no_context;
do_sigbus:
---- head-2010-04-29.orig/arch/x86/mm/init_64-xen.c 2010-04-29 09:47:36.000000000 +0200
-+++ head-2010-04-29/arch/x86/mm/init_64-xen.c 2010-04-29 09:47:49.000000000 +0200
+--- head-2010-05-12.orig/arch/x86/mm/init_64-xen.c 2010-04-29 09:47:36.000000000 +0200
++++ head-2010-05-12/arch/x86/mm/init_64-xen.c 2010-04-29 09:47:49.000000000 +0200
@@ -66,6 +66,9 @@ int after_bootmem;
DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
extern unsigned long start_pfn;
@@ -2444,8 +2444,8 @@ Acked-by: jbeulich@novell.com
+ return "[vsyscall]";
+ return NULL;
+}
---- head-2010-04-29.orig/arch/x86/mm/pageattr_64-xen.c 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/mm/pageattr_64-xen.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/pageattr_64-xen.c 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/pageattr_64-xen.c 2010-03-24 15:09:22.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 */
@@ -2550,8 +2550,8 @@ Acked-by: jbeulich@novell.com
ClearPagePrivate(pg);
__free_page(pg);
}
---- head-2010-04-29.orig/arch/x86/vdso/vdso32/note.S 2010-04-29 09:29:49.000000000 +0200
-+++ head-2010-04-29/arch/x86/vdso/vdso32/note.S 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/vdso/vdso32/note.S 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/arch/x86/vdso/vdso32/note.S 2010-03-24 15:09:22.000000000 +0100
@@ -13,7 +13,7 @@ ELFNOTE_START(Linux, 0, "a")
.long LINUX_VERSION_CODE
ELFNOTE_END
@@ -2574,9 +2574,9 @@ Acked-by: jbeulich@novell.com
.byte VDSO_NOTE_NONEGSEG_BIT; .asciz "nosegneg" /* bit, name */
ELFNOTE_END
#endif
---- head-2010-04-29.orig/drivers/Makefile 2010-03-24 14:54:29.000000000 +0100
-+++ head-2010-04-29/drivers/Makefile 2010-03-24 15:09:22.000000000 +0100
-@@ -17,7 +17,7 @@ obj-$(CONFIG_SFI) += sfi/
+--- head-2010-05-12.orig/drivers/Makefile 2010-05-12 08:58:07.000000000 +0200
++++ head-2010-05-12/drivers/Makefile 2010-05-12 09:00:57.000000000 +0200
+@@ -18,7 +18,7 @@ obj-$(CONFIG_PNP) += pnp/
obj-$(CONFIG_ARM_AMBA) += amba/
obj-$(CONFIG_VIRTIO) += virtio/
@@ -2585,8 +2585,8 @@ Acked-by: jbeulich@novell.com
# regulators early, since some subsystems rely on them to initialize
obj-$(CONFIG_REGULATOR) += regulator/
---- head-2010-04-29.orig/drivers/block/Kconfig 2010-04-29 09:29:49.000000000 +0200
-+++ head-2010-04-29/drivers/block/Kconfig 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/drivers/block/Kconfig 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/drivers/block/Kconfig 2010-03-24 15:09:22.000000000 +0100
@@ -466,9 +466,9 @@ config XILINX_SYSACE
help
Include support for the Xilinx SystemACE CompactFlash interface
@@ -2599,8 +2599,8 @@ Acked-by: jbeulich@novell.com
default y
help
This driver implements the front-end of the Xen virtual
---- head-2010-04-29.orig/drivers/block/Makefile 2010-04-29 09:29:49.000000000 +0200
-+++ head-2010-04-29/drivers/block/Makefile 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/drivers/block/Makefile 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/drivers/block/Makefile 2010-03-24 15:09:22.000000000 +0100
@@ -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
@@ -2610,8 +2610,8 @@ Acked-by: jbeulich@novell.com
obj-$(CONFIG_BLK_DEV_DRBD) += drbd/
obj-$(CONFIG_CIPHER_TWOFISH) += loop_fish2.o
---- head-2010-04-29.orig/drivers/block/xen-blkfront.c 2010-04-29 09:29:49.000000000 +0200
-+++ head-2010-04-29/drivers/block/xen-blkfront.c 2010-04-15 09:54:11.000000000 +0200
+--- head-2010-05-12.orig/drivers/block/xen-blkfront.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/drivers/block/xen-blkfront.c 2010-04-15 09:54:11.000000000 +0200
@@ -1057,7 +1057,6 @@ static const struct xenbus_device_id blk
static struct xenbus_driver blkfront = {
@@ -2620,8 +2620,8 @@ Acked-by: jbeulich@novell.com
.ids = blkfront_ids,
.probe = blkfront_probe,
.remove = blkfront_remove,
---- head-2010-04-29.orig/drivers/char/Kconfig 2010-03-24 14:36:44.000000000 +0100
-+++ head-2010-04-29/drivers/char/Kconfig 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/drivers/char/Kconfig 2010-03-24 14:36:44.000000000 +0100
++++ head-2010-05-12/drivers/char/Kconfig 2010-03-24 15:09:22.000000000 +0100
@@ -646,7 +646,7 @@ config HVC_IUCV
config HVC_XEN
@@ -2631,8 +2631,8 @@ Acked-by: jbeulich@novell.com
select HVC_DRIVER
select HVC_IRQ
default y
---- head-2010-04-29.orig/drivers/net/Kconfig 2010-04-29 09:29:49.000000000 +0200
-+++ head-2010-04-29/drivers/net/Kconfig 2010-04-15 09:54:18.000000000 +0200
+--- head-2010-05-12.orig/drivers/net/Kconfig 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/drivers/net/Kconfig 2010-04-15 09:54:18.000000000 +0200
@@ -2862,9 +2862,9 @@ source "drivers/ieee802154/Kconfig"
source "drivers/s390/net/Kconfig"
@@ -2645,8 +2645,8 @@ Acked-by: jbeulich@novell.com
default y
help
The network device frontend driver allows the kernel to
---- head-2010-04-29.orig/drivers/net/Makefile 2010-04-29 09:29:49.000000000 +0200
-+++ head-2010-04-29/drivers/net/Makefile 2010-04-15 09:54:24.000000000 +0200
+--- head-2010-05-12.orig/drivers/net/Makefile 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/drivers/net/Makefile 2010-04-15 09:54:24.000000000 +0200
@@ -166,7 +166,7 @@ obj-$(CONFIG_PPPOL2TP) += pppox.o pppol2
obj-$(CONFIG_SLIP) += slip.o
obj-$(CONFIG_SLHC) += slhc.o
@@ -2656,8 +2656,8 @@ Acked-by: jbeulich@novell.com
obj-$(CONFIG_DUMMY) += dummy.o
obj-$(CONFIG_IFB) += ifb.o
---- head-2010-04-29.orig/drivers/net/xen-netfront.c 2010-04-29 09:29:49.000000000 +0200
-+++ head-2010-04-29/drivers/net/xen-netfront.c 2010-04-15 09:55:17.000000000 +0200
+--- head-2010-05-12.orig/drivers/net/xen-netfront.c 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/drivers/net/xen-netfront.c 2010-04-15 09:55:17.000000000 +0200
@@ -36,8 +36,6 @@
#include <linux/skbuff.h>
#include <linux/ethtool.h>
@@ -2721,8 +2721,8 @@ Acked-by: jbeulich@novell.com
.ids = netfront_ids,
.probe = netfront_probe,
.remove = __devexit_p(xennet_remove),
---- head-2010-04-29.orig/drivers/xen/Kconfig 2010-03-24 15:06:12.000000000 +0100
-+++ head-2010-04-29/drivers/xen/Kconfig 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/Kconfig 2010-03-24 15:06:12.000000000 +0100
++++ head-2010-05-12/drivers/xen/Kconfig 2010-03-24 15:09:22.000000000 +0100
@@ -23,6 +23,9 @@ config XEN_PRIVILEGED_GUEST
config XEN_UNPRIVILEGED_GUEST
def_bool !XEN_PRIVILEGED_GUEST
@@ -2733,8 +2733,8 @@ Acked-by: jbeulich@novell.com
config XEN_PRIVCMD
def_bool y
---- head-2010-04-29.orig/drivers/xen/Makefile 2010-01-19 16:01:03.000000000 +0100
-+++ head-2010-04-29/drivers/xen/Makefile 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/Makefile 2010-01-19 16:01:03.000000000 +0100
++++ head-2010-05-12/drivers/xen/Makefile 2010-03-24 15:09:22.000000000 +0100
@@ -1,10 +1,12 @@
-obj-y += core/
-obj-y += console/
@@ -2754,8 +2754,8 @@ Acked-by: jbeulich@novell.com
obj-$(CONFIG_XEN_BALLOON) += balloon/
obj-$(CONFIG_XEN_BLKDEV_BACKEND) += blkback/
obj-$(CONFIG_XEN_BLKDEV_TAP) += blktap/
---- head-2010-04-29.orig/drivers/xen/balloon/balloon.c 2010-03-24 15:08:58.000000000 +0100
-+++ head-2010-04-29/drivers/xen/balloon/balloon.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/balloon/balloon.c 2010-03-24 15:08:58.000000000 +0100
++++ head-2010-05-12/drivers/xen/balloon/balloon.c 2010-03-24 15:09:22.000000000 +0100
@@ -324,13 +324,9 @@ static int increase_reservation(unsigned
#ifndef MODULE
@@ -2770,8 +2770,8 @@ Acked-by: jbeulich@novell.com
vm_total_pages = nr_free_pagecache_pages();
#endif
---- head-2010-04-29.orig/drivers/xen/blkback/blkback.c 2010-03-24 15:08:58.000000000 +0100
-+++ head-2010-04-29/drivers/xen/blkback/blkback.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/blkback/blkback.c 2010-03-24 15:08:58.000000000 +0100
++++ head-2010-05-12/drivers/xen/blkback/blkback.c 2010-03-24 15:09:22.000000000 +0100
@@ -156,7 +156,7 @@ static void unplug_queue(blkif_t *blkif)
static void plug_queue(blkif_t *blkif, struct block_device *bdev)
@@ -2781,8 +2781,8 @@ Acked-by: jbeulich@novell.com
if (q == blkif->plug)
return;
---- head-2010-04-29.orig/drivers/xen/blkback/common.h 2010-03-24 15:06:12.000000000 +0100
-+++ head-2010-04-29/drivers/xen/blkback/common.h 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/blkback/common.h 2010-03-24 15:06:12.000000000 +0100
++++ head-2010-05-12/drivers/xen/blkback/common.h 2010-03-24 15:09:22.000000000 +0100
@@ -82,7 +82,7 @@ typedef struct blkif_st {
wait_queue_head_t wq;
struct task_struct *xenblkd;
@@ -2792,8 +2792,8 @@ Acked-by: jbeulich@novell.com
int is_suspended_req;
blkif_request_t suspended_req;
---- head-2010-04-29.orig/drivers/xen/blkback/interface.c 2010-03-24 15:08:58.000000000 +0100
-+++ head-2010-04-29/drivers/xen/blkback/interface.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/blkback/interface.c 2010-03-24 15:08:58.000000000 +0100
++++ head-2010-05-12/drivers/xen/blkback/interface.c 2010-03-24 15:09:22.000000000 +0100
@@ -181,5 +181,5 @@ void blkif_free(blkif_t *blkif)
void __init blkif_interface_init(void)
{
@@ -2801,8 +2801,8 @@ Acked-by: jbeulich@novell.com
- 0, 0, NULL, NULL);
+ 0, 0, NULL);
}
---- head-2010-04-29.orig/drivers/xen/blkback/xenbus.c 2010-03-24 15:09:08.000000000 +0100
-+++ head-2010-04-29/drivers/xen/blkback/xenbus.c 2010-03-24 15:10:17.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/blkback/xenbus.c 2010-03-24 15:09:08.000000000 +0100
++++ head-2010-05-12/drivers/xen/blkback/xenbus.c 2010-03-24 15:10:17.000000000 +0100
@@ -27,8 +27,6 @@
pr_debug("blkback/xenbus (%s:%d) " fmt ".\n", \
__FUNCTION__, __LINE__, ##args)
@@ -2839,8 +2839,8 @@ Acked-by: jbeulich@novell.com
return 0;
}
---- head-2010-04-29.orig/drivers/xen/blkfront/blkfront.c 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/drivers/xen/blkfront/blkfront.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/blkfront/blkfront.c 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/drivers/xen/blkfront/blkfront.c 2010-03-24 15:09:22.000000000 +0100
@@ -688,7 +688,7 @@ static int blkif_queue_request(struct re
* do_blkif_request
* read a block; request is in a request queue
@@ -2850,8 +2850,8 @@ Acked-by: jbeulich@novell.com
{
struct blkfront_info *info = NULL;
struct request *req;
---- head-2010-04-29.orig/drivers/xen/blkfront/block.h 2010-02-24 13:13:46.000000000 +0100
-+++ head-2010-04-29/drivers/xen/blkfront/block.h 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/blkfront/block.h 2010-02-24 13:13:46.000000000 +0100
++++ head-2010-05-12/drivers/xen/blkfront/block.h 2010-03-24 15:09:22.000000000 +0100
@@ -107,7 +107,7 @@ struct blkfront_info
struct scatterlist sg[BLKIF_MAX_SEGMENTS_PER_REQUEST];
unsigned int irq;
@@ -2870,8 +2870,8 @@ Acked-by: jbeulich@novell.com
/* Virtual block-device subsystem. */
/* Note that xlvbd_add doesn't call add_disk for you: you're expected
---- head-2010-04-29.orig/drivers/xen/blkfront/vbd.c 2010-01-18 15:23:12.000000000 +0100
-+++ head-2010-04-29/drivers/xen/blkfront/vbd.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/blkfront/vbd.c 2010-01-18 15:23:12.000000000 +0100
++++ head-2010-05-12/drivers/xen/blkfront/vbd.c 2010-03-24 15:09:22.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)
@@ -2881,8 +2881,8 @@ Acked-by: jbeulich@novell.com
rq = blk_init_queue(do_blkif_request, &blkif_io_lock);
if (rq == NULL)
---- head-2010-04-29.orig/drivers/xen/blktap/common.h 2010-03-24 15:06:12.000000000 +0100
-+++ head-2010-04-29/drivers/xen/blktap/common.h 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/blktap/common.h 2010-03-24 15:06:12.000000000 +0100
++++ head-2010-05-12/drivers/xen/blktap/common.h 2010-03-24 15:09:22.000000000 +0100
@@ -68,7 +68,7 @@ typedef struct blkif_st {
wait_queue_head_t wq;
struct task_struct *xenblkd;
@@ -2892,8 +2892,8 @@ Acked-by: jbeulich@novell.com
/* statistics */
unsigned long st_print;
---- head-2010-04-29.orig/drivers/xen/blktap/interface.c 2010-03-24 15:08:58.000000000 +0100
-+++ head-2010-04-29/drivers/xen/blktap/interface.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/blktap/interface.c 2010-03-24 15:08:58.000000000 +0100
++++ head-2010-05-12/drivers/xen/blktap/interface.c 2010-03-24 15:09:22.000000000 +0100
@@ -181,5 +181,5 @@ void tap_blkif_kmem_cache_free(blkif_t *
void __init tap_blkif_interface_init(void)
{
@@ -2901,8 +2901,8 @@ Acked-by: jbeulich@novell.com
- 0, 0, NULL, NULL);
+ 0, 0, NULL);
}
---- head-2010-04-29.orig/drivers/xen/blktap/xenbus.c 2010-04-29 09:47:21.000000000 +0200
-+++ head-2010-04-29/drivers/xen/blktap/xenbus.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/blktap/xenbus.c 2010-04-29 09:47:21.000000000 +0200
++++ head-2010-05-12/drivers/xen/blktap/xenbus.c 2010-03-24 15:09:22.000000000 +0100
@@ -50,8 +50,6 @@ struct backend_info
int group_added;
};
@@ -2939,8 +2939,8 @@ Acked-by: jbeulich@novell.com
return 0;
}
---- head-2010-04-29.orig/drivers/xen/blktap2/device.c 2010-03-02 09:56:10.000000000 +0100
-+++ head-2010-04-29/drivers/xen/blktap2/device.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/blktap2/device.c 2010-03-02 09:56:10.000000000 +0100
++++ head-2010-05-12/drivers/xen/blktap2/device.c 2010-03-24 15:09:22.000000000 +0100
@@ -836,7 +836,7 @@ static void
blktap_device_run_queue(struct blktap *tap)
{
@@ -2967,8 +2967,8 @@ Acked-by: jbeulich@novell.com
- BTERR("blktap device unregister failed\n");
+ unregister_blkdev(blktap_device_major, "tapdev");
}
---- head-2010-04-29.orig/drivers/xen/blktap2/sysfs.c 2010-03-24 15:06:12.000000000 +0100
-+++ head-2010-04-29/drivers/xen/blktap2/sysfs.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/blktap2/sysfs.c 2010-03-24 15:06:12.000000000 +0100
++++ head-2010-05-12/drivers/xen/blktap2/sysfs.c 2010-03-24 15:09:22.000000000 +0100
@@ -334,6 +334,22 @@ blktap_sysfs_create(struct blktap *tap)
return err;
}
@@ -3011,8 +3011,8 @@ Acked-by: jbeulich@novell.com
}
static ssize_t
---- head-2010-04-29.orig/drivers/xen/core/reboot.c 2010-03-24 15:08:58.000000000 +0100
-+++ head-2010-04-29/drivers/xen/core/reboot.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/core/reboot.c 2010-03-24 15:08:58.000000000 +0100
++++ head-2010-05-12/drivers/xen/core/reboot.c 2010-03-24 15:09:22.000000000 +0100
@@ -4,6 +4,7 @@
#include <linux/unistd.h>
#include <linux/module.h>
@@ -3021,8 +3021,8 @@ Acked-by: jbeulich@novell.com
#include <linux/sysrq.h>
#include <asm/hypervisor.h>
#include <xen/xenbus.h>
---- head-2010-04-29.orig/drivers/xen/scsiback/interface.c 2010-03-24 15:08:58.000000000 +0100
-+++ head-2010-04-29/drivers/xen/scsiback/interface.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/scsiback/interface.c 2010-03-24 15:08:58.000000000 +0100
++++ head-2010-05-12/drivers/xen/scsiback/interface.c 2010-03-24 15:09:22.000000000 +0100
@@ -171,7 +171,7 @@ void scsiback_free(struct vscsibk_info *
int __init scsiback_interface_init(void)
{
@@ -3032,8 +3032,8 @@ Acked-by: jbeulich@novell.com
if (!scsiback_cachep) {
printk(KERN_ERR "scsiback: can't init scsi cache\n");
return -ENOMEM;
---- head-2010-04-29.orig/drivers/xen/scsifront/scsifront.c 2010-03-24 15:06:12.000000000 +0100
-+++ head-2010-04-29/drivers/xen/scsifront/scsifront.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/scsifront/scsifront.c 2010-03-24 15:06:12.000000000 +0100
++++ head-2010-05-12/drivers/xen/scsifront/scsifront.c 2010-03-24 15:09:22.000000000 +0100
@@ -147,7 +147,7 @@ static void scsifront_cdb_cmd_done(struc
add_id_to_freelist(info, id);
@@ -3043,8 +3043,8 @@ Acked-by: jbeulich@novell.com
if (ring_res->sense_len > VSCSIIF_SENSE_BUFFERSIZE)
sense_len = VSCSIIF_SENSE_BUFFERSIZE;
---- head-2010-04-29.orig/drivers/xen/tpmback/interface.c 2010-03-24 15:09:08.000000000 +0100
-+++ head-2010-04-29/drivers/xen/tpmback/interface.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/tpmback/interface.c 2010-03-24 15:09:08.000000000 +0100
++++ head-2010-05-12/drivers/xen/tpmback/interface.c 2010-03-24 15:09:22.000000000 +0100
@@ -13,6 +13,7 @@
#include "common.h"
@@ -3062,8 +3062,8 @@ Acked-by: jbeulich@novell.com
return tpmif_cachep ? 0 : -ENOMEM;
}
---- head-2010-04-29.orig/drivers/xen/usbfront/xenbus.c 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/drivers/xen/usbfront/xenbus.c 2010-04-15 09:53:49.000000000 +0200
+--- head-2010-05-12.orig/drivers/xen/usbfront/xenbus.c 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/drivers/xen/usbfront/xenbus.c 2010-04-15 09:53:49.000000000 +0200
@@ -393,7 +393,7 @@ static int __init usbfront_init(void)
return -ENODEV;
@@ -3073,8 +3073,8 @@ Acked-by: jbeulich@novell.com
if (!xenhcd_urbp_cachep) {
printk(KERN_ERR "usbfront failed to create kmem cache\n");
return -ENOMEM;
---- head-2010-04-29.orig/drivers/xen/util.c 2007-07-10 09:42:30.000000000 +0200
-+++ head-2010-04-29/drivers/xen/util.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/util.c 2007-07-10 09:42:30.000000000 +0200
++++ head-2010-05-12/drivers/xen/util.c 2010-03-24 15:09:22.000000000 +0100
@@ -1,8 +1,5 @@
-#include <linux/mm.h>
+#include <linux/err.h>
@@ -3131,8 +3131,8 @@ Acked-by: jbeulich@novell.com
-}
-EXPORT_SYMBOL_GPL(free_vm_area);
-#endif /* CONFIG_X86 */
---- head-2010-04-29.orig/drivers/xen/xenbus/xenbus_client.c 2010-01-19 16:01:03.000000000 +0100
-+++ head-2010-04-29/drivers/xen/xenbus/xenbus_client.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/xenbus/xenbus_client.c 2010-01-19 16:01:03.000000000 +0100
++++ head-2010-05-12/drivers/xen/xenbus/xenbus_client.c 2010-03-24 15:09:22.000000000 +0100
@@ -30,19 +30,26 @@
* IN THE SOFTWARE.
*/
@@ -3579,8 +3579,8 @@ Acked-by: jbeulich@novell.com
enum xenbus_state xenbus_read_driver_state(const char *path)
{
enum xenbus_state result;
---- head-2010-04-29.orig/drivers/xen/xenbus/xenbus_comms.c 2010-03-24 15:08:58.000000000 +0100
-+++ head-2010-04-29/drivers/xen/xenbus/xenbus_comms.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/xenbus/xenbus_comms.c 2010-03-24 15:08:58.000000000 +0100
++++ head-2010-05-12/drivers/xen/xenbus/xenbus_comms.c 2010-03-24 15:09:22.000000000 +0100
@@ -34,12 +34,15 @@
#include <linux/interrupt.h>
#include <linux/sched.h>
@@ -3638,8 +3638,8 @@ Acked-by: jbeulich@novell.com
xen_store_evtchn, wake_waiting,
0, "xenbus", &xb_waitq);
if (err <= 0) {
---- head-2010-04-29.orig/drivers/xen/xenbus/xenbus_probe.c 2010-03-24 15:09:08.000000000 +0100
-+++ head-2010-04-29/drivers/xen/xenbus/xenbus_probe.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/xenbus/xenbus_probe.c 2010-03-24 15:09:08.000000000 +0100
++++ head-2010-05-12/drivers/xen/xenbus/xenbus_probe.c 2010-03-24 15:09:22.000000000 +0100
@@ -43,21 +43,26 @@
#include <linux/mm.h>
#include <linux/notifier.h>
@@ -3951,8 +3951,8 @@ Acked-by: jbeulich@novell.com
{
return xenbus_probe_init();
}
---- head-2010-04-29.orig/drivers/xen/xenbus/xenbus_probe.h 2010-03-24 15:09:08.000000000 +0100
-+++ head-2010-04-29/drivers/xen/xenbus/xenbus_probe.h 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/xenbus/xenbus_probe.h 2010-03-24 15:09:08.000000000 +0100
++++ head-2010-05-12/drivers/xen/xenbus/xenbus_probe.h 2010-03-24 15:09:22.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);
@@ -3971,8 +3971,8 @@ Acked-by: jbeulich@novell.com
+extern void xenbus_dev_changed(const char *node, struct xen_bus_type *bus);
#endif
---- head-2010-04-29.orig/drivers/xen/xenbus/xenbus_probe_backend.c 2010-03-24 15:09:08.000000000 +0100
-+++ head-2010-04-29/drivers/xen/xenbus/xenbus_probe_backend.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/xenbus/xenbus_probe_backend.c 2010-03-24 15:09:08.000000000 +0100
++++ head-2010-05-12/drivers/xen/xenbus/xenbus_probe_backend.c 2010-03-24 15:09:22.000000000 +0100
@@ -236,7 +236,7 @@ static void backend_changed(struct xenbu
{
DPRINTK("");
@@ -3982,8 +3982,8 @@ Acked-by: jbeulich@novell.com
}
static struct xenbus_watch be_watch = {
---- head-2010-04-29.orig/drivers/xen/xenbus/xenbus_xs.c 2010-01-19 16:01:04.000000000 +0100
-+++ head-2010-04-29/drivers/xen/xenbus/xenbus_xs.c 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/xenbus/xenbus_xs.c 2010-01-19 16:01:04.000000000 +0100
++++ head-2010-05-12/drivers/xen/xenbus/xenbus_xs.c 2010-03-24 15:09:22.000000000 +0100
@@ -256,7 +256,7 @@ static void *xs_talkv(struct xenbus_tran
}
@@ -4068,8 +4068,8 @@ Acked-by: jbeulich@novell.com
}
return 0;
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/fixmap_32.h 2010-03-24 15:09:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/fixmap_32.h 2010-03-24 15:09:22.000000000 +0100
@@ -53,6 +53,8 @@ extern unsigned long __FIXADDR_TOP;
enum fixed_addresses {
FIX_HOLE,
@@ -4079,8 +4079,8 @@ Acked-by: jbeulich@novell.com
#ifdef CONFIG_X86_LOCAL_APIC
FIX_APIC_BASE, /* local (CPU) APIC) -- required for SMP or not */
#endif
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/highmem.h 2010-03-24 17:03:18.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/highmem.h 2010-03-24 17:04:33.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/highmem.h 2010-03-24 17:03:18.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/highmem.h 2010-03-24 17:04:33.000000000 +0100
@@ -75,8 +75,7 @@ struct page *kmap_atomic_to_page(void *p
#define kmap_atomic_pte(page, type) \
@@ -4091,8 +4091,8 @@ Acked-by: jbeulich@novell.com
#define flush_cache_kmaps() do { } while (0)
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/maddr_32.h 2008-04-02 12:34:02.000000000 +0200
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/maddr_32.h 2010-03-24 15:09:23.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/maddr_32.h 2008-04-02 12:34:02.000000000 +0200
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/maddr_32.h 2010-03-24 15:09:23.000000000 +0100
@@ -155,6 +155,7 @@ static inline paddr_t pte_machine_to_phy
#ifdef CONFIG_X86_PAE
@@ -4101,8 +4101,8 @@ Acked-by: jbeulich@novell.com
static inline pte_t pfn_pte_ma(unsigned long page_nr, pgprot_t pgprot)
{
pte_t pte;
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/mmu_context_32.h 2010-03-24 15:09:23.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/mmu_context_32.h 2010-03-24 15:09:23.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)
@@ -4130,8 +4130,8 @@ Acked-by: jbeulich@novell.com
/* stop flush ipis for the previous mm */
cpu_clear(cpu, prev->cpu_vm_mask);
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/pgalloc_32.h 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/pgalloc_32.h 2010-03-24 15:09:23.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/pgalloc_32.h 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/pgalloc_32.h 2010-03-24 15:09:23.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 */
@@ -4160,8 +4160,8 @@ Acked-by: jbeulich@novell.com
if (!PageHighMem(pte)) \
BUG_ON(HYPERVISOR_update_va_mapping( \
(unsigned long)__va(pfn << PAGE_SHIFT), \
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/pgtable_32.h 2010-03-24 15:09:23.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/pgtable_32.h 2010-03-24 15:09:23.000000000 +0100
@@ -26,9 +26,6 @@
#include <linux/spinlock.h>
#include <linux/sched.h>
@@ -4293,8 +4293,8 @@ Acked-by: jbeulich@novell.com
xen_l1_entry_update(ptep, __pte(0)); \
else \
*(ptep) = __pte(0); \
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/pgtable-3level.h 2010-03-24 15:09:23.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/pgtable-3level.h 2010-03-24 15:09:23.000000000 +0100
@@ -23,26 +23,11 @@
#define pud_present(pud) 1
@@ -4323,8 +4323,8 @@ Acked-by: jbeulich@novell.com
}
/* Rules for using set_pte: the pte being assigned *must* be
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/processor_32.h 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/processor_32.h 2010-03-24 15:09:23.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/processor_32.h 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/processor_32.h 2010-03-24 15:09:23.000000000 +0100
@@ -89,7 +89,6 @@ struct cpuinfo_x86 {
#define X86_VENDOR_UMC 3
#define X86_VENDOR_NEXGEN 4
@@ -4370,8 +4370,8 @@ Acked-by: jbeulich@novell.com
/*
* Size of io_bitmap.
*/
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/system_32.h 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/system_32.h 2010-03-24 15:09:23.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/system_32.h 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/system_32.h 2010-03-24 15:09:23.000000000 +0100
@@ -205,11 +205,6 @@ static inline unsigned long get_limit(un
*/
@@ -4400,8 +4400,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);
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/tlbflush_32.h 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/tlbflush_32.h 2010-03-24 15:09:23.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/tlbflush_32.h 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/tlbflush_32.h 2010-03-24 15:09:23.000000000 +0100
@@ -91,7 +91,11 @@ struct tlb_state
DECLARE_PER_CPU(struct tlb_state, cpu_tlbstate);
#endif /* SMP */
@@ -4415,8 +4415,8 @@ Acked-by: jbeulich@novell.com
static inline void flush_tlb_pgtables(struct mm_struct *mm,
unsigned long start, unsigned long end)
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/fixmap_64.h 2010-03-24 15:09:23.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/fixmap_64.h 2010-03-24 15:09:23.000000000 +0100
@@ -23,9 +23,9 @@
* compile time, but to set the physical address only
* in the boot process.
@@ -4448,8 +4448,8 @@ Acked-by: jbeulich@novell.com
}
#endif
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/mmu_context_64.h 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/mmu_context_64.h 2010-03-24 15:09:23.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/mmu_context_64.h 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/mmu_context_64.h 2010-03-24 15:09:23.000000000 +0100
@@ -76,7 +76,7 @@ static inline void switch_mm(struct mm_s
if (likely(prev != next)) {
@@ -4468,8 +4468,8 @@ Acked-by: jbeulich@novell.com
mm_pin(next);
switch_mm(prev, next, NULL);
}
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/pgalloc_64.h 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/pgalloc_64.h 2010-03-24 15:09:23.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/pgalloc_64.h 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/pgalloc_64.h 2010-03-24 15:09:23.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)
@@ -4497,8 +4497,8 @@ Acked-by: jbeulich@novell.com
BUG_ON(HYPERVISOR_update_va_mapping(
(unsigned long)pud,
pfn_pte(virt_to_phys(pud)>>PAGE_SHIFT,
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/pgtable_64.h 2010-03-24 15:09:23.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/pgtable_64.h 2010-03-24 15:09:23.000000000 +0100
@@ -304,7 +304,7 @@ static inline pte_t ptep_get_and_clear_f
{
if (full) {
@@ -4589,8 +4589,8 @@ Acked-by: jbeulich@novell.com
#define __HAVE_ARCH_PTEP_GET_AND_CLEAR
#define __HAVE_ARCH_PTEP_GET_AND_CLEAR_FULL
#define __HAVE_ARCH_PTEP_CLEAR_FLUSH
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/processor_64.h 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/processor_64.h 2010-03-24 15:09:23.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/processor_64.h 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/processor_64.h 2010-03-24 15:09:23.000000000 +0100
@@ -83,7 +83,6 @@ struct cpuinfo_x86 {
#define X86_VENDOR_UMC 3
#define X86_VENDOR_NEXGEN 4
@@ -4639,8 +4639,8 @@ Acked-by: jbeulich@novell.com
static inline void serialize_cpu(void)
{
__asm__ __volatile__ ("cpuid" : : : "ax", "bx", "cx", "dx");
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/system_64.h 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/system_64.h 2010-03-24 15:09:23.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/system_64.h 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/system_64.h 2010-03-24 15:09:23.000000000 +0100
@@ -79,12 +79,16 @@ static inline unsigned long read_cr0(voi
unsigned long cr0;
asm volatile("movq %%cr0,%0" : "=r" (cr0));
@@ -4701,8 +4701,8 @@ Acked-by: jbeulich@novell.com
#endif /* __KERNEL__ */
#define nop() __asm__ __volatile__ ("nop")
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/tlbflush_64.h 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/tlbflush_64.h 2010-03-24 15:09:23.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/tlbflush_64.h 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/tlbflush_64.h 2010-03-24 15:09:23.000000000 +0100
@@ -89,7 +89,11 @@ static inline void flush_tlb_range(struc
#endif
@@ -4716,8 +4716,8 @@ Acked-by: jbeulich@novell.com
static inline void flush_tlb_pgtables(struct mm_struct *mm,
unsigned long start, unsigned long end)
---- head-2010-04-29.orig/arch/x86/include/asm/thread_info.h 2010-03-24 15:06:08.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/asm/thread_info.h 2010-03-24 15:09:23.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/asm/thread_info.h 2010-03-24 15:06:08.000000000 +0100
++++ head-2010-05-12/arch/x86/include/asm/thread_info.h 2010-03-24 15:09:23.000000000 +0100
@@ -153,7 +153,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)
@@ -4728,8 +4728,8 @@ Acked-by: jbeulich@novell.com
#endif
#define PREEMPT_ACTIVE 0x10000000
---- head-2010-04-29.orig/arch/x86/include/asm/xen/interface.h 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/arch/x86/include/asm/xen/interface.h 2010-03-24 15:09:23.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/asm/xen/interface.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/arch/x86/include/asm/xen/interface.h 2010-03-24 15:09:23.000000000 +0100
@@ -10,17 +10,20 @@
#define _ASM_X86_XEN_INTERFACE_H
@@ -4782,8 +4782,8 @@ Acked-by: jbeulich@novell.com
/*
* SEGMENT DESCRIPTOR TABLES
---- head-2010-04-29.orig/include/linux/elfnote.h 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/include/linux/elfnote.h 2010-03-24 15:09:23.000000000 +0100
+--- head-2010-05-12.orig/include/linux/elfnote.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/include/linux/elfnote.h 2010-03-24 15:09:23.000000000 +0100
@@ -52,7 +52,7 @@
4484:.balign 4 ; \
.popsection ;
@@ -4793,8 +4793,8 @@ Acked-by: jbeulich@novell.com
ELFNOTE_START(name, type, "") \
desc ; \
ELFNOTE_END
---- head-2010-04-29.orig/include/linux/page-flags.h 2010-03-24 15:02:17.000000000 +0100
-+++ head-2010-04-29/include/linux/page-flags.h 2010-03-24 15:09:23.000000000 +0100
+--- head-2010-05-12.orig/include/linux/page-flags.h 2010-03-24 15:02:17.000000000 +0100
++++ head-2010-05-12/include/linux/page-flags.h 2010-03-24 15:09:23.000000000 +0100
@@ -126,8 +126,15 @@ enum pageflags {
PG_fscache = PG_private_2, /* page backed by cache */
@@ -4823,8 +4823,8 @@ Acked-by: jbeulich@novell.com
#else
# define __PG_XEN (1 << PG_foreign)
#endif
---- head-2010-04-29.orig/include/linux/skbuff.h 2010-04-15 09:52:44.000000000 +0200
-+++ head-2010-04-29/include/linux/skbuff.h 2010-04-15 09:53:55.000000000 +0200
+--- head-2010-05-12.orig/include/linux/skbuff.h 2010-04-15 09:52:44.000000000 +0200
++++ head-2010-05-12/include/linux/skbuff.h 2010-04-15 09:53:55.000000000 +0200
@@ -2110,7 +2110,7 @@ static inline void skb_forward_csum(stru
bool skb_partial_csum_set(struct sk_buff *skb, u16 start, u16 off);
@@ -4834,8 +4834,8 @@ Acked-by: jbeulich@novell.com
int skb_checksum_setup(struct sk_buff *skb);
#else
static inline int skb_checksum_setup(struct sk_buff *skb) { return 0; }
---- head-2010-04-29.orig/include/xen/driver_util.h 2007-06-12 13:14:19.000000000 +0200
-+++ head-2010-04-29/include/xen/driver_util.h 2010-03-24 15:09:23.000000000 +0100
+--- head-2010-05-12.orig/include/xen/driver_util.h 2007-06-12 13:14:19.000000000 +0200
++++ head-2010-05-12/include/xen/driver_util.h 2010-03-24 15:09:23.000000000 +0100
@@ -5,10 +5,6 @@
#include <linux/vmalloc.h>
#include <linux/device.h>
@@ -4847,8 +4847,8 @@ Acked-by: jbeulich@novell.com
extern struct class *get_xen_class(void);
#endif /* __ASM_XEN_DRIVER_UTIL_H__ */
---- head-2010-04-29.orig/include/xen/features.h 2010-04-29 09:29:50.000000000 +0200
-+++ head-2010-04-29/include/xen/features.h 2010-03-24 15:09:23.000000000 +0100
+--- head-2010-05-12.orig/include/xen/features.h 2010-05-12 08:55:24.000000000 +0200
++++ head-2010-05-12/include/xen/features.h 2010-03-24 15:09:23.000000000 +0100
@@ -10,6 +10,7 @@
#define __XEN_FEATURES_H__
@@ -4863,8 +4863,8 @@ Acked-by: jbeulich@novell.com
-#endif /* __ASM_XEN_FEATURES_H__ */
+#endif /* __XEN_FEATURES_H__ */
---- head-2010-04-29.orig/include/xen/interface/arch-x86/xen.h 2010-01-04 11:56:34.000000000 +0100
-+++ head-2010-04-29/include/xen/interface/arch-x86/xen.h 2010-03-24 15:09:23.000000000 +0100
+--- head-2010-05-12.orig/include/xen/interface/arch-x86/xen.h 2010-01-04 11:56:34.000000000 +0100
++++ head-2010-05-12/include/xen/interface/arch-x86/xen.h 2010-03-24 15:09:23.000000000 +0100
@@ -49,6 +49,9 @@
#define get_xen_guest_handle(val, hnd) do { val = (hnd).p; } while (0)
#endif
@@ -4875,8 +4875,8 @@ Acked-by: jbeulich@novell.com
#if defined(__i386__)
#include "xen-x86_32.h"
#elif defined(__x86_64__)
---- head-2010-04-29.orig/include/xen/interface/event_channel.h 2010-01-19 16:01:04.000000000 +0100
-+++ head-2010-04-29/include/xen/interface/event_channel.h 2010-03-24 15:09:23.000000000 +0100
+--- head-2010-05-12.orig/include/xen/interface/event_channel.h 2010-01-19 16:01:04.000000000 +0100
++++ head-2010-05-12/include/xen/interface/event_channel.h 2010-03-24 15:09:23.000000000 +0100
@@ -250,6 +250,7 @@ struct evtchn_op {
struct evtchn_unmask unmask;
} u;
@@ -4885,8 +4885,8 @@ Acked-by: jbeulich@novell.com
typedef struct evtchn_op evtchn_op_t;
DEFINE_XEN_GUEST_HANDLE(evtchn_op_t);
---- head-2010-04-29.orig/include/xen/interface/io/netif.h 2010-01-19 16:01:04.000000000 +0100
-+++ head-2010-04-29/include/xen/interface/io/netif.h 2010-03-24 15:09:23.000000000 +0100
+--- head-2010-05-12.orig/include/xen/interface/io/netif.h 2010-01-19 16:01:04.000000000 +0100
++++ head-2010-05-12/include/xen/interface/io/netif.h 2010-03-24 15:09:23.000000000 +0100
@@ -183,8 +183,22 @@ typedef struct netif_rx_response netif_r
* Generate netif ring structures and types.
*/
@@ -4910,8 +4910,8 @@ Acked-by: jbeulich@novell.com
#define NETIF_RSP_DROPPED -2
#define NETIF_RSP_ERROR -1
---- head-2010-04-29.orig/include/xen/interface/memory.h 2010-01-19 16:01:04.000000000 +0100
-+++ head-2010-04-29/include/xen/interface/memory.h 2010-03-24 15:09:23.000000000 +0100
+--- head-2010-05-12.orig/include/xen/interface/memory.h 2010-01-19 16:01:04.000000000 +0100
++++ head-2010-05-12/include/xen/interface/memory.h 2010-03-24 15:09:23.000000000 +0100
@@ -85,6 +85,7 @@ struct xen_memory_reservation {
*/
domid_t domid;
@@ -4936,8 +4936,8 @@ Acked-by: jbeulich@novell.com
typedef struct xen_add_to_physmap xen_add_to_physmap_t;
DEFINE_XEN_GUEST_HANDLE(xen_add_to_physmap_t);
---- head-2010-04-29.orig/include/xen/interface/sched.h 2010-01-19 16:01:04.000000000 +0100
-+++ head-2010-04-29/include/xen/interface/sched.h 2010-03-24 15:09:23.000000000 +0100
+--- head-2010-05-12.orig/include/xen/interface/sched.h 2010-01-19 16:01:04.000000000 +0100
++++ head-2010-05-12/include/xen/interface/sched.h 2010-03-24 15:09:23.000000000 +0100
@@ -67,6 +67,7 @@
struct sched_shutdown {
unsigned int reason; /* SHUTDOWN_* */
@@ -4954,8 +4954,8 @@ Acked-by: jbeulich@novell.com
typedef struct sched_poll sched_poll_t;
DEFINE_XEN_GUEST_HANDLE(sched_poll_t);
---- head-2010-04-29.orig/include/xen/interface/version.h 2010-01-19 16:01:04.000000000 +0100
-+++ head-2010-04-29/include/xen/interface/version.h 2010-03-24 15:09:23.000000000 +0100
+--- head-2010-05-12.orig/include/xen/interface/version.h 2010-01-19 16:01:04.000000000 +0100
++++ head-2010-05-12/include/xen/interface/version.h 2010-03-24 15:09:23.000000000 +0100
@@ -36,6 +36,9 @@
/* arg == xen_extraversion_t. */
#define XENVER_extraversion 1
@@ -4983,8 +4983,8 @@ Acked-by: jbeulich@novell.com
#define XEN_CHANGESET_INFO_LEN (sizeof(xen_changeset_info_t))
#define XENVER_platform_parameters 5
---- head-2010-04-29.orig/include/xen/interface/xen.h 2010-01-19 16:01:04.000000000 +0100
-+++ head-2010-04-29/include/xen/interface/xen.h 2010-03-24 15:09:23.000000000 +0100
+--- head-2010-05-12.orig/include/xen/interface/xen.h 2010-05-07 11:10:48.000000000 +0200
++++ head-2010-05-12/include/xen/interface/xen.h 2010-05-12 09:01:12.000000000 +0200
@@ -32,7 +32,9 @@
#include <asm/pvclock-abi.h>
#endif
@@ -5014,7 +5014,7 @@ Acked-by: jbeulich@novell.com
#define __HYPERVISOR_dom0_op __HYPERVISOR_platform_op
#endif
-@@ -297,6 +299,7 @@ struct mmuext_op {
+@@ -302,6 +304,7 @@ struct mmuext_op {
xen_pfn_t src_mfn;
} arg2;
};
@@ -5022,7 +5022,7 @@ Acked-by: jbeulich@novell.com
typedef struct mmuext_op mmuext_op_t;
DEFINE_XEN_GUEST_HANDLE(mmuext_op_t);
#endif
-@@ -386,6 +389,7 @@ struct mmu_update {
+@@ -391,6 +394,7 @@ struct mmu_update {
uint64_t ptr; /* Machine address of PTE. */
uint64_t val; /* New contents of PTE. */
};
@@ -5030,7 +5030,7 @@ Acked-by: jbeulich@novell.com
typedef struct mmu_update mmu_update_t;
DEFINE_XEN_GUEST_HANDLE(mmu_update_t);
-@@ -394,9 +398,15 @@ DEFINE_XEN_GUEST_HANDLE(mmu_update_t);
+@@ -399,9 +403,15 @@ DEFINE_XEN_GUEST_HANDLE(mmu_update_t);
* NB. The fields are natural register size for this architecture.
*/
struct multicall_entry {
@@ -5047,8 +5047,8 @@ Acked-by: jbeulich@novell.com
typedef struct multicall_entry multicall_entry_t;
DEFINE_XEN_GUEST_HANDLE(multicall_entry_t);
---- head-2010-04-29.orig/include/xen/xenbus.h 2010-03-24 15:09:08.000000000 +0100
-+++ head-2010-04-29/include/xen/xenbus.h 2010-03-24 15:09:23.000000000 +0100
+--- head-2010-05-12.orig/include/xen/xenbus.h 2010-03-24 15:09:08.000000000 +0100
++++ head-2010-05-12/include/xen/xenbus.h 2010-03-24 15:09:23.000000000 +0100
@@ -57,16 +57,20 @@ struct xenbus_watch
void (*callback)(struct xenbus_watch *,
const char **vec, unsigned int len);
@@ -5093,8 +5093,8 @@ Acked-by: jbeulich@novell.com
/**
* Advertise in the store a change of the given driver to the given new_state.
---- head-2010-04-29.orig/net/core/dev.c 2010-04-29 09:47:32.000000000 +0200
-+++ head-2010-04-29/net/core/dev.c 2010-04-29 09:47:45.000000000 +0200
+--- head-2010-05-12.orig/net/core/dev.c 2010-04-29 09:47:32.000000000 +0200
++++ head-2010-05-12/net/core/dev.c 2010-04-29 09:47:45.000000000 +0200
@@ -139,7 +139,7 @@
/* This should be increased if a protocol with a bigger head is added. */
#define GRO_MAX_HEAD (MAX_HEADER + 128)
diff --git a/patches.xen/xen3-patch-2.6.27 b/patches.xen/xen3-patch-2.6.27
index 2de0cd6070..c56abff101 100644
--- a/patches.xen/xen3-patch-2.6.27
+++ b/patches.xen/xen3-patch-2.6.27
@@ -474,7 +474,7 @@ Automatically created from "patches.kernel.org/patch-2.6.27" by xen-port-patches
BLANK();
OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
OFFSET(XEN_vcpu_info_pending, vcpu_info, evtchn_upcall_pending);
---- head-2010-04-29.orig/arch/x86/kernel/cpu/amd.c 2010-04-29 09:29:49.000000000 +0200
+--- head-2010-04-29.orig/arch/x86/kernel/cpu/amd.c 2010-05-06 14:21:17.000000000 +0200
+++ head-2010-04-29/arch/x86/kernel/cpu/amd.c 2010-03-24 15:12:46.000000000 +0100
@@ -546,6 +546,7 @@ static void __cpuinit init_amd(struct cp
fam10h_check_enable_mmcfg();
@@ -492,7 +492,7 @@ Automatically created from "patches.kernel.org/patch-2.6.27" by xen-port-patches
}
#ifdef CONFIG_X86_32
---- head-2010-04-29.orig/arch/x86/kernel/cpu/bugs_64.c 2010-04-29 09:29:49.000000000 +0200
+--- head-2010-04-29.orig/arch/x86/kernel/cpu/bugs_64.c 2010-05-06 14:21:17.000000000 +0200
+++ head-2010-04-29/arch/x86/kernel/cpu/bugs_64.c 2010-03-24 15:12:46.000000000 +0100
@@ -20,6 +20,7 @@ void __init check_bugs(void)
#endif
@@ -5132,7 +5132,7 @@ Automatically created from "patches.kernel.org/patch-2.6.27" by xen-port-patches
cmpl $nr_syscalls,%eax
jb syscall_call
jmp syscall_exit
---- head-2010-04-29.orig/arch/x86/kernel/entry_64.S 2010-04-29 09:29:49.000000000 +0200
+--- head-2010-04-29.orig/arch/x86/kernel/entry_64.S 2010-05-06 14:21:17.000000000 +0200
+++ head-2010-04-29/arch/x86/kernel/entry_64.S 2010-03-24 15:12:46.000000000 +0100
@@ -1276,7 +1276,7 @@ ENTRY(arch_unwind_init_running)
END(arch_unwind_init_running)
@@ -9677,7 +9677,7 @@ Automatically created from "patches.kernel.org/patch-2.6.27" by xen-port-patches
-#endif /* CONFIG_X86_IO_APIC */
-#endif /* CONFIG_ACPI */
+late_initcall(update_mp_table);
---- head-2010-04-29.orig/arch/x86/kernel/apic/nmi.c 2010-04-29 09:29:49.000000000 +0200
+--- head-2010-04-29.orig/arch/x86/kernel/apic/nmi.c 2010-05-06 14:21:17.000000000 +0200
+++ head-2010-04-29/arch/x86/kernel/apic/nmi.c 2010-04-15 10:05:32.000000000 +0200
@@ -28,7 +28,9 @@
#include <linux/kdebug.h>
@@ -10082,7 +10082,7 @@ Automatically created from "patches.kernel.org/patch-2.6.27" by xen-port-patches
};
void __init no_iommu_init(void)
---- head-2010-04-29.orig/arch/x86/kernel/probe_roms_32.c 2010-04-29 09:29:49.000000000 +0200
+--- head-2010-04-29.orig/arch/x86/kernel/probe_roms_32.c 2010-05-06 14:21:17.000000000 +0200
+++ head-2010-04-29/arch/x86/kernel/probe_roms_32.c 2010-03-24 15:12:46.000000000 +0100
@@ -131,7 +131,7 @@ void __init probe_roms(void)
upper = system_rom_resource.start;
@@ -21130,7 +21130,7 @@ Automatically created from "patches.kernel.org/patch-2.6.27" by xen-port-patches
void make_lowmem_page_readonly(void *va, unsigned int feature)
{
pte_t *pte;
---- head-2010-04-29.orig/arch/x86/pci/amd_bus.c 2010-04-29 09:29:49.000000000 +0200
+--- head-2010-04-29.orig/arch/x86/pci/amd_bus.c 2010-05-06 14:21:17.000000000 +0200
+++ head-2010-04-29/arch/x86/pci/amd_bus.c 2010-03-24 15:12:46.000000000 +0100
@@ -390,6 +390,14 @@ static int __init pci_io_ecs_init(void)
for_each_online_cpu(cpu)
@@ -22259,8 +22259,8 @@ Automatically created from "patches.kernel.org/patch-2.6.27" by xen-port-patches
acpi_processor_remove_fs(device);
---- head-2010-04-29.orig/drivers/acpi/processor_perflib.c 2010-04-15 09:43:05.000000000 +0200
-+++ head-2010-04-29/drivers/acpi/processor_perflib.c 2010-04-15 10:05:19.000000000 +0200
+--- head-2010-04-29.orig/drivers/acpi/processor_perflib.c 2010-05-06 14:22:32.000000000 +0200
++++ head-2010-04-29/drivers/acpi/processor_perflib.c 2010-05-06 14:23:47.000000000 +0200
@@ -187,6 +187,12 @@ int acpi_processor_ppc_has_changed(struc
{
int ret;
@@ -23334,7 +23334,7 @@ Automatically created from "patches.kernel.org/patch-2.6.27" by xen-port-patches
if (fd < 0)
return fd;
---- head-2010-04-29.orig/include/Kbuild 2010-04-29 09:29:49.000000000 +0200
+--- head-2010-04-29.orig/include/Kbuild 2010-05-06 14:21:17.000000000 +0200
+++ head-2010-04-29/include/Kbuild 2010-03-24 15:12:46.000000000 +0100
@@ -8,5 +8,6 @@ header-y += mtd/
header-y += rdma/
@@ -25604,7 +25604,7 @@ Automatically created from "patches.kernel.org/patch-2.6.27" by xen-port-patches
-#define ARCH_SETUP machine_specific_arch_setup();
-
-static void __init machine_specific_arch_setup(void);
---- head-2010-04-29.orig/arch/x86/include/asm/traps.h 2010-04-29 09:29:49.000000000 +0200
+--- head-2010-04-29.orig/arch/x86/include/asm/traps.h 2010-05-06 14:21:17.000000000 +0200
+++ head-2010-04-29/arch/x86/include/asm/traps.h 2010-03-24 15:12:46.000000000 +0100
@@ -37,6 +37,9 @@ asmlinkage void alignment_check(void);
asmlinkage void machine_check(void);
@@ -25727,7 +25727,7 @@ Automatically created from "patches.kernel.org/patch-2.6.27" by xen-port-patches
typedef struct xenbus_alloc {
domid_t dom;
__u32 port;
---- head-2010-04-29.orig/kernel/hrtimer.c 2010-04-29 09:29:49.000000000 +0200
+--- head-2010-04-29.orig/kernel/hrtimer.c 2010-05-06 14:21:17.000000000 +0200
+++ head-2010-04-29/kernel/hrtimer.c 2010-03-24 15:12:46.000000000 +0100
@@ -1108,7 +1108,7 @@ ktime_t hrtimer_get_remaining(const stru
}
@@ -25749,7 +25749,7 @@ Automatically created from "patches.kernel.org/patch-2.6.27" by xen-port-patches
#endif
vmcoreinfo_note[VMCOREINFO_NOTE_SIZE/4];
size_t vmcoreinfo_size;
---- head-2010-04-29.orig/kernel/timer.c 2010-04-29 09:29:49.000000000 +0200
+--- head-2010-04-29.orig/kernel/timer.c 2010-05-06 14:21:17.000000000 +0200
+++ head-2010-04-29/kernel/timer.c 2010-04-15 10:05:03.000000000 +0200
@@ -1044,7 +1044,7 @@ static inline void __run_timers(struct t
spin_unlock_irq(&base->lock);
diff --git a/patches.xen/xen3-patch-2.6.29 b/patches.xen/xen3-patch-2.6.29
index 4fb4652f1e..eafca426b7 100644
--- a/patches.xen/xen3-patch-2.6.29
+++ b/patches.xen/xen3-patch-2.6.29
@@ -7334,7 +7334,7 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
return IRQ_HANDLED;
--- head-2010-04-29.orig/arch/x86/kernel/time-xen.c 2010-03-24 15:14:47.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/time-xen.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-04-29/arch/x86/kernel/time-xen.c 2010-05-11 17:14:09.000000000 +0200
@@ -454,11 +454,7 @@ irqreturn_t timer_interrupt(int irq, voi
struct vcpu_runstate_info runstate;
@@ -7370,7 +7370,7 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
* ensures that the ticks are accounted as idle/wait.
*/
blocked = runstate.time[RUNSTATE_blocked]
-@@ -548,7 +542,7 @@ irqreturn_t timer_interrupt(int irq, voi
+@@ -548,18 +542,23 @@ irqreturn_t timer_interrupt(int irq, voi
do_div(blocked, NS_PER_TICK);
per_cpu(processed_blocked_time, cpu) += blocked * NS_PER_TICK;
per_cpu(processed_system_time, cpu) += blocked * NS_PER_TICK;
@@ -7379,18 +7379,20 @@ Automatically created from "patches.kernel.org/patch-2.6.29" by xen-port-patches
}
/* Account user/system ticks. */
-@@ -556,10 +550,14 @@ irqreturn_t timer_interrupt(int irq, voi
+ if (delta_cpu > 0) {
++ cputime_t ct;
++
do_div(delta_cpu, NS_PER_TICK);
per_cpu(processed_system_time, cpu) += delta_cpu * NS_PER_TICK;
++ ct = jiffies_to_cputime(delta_cpu);
if (user_mode_vm(get_irq_regs()))
- account_user_time(current, (cputime_t)delta_cpu);
- else
-+ account_user_time(current, (cputime_t)delta_cpu,
-+ (cputime_t)delta_cpu);
++ account_user_time(current, ct, cputime_to_scaled(ct));
+ else if (current != idle_task(cpu))
account_system_time(current, HARDIRQ_OFFSET,
-+ (cputime_t)delta_cpu,
- (cputime_t)delta_cpu);
+- (cputime_t)delta_cpu);
++ ct, cputime_to_scaled(ct));
+ else
+ account_idle_ticks(delta_cpu);
}
diff --git a/patches.xen/xen3-patch-2.6.30 b/patches.xen/xen3-patch-2.6.30
index a1da1d1d90..a907157215 100644
--- a/patches.xen/xen3-patch-2.6.30
+++ b/patches.xen/xen3-patch-2.6.30
@@ -7,8 +7,8 @@ Patch-mainline: 2.6.30
Acked-by: Jeff Mahoney <jeffm@suse.com>
Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches.py
---- head-2010-04-15.orig/arch/ia64/include/asm/xen/hypervisor.h 2010-03-24 15:14:47.000000000 +0100
-+++ head-2010-04-15/arch/ia64/include/asm/xen/hypervisor.h 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/ia64/include/asm/xen/hypervisor.h 2010-03-24 15:14:47.000000000 +0100
++++ head-2010-05-12/arch/ia64/include/asm/xen/hypervisor.h 2010-03-24 15:25:06.000000000 +0100
@@ -34,13 +34,13 @@
#define _ASM_IA64_XEN_HYPERVISOR_H
@@ -24,8 +24,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
extern struct shared_info *HYPERVISOR_shared_info;
extern struct start_info *xen_start_info;
---- head-2010-04-15.orig/arch/ia64/kernel/vmlinux.lds.S 2010-04-28 17:06:46.000000000 +0200
-+++ head-2010-04-15/arch/ia64/kernel/vmlinux.lds.S 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/ia64/kernel/vmlinux.lds.S 2010-05-12 08:55:23.000000000 +0200
++++ head-2010-05-12/arch/ia64/kernel/vmlinux.lds.S 2010-03-24 15:25:06.000000000 +0100
@@ -182,7 +182,7 @@ SECTIONS
__start_gate_section = .;
*(.data.gate)
@@ -35,8 +35,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
. = ALIGN(PAGE_SIZE);
__xen_start_gate_section = .;
*(.data.gate.xen)
---- head-2010-04-15.orig/arch/x86/Kconfig 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/Kconfig 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/Kconfig 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/Kconfig 2010-03-24 15:25:06.000000000 +0100
@@ -49,8 +49,8 @@ config X86
select HAVE_REGS_AND_STACK_ACCESS_API
select HAVE_DMA_API_DEBUG
@@ -91,8 +91,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
config X86_REROUTE_FOR_BROKEN_BOOT_IRQS
bool "Reroute for broken boot IRQs"
default n
---- head-2010-04-15.orig/arch/x86/Makefile 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/Makefile 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/Makefile 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/Makefile 2010-03-24 15:25:06.000000000 +0100
@@ -111,10 +111,6 @@ endif
# prevent gcc from generating any FP code by mistake
KBUILD_CFLAGS += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,)
@@ -116,8 +116,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
PHONY += install
install:
---- head-2010-04-15.orig/arch/x86/boot/Makefile 2010-03-24 15:01:37.000000000 +0100
-+++ head-2010-04-15/arch/x86/boot/Makefile 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/boot/Makefile 2010-03-24 15:01:37.000000000 +0100
++++ head-2010-05-12/arch/x86/boot/Makefile 2010-03-24 15:25:06.000000000 +0100
@@ -204,6 +204,12 @@ $(obj)/vmlinux-stripped: OBJCOPYFLAGS :=
$(obj)/vmlinux-stripped: vmlinux FORCE
$(call if_changed,objcopy)
@@ -132,8 +132,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
- sh $(srctree)/$(src)/install.sh $(KERNELRELEASE) $(obj)/bzImage \
+ sh $(srctree)/$(src)/install.sh $(KERNELRELEASE) $(obj)/$(bzImage) \
System.map "$(INSTALL_PATH)"
---- head-2010-04-15.orig/arch/x86/ia32/ia32entry-xen.S 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/ia32/ia32entry-xen.S 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/ia32/ia32entry-xen.S 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/ia32/ia32entry-xen.S 2010-03-24 15:25:06.000000000 +0100
@@ -502,7 +502,7 @@ ia32_sys_call_table:
.quad sys32_olduname
.quad sys_umask /* 60 */
@@ -150,8 +150,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
+ .quad compat_sys_preadv
+ .quad compat_sys_pwritev
ia32_syscall_end:
---- head-2010-04-15.orig/arch/x86/include/asm/kexec.h 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/include/asm/kexec.h 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/asm/kexec.h 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/include/asm/kexec.h 2010-03-24 15:25:06.000000000 +0100
@@ -21,8 +21,14 @@
# define PA_CONTROL_PAGE 0
# define VA_CONTROL_PAGE 1
@@ -167,8 +167,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
#endif
# define KEXEC_CONTROL_CODE_MAX_SIZE 2048
---- head-2010-04-15.orig/arch/x86/include/asm/page_64_types.h 2010-04-28 17:06:46.000000000 +0200
-+++ head-2010-04-15/arch/x86/include/asm/page_64_types.h 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/asm/page_64_types.h 2010-05-12 08:55:23.000000000 +0200
++++ head-2010-05-12/arch/x86/include/asm/page_64_types.h 2010-03-24 15:25:06.000000000 +0100
@@ -69,7 +69,15 @@ extern void init_extra_mapping_wb(unsign
#endif /* !__ASSEMBLY__ */
@@ -185,8 +185,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
#endif
#endif /* _ASM_X86_PAGE_64_DEFS_H */
---- head-2010-04-15.orig/arch/x86/include/mach-xen/asm/desc.h 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/include/mach-xen/asm/desc.h 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/desc.h 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/desc.h 2010-03-24 15:25:06.000000000 +0100
@@ -39,7 +39,7 @@ extern gate_desc idt_table[];
struct gdt_page {
struct desc_struct gdt[GDT_ENTRIES];
@@ -234,8 +234,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
BUG();
}
#endif
---- head-2010-04-15.orig/arch/x86/include/mach-xen/asm/fixmap.h 2010-03-24 15:14:47.000000000 +0100
-+++ head-2010-04-15/arch/x86/include/mach-xen/asm/fixmap.h 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/fixmap.h 2010-03-24 15:14:47.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/fixmap.h 2010-03-24 15:25:06.000000000 +0100
@@ -1,11 +1,154 @@
+/*
+ * fixmap.h: compile-time virtual memory allocation
@@ -412,7 +412,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
}
+#endif /* !__ASSEMBLY__ */
#endif /* _ASM_X86_FIXMAP_H */
---- head-2010-04-15.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2010-03-24 15:14:47.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/fixmap_32.h 2010-03-24 15:14:47.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,125 +0,0 @@
-/*
@@ -540,7 +540,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
-
-#endif /* !__ASSEMBLY__ */
-#endif /* _ASM_X86_FIXMAP_32_H */
---- head-2010-04-15.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2010-03-24 15:17:58.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/fixmap_64.h 2010-03-24 15:17:58.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,90 +0,0 @@
-/*
@@ -633,8 +633,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
-#define FIXADDR_USER_END (FIXADDR_USER_START + PAGE_SIZE)
-
-#endif /* _ASM_X86_FIXMAP_64_H */
---- head-2010-04-15.orig/arch/x86/include/mach-xen/asm/highmem.h 2010-03-24 17:05:16.000000000 +0100
-+++ head-2010-04-15/arch/x86/include/mach-xen/asm/highmem.h 2010-03-24 17:05:22.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/highmem.h 2010-03-24 17:05:16.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/highmem.h 2010-03-24 17:05:22.000000000 +0100
@@ -62,6 +62,7 @@ void *kmap_atomic_prot(struct page *page
void *kmap_atomic(struct page *page, enum km_type type);
void kunmap_atomic(void *kvaddr, enum km_type type);
@@ -643,8 +643,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
struct page *kmap_atomic_to_page(void *ptr);
#define kmap_atomic_pte(page, type) \
---- head-2010-04-15.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/include/mach-xen/asm/hypervisor.h 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/hypervisor.h 2010-03-24 15:25:06.000000000 +0100
@@ -46,7 +46,7 @@
#include <xen/interface/arch-x86/xen-mca.h>
#include <asm/percpu.h>
@@ -678,8 +678,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
#if 0 /* All uses are in places potentially called asynchronously, but
* asynchronous code should rather not make use of lazy mode at all.
---- head-2010-04-15.orig/arch/x86/include/mach-xen/asm/io.h 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/include/mach-xen/asm/io.h 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/io.h 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/io.h 2010-03-24 15:25:06.000000000 +0100
@@ -5,6 +5,10 @@
#include <linux/compiler.h>
@@ -855,7 +855,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
#endif /* _ASM_X86_IO_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-04-15/arch/x86/include/mach-xen/asm/ipi.h 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/ipi.h 2010-03-24 15:25:06.000000000 +0100
@@ -0,0 +1,13 @@
+#ifndef _ASM_X86_IPI_H
+#define _ASM_X86_IPI_H
@@ -870,8 +870,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
+void xen_send_IPI_self(int vector);
+
+#endif /* _ASM_X86_IPI_H */
---- head-2010-04-15.orig/arch/x86/include/mach-xen/asm/irqflags.h 2010-03-24 15:14:47.000000000 +0100
-+++ head-2010-04-15/arch/x86/include/mach-xen/asm/irqflags.h 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/irqflags.h 2010-03-24 15:14:47.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/irqflags.h 2010-03-24 15:25:06.000000000 +0100
@@ -94,7 +94,7 @@ static inline void halt(void)
#ifdef CONFIG_X86_64
@@ -889,8 +889,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
call evtchn_do_upcall ; \
add $4,%esp ; \
jmp ret_from_intr
---- head-2010-04-15.orig/arch/x86/include/mach-xen/asm/irq_vectors.h 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/include/mach-xen/asm/irq_vectors.h 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/irq_vectors.h 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/irq_vectors.h 2010-03-24 15:25:06.000000000 +0100
@@ -2,29 +2,46 @@
#define _ASM_X86_IRQ_VECTORS_H
@@ -1002,8 +1002,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
+#define NR_IRQS (NR_PIRQS + NR_DYNIRQS)
#endif /* _ASM_X86_IRQ_VECTORS_H */
---- head-2010-04-15.orig/arch/x86/include/mach-xen/asm/mmu_context.h 2010-03-24 15:14:47.000000000 +0100
-+++ head-2010-04-15/arch/x86/include/mach-xen/asm/mmu_context.h 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/mmu_context.h 2010-03-24 15:14:47.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/mmu_context.h 2010-03-24 15:25:06.000000000 +0100
@@ -26,11 +26,117 @@ static inline void xen_activate_mm(struc
int init_new_context(struct task_struct *tsk, struct mm_struct *mm);
void destroy_context(struct mm_struct *mm);
@@ -1142,7 +1142,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
+#endif
#endif /* _ASM_X86_MMU_CONTEXT_H */
---- head-2010-04-15.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2010-03-24 15:17:58.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/mmu_context_32.h 2010-03-24 15:17:58.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,83 +0,0 @@
-#ifndef _ASM_X86_MMU_CONTEXT_32_H
@@ -1228,7 +1228,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
- asm("movl %0,%%gs": :"r" (0));
-
-#endif /* _ASM_X86_MMU_CONTEXT_32_H */
---- head-2010-04-15.orig/arch/x86/include/mach-xen/asm/mmu_context_64.h 2010-03-24 15:14:47.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/mmu_context_64.h 2010-03-24 15:14:47.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,106 +0,0 @@
-#ifndef _ASM_X86_MMU_CONTEXT_64_H
@@ -1337,8 +1337,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
-} while (0)
-
-#endif /* _ASM_X86_MMU_CONTEXT_64_H */
---- head-2010-04-15.orig/arch/x86/include/mach-xen/asm/pci.h 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/include/mach-xen/asm/pci.h 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/pci.h 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/pci.h 2010-03-24 15:25:06.000000000 +0100
@@ -41,7 +41,6 @@ static inline int pci_proc_domain(struct
return pci_domain_nr(bus);
}
@@ -1408,8 +1408,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
static inline const struct cpumask *
cpumask_of_pcibus(const struct pci_bus *bus)
{
---- head-2010-04-15.orig/arch/x86/include/mach-xen/asm/pgtable.h 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/include/mach-xen/asm/pgtable.h 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/pgtable.h 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/pgtable.h 2010-03-24 15:25:06.000000000 +0100
@@ -1,178 +1,9 @@
#ifndef _ASM_X86_PGTABLE_H
#define _ASM_X86_PGTABLE_H
@@ -2055,8 +2055,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
#ifdef CONFIG_HIGHPTE
#include <asm/io.h>
struct page *kmap_atomic_to_page(void *);
---- head-2010-04-15.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/include/mach-xen/asm/pgtable-3level.h 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/pgtable-3level.h 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/pgtable-3level.h 2010-03-24 15:25:06.000000000 +0100
@@ -20,21 +20,6 @@
__FILE__, __LINE__, &(e), __pgd_val(e), \
(pgd_val(e) & PTE_PFN_MASK) >> PAGE_SHIFT)
@@ -2113,7 +2113,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
#define __pte_mfn(_pte) (((_pte).pte_low >> PAGE_SHIFT) | \
((_pte).pte_high << (32-PAGE_SHIFT)))
---- head-2010-04-15.orig/arch/x86/include/mach-xen/asm/pgtable-3level-defs.h 2010-03-24 15:14:47.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/pgtable-3level-defs.h 2010-03-24 15:14:47.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-#ifndef _ASM_X86_PGTABLE_3LEVEL_DEFS_H
@@ -2141,7 +2141,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
-
-#endif /* _ASM_X86_PGTABLE_3LEVEL_DEFS_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-04-15/arch/x86/include/mach-xen/asm/pgtable-3level_types.h 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/pgtable-3level_types.h 2010-03-24 15:25:06.000000000 +0100
@@ -0,0 +1,44 @@
+#ifndef _ASM_X86_PGTABLE_3LEVEL_DEFS_H
+#define _ASM_X86_PGTABLE_3LEVEL_DEFS_H
@@ -2187,8 +2187,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
+
+
+#endif /* _ASM_X86_PGTABLE_3LEVEL_DEFS_H */
---- head-2010-04-15.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/include/mach-xen/asm/pgtable_32.h 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/pgtable_32.h 2010-03-24 15:25:06.000000000 +0100
@@ -1,6 +1,8 @@
#ifndef _ASM_X86_PGTABLE_32_H
#define _ASM_X86_PGTABLE_32_H
@@ -2321,8 +2321,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
- direct_remap_pfn_range(vma, from, pfn, size, prot, DOMID_IO)
-
#endif /* _ASM_X86_PGTABLE_32_H */
---- head-2010-04-15.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/include/mach-xen/asm/pgtable_64.h 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/pgtable_64.h 2010-03-24 15:25:06.000000000 +0100
@@ -2,6 +2,8 @@
#define _ASM_X86_PGTABLE_64_H
@@ -2519,7 +2519,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-04-15/arch/x86/include/mach-xen/asm/pgtable_64_types.h 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/pgtable_64_types.h 2010-03-24 15:25:06.000000000 +0100
@@ -0,0 +1,63 @@
+#ifndef _ASM_X86_PGTABLE_64_DEFS_H
+#define _ASM_X86_PGTABLE_64_DEFS_H
@@ -2585,7 +2585,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
+
+#endif /* _ASM_X86_PGTABLE_64_DEFS_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-04-15/arch/x86/include/mach-xen/asm/pgtable_types.h 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/pgtable_types.h 2010-03-24 15:25:06.000000000 +0100
@@ -0,0 +1,388 @@
+#ifndef _ASM_X86_PGTABLE_DEFS_H
+#define _ASM_X86_PGTABLE_DEFS_H
@@ -2975,8 +2975,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
+#endif /* !__ASSEMBLY__ */
+
+#endif /* _ASM_X86_PGTABLE_DEFS_H */
---- head-2010-04-15.orig/arch/x86/include/mach-xen/asm/processor.h 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/include/mach-xen/asm/processor.h 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/processor.h 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/processor.h 2010-03-24 15:25:06.000000000 +0100
@@ -16,6 +16,7 @@ struct mm_struct;
#include <asm/cpufeature.h>
#include <asm/system.h>
@@ -3161,8 +3161,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
#define INIT_THREAD { \
.sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
---- head-2010-04-15.orig/arch/x86/include/mach-xen/asm/smp.h 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/include/mach-xen/asm/smp.h 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/smp.h 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/smp.h 2010-03-24 15:25:06.000000000 +0100
@@ -15,53 +15,25 @@
# include <asm/io_apic.h>
# endif
@@ -3328,8 +3328,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
-
#endif /* __ASSEMBLY__ */
#endif /* _ASM_X86_SMP_H */
---- head-2010-04-15.orig/arch/x86/include/mach-xen/asm/spinlock.h 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/include/mach-xen/asm/spinlock.h 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/spinlock.h 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/spinlock.h 2010-03-24 15:25:06.000000000 +0100
@@ -255,40 +255,18 @@ static __always_inline void __ticket_spi
static inline int xen_spinlock_init(unsigned int cpu) { return 0; }
static inline void xen_spinlock_cleanup(unsigned int cpu) {}
@@ -3424,8 +3424,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
#define _raw_spin_relax(lock) cpu_relax()
#define _raw_read_relax(lock) cpu_relax()
#define _raw_write_relax(lock) cpu_relax()
---- head-2010-04-15.orig/arch/x86/include/mach-xen/asm/spinlock_types.h 2010-03-24 15:14:47.000000000 +0100
-+++ head-2010-04-15/arch/x86/include/mach-xen/asm/spinlock_types.h 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/spinlock_types.h 2010-03-24 15:14:47.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/spinlock_types.h 2010-03-24 15:25:06.000000000 +0100
@@ -26,6 +26,20 @@ typedef union {
# define TICKET_SHIFT 16
u16 cur, seq;
@@ -3447,8 +3447,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
#endif
};
} raw_spinlock_t;
---- head-2010-04-15.orig/arch/x86/include/mach-xen/asm/system.h 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/include/mach-xen/asm/system.h 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/system.h 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/system.h 2010-03-24 15:25:06.000000000 +0100
@@ -21,9 +21,24 @@
struct task_struct; /* one of the stranger aspects of C forward declarations */
struct task_struct *__switch_to(struct task_struct *prev,
@@ -3577,8 +3577,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
static inline unsigned long get_limit(unsigned long segment)
{
unsigned long __limit;
---- head-2010-04-15.orig/arch/x86/include/mach-xen/asm/tlbflush.h 2010-03-24 15:14:47.000000000 +0100
-+++ head-2010-04-15/arch/x86/include/mach-xen/asm/tlbflush.h 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/tlbflush.h 2010-03-24 15:14:47.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/tlbflush.h 2010-03-24 15:25:06.000000000 +0100
@@ -86,21 +86,20 @@ static inline void flush_tlb_range(struc
flush_tlb_mm(vma->vm_mm);
}
@@ -3612,8 +3612,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
+extern void zap_low_mappings(void);
+
#endif /* _ASM_X86_TLBFLUSH_H */
---- head-2010-04-15.orig/arch/x86/kernel/Makefile 2010-03-24 15:14:47.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/Makefile 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/Makefile 2010-03-24 15:14:47.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/Makefile 2010-03-24 15:25:06.000000000 +0100
@@ -122,7 +122,6 @@ obj-$(CONFIG_X86_XEN) += fixup.o
###
# 64 bit specific files
@@ -3637,8 +3637,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
+ i8259.o irqinit_$(BITS).o pci-swiotlb.o reboot.o smpboot.o tsc.o \
+ tsc_sync.o uv_%.o vsmp_64.o
disabled-obj-$(CONFIG_XEN_UNPRIVILEGED_GUEST) += probe_roms_32.o
---- head-2010-04-15.orig/arch/x86/kernel/acpi/boot.c 2010-04-15 10:05:36.000000000 +0200
-+++ head-2010-04-15/arch/x86/kernel/acpi/boot.c 2010-04-15 10:07:05.000000000 +0200
+--- head-2010-05-12.orig/arch/x86/kernel/acpi/boot.c 2010-04-15 10:05:36.000000000 +0200
++++ head-2010-05-12/arch/x86/kernel/acpi/boot.c 2010-04-15 10:07:05.000000000 +0200
@@ -115,11 +115,6 @@ char *__init __acpi_map_table(unsigned l
if (!phys || !size)
return NULL;
@@ -3662,8 +3662,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
return 0;
}
---- head-2010-04-15.orig/arch/x86/kernel/acpi/sleep-xen.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/acpi/sleep-xen.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/acpi/sleep-xen.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/acpi/sleep-xen.c 2010-03-24 15:25:06.000000000 +0100
@@ -104,6 +104,7 @@ int acpi_save_state_mem(void)
stack_start.sp = temp_stack + sizeof(temp_stack);
early_gdt_descr.address =
@@ -3672,8 +3672,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
#endif
initial_code = (unsigned long)wakeup_long64;
saved_magic = 0x123456789abcdef0;
---- head-2010-04-15.orig/arch/x86/kernel/apic/Makefile 2010-04-28 17:06:46.000000000 +0200
-+++ head-2010-04-15/arch/x86/kernel/apic/Makefile 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/apic/Makefile 2010-05-12 08:55:23.000000000 +0200
++++ head-2010-05-12/arch/x86/kernel/apic/Makefile 2010-03-24 15:25:06.000000000 +0100
@@ -17,3 +17,10 @@ obj-$(CONFIG_X86_BIGSMP) += bigsmp_32.o
obj-$(CONFIG_X86_NUMAQ) += numaq_32.o
obj-$(CONFIG_X86_ES7000) += es7000_32.o
@@ -3685,8 +3685,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
+
+disabled-obj-$(CONFIG_XEN) := apic_flat_$(BITS).o
+disabled-obj-$(filter-out $(CONFIG_SMP),$(CONFIG_XEN)) += ipi.o
---- head-2010-04-15.orig/arch/x86/kernel/apic/apic-xen.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/apic/apic-xen.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/apic/apic-xen.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/apic/apic-xen.c 2010-03-24 15:25:06.000000000 +0100
@@ -4,11 +4,20 @@
#include <linux/init.h>
@@ -3708,8 +3708,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
/*
* Debug level, exported for io_apic.c
*/
---- head-2010-04-15.orig/arch/x86/kernel/apic/io_apic-xen.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/apic/io_apic-xen.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/apic/io_apic-xen.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/apic/io_apic-xen.c 2010-03-24 15:25:06.000000000 +0100
@@ -1,7 +1,7 @@
/*
* Intel IO-APIC support for multi-Pentium hosts.
@@ -5626,8 +5626,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
}
for (i = 0; i < nr_ioapics; i++) {
---- head-2010-04-15.orig/arch/x86/kernel/apic/ipi-xen.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/apic/ipi-xen.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/apic/ipi-xen.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/apic/ipi-xen.c 2010-03-24 15:25:06.000000000 +0100
@@ -17,38 +17,8 @@
#include <asm/mmu_context.h>
#include <asm/apic.h>
@@ -5877,7 +5877,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
-#endif
-#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-04-15/arch/x86/kernel/apic/probe_32-xen.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/apic/probe_32-xen.c 2010-03-24 15:25:06.000000000 +0100
@@ -0,0 +1,69 @@
+/*
+ * Default generic APIC driver. This handles up to 8 CPUs.
@@ -5948,8 +5948,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
+
+struct apic *apic = &apic_xen;
+EXPORT_SYMBOL_GPL(apic);
---- head-2010-04-15.orig/arch/x86/kernel/asm-offsets_32.c 2010-03-24 15:10:37.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/asm-offsets_32.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/asm-offsets_32.c 2010-03-24 15:10:37.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/asm-offsets_32.c 2010-03-24 15:25:06.000000000 +0100
@@ -115,6 +115,11 @@ void foo(void)
OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
@@ -5962,8 +5962,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
#ifdef CONFIG_PARAVIRT
BLANK();
OFFSET(PARAVIRT_enabled, pv_info, paravirt_enabled);
---- head-2010-04-15.orig/arch/x86/kernel/cpu/common-xen.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/cpu/common-xen.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/cpu/common-xen.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/cpu/common-xen.c 2010-03-24 15:25:06.000000000 +0100
@@ -1,101 +1,94 @@
-#include <linux/init.h>
-#include <linux/kernel.h>
@@ -7068,8 +7068,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
-
-
#endif
---- head-2010-04-15.orig/arch/x86/kernel/e820-xen.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/e820-xen.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/e820-xen.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/e820-xen.c 2010-03-24 15:25:06.000000000 +0100
@@ -129,19 +129,50 @@ int __init e820_all_mapped(u64 start, u6
/*
* Add a memory region to the kernel e820 map.
@@ -7327,8 +7327,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
/*
* Try to copy the BIOS-supplied E820-map.
*
---- head-2010-04-15.orig/arch/x86/kernel/early_printk-xen.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/early_printk-xen.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/early_printk-xen.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/early_printk-xen.c 2010-03-24 15:25:06.000000000 +0100
@@ -12,8 +12,8 @@
#include <asm/fcntl.h>
#include <asm/setup.h>
@@ -7412,8 +7412,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
{
u32 dword;
dword = read_pci_config(ehci_dev.bus, ehci_dev.slot, ehci_dev.func,
---- head-2010-04-15.orig/arch/x86/kernel/entry_32-xen.S 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/entry_32-xen.S 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/entry_32-xen.S 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/entry_32-xen.S 2010-03-24 15:25:06.000000000 +0100
@@ -30,12 +30,13 @@
* 1C(%esp) - %ds
* 20(%esp) - %es
@@ -8121,8 +8121,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
/* copy the iret frame of 12 bytes */
.rept 3
pushl 16(%esp)
---- head-2010-04-15.orig/arch/x86/kernel/entry_64-xen.S 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/entry_64-xen.S 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/entry_64-xen.S 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/entry_64-xen.S 2010-03-24 15:25:06.000000000 +0100
@@ -51,10 +51,10 @@
#include <asm/unistd.h>
#include <asm/thread_info.h>
@@ -8324,8 +8324,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
RESTORE_ALL 8
jmp irq_return
paranoid_userspace:
---- head-2010-04-15.orig/arch/x86/kernel/head-xen.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/head-xen.c 2010-04-28 17:07:13.000000000 +0200
+--- head-2010-05-12.orig/arch/x86/kernel/head-xen.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/head-xen.c 2010-04-28 17:07:13.000000000 +0200
@@ -2,6 +2,7 @@
#include <linux/init.h>
@@ -8517,8 +8517,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
#endif
}
+#endif /* CONFIG_XEN */
---- head-2010-04-15.orig/arch/x86/kernel/head32-xen.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/head32-xen.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/head32-xen.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/head32-xen.c 2010-03-24 15:25:06.000000000 +0100
@@ -9,6 +9,7 @@
#include <linux/start_kernel.h>
@@ -8564,8 +8564,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
/*
* At this point everything still needed from the boot loader
---- head-2010-04-15.orig/arch/x86/kernel/head64-xen.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/head64-xen.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/head64-xen.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/head64-xen.c 2010-03-24 15:25:06.000000000 +0100
@@ -7,9 +7,6 @@
* Modified for Xen.
*/
@@ -8681,8 +8681,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
/*
* At this point everything still needed from the boot loader
---- head-2010-04-15.orig/arch/x86/kernel/head_32-xen.S 2010-03-24 15:12:36.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/head_32-xen.S 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/head_32-xen.S 2010-03-24 15:12:36.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/head_32-xen.S 2010-03-24 15:25:06.000000000 +0100
@@ -6,12 +6,14 @@
#include <linux/init.h>
#include <linux/linkage.h>
@@ -8760,8 +8760,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
movl %eax,%gs
cld # gcc2 wants the direction flag cleared at all times
---- head-2010-04-15.orig/arch/x86/kernel/head_64-xen.S 2010-03-24 15:12:46.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/head_64-xen.S 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/head_64-xen.S 2010-03-24 15:12:46.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/head_64-xen.S 2010-03-24 15:25:06.000000000 +0100
@@ -21,6 +21,7 @@
#include <asm/msr.h>
#include <asm/cache.h>
@@ -8796,8 +8796,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
#define NEXT_PAGE(name) \
.balign PAGE_SIZE; \
phys_##name = . - .text.head; \
---- head-2010-04-15.orig/arch/x86/kernel/ioport-xen.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/ioport-xen.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/ioport-xen.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/ioport-xen.c 2010-03-24 15:25:06.000000000 +0100
@@ -91,9 +91,8 @@ static int do_iopl(unsigned int level, s
}
@@ -8809,8 +8809,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
unsigned int level = regs->bx;
#else
asmlinkage long sys_iopl(unsigned int level, struct pt_regs *regs)
---- head-2010-04-15.orig/arch/x86/kernel/irq-xen.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/irq-xen.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/irq-xen.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/irq-xen.c 2010-03-24 15:25:06.000000000 +0100
@@ -6,13 +6,20 @@
#include <linux/kernel_stat.h>
#include <linux/seq_file.h>
@@ -8989,8 +8989,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
+ set_irq_regs(old_regs);
+}
+#endif
---- head-2010-04-15.orig/arch/x86/kernel/machine_kexec_64.c 2010-04-15 10:03:05.000000000 +0200
-+++ head-2010-04-15/arch/x86/kernel/machine_kexec_64.c 2010-04-15 10:07:08.000000000 +0200
+--- head-2010-05-12.orig/arch/x86/kernel/machine_kexec_64.c 2010-04-15 10:03:05.000000000 +0200
++++ head-2010-05-12/arch/x86/kernel/machine_kexec_64.c 2010-04-15 10:07:08.000000000 +0200
@@ -92,13 +92,8 @@ void machine_kexec_setup_load_arg(xen_ke
xki->page_list[PA_CONTROL_PAGE] = __ma(control_page);
xki->page_list[PA_TABLE_PAGE] = __ma(table_page);
@@ -9016,8 +9016,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
result = 0;
out:
return result;
---- head-2010-04-15.orig/arch/x86/kernel/microcode_core-xen.c 2010-03-24 15:14:47.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/microcode_core-xen.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/microcode_core-xen.c 2010-03-24 15:14:47.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/microcode_core-xen.c 2010-03-24 15:25:06.000000000 +0100
@@ -21,28 +21,28 @@
* as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version.
@@ -9086,8 +9086,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
static int request_microcode(const char *name)
{
---- head-2010-04-15.orig/arch/x86/kernel/mpparse-xen.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/mpparse-xen.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/mpparse-xen.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/mpparse-xen.c 2010-03-24 15:25:06.000000000 +0100
@@ -3,7 +3,7 @@
* compliant MP-table parsing routines.
*
@@ -9903,8 +9903,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
}
/*
---- head-2010-04-15.orig/arch/x86/kernel/pci-dma-xen.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/pci-dma-xen.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/pci-dma-xen.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/pci-dma-xen.c 2010-03-24 15:25:06.000000000 +0100
@@ -1,4 +1,5 @@
#include <linux/dma-mapping.h>
+#include <linux/dma-debug.h>
@@ -10021,8 +10021,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
forbid_dac = 1;
}
}
---- head-2010-04-15.orig/arch/x86/kernel/pci-nommu-xen.c 2010-03-24 15:14:47.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/pci-nommu-xen.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/pci-nommu-xen.c 2010-03-24 15:14:47.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/pci-nommu-xen.c 2010-03-24 15:25:06.000000000 +0100
@@ -24,7 +24,7 @@ do { \
static int
@@ -10097,8 +10097,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
};
void __init no_iommu_init(void)
---- head-2010-04-15.orig/arch/x86/kernel/process-xen.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/process-xen.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/process-xen.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/process-xen.c 2010-03-24 15:25:06.000000000 +0100
@@ -1,16 +1,19 @@
#include <linux/errno.h>
#include <linux/kernel.h>
@@ -10374,8 +10374,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
static int __init idle_setup(char *str)
{
if (!str)
---- head-2010-04-15.orig/arch/x86/kernel/process_32-xen.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/process_32-xen.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/process_32-xen.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/process_32-xen.c 2010-03-24 15:25:06.000000000 +0100
@@ -11,6 +11,7 @@
#include <stdarg.h>
@@ -10697,8 +10697,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
if (error == 0) {
/* Make sure we don't return using sysenter.. */
set_thread_flag(TIF_IRET);
---- head-2010-04-15.orig/arch/x86/kernel/process_64-xen.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/process_64-xen.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/process_64-xen.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/process_64-xen.c 2010-03-24 15:25:06.000000000 +0100
@@ -19,6 +19,7 @@
#include <stdarg.h>
@@ -11020,8 +11020,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
unsigned long get_wchan(struct task_struct *p)
{
unsigned long stack;
---- head-2010-04-15.orig/arch/x86/kernel/quirks-xen.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/quirks-xen.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/quirks-xen.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/quirks-xen.c 2010-03-24 15:25:06.000000000 +0100
@@ -75,8 +75,7 @@ static void ich_force_hpet_resume(void)
if (!force_hpet_address)
return;
@@ -11051,8 +11051,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
}
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_1,
---- head-2010-04-15.orig/arch/x86/kernel/setup-xen.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/setup-xen.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/setup-xen.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/setup-xen.c 2010-03-24 15:25:06.000000000 +0100
@@ -74,14 +74,15 @@
#include <asm/e820.h>
#include <asm/mpspec.h>
@@ -11422,8 +11422,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
#ifdef CONFIG_XEN
static int
xen_panic_event(struct notifier_block *this, unsigned long event, void *ptr)
---- head-2010-04-15.orig/arch/x86/kernel/setup_percpu.c 2010-04-28 17:06:46.000000000 +0200
-+++ head-2010-04-15/arch/x86/kernel/setup_percpu.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/setup_percpu.c 2010-05-12 08:55:23.000000000 +0200
++++ head-2010-05-12/arch/x86/kernel/setup_percpu.c 2010-03-24 15:25:06.000000000 +0100
@@ -231,7 +231,7 @@ void __init setup_per_cpu_areas(void)
* are zeroed indicating that the static arrays are
* gone.
@@ -11442,8 +11442,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
early_per_cpu_ptr(x86_cpu_to_apicid) = NULL;
early_per_cpu_ptr(x86_bios_cpu_apicid) = NULL;
#endif
---- head-2010-04-15.orig/arch/x86/kernel/smp-xen.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/smp-xen.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/smp-xen.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/smp-xen.c 2010-03-24 15:25:06.000000000 +0100
@@ -2,7 +2,7 @@
* Intel SMP support routines.
*
@@ -11483,9 +11483,19 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
}
/*
---- head-2010-04-15.orig/arch/x86/kernel/time-xen.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/time-xen.c 2010-03-24 15:25:06.000000000 +0100
-@@ -586,7 +586,7 @@ EXPORT_SYMBOL_GPL(mark_tsc_unstable);
+--- head-2010-05-12.orig/arch/x86/kernel/time-xen.c 2010-05-11 17:14:09.000000000 +0200
++++ head-2010-05-12/arch/x86/kernel/time-xen.c 2010-05-12 09:02:08.000000000 +0200
+@@ -554,7 +554,8 @@ irqreturn_t timer_interrupt(int irq, voi
+ ct = jiffies_to_cputime(delta_cpu);
+ if (user_mode_vm(get_irq_regs()))
+ account_user_time(current, ct, cputime_to_scaled(ct));
+- else if (current != idle_task(cpu))
++ else if (current != idle_task(cpu)
++ || irq_count() != HARDIRQ_OFFSET)
+ account_system_time(current, HARDIRQ_OFFSET,
+ ct, cputime_to_scaled(ct));
+ else
+@@ -587,7 +588,7 @@ EXPORT_SYMBOL_GPL(mark_tsc_unstable);
static cycle_t cs_last;
@@ -11494,8 +11504,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
{
#ifdef CONFIG_SMP
cycle_t last = get64(&cs_last);
---- head-2010-04-15.orig/arch/x86/kernel/traps-xen.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/traps-xen.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/traps-xen.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/traps-xen.c 2010-03-24 15:25:06.000000000 +0100
@@ -54,15 +54,14 @@
#include <asm/desc.h>
#include <asm/i387.h>
@@ -11610,8 +11620,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
if (notify_die(DIE_TRAP, "iret exception",
regs, error_code, 32, SIGILL) == NOTIFY_STOP)
return;
---- head-2010-04-15.orig/arch/x86/kernel/vmlinux.lds.S 2010-03-24 15:08:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/vmlinux.lds.S 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/vmlinux.lds.S 2010-03-24 15:08:58.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/vmlinux.lds.S 2010-03-24 15:25:06.000000000 +0100
@@ -16,8 +16,10 @@
#ifdef CONFIG_X86_32
@@ -11624,7 +11634,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
#endif
#include <asm-generic/vmlinux.lds.h>
---- head-2010-04-15.orig/arch/x86/mach-xen/Makefile 2007-06-12 13:12:48.000000000 +0200
+--- head-2010-05-12.orig/arch/x86/mach-xen/Makefile 2007-06-12 13:12:48.000000000 +0200
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-#
@@ -11632,7 +11642,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
-#
-
-obj-y := setup.o
---- head-2010-04-15.orig/arch/x86/mach-xen/setup.c 2010-03-24 15:12:46.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mach-xen/setup.c 2010-03-24 15:12:46.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,190 +0,0 @@
-/*
@@ -11825,8 +11835,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
- }
-#endif
-}
---- head-2010-04-15.orig/arch/x86/mm/Makefile 2010-03-24 15:01:37.000000000 +0100
-+++ head-2010-04-15/arch/x86/mm/Makefile 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/Makefile 2010-03-24 15:01:37.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/Makefile 2010-03-24 15:25:06.000000000 +0100
@@ -26,5 +26,6 @@ obj-$(CONFIG_K8_NUMA) += k8topology_64.
obj-$(CONFIG_ACPI_NUMA) += srat_$(BITS).o
@@ -11834,8 +11844,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
+disabled-obj-$(CONFIG_XEN) := tlb.o
obj-$(CONFIG_MEMTEST) += memtest.o
---- head-2010-04-15.orig/arch/x86/mm/fault-xen.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/mm/fault-xen.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/fault-xen.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/fault-xen.c 2010-03-24 15:25:06.000000000 +0100
@@ -1,73 +1,79 @@
/*
* Copyright (C) 1995 Linus Torvalds
@@ -13545,8 +13555,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
- }
-#endif
}
---- head-2010-04-15.orig/arch/x86/mm/highmem_32-xen.c 2010-03-24 15:14:47.000000000 +0100
-+++ head-2010-04-15/arch/x86/mm/highmem_32-xen.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/highmem_32-xen.c 2010-03-24 15:14:47.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/highmem_32-xen.c 2010-03-24 15:25:06.000000000 +0100
@@ -1,5 +1,6 @@
#include <linux/highmem.h>
#include <linux/module.h>
@@ -13675,8 +13685,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
+ }
+ totalram_pages += totalhigh_pages;
+}
---- head-2010-04-15.orig/arch/x86/mm/hypervisor.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/mm/hypervisor.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/hypervisor.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/hypervisor.c 2010-03-24 15:25:06.000000000 +0100
@@ -36,6 +36,7 @@
#include <linux/vmalloc.h>
#include <asm/page.h>
@@ -13713,7 +13723,7 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
return HYPERVISOR_update_descriptor(mach_gp, *(const u64*)desc);
}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-04-15/arch/x86/mm/init-xen.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/init-xen.c 2010-03-24 15:25:06.000000000 +0100
@@ -0,0 +1,459 @@
+#include <linux/ioport.h>
+#include <linux/swap.h>
@@ -14174,8 +14184,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
+ free_init_pages("initrd memory", start, end);
+}
+#endif
---- head-2010-04-15.orig/arch/x86/mm/init_32-xen.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/mm/init_32-xen.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/init_32-xen.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/init_32-xen.c 2010-03-24 15:25:06.000000000 +0100
@@ -52,9 +52,7 @@
#include <asm/swiotlb.h>
#include <asm/setup.h>
@@ -14871,8 +14881,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
int __init reserve_bootmem_generic(unsigned long phys, unsigned long len,
int flags)
{
---- head-2010-04-15.orig/arch/x86/mm/init_64-xen.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/mm/init_64-xen.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/init_64-xen.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/init_64-xen.c 2010-03-24 15:25:06.000000000 +0100
@@ -51,6 +51,8 @@
#include <asm/kdebug.h>
#include <asm/numa.h>
@@ -15180,8 +15190,12 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
- PAGE_KERNEL_RO);
-
- table_top = max(table_cur, start);
--}
--
++ WARN(e820_table_end != e820_table_top, "start=%lx cur=%lx top=%lx\n",
++ e820_table_start, e820_table_end, e820_table_top);
++ if (e820_table_end > e820_table_top)
++ e820_table_top = e820_table_end;
+ }
+
-static void __init init_gbpages(void)
-{
-#ifndef CONFIG_XEN
@@ -15190,12 +15204,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
- else
- direct_gbpages = 0;
-#endif
-+ WARN(e820_table_end != e820_table_top, "start=%lx cur=%lx top=%lx\n",
-+ e820_table_start, e820_table_end, e820_table_top);
-+ if (e820_table_end > e820_table_top)
-+ e820_table_top = e820_table_end;
- }
-
+-}
+-
-static unsigned long __meminit kernel_physical_mapping_init(unsigned long start,
- unsigned long end,
- unsigned long page_size_mask)
@@ -15556,8 +15566,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
int __init reserve_bootmem_generic(unsigned long phys, unsigned long len,
int flags)
{
---- head-2010-04-15.orig/arch/x86/mm/iomap_32-xen.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/mm/iomap_32-xen.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/iomap_32-xen.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/iomap_32-xen.c 2010-03-24 15:25:06.000000000 +0100
@@ -20,10 +20,11 @@
#include <asm/pat.h>
#include <linux/bitops.h>
@@ -15619,8 +15629,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
}
EXPORT_SYMBOL_GPL(iomap_atomic_prot_pfn);
---- head-2010-04-15.orig/arch/x86/mm/ioremap-xen.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/mm/ioremap-xen.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/ioremap-xen.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/ioremap-xen.c 2010-03-24 15:25:06.000000000 +0100
@@ -23,13 +23,17 @@
#include <asm/pgalloc.h>
#include <asm/pat.h>
@@ -15876,8 +15886,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
-{
- WARN_ON(1);
-}
---- head-2010-04-15.orig/arch/x86/mm/pageattr-xen.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/mm/pageattr-xen.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/pageattr-xen.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/pageattr-xen.c 2010-03-24 15:25:06.000000000 +0100
@@ -16,6 +16,7 @@
#include <asm/processor.h>
#include <asm/tlbflush.h>
@@ -16415,8 +16425,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
int set_pages_x(struct page *page, int numpages)
{
unsigned long addr = (unsigned long)page_address(page);
---- head-2010-04-15.orig/arch/x86/mm/pat-xen.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/arch/x86/mm/pat-xen.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/pat-xen.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/pat-xen.c 2010-03-24 15:25:06.000000000 +0100
@@ -31,7 +31,7 @@
#ifdef CONFIG_X86_PAT
int __read_mostly pat_enabled = 1;
@@ -16812,8 +16822,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
}
#endif /* CONFIG_XEN */
---- head-2010-04-15.orig/arch/x86/mm/pgtable-xen.c 2010-03-24 15:14:47.000000000 +0100
-+++ head-2010-04-15/arch/x86/mm/pgtable-xen.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/pgtable-xen.c 2010-03-24 15:14:47.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/pgtable-xen.c 2010-03-24 15:25:06.000000000 +0100
@@ -122,10 +122,6 @@ void __pud_free_tlb(struct mmu_gather *t
#endif /* PAGETABLE_LEVELS > 3 */
#endif /* PAGETABLE_LEVELS > 2 */
@@ -16885,8 +16895,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
xen_l1_entry_update(level1_fixmap_pgt + pte_index(address),
pfn_pte_ma(phys >> PAGE_SHIFT, flags));
fixmaps_set++;
---- head-2010-04-15.orig/arch/x86/mm/pgtable_32-xen.c 2010-03-24 15:14:47.000000000 +0100
-+++ head-2010-04-15/arch/x86/mm/pgtable_32-xen.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/pgtable_32-xen.c 2010-03-24 15:14:47.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/pgtable_32-xen.c 2010-03-24 15:25:06.000000000 +0100
@@ -25,6 +25,8 @@
#include <xen/features.h>
#include <asm/hypervisor.h>
@@ -16927,8 +16937,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
/*
* vmalloc=size forces the vmalloc area to be exactly 'size'
* bytes. This can be used to increase (or decrease) the
---- head-2010-04-15.orig/drivers/acpi/Makefile 2010-03-24 14:53:41.000000000 +0100
-+++ head-2010-04-15/drivers/acpi/Makefile 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/drivers/acpi/Makefile 2010-03-24 14:53:41.000000000 +0100
++++ head-2010-05-12/drivers/acpi/Makefile 2010-03-24 15:25:06.000000000 +0100
@@ -64,8 +64,6 @@ obj-$(CONFIG_ACPI_POWER_METER) += power_
processor-y := processor_driver.o processor_throttling.o
processor-y += processor_idle.o processor_thermal.o
@@ -16939,8 +16949,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
+processor-$(CONFIG_PROCESSOR_EXTERNAL_CONTROL) += processor_perflib.o processor_extcntl.o
obj-$(CONFIG_ACPI_PROCESSOR_AGGREGATOR) += acpi_pad.o
---- head-2010-04-15.orig/drivers/acpi/acpica/hwsleep.c 2010-03-24 15:14:47.000000000 +0100
-+++ head-2010-04-15/drivers/acpi/acpica/hwsleep.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/drivers/acpi/acpica/hwsleep.c 2010-03-24 15:14:47.000000000 +0100
++++ head-2010-05-12/drivers/acpi/acpica/hwsleep.c 2010-03-24 15:25:06.000000000 +0100
@@ -394,7 +394,7 @@ acpi_status asmlinkage acpi_enter_sleep_
#else
/* PV ACPI just need check hypercall return value */
@@ -16950,8 +16960,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
if (err) {
printk(KERN_ERR "ACPI: Hypervisor failure [%d]\n", err);
return_ACPI_STATUS(AE_ERROR);
---- head-2010-04-15.orig/drivers/acpi/processor_idle.c 2010-04-15 10:06:51.000000000 +0200
-+++ head-2010-04-15/drivers/acpi/processor_idle.c 2010-04-15 10:06:59.000000000 +0200
+--- head-2010-05-12.orig/drivers/acpi/processor_idle.c 2010-04-15 10:06:51.000000000 +0200
++++ head-2010-05-12/drivers/acpi/processor_idle.c 2010-04-15 10:06:59.000000000 +0200
@@ -606,7 +606,7 @@ static void acpi_processor_power_verify_
#ifndef CONFIG_PROCESSOR_EXTERNAL_CONTROL
cx->latency_ticks = cx->latency;
@@ -16970,8 +16980,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
#endif
break;
---- head-2010-04-15.orig/drivers/oprofile/oprofile_files.c 2010-03-24 15:02:17.000000000 +0100
-+++ head-2010-04-15/drivers/oprofile/oprofile_files.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/drivers/oprofile/oprofile_files.c 2010-03-24 15:02:17.000000000 +0100
++++ head-2010-05-12/drivers/oprofile/oprofile_files.c 2010-03-24 15:25:06.000000000 +0100
@@ -172,6 +172,7 @@ static const struct file_operations dump
};
@@ -16980,8 +16990,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
#define TMPBUFSIZE 512
---- head-2010-04-15.orig/drivers/pci/msi-xen.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/drivers/pci/msi-xen.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/drivers/pci/msi-xen.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/drivers/pci/msi-xen.c 2010-03-24 15:25:06.000000000 +0100
@@ -47,47 +47,50 @@ struct msi_pirq_entry {
/* Arch hooks */
@@ -17220,8 +17230,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
if (nvec > nr_entries)
return -EINVAL;
---- head-2010-04-15.orig/drivers/xen/Kconfig 2010-03-24 15:18:46.000000000 +0100
-+++ head-2010-04-15/drivers/xen/Kconfig 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/Kconfig 2010-03-24 15:18:46.000000000 +0100
++++ head-2010-05-12/drivers/xen/Kconfig 2010-03-24 15:25:06.000000000 +0100
@@ -14,7 +14,6 @@ menu "XEN"
config XEN_PRIVILEGED_GUEST
@@ -17241,8 +17251,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
config NO_IDLE_HZ
def_bool y
---- head-2010-04-15.orig/drivers/xen/char/mem.c 2010-03-24 15:12:46.000000000 +0100
-+++ head-2010-04-15/drivers/xen/char/mem.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/char/mem.c 2010-03-24 15:12:46.000000000 +0100
++++ head-2010-05-12/drivers/xen/char/mem.c 2010-03-24 15:25:06.000000000 +0100
@@ -158,21 +158,7 @@ static ssize_t write_mem(struct file * f
}
@@ -17265,8 +17275,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
#ifdef CONFIG_HAVE_IOREMAP_PROT
.access = generic_access_phys
#endif
---- head-2010-04-15.orig/drivers/xen/core/Makefile 2010-04-19 14:50:32.000000000 +0200
-+++ head-2010-04-15/drivers/xen/core/Makefile 2010-04-19 14:52:49.000000000 +0200
+--- head-2010-05-12.orig/drivers/xen/core/Makefile 2010-04-19 14:50:32.000000000 +0200
++++ head-2010-05-12/drivers/xen/core/Makefile 2010-04-19 14:52:49.000000000 +0200
@@ -10,5 +10,5 @@ obj-$(CONFIG_SYS_HYPERVISOR) += hypervis
obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o
obj-$(CONFIG_XEN_SYSFS) += xen_sysfs.o
@@ -17274,8 +17284,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
-obj-$(CONFIG_X86_SMP) += spinlock.o
+obj-$(CONFIG_SMP) += spinlock.o
obj-$(CONFIG_KEXEC) += machine_kexec.o
---- head-2010-04-15.orig/drivers/xen/core/evtchn.c 2010-04-23 15:19:25.000000000 +0200
-+++ head-2010-04-15/drivers/xen/core/evtchn.c 2010-04-23 15:19:37.000000000 +0200
+--- head-2010-05-12.orig/drivers/xen/core/evtchn.c 2010-04-23 15:19:25.000000000 +0200
++++ head-2010-05-12/drivers/xen/core/evtchn.c 2010-04-23 15:19:37.000000000 +0200
@@ -150,13 +150,15 @@ DEFINE_PER_CPU(int, ipi_to_irq[NR_IPIS])
#ifdef CONFIG_SMP
@@ -17568,8 +17578,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
#else
for (i = PIRQ_BASE; i < (PIRQ_BASE + NR_IRQS_LEGACY); i++) {
#endif
---- head-2010-04-15.orig/drivers/xen/core/smpboot.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/drivers/xen/core/smpboot.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/core/smpboot.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/drivers/xen/core/smpboot.c 2010-03-24 15:25:06.000000000 +0100
@@ -18,7 +18,6 @@
#include <linux/cpu.h>
#include <linux/percpu.h>
@@ -17687,8 +17697,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
prefill_possible_map();
}
---- head-2010-04-15.orig/drivers/xen/core/spinlock.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/drivers/xen/core/spinlock.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/core/spinlock.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/drivers/xen/core/spinlock.c 2010-03-24 15:25:06.000000000 +0100
@@ -78,13 +78,13 @@ static unsigned int spin_adjust(struct s
unsigned int xen_spin_adjust(const raw_spinlock_t *lock, unsigned int token)
@@ -17726,8 +17736,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
rm_lock = &__get_cpu_var(spinning_rm_lock);
raw_local_irq_disable();
__raw_write_lock(rm_lock);
---- head-2010-04-15.orig/drivers/xen/netback/interface.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/drivers/xen/netback/interface.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/netback/interface.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/drivers/xen/netback/interface.c 2010-03-24 15:25:06.000000000 +0100
@@ -121,7 +121,7 @@ static void netbk_get_drvinfo(struct net
struct ethtool_drvinfo *info)
{
@@ -17737,8 +17747,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
}
static const struct netif_stat {
---- head-2010-04-15.orig/drivers/xen/netback/netback.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/drivers/xen/netback/netback.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/netback/netback.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/drivers/xen/netback/netback.c 2010-03-24 15:25:06.000000000 +0100
@@ -333,7 +333,7 @@ int netif_be_start_xmit(struct sk_buff *
*/
netif->tx_queue_timeout.data = (unsigned long)netif;
@@ -17767,8 +17777,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
netif_put(netif);
continue;
}
---- head-2010-04-15.orig/drivers/xen/netfront/netfront.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/drivers/xen/netfront/netfront.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/netfront/netfront.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/drivers/xen/netfront/netfront.c 2010-03-24 15:25:06.000000000 +0100
@@ -102,7 +102,7 @@ static const int MODPARM_rx_flip = 0;
static inline void dev_disable_gso_features(struct net_device *dev)
{
@@ -17814,8 +17824,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
local_irq_restore(flags);
}
---- head-2010-04-15.orig/drivers/xen/sfc_netfront/accel_msg.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/drivers/xen/sfc_netfront/accel_msg.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/sfc_netfront/accel_msg.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/drivers/xen/sfc_netfront/accel_msg.c 2010-03-24 15:25:06.000000000 +0100
@@ -47,7 +47,7 @@ static void vnic_start_interrupts(netfro
netfront_accel_disable_net_interrupts(vnic);
vnic->irq_enabled = 0;
@@ -17834,8 +17844,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
}
else {
spin_unlock_irqrestore(&vnic->irq_enabled_lock, flags);
---- head-2010-04-15.orig/drivers/xen/usbback/usbstub.c 2010-03-24 15:06:12.000000000 +0100
-+++ head-2010-04-15/drivers/xen/usbback/usbstub.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/usbback/usbstub.c 2010-03-24 15:06:12.000000000 +0100
++++ head-2010-05-12/drivers/xen/usbback/usbstub.c 2010-03-24 15:25:06.000000000 +0100
@@ -188,7 +188,7 @@ static int usbstub_probe(struct usb_inte
const struct usb_device_id *id)
{
@@ -17845,8 +17855,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
struct vusb_port_id *portid = NULL;
struct usbstub *stub = NULL;
usbif_t *usbif = NULL;
---- head-2010-04-15.orig/drivers/xen/usbfront/usbfront-dbg.c 2010-03-24 15:10:37.000000000 +0100
-+++ head-2010-04-15/drivers/xen/usbfront/usbfront-dbg.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/usbfront/usbfront-dbg.c 2010-03-24 15:10:37.000000000 +0100
++++ head-2010-05-12/drivers/xen/usbfront/usbfront-dbg.c 2010-03-24 15:25:06.000000000 +0100
@@ -64,7 +64,7 @@ static ssize_t show_statistics(struct de
"%s\n"
"xenhcd, hcd state %d\n",
@@ -17856,8 +17866,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
hcd->product_desc,
hcd->state);
size -= temp;
---- head-2010-04-15.orig/drivers/xen/usbfront/xenbus.c 2010-04-15 09:53:49.000000000 +0200
-+++ head-2010-04-15/drivers/xen/usbfront/xenbus.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/usbfront/xenbus.c 2010-04-15 09:53:49.000000000 +0200
++++ head-2010-05-12/drivers/xen/usbfront/xenbus.c 2010-03-24 15:25:06.000000000 +0100
@@ -252,10 +252,10 @@ static struct usb_hcd *create_hcd(struct
}
switch (usb_ver) {
@@ -17871,8 +17881,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
break;
default:
xenbus_dev_fatal(dev, err, "invalid usb-ver");
---- head-2010-04-15.orig/drivers/xen/xenbus/xenbus_probe.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/drivers/xen/xenbus/xenbus_probe.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/xenbus/xenbus_probe.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/drivers/xen/xenbus/xenbus_probe.c 2010-03-24 15:25:06.000000000 +0100
@@ -230,7 +230,7 @@ static struct xen_bus_type xenbus_fronte
},
#if defined(CONFIG_XEN) || defined(MODULE)
@@ -17882,8 +17892,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
},
#endif
};
---- head-2010-04-15.orig/drivers/xen/xenbus/xenbus_probe_backend.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/drivers/xen/xenbus/xenbus_probe_backend.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/xenbus/xenbus_probe_backend.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/drivers/xen/xenbus/xenbus_probe_backend.c 2010-03-24 15:25:06.000000000 +0100
@@ -129,7 +129,7 @@ static struct xen_bus_type xenbus_backen
.dev_attrs = xenbus_backend_attrs,
},
@@ -17893,8 +17903,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
},
};
---- head-2010-04-15.orig/include/linux/interrupt.h 2010-03-24 14:53:41.000000000 +0100
-+++ head-2010-04-15/include/linux/interrupt.h 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/include/linux/interrupt.h 2010-03-24 14:53:41.000000000 +0100
++++ head-2010-05-12/include/linux/interrupt.h 2010-03-24 15:25:06.000000000 +0100
@@ -52,6 +52,7 @@
* IRQF_ONESHOT - Interrupt is not reenabled after the hardirq handler finished.
* Used by threaded interrupts which need to keep the
@@ -17911,8 +17921,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
/*
* Bits used by threaded handlers:
---- head-2010-04-15.orig/kernel/irq/manage.c 2010-04-28 17:06:46.000000000 +0200
-+++ head-2010-04-15/kernel/irq/manage.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/kernel/irq/manage.c 2010-05-12 08:55:23.000000000 +0200
++++ head-2010-05-12/kernel/irq/manage.c 2010-03-24 15:25:06.000000000 +0100
@@ -200,7 +200,8 @@ static inline int setup_affinity(unsigne
void __disable_irq(struct irq_desc *desc, unsigned int irq, bool suspend)
{
@@ -17923,8 +17933,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
return;
desc->status |= IRQ_SUSPENDED;
}
---- head-2010-04-15.orig/lib/swiotlb-xen.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/lib/swiotlb-xen.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/lib/swiotlb-xen.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/lib/swiotlb-xen.c 2010-03-24 15:25:06.000000000 +0100
@@ -175,7 +175,7 @@ static void *swiotlb_bus_to_virt(dma_add
return phys_to_virt(swiotlb_bus_to_phys(address));
}
@@ -18110,8 +18120,8 @@ Automatically created from "patches.kernel.org/patch-2.6.30" by xen-port-patches
{
struct scatterlist *sg;
int i;
---- head-2010-04-15.orig/mm/page_alloc.c 2010-03-24 15:06:12.000000000 +0100
-+++ head-2010-04-15/mm/page_alloc.c 2010-03-24 15:25:06.000000000 +0100
+--- head-2010-05-12.orig/mm/page_alloc.c 2010-03-24 15:06:12.000000000 +0100
++++ head-2010-05-12/mm/page_alloc.c 2010-03-24 15:25:06.000000000 +0100
@@ -4685,11 +4685,9 @@ static void __setup_per_zone_wmarks(void
}
diff --git a/patches.xen/xen3-patch-2.6.31 b/patches.xen/xen3-patch-2.6.31
index 7ff517a0d8..be580808b6 100644
--- a/patches.xen/xen3-patch-2.6.31
+++ b/patches.xen/xen3-patch-2.6.31
@@ -7,8 +7,8 @@ Patch-mainline: 2.6.31
Acked-by: Jeff Mahoney <jeffm@suse.com>
Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches.py
---- head-2010-04-29.orig/arch/x86/Kconfig 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/Kconfig 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/Kconfig 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/Kconfig 2010-03-24 15:25:21.000000000 +0100
@@ -24,7 +24,7 @@ config X86
select HAVE_UNSTABLE_SCHED_CLOCK
select HAVE_IDE
@@ -44,8 +44,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
default "0x1000000"
---help---
This gives the physical address where the kernel is loaded.
---- head-2010-04-29.orig/arch/x86/ia32/ia32entry-xen.S 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/ia32/ia32entry-xen.S 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/ia32/ia32entry-xen.S 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/ia32/ia32entry-xen.S 2010-03-24 15:25:21.000000000 +0100
@@ -770,9 +770,11 @@ ia32_sys_call_table:
.quad compat_sys_signalfd4
.quad sys_eventfd2
@@ -59,8 +59,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
+ .quad compat_sys_rt_tgsigqueueinfo /* 335 */
+ .quad sys_perf_counter_open
ia32_syscall_end:
---- head-2010-04-29.orig/arch/x86/include/asm/hw_irq.h 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/asm/hw_irq.h 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/asm/hw_irq.h 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/include/asm/hw_irq.h 2010-03-24 15:25:21.000000000 +0100
@@ -133,6 +133,7 @@ extern asmlinkage void smp_invalidate_in
extern irqreturn_t smp_reschedule_interrupt(int, void *);
extern irqreturn_t smp_call_function_interrupt(int, void *);
@@ -69,8 +69,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
#endif
#endif
---- head-2010-04-29.orig/arch/x86/include/asm/required-features.h 2010-04-29 09:29:49.000000000 +0200
-+++ head-2010-04-29/arch/x86/include/asm/required-features.h 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/asm/required-features.h 2010-05-12 08:55:23.000000000 +0200
++++ head-2010-05-12/arch/x86/include/asm/required-features.h 2010-03-24 15:25:21.000000000 +0100
@@ -48,7 +48,7 @@
#endif
@@ -80,8 +80,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
/* Paravirtualized systems may not have PSE or PGE available */
#define NEED_PSE 0
#define NEED_PGE 0
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/agp.h 2010-03-24 15:14:47.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/agp.h 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/agp.h 2010-03-24 15:14:47.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/agp.h 2010-03-24 15:25:21.000000000 +0100
@@ -31,6 +31,7 @@
/* Convert a physical address to an address suitable for the GART. */
#define phys_to_gart(x) phys_to_machine(x)
@@ -90,8 +90,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
/* GATT allocation. Returns/accepts GATT kernel virtual address. */
#define alloc_gatt_pages(order) ({ \
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/desc.h 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/desc.h 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/desc.h 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/desc.h 2010-03-24 15:25:21.000000000 +0100
@@ -1,7 +1,6 @@
#ifndef _ASM_X86_DESC_H
#define _ASM_X86_DESC_H
@@ -130,8 +130,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
-#endif /* __ASSEMBLY__ */
-
#endif /* _ASM_X86_DESC_H */
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/fixmap.h 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/fixmap.h 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/fixmap.h 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/fixmap.h 2010-03-24 15:25:21.000000000 +0100
@@ -118,12 +118,9 @@ enum fixed_addresses {
#ifdef CONFIG_PARAVIRT
FIX_PARAVIRT_BOOTMAP,
@@ -157,8 +157,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
#ifdef CONFIG_X86_32
FIX_WP_TEST,
#endif
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/irq_vectors.h 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/irq_vectors.h 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/irq_vectors.h 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/irq_vectors.h 2010-03-24 15:25:21.000000000 +0100
@@ -1,8 +1,11 @@
#ifndef _ASM_X86_IRQ_VECTORS_H
#define _ASM_X86_IRQ_VECTORS_H
@@ -181,8 +181,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
/*
* The maximum number of vectors supported by i386 processors
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/pci.h 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/pci.h 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/pci.h 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/pci.h 2010-03-24 15:25:21.000000000 +0100
@@ -97,7 +97,8 @@ extern void pci_iommu_alloc(void);
#define PCI_DMA_BUS_IS_PHYS 0
@@ -201,8 +201,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
#ifdef CONFIG_NUMA
/* Returns the node based on pci bus */
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/pgalloc.h 2010-03-24 15:14:47.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/pgalloc.h 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/pgalloc.h 2010-03-24 15:14:47.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/pgalloc.h 2010-03-24 15:25:21.000000000 +0100
@@ -51,7 +51,13 @@ static inline void pte_free(struct mm_st
__pte_free(pte);
}
@@ -249,8 +249,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
#endif /* PAGETABLE_LEVELS > 3 */
#endif /* PAGETABLE_LEVELS > 2 */
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/pgtable.h 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/pgtable.h 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/pgtable.h 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/pgtable.h 2010-03-24 15:25:21.000000000 +0100
@@ -2,6 +2,7 @@
#define _ASM_X86_PGTABLE_H
@@ -309,8 +309,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
/* local pte updates need not use xchg for locking */
static inline pte_t xen_local_ptep_get_and_clear(pte_t *ptep, pte_t res)
{
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/pgtable_32.h 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/pgtable_32.h 2010-03-24 15:25:21.000000000 +0100
@@ -48,13 +48,17 @@ extern void set_pmd_pfn(unsigned long, u
#endif
@@ -331,8 +331,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
#define pte_unmap_nested(pte) kunmap_atomic((pte), KM_PTE1)
#else
#define pte_offset_map(dir, address) \
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/pgtable_64.h 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/pgtable_64.h 2010-03-24 15:25:21.000000000 +0100
@@ -33,10 +33,6 @@ extern pgd_t init_level4_pgt[];
extern void paging_init(void);
@@ -365,8 +365,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
#define __HAVE_ARCH_PTE_SAME
#endif /* !__ASSEMBLY__ */
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/pgtable_64_types.h 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/pgtable_64_types.h 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/pgtable_64_types.h 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/pgtable_64_types.h 2010-03-24 15:25:21.000000000 +0100
@@ -51,11 +51,12 @@ typedef union { pteval_t pte; unsigned i
#define PGDIR_SIZE (_AC(1, UL) << PGDIR_SHIFT)
#define PGDIR_MASK (~(PGDIR_SIZE - 1))
@@ -383,8 +383,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
#define MODULES_VADDR _AC(0xffffffffa0000000, UL)
#define MODULES_END _AC(0xffffffffff000000, UL)
#define MODULES_LEN (MODULES_END - MODULES_VADDR)
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/pgtable_types.h 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/pgtable_types.h 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/pgtable_types.h 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/pgtable_types.h 2010-03-24 15:25:21.000000000 +0100
@@ -18,7 +18,7 @@
#define _PAGE_BIT_GLOBAL 8 /* Global TLB entry PPro+ */
#define _PAGE_BIT_UNUSED1 9 /* available for programmer */
@@ -422,8 +422,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
#define pgprot_writecombine pgprot_writecombine
extern pgprot_t pgprot_writecombine(pgprot_t prot);
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/processor.h 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/processor.h 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/processor.h 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/processor.h 2010-03-24 15:25:21.000000000 +0100
@@ -136,7 +136,8 @@ struct cpuinfo_x86 {
extern struct cpuinfo_x86 boot_cpu_data;
extern struct cpuinfo_x86 new_cpu_data;
@@ -530,8 +530,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
}
/*
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/smp.h 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/smp.h 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/smp.h 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/smp.h 2010-03-24 15:25:21.000000000 +0100
@@ -195,7 +195,7 @@ extern unsigned disabled_cpus __cpuinitd
static inline int logical_smp_processor_id(void)
{
@@ -541,8 +541,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
}
#endif
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/spinlock.h 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/spinlock.h 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/spinlock.h 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/spinlock.h 2010-03-24 15:25:21.000000000 +0100
@@ -432,4 +432,8 @@ static inline void __raw_write_unlock(ra
#define _raw_read_relax(lock) cpu_relax()
#define _raw_write_relax(lock) cpu_relax()
@@ -552,8 +552,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
+#define ARCH_HAS_SMP_MB_AFTER_LOCK
+
#endif /* _ASM_X86_SPINLOCK_H */
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/tlbflush.h 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/tlbflush.h 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/tlbflush.h 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/tlbflush.h 2010-03-24 15:25:21.000000000 +0100
@@ -111,6 +111,6 @@ static inline void flush_tlb_kernel_rang
flush_tlb_all();
}
@@ -562,8 +562,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
+extern void zap_low_mappings(bool early);
#endif /* _ASM_X86_TLBFLUSH_H */
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/xor.h 2010-03-24 15:14:47.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/xor.h 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/xor.h 2010-03-24 15:14:47.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/xor.h 2010-03-24 15:25:21.000000000 +0100
@@ -1,4 +1,7 @@
-#ifdef CONFIG_X86_32
+#ifdef CONFIG_KMEMCHECK
@@ -573,8 +573,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
# include "../../asm/xor_32.h"
#else
# include "xor_64.h"
---- head-2010-04-29.orig/arch/x86/kernel/Makefile 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/Makefile 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/Makefile 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/Makefile 2010-03-24 15:25:21.000000000 +0100
@@ -137,6 +137,6 @@ ifeq ($(CONFIG_X86_64),y)
endif
@@ -584,8 +584,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
+ i8259.o irqinit.o pci-swiotlb.o reboot.o smpboot.o tsc.o tsc_sync.o \
+ uv_%.o vsmp_64.o
disabled-obj-$(CONFIG_XEN_UNPRIVILEGED_GUEST) += probe_roms_32.o
---- head-2010-04-29.orig/arch/x86/kernel/acpi/sleep-xen.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/acpi/sleep-xen.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/acpi/sleep-xen.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/acpi/sleep-xen.c 2010-03-24 15:25:21.000000000 +0100
@@ -107,7 +107,7 @@ int acpi_save_state_mem(void)
initial_gs = per_cpu_offset(smp_processor_id());
#endif
@@ -595,8 +595,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
#endif /* CONFIG_64BIT */
#endif
---- head-2010-04-29.orig/arch/x86/kernel/apic/io_apic-xen.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/apic/io_apic-xen.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/apic/io_apic-xen.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/apic/io_apic-xen.c 2010-03-24 15:25:21.000000000 +0100
@@ -59,6 +59,7 @@
#include <asm/setup.h>
#include <asm/irq_remapping.h>
@@ -2235,8 +2235,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
- * IO APICS that are mapped in on a BAR in PCI space. */
-late_initcall(ioapic_insert_resources);
#endif /* !CONFIG_XEN */
---- head-2010-04-29.orig/arch/x86/kernel/apic/probe_32-xen.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/apic/probe_32-xen.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/apic/probe_32-xen.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/apic/probe_32-xen.c 2010-03-24 15:25:21.000000000 +0100
@@ -20,23 +20,12 @@
#include <asm/apic.h>
#include <asm/setup.h>
@@ -2261,8 +2261,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
static int xen_phys_pkg_id(int cpuid_apic, int index_msb)
{
---- head-2010-04-29.orig/arch/x86/kernel/cpu/amd.c 2010-03-24 15:12:46.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/cpu/amd.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/cpu/amd.c 2010-03-24 15:12:46.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/cpu/amd.c 2010-03-24 15:25:21.000000000 +0100
@@ -403,7 +403,7 @@ static void __cpuinit early_init_amd(str
(c->x86_model == 8 && c->x86_mask >= 8))
set_cpu_cap(c, X86_FEATURE_K6_MTRR);
@@ -2272,8 +2272,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
/* check CPU config space for extended APIC ID */
if (cpu_has_apic && c->x86 >= 0xf) {
unsigned int val;
---- head-2010-04-29.orig/arch/x86/kernel/cpu/common-xen.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/cpu/common-xen.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/cpu/common-xen.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/cpu/common-xen.c 2010-03-24 15:25:21.000000000 +0100
@@ -13,6 +13,7 @@
#include <linux/io.h>
@@ -2437,16 +2437,16 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
}
void __cpuinit identify_secondary_cpu(struct cpuinfo_x86 *c)
---- head-2010-04-29.orig/arch/x86/kernel/cpu/mcheck/Makefile 2010-03-24 15:06:12.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/cpu/mcheck/Makefile 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/cpu/mcheck/Makefile 2010-03-24 15:06:12.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/cpu/mcheck/Makefile 2010-03-24 15:25:21.000000000 +0100
@@ -9,5 +9,3 @@ obj-$(CONFIG_X86_MCE_THRESHOLD) += thres
obj-$(CONFIG_X86_MCE_INJECT) += mce-inject.o
obj-$(CONFIG_X86_THERMAL_VECTOR) += therm_throt.o
-
-disabled-obj-$(CONFIG_XEN) := therm_throt.o
---- head-2010-04-29.orig/arch/x86/kernel/cpu/mcheck/mce.c 2010-04-15 09:44:40.000000000 +0200
-+++ head-2010-04-29/arch/x86/kernel/cpu/mcheck/mce.c 2010-04-15 10:07:27.000000000 +0200
+--- head-2010-05-12.orig/arch/x86/kernel/cpu/mcheck/mce.c 2010-04-15 09:44:40.000000000 +0200
++++ head-2010-05-12/arch/x86/kernel/cpu/mcheck/mce.c 2010-04-15 10:07:27.000000000 +0200
@@ -476,7 +476,9 @@ static inline void mce_get_rip(struct mc
*/
asmlinkage void smp_mce_self_interrupt(struct pt_regs *regs)
@@ -2475,8 +2475,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
printk(KERN_DEBUG "MCE: bind virq for DOM0 logging\n");
bind_virq_for_mce();
---- head-2010-04-29.orig/arch/x86/kernel/cpu/mcheck/mce_dom0.c 2010-03-24 15:06:12.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/cpu/mcheck/mce_dom0.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/cpu/mcheck/mce_dom0.c 2010-03-24 15:06:12.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/cpu/mcheck/mce_dom0.c 2010-03-24 15:25:21.000000000 +0100
@@ -7,12 +7,17 @@
#include <asm/hypercall.h>
#include <asm/mce.h>
@@ -2586,8 +2586,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
+ return 0;
}
---- head-2010-04-29.orig/arch/x86/kernel/e820-xen.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/e820-xen.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/e820-xen.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/e820-xen.c 2010-03-24 15:25:21.000000000 +0100
@@ -659,7 +659,7 @@ __init int e820_search_gap(unsigned long
*/
__init void e820_setup_gap(void)
@@ -2680,8 +2680,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
}
#undef e820
---- head-2010-04-29.orig/arch/x86/kernel/entry_32-xen.S 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/entry_32-xen.S 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/entry_32-xen.S 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/entry_32-xen.S 2010-03-24 15:25:21.000000000 +0100
@@ -48,7 +48,6 @@
#include <asm/segment.h>
#include <asm/smp.h>
@@ -2827,8 +2827,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
CFI_ENDPROC
nmi_stack_fixup:
---- head-2010-04-29.orig/arch/x86/kernel/entry_64.S 2010-03-24 15:12:46.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/entry_64.S 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/entry_64.S 2010-03-24 15:12:46.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/entry_64.S 2010-03-24 15:25:21.000000000 +0100
@@ -1410,7 +1410,7 @@ END(kdb_call)
paranoidzeroentry_ist debug do_debug DEBUG_STACK
paranoidzeroentry_ist int3 do_int3 DEBUG_STACK
@@ -2838,8 +2838,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
zeroentry xen_debug do_debug
zeroentry xen_int3 do_int3
errorentry xen_stack_segment do_stack_segment
---- head-2010-04-29.orig/arch/x86/kernel/entry_64-xen.S 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/entry_64-xen.S 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/entry_64-xen.S 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/entry_64-xen.S 2010-03-24 15:25:21.000000000 +0100
@@ -139,6 +139,7 @@ ENTRY(ftrace_graph_caller)
leaq 8(%rbp), %rdi
@@ -2927,8 +2927,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
#endif
#ifndef CONFIG_XEN
---- head-2010-04-29.orig/arch/x86/kernel/head_32-xen.S 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/head_32-xen.S 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/head_32-xen.S 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/head_32-xen.S 2010-03-24 15:25:21.000000000 +0100
@@ -120,12 +120,6 @@ ENTRY(hypercall_page)
CFI_ENDPROC
@@ -2942,8 +2942,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
* BSS section
*/
.section ".bss.page_aligned","wa"
---- head-2010-04-29.orig/arch/x86/kernel/head_64-xen.S 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/head_64-xen.S 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/head_64-xen.S 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/head_64-xen.S 2010-03-24 15:25:21.000000000 +0100
@@ -15,7 +15,6 @@
#include <linux/threads.h>
#include <linux/init.h>
@@ -2952,8 +2952,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
#include <asm/segment.h>
#include <asm/page.h>
#include <asm/msr.h>
---- head-2010-04-29.orig/arch/x86/kernel/init_task.c 2010-04-29 09:29:49.000000000 +0200
-+++ head-2010-04-29/arch/x86/kernel/init_task.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/init_task.c 2010-05-12 08:55:23.000000000 +0200
++++ head-2010-05-12/arch/x86/kernel/init_task.c 2010-03-24 15:25:21.000000000 +0100
@@ -31,6 +31,7 @@ union thread_union init_thread_union __i
struct task_struct init_task = INIT_TASK(init_task);
EXPORT_SYMBOL(init_task);
@@ -2968,8 +2968,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;
-
+#endif
---- head-2010-04-29.orig/arch/x86/kernel/irq-xen.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/irq-xen.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/irq-xen.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/irq-xen.c 2010-03-24 15:25:21.000000000 +0100
@@ -12,6 +12,8 @@
#include <asm/io_apic.h>
#include <asm/irq.h>
@@ -3093,8 +3093,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
}
irq_exit();
---- head-2010-04-29.orig/arch/x86/kernel/microcode_core-xen.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/microcode_core-xen.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/microcode_core-xen.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/microcode_core-xen.c 2010-03-24 15:25:21.000000000 +0100
@@ -22,27 +22,21 @@
* 2 of the License, or (at your option) any later version.
*/
@@ -3251,8 +3251,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
-
-module_init(microcode_init);
module_exit(microcode_exit);
---- head-2010-04-29.orig/arch/x86/kernel/mpparse-xen.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/mpparse-xen.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/mpparse-xen.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/mpparse-xen.c 2010-03-24 15:25:21.000000000 +0100
@@ -17,6 +17,7 @@
#include <linux/acpi.h>
#include <linux/module.h>
@@ -3329,8 +3329,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
alloc_mptable = 1;
if (!p)
return 0;
---- head-2010-04-29.orig/arch/x86/kernel/pci-dma-xen.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/pci-dma-xen.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/pci-dma-xen.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/pci-dma-xen.c 2010-03-24 15:25:21.000000000 +0100
@@ -32,6 +32,8 @@ int no_iommu __read_mostly;
/* Set this to 1 if there is a HW IOMMU in the system */
int iommu_detected __read_mostly = 0;
@@ -3360,8 +3360,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
}
/* Must execute after PCI subsystem */
fs_initcall(pci_iommu_init);
---- head-2010-04-29.orig/arch/x86/kernel/process-xen.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/process-xen.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/process-xen.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/process-xen.c 2010-03-24 15:25:21.000000000 +0100
@@ -8,12 +8,15 @@
#include <linux/module.h>
#include <linux/pm.h>
@@ -3440,8 +3440,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
+ return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
+}
+
---- head-2010-04-29.orig/arch/x86/kernel/process_32-xen.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/process_32-xen.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/process_32-xen.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/process_32-xen.c 2010-03-24 15:25:21.000000000 +0100
@@ -9,8 +9,6 @@
* This file handles the architecture-dependent parts of process handling..
*/
@@ -3494,8 +3494,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
- unsigned long range_end = mm->brk + 0x02000000;
- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
-}
---- head-2010-04-29.orig/arch/x86/kernel/process_64-xen.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/process_64-xen.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/process_64-xen.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/process_64-xen.c 2010-03-24 15:25:21.000000000 +0100
@@ -17,8 +17,6 @@
* This file handles the architecture-dependent parts of process handling..
*/
@@ -3548,8 +3548,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
- unsigned long range_end = mm->brk + 0x02000000;
- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
-}
---- head-2010-04-29.orig/arch/x86/kernel/quirks-xen.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/quirks-xen.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/quirks-xen.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/quirks-xen.c 2010-03-24 15:25:21.000000000 +0100
@@ -492,5 +492,42 @@ void force_hpet_resume(void)
break;
}
@@ -3593,8 +3593,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_10H_NB_LINK,
+ quirk_amd_nb_node);
#endif
---- head-2010-04-29.orig/arch/x86/kernel/setup-xen.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/setup-xen.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/setup-xen.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/setup-xen.c 2010-03-24 15:25:21.000000000 +0100
@@ -142,6 +142,14 @@ EXPORT_SYMBOL(xen_start_info);
#define ARCH_SETUP
#endif
@@ -3791,8 +3791,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
* x86_quirk_intr_init - post gate setup interrupt initialisation
*
* Description:
---- head-2010-04-29.orig/arch/x86/kernel/smp-xen.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/smp-xen.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/smp-xen.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/smp-xen.c 2010-03-24 15:25:21.000000000 +0100
@@ -135,11 +135,38 @@ void xen_send_call_func_ipi(const struct
* this function calls the 'stop' function on all other CPUs in the system.
*/
@@ -3833,8 +3833,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
local_irq_save(flags);
disable_all_local_evtchn();
local_irq_restore(flags);
---- head-2010-04-29.orig/arch/x86/kernel/traps-xen.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/traps-xen.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/traps-xen.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/traps-xen.c 2010-03-24 15:25:21.000000000 +0100
@@ -45,6 +45,7 @@
#include <linux/edac.h>
#endif
@@ -3919,8 +3919,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
thread->status |= TS_USEDFPU; /* So we fnsave on switch_to() */
tsk->fpu_counter++;
}
---- head-2010-04-29.orig/arch/x86/kernel/vsyscall_64-xen.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/vsyscall_64-xen.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/vsyscall_64-xen.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/vsyscall_64-xen.c 2010-03-24 15:25:21.000000000 +0100
@@ -132,15 +132,7 @@ static __always_inline void do_vgettimeo
return;
}
@@ -3937,8 +3937,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
base = __vsyscall_gtod_data.clock.cycle_last;
mask = __vsyscall_gtod_data.clock.mask;
mult = __vsyscall_gtod_data.clock.mult;
---- head-2010-04-29.orig/arch/x86/mm/fault-xen.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/mm/fault-xen.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/fault-xen.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/fault-xen.c 2010-03-24 15:25:21.000000000 +0100
@@ -3,40 +3,18 @@
* Copyright (C) 2001, 2002 Andi Kleen, SuSE Labs.
* Copyright (C) 2008-2009, Red Hat Inc., Ingo Molnar
@@ -4134,8 +4134,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
check_v8086_mode(regs, address, tsk);
---- head-2010-04-29.orig/arch/x86/mm/highmem_32-xen.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/mm/highmem_32-xen.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/highmem_32-xen.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/highmem_32-xen.c 2010-03-24 15:25:21.000000000 +0100
@@ -44,7 +44,6 @@ void *kmap_atomic_prot(struct page *page
vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
BUG_ON(!pte_none(*(kmap_pte-idx)));
@@ -4160,8 +4160,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
#ifdef CONFIG_HIGHPTE
EXPORT_SYMBOL(kmap_atomic_to_page);
#endif
---- head-2010-04-29.orig/arch/x86/mm/init-xen.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/mm/init-xen.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/init-xen.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/init-xen.c 2010-03-24 15:25:21.000000000 +0100
@@ -1,3 +1,4 @@
+#include <linux/initrd.h>
#include <linux/ioport.h>
@@ -4302,8 +4302,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
if (use_gbpages)
page_size_mask |= 1 << PG_LEVEL_1G;
---- head-2010-04-29.orig/arch/x86/mm/init_32-xen.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/mm/init_32-xen.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/init_32-xen.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/init_32-xen.c 2010-03-24 15:25:21.000000000 +0100
@@ -52,12 +52,9 @@
#include <asm/swiotlb.h>
#include <asm/setup.h>
@@ -4433,8 +4433,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
SetPagePinned(virt_to_page(init_mm.pgd));
}
---- head-2010-04-29.orig/arch/x86/mm/init_64-xen.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/mm/init_64-xen.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/init_64-xen.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/init_64-xen.c 2010-03-24 15:25:21.000000000 +0100
@@ -56,21 +56,11 @@
#include <xen/features.h>
@@ -4565,8 +4565,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
#endif
#ifndef CONFIG_XEN
---- head-2010-04-29.orig/arch/x86/mm/iomap_32-xen.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/mm/iomap_32-xen.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/iomap_32-xen.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/iomap_32-xen.c 2010-03-24 15:25:21.000000000 +0100
@@ -84,7 +84,6 @@ iounmap_atomic(void *kvaddr, enum km_typ
if (vaddr == __fix_to_virt(FIX_KMAP_BEGIN+idx))
kpte_clear_flush(kmap_pte-idx, vaddr);
@@ -4575,8 +4575,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
pagefault_enable();
}
EXPORT_SYMBOL_GPL(iounmap_atomic);
---- head-2010-04-29.orig/arch/x86/mm/pageattr-xen.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/mm/pageattr-xen.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/pageattr-xen.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/pageattr-xen.c 2010-03-24 15:25:21.000000000 +0100
@@ -11,6 +11,7 @@
#include <linux/interrupt.h>
#include <linux/seq_file.h>
@@ -4801,8 +4801,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
end = start + PAGE_SIZE;
free_memtype(start, end);
}
---- head-2010-04-29.orig/arch/x86/mm/pat-xen.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/mm/pat-xen.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/pat-xen.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/pat-xen.c 2010-03-24 15:25:21.000000000 +0100
@@ -639,7 +639,8 @@ static int reserve_pfn_range(u64 paddr,
return ret;
@@ -4813,8 +4813,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
free_memtype(paddr, paddr + size);
printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
" for %Lx-%Lx, got %s\n",
---- head-2010-04-29.orig/arch/x86/mm/pgtable-xen.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/mm/pgtable-xen.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/pgtable-xen.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/pgtable-xen.c 2010-03-24 15:25:21.000000000 +0100
@@ -8,9 +8,11 @@
#include <asm/hypervisor.h>
#include <asm/mmu_context.h>
@@ -4884,9 +4884,9 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
if (pgd == NULL)
goto out;
---- head-2010-04-29.orig/arch/x86/pci/i386.c 2010-04-29 09:29:49.000000000 +0200
-+++ head-2010-04-29/arch/x86/pci/i386.c 2010-04-15 10:07:34.000000000 +0200
-@@ -236,12 +236,14 @@ void __init pcibios_resource_survey(void
+--- head-2010-05-12.orig/arch/x86/pci/i386.c 2010-05-12 08:55:23.000000000 +0200
++++ head-2010-05-12/arch/x86/pci/i386.c 2010-05-12 09:02:26.000000000 +0200
+@@ -239,12 +239,14 @@ void __init pcibios_resource_survey(void
pcibios_allocate_resources(1);
e820_reserve_resources_late();
@@ -4901,8 +4901,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
}
/**
---- head-2010-04-29.orig/arch/x86/pci/irq-xen.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-29/arch/x86/pci/irq-xen.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/pci/irq-xen.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/pci/irq-xen.c 2010-03-24 15:25:21.000000000 +0100
@@ -895,6 +895,9 @@ static int pcibios_lookup_irq(struct pci
return 0;
}
@@ -5047,8 +5047,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
} else if (pci_probe & PCI_BIOS_IRQ_SCAN)
msg = "";
else
---- head-2010-04-29.orig/arch/x86/pci/pcifront.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-29/arch/x86/pci/pcifront.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/pci/pcifront.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/pci/pcifront.c 2010-03-24 15:25:21.000000000 +0100
@@ -6,6 +6,7 @@
*/
#include <linux/module.h>
@@ -5065,8 +5065,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
evtchn_register_pirq(irq);
dev->irq = irq;
---- head-2010-04-29.orig/arch/x86/vdso/vdso32-setup-xen.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-29/arch/x86/vdso/vdso32-setup-xen.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/vdso/vdso32-setup-xen.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/vdso/vdso32-setup-xen.c 2010-03-24 15:25:21.000000000 +0100
@@ -377,6 +377,8 @@ int arch_setup_additional_pages(struct l
}
}
@@ -5091,8 +5091,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
up_write(&mm->mmap_sem);
return ret;
---- head-2010-04-29.orig/drivers/acpi/processor_driver.c 2010-04-15 10:05:23.000000000 +0200
-+++ head-2010-04-29/drivers/acpi/processor_driver.c 2010-04-15 10:07:40.000000000 +0200
+--- head-2010-05-12.orig/drivers/acpi/processor_driver.c 2010-04-15 10:05:23.000000000 +0200
++++ head-2010-05-12/drivers/acpi/processor_driver.c 2010-04-15 10:07:40.000000000 +0200
@@ -457,7 +457,14 @@ static int acpi_processor_get_info(struc
* generated as the following format:
* CPU+CPU ID.
@@ -5109,8 +5109,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Processor [%d:%d]\n", pr->id,
pr->acpi_id));
---- head-2010-04-29.orig/drivers/char/agp/intel-agp.c 2010-04-15 09:52:07.000000000 +0200
-+++ head-2010-04-29/drivers/char/agp/intel-agp.c 2010-04-15 10:07:46.000000000 +0200
+--- head-2010-05-12.orig/drivers/char/agp/intel-agp.c 2010-04-15 09:52:07.000000000 +0200
++++ head-2010-05-12/drivers/char/agp/intel-agp.c 2010-04-15 10:07:46.000000000 +0200
@@ -607,7 +607,11 @@ static struct agp_memory *alloc_agpphysm
new->page_count = pg_count;
new->num_scratch_pages = pg_count;
@@ -5123,8 +5123,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
return new;
}
---- head-2010-04-29.orig/drivers/edac/Kconfig 2010-04-29 09:29:49.000000000 +0200
-+++ head-2010-04-29/drivers/edac/Kconfig 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/drivers/edac/Kconfig 2010-05-12 08:55:23.000000000 +0200
++++ head-2010-05-12/drivers/edac/Kconfig 2010-03-24 15:25:21.000000000 +0100
@@ -72,6 +72,7 @@ config EDAC_MM_EDAC
config EDAC_AMD64
tristate "AMD64 (Opteron, Athlon64) K8, F10h, F11h"
@@ -5133,8 +5133,78 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
help
Support for error detection and correction on the AMD 64
Families of Memory Controllers (K8, F10h and F11h)
---- head-2010-04-29.orig/drivers/pci/msi-xen.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/drivers/pci/msi-xen.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/drivers/gpu/drm/ttm/ttm_bo.c 2010-05-12 08:46:08.000000000 +0200
++++ head-2010-05-12/drivers/gpu/drm/ttm/ttm_bo.c 2010-05-07 11:30:47.000000000 +0200
+@@ -1404,6 +1404,14 @@ int ttm_bo_global_init(struct ttm_global
+ ret = -ENOMEM;
+ goto out_no_drp;
+ }
++#ifdef CONFIG_XEN
++ ret = xen_limit_pages_to_max_mfn(glob->dummy_read_page, 0, 32);
++ if (!ret)
++ clear_page(page_address(glob->dummy_read_page));
++ else
++ printk(KERN_WARNING
++ "Error restricting dummy read page: %d\n", ret);
++#endif
+
+ INIT_LIST_HEAD(&glob->swap_lru);
+ INIT_LIST_HEAD(&glob->device_list);
+--- head-2010-05-12.orig/drivers/gpu/drm/ttm/ttm_bo_util.c 2010-04-15 09:29:05.000000000 +0200
++++ head-2010-05-12/drivers/gpu/drm/ttm/ttm_bo_util.c 2010-05-05 14:59:20.000000000 +0200
+@@ -519,6 +519,10 @@ int ttm_bo_pfn_prot(struct ttm_buffer_ob
+ PAGE_SHIFT));
+ *prot = (mem->placement & TTM_PL_FLAG_CACHED) ?
+ PAGE_KERNEL : ttm_io_prot(mem->placement, PAGE_KERNEL);
++#if defined(CONFIG_XEN) && defined(_PAGE_IOMAP)
++ if (bus_size != 0)
++ pgprot_val(*prot) |= _PAGE_IOMAP;
++#endif
+
+ return 0;
+ }
+--- head-2010-05-12.orig/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-02-24 19:52:17.000000000 +0100
++++ head-2010-05-12/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-05-05 14:55:27.000000000 +0200
+@@ -158,6 +158,9 @@ static int ttm_bo_vm_fault(struct vm_are
+ if (is_iomem) {
+ vma->vm_page_prot = ttm_io_prot(bo->mem.placement,
+ vma->vm_page_prot);
++#if defined(CONFIG_XEN) && defined(_PAGE_IOMAP)
++ pgprot_val(vma->vm_page_prot) |= _PAGE_IOMAP;
++#endif
+ } else {
+ ttm = bo->ttm;
+ vma->vm_page_prot = (bo->mem.placement & TTM_PL_FLAG_CACHED) ?
+--- head-2010-05-12.orig/drivers/gpu/drm/ttm/ttm_tt.c 2010-04-15 09:29:05.000000000 +0200
++++ head-2010-05-12/drivers/gpu/drm/ttm/ttm_tt.c 2010-05-06 14:33:11.000000000 +0200
+@@ -68,7 +68,25 @@ static struct page *ttm_tt_alloc_page(un
+ else
+ gfp_flags |= __GFP_HIGHMEM;
+
++#ifndef CONFIG_XEN
+ return alloc_page(gfp_flags);
++#else
++ {
++ struct page *page = alloc_page(gfp_flags);
++
++ if (page && (page_flags & TTM_PAGE_FLAG_DMA32)) {
++ int ret = xen_limit_pages_to_max_mfn(page, 0, 32);
++
++ if (ret)
++ printk(KERN_WARNING TTM_PFX
++ "Error restricting pfn %lx: %d\n",
++ page_to_pfn(page), ret);
++ else if (page_flags & TTM_PAGE_FLAG_ZERO_ALLOC)
++ clear_page(page_address(page));
++ }
++ return page;
++ }
++#endif
+ }
+
+ static void ttm_tt_free_user_pages(struct ttm_tt *ttm)
+--- head-2010-05-12.orig/drivers/pci/msi-xen.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/drivers/pci/msi-xen.c 2010-03-24 15:25:21.000000000 +0100
@@ -95,22 +95,17 @@ void arch_teardown_msi_irqs(struct pci_d
}
#endif
@@ -5288,8 +5358,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
/* Check for any invalid entries */
for (i = 0; i < nvec; i++) {
---- head-2010-04-29.orig/drivers/xen/Kconfig 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/drivers/xen/Kconfig 2010-03-31 13:35:09.000000000 +0200
+--- head-2010-05-12.orig/drivers/xen/Kconfig 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/drivers/xen/Kconfig 2010-03-31 13:35:09.000000000 +0200
@@ -374,7 +374,8 @@ config XEN_SCRUB_PAGES
config XEN_DEV_EVTCHN
@@ -5309,8 +5379,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
select SYS_HYPERVISOR
default y
help
---- head-2010-04-29.orig/drivers/xen/Makefile 2010-04-19 14:52:22.000000000 +0200
-+++ head-2010-04-29/drivers/xen/Makefile 2010-04-19 14:53:25.000000000 +0200
+--- head-2010-05-12.orig/drivers/xen/Makefile 2010-04-19 14:52:22.000000000 +0200
++++ head-2010-05-12/drivers/xen/Makefile 2010-04-19 14:53:25.000000000 +0200
@@ -5,7 +5,6 @@ xen-balloon-$(CONFIG_PARAVIRT_XEN) := ba
xen-balloon-$(CONFIG_XEN) := balloon/
obj-$(CONFIG_XEN) += core/
@@ -5329,8 +5399,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
obj-$(CONFIG_XEN_BLKDEV_BACKEND) += blkback/
obj-$(CONFIG_XEN_BLKDEV_TAP) += blktap/
obj-$(CONFIG_XEN_BLKDEV_TAP2) += blktap2/
---- head-2010-04-29.orig/drivers/xen/balloon/balloon.c 2010-03-24 15:12:46.000000000 +0100
-+++ head-2010-04-29/drivers/xen/balloon/balloon.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/balloon/balloon.c 2010-03-24 15:12:46.000000000 +0100
++++ head-2010-05-12/drivers/xen/balloon/balloon.c 2010-03-24 15:25:21.000000000 +0100
@@ -323,7 +323,7 @@ static int increase_reservation(unsigned
balloon_unlock(flags);
@@ -5340,8 +5410,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
if (rc > 0)
kswapd_run(0);
if (need_zonelists_rebuild)
---- head-2010-04-29.orig/drivers/xen/blkback/blkback.c 2010-03-24 15:10:37.000000000 +0100
-+++ head-2010-04-29/drivers/xen/blkback/blkback.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/blkback/blkback.c 2010-03-24 15:10:37.000000000 +0100
++++ head-2010-05-12/drivers/xen/blkback/blkback.c 2010-03-24 15:25:21.000000000 +0100
@@ -526,7 +526,7 @@ static int dispatch_rw_block_io(blkif_t
for (i = 0; i < nseg; i++) {
@@ -5351,8 +5421,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
DPRINTK("Misaligned I/O request from domain %d",
blkif->domid);
goto fail_put_bio;
---- head-2010-04-29.orig/drivers/xen/blkback/vbd.c 2010-03-24 15:14:47.000000000 +0100
-+++ head-2010-04-29/drivers/xen/blkback/vbd.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/blkback/vbd.c 2010-03-24 15:14:47.000000000 +0100
++++ head-2010-05-12/drivers/xen/blkback/vbd.c 2010-03-24 15:25:21.000000000 +0100
@@ -47,7 +47,7 @@ unsigned int vbd_info(struct vbd *vbd)
unsigned long vbd_secsize(struct vbd *vbd)
@@ -5362,8 +5432,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
}
int vbd_create(blkif_t *blkif, blkif_vdev_t handle, unsigned major,
---- head-2010-04-29.orig/drivers/xen/blkback/xenbus.c 2010-03-24 15:10:17.000000000 +0100
-+++ head-2010-04-29/drivers/xen/blkback/xenbus.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/blkback/xenbus.c 2010-03-24 15:10:17.000000000 +0100
++++ head-2010-05-12/drivers/xen/blkback/xenbus.c 2010-03-24 15:25:21.000000000 +0100
@@ -108,7 +108,7 @@ static void update_blkif_status(blkif_t
if (!get_device(_dev)) \
return ret; \
@@ -5409,8 +5479,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
int err;
DPRINTK("%s", xenbus_strstate(frontend_state));
---- head-2010-04-29.orig/drivers/xen/blkfront/blkfront.c 2010-03-24 15:14:47.000000000 +0100
-+++ head-2010-04-29/drivers/xen/blkfront/blkfront.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/blkfront/blkfront.c 2010-03-24 15:14:47.000000000 +0100
++++ head-2010-05-12/drivers/xen/blkfront/blkfront.c 2010-03-24 15:25:21.000000000 +0100
@@ -119,12 +119,12 @@ static int blkfront_probe(struct xenbus_
/* Front end dir is a number, which is used as the id. */
@@ -5519,8 +5589,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
return info->is_ready && info->xbdev;
}
---- head-2010-04-29.orig/drivers/xen/blkfront/vbd.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-29/drivers/xen/blkfront/vbd.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/blkfront/vbd.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/drivers/xen/blkfront/vbd.c 2010-03-24 15:25:21.000000000 +0100
@@ -313,7 +313,7 @@ xlvbd_init_blk_queue(struct gendisk *gd,
#endif
@@ -5539,8 +5609,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
if (info->gd->flags & GENHD_FL_CD)
return sprintf(buf, "cdrom\n");
---- head-2010-04-29.orig/drivers/xen/blktap/blktap.c 2010-04-29 09:51:40.000000000 +0200
-+++ head-2010-04-29/drivers/xen/blktap/blktap.c 2010-04-29 09:52:39.000000000 +0200
+--- head-2010-05-12.orig/drivers/xen/blktap/blktap.c 2010-04-29 09:51:40.000000000 +0200
++++ head-2010-05-12/drivers/xen/blktap/blktap.c 2010-04-29 09:52:39.000000000 +0200
@@ -567,7 +567,8 @@ void signal_tapdisk(int idx)
return;
@@ -5551,8 +5621,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
if (ptask)
info->status = CLEANSHUTDOWN;
}
---- head-2010-04-29.orig/drivers/xen/blktap/xenbus.c 2010-03-24 15:09:22.000000000 +0100
-+++ head-2010-04-29/drivers/xen/blktap/xenbus.c 2010-04-29 09:52:52.000000000 +0200
+--- head-2010-05-12.orig/drivers/xen/blktap/xenbus.c 2010-03-24 15:09:22.000000000 +0100
++++ head-2010-05-12/drivers/xen/blktap/xenbus.c 2010-04-29 09:52:52.000000000 +0200
@@ -128,7 +128,7 @@ static int blktap_name(blkif_t *blkif, c
if (!get_device(_dev)) \
return ret; \
@@ -5615,8 +5685,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
int err;
DPRINTK("fe_changed(%s,%d)\n", dev->nodename, frontend_state);
---- head-2010-04-29.orig/drivers/xen/blktap2/device.c 2010-03-24 15:14:47.000000000 +0100
-+++ head-2010-04-29/drivers/xen/blktap2/device.c 2010-04-19 14:53:31.000000000 +0200
+--- head-2010-05-12.orig/drivers/xen/blktap2/device.c 2010-03-24 15:14:47.000000000 +0100
++++ head-2010-05-12/drivers/xen/blktap2/device.c 2010-04-19 14:53:31.000000000 +0200
@@ -208,13 +208,6 @@ flush_tlb_kernel_page(unsigned long kvad
#endif
}
@@ -5758,8 +5828,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
blk_queue_max_sectors(rq, 512);
/* Each segment in a request is up to an aligned page in size. */
---- head-2010-04-29.orig/drivers/xen/console/console.c 2010-03-24 15:12:46.000000000 +0100
-+++ head-2010-04-29/drivers/xen/console/console.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/console/console.c 2010-03-24 15:12:46.000000000 +0100
++++ head-2010-05-12/drivers/xen/console/console.c 2010-03-24 15:25:21.000000000 +0100
@@ -46,7 +46,6 @@
#include <linux/slab.h>
#include <linux/init.h>
@@ -5788,8 +5858,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
tty->closing = 0;
spin_lock_irqsave(&xencons_lock, flags);
xencons_tty = NULL;
---- head-2010-04-29.orig/drivers/xen/core/evtchn.c 2010-04-23 15:19:37.000000000 +0200
-+++ head-2010-04-29/drivers/xen/core/evtchn.c 2010-04-23 15:19:43.000000000 +0200
+--- head-2010-05-12.orig/drivers/xen/core/evtchn.c 2010-04-23 15:19:37.000000000 +0200
++++ head-2010-05-12/drivers/xen/core/evtchn.c 2010-04-23 15:19:43.000000000 +0200
@@ -35,7 +35,6 @@
#include <linux/interrupt.h>
#include <linux/sched.h>
@@ -5866,8 +5936,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
eoi_gmfn.gmfn = virt_to_machine(pirq_needs_eoi) >> PAGE_SHIFT;
if (HYPERVISOR_physdev_op(PHYSDEVOP_pirq_eoi_gmfn, &eoi_gmfn) == 0)
pirq_eoi_does_unmask = true;
---- head-2010-04-29.orig/drivers/xen/core/smpboot.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/drivers/xen/core/smpboot.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/core/smpboot.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/drivers/xen/core/smpboot.c 2010-03-24 15:25:21.000000000 +0100
@@ -43,9 +43,11 @@ EXPORT_PER_CPU_SYMBOL(cpu_info);
static DEFINE_PER_CPU(int, resched_irq);
static DEFINE_PER_CPU(int, callfunc_irq);
@@ -5924,8 +5994,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
xen_spinlock_cleanup(cpu);
}
#endif
---- head-2010-04-29.orig/drivers/xen/evtchn.c 2010-04-29 09:29:49.000000000 +0200
-+++ head-2010-04-29/drivers/xen/evtchn.c 2010-04-15 10:08:13.000000000 +0200
+--- head-2010-05-12.orig/drivers/xen/evtchn.c 2010-05-12 08:55:23.000000000 +0200
++++ head-2010-05-12/drivers/xen/evtchn.c 2010-04-15 10:08:13.000000000 +0200
@@ -48,10 +48,17 @@
#include <linux/mutex.h>
#include <linux/cpu.h>
@@ -5963,8 +6033,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
if (u->name == NULL) {
kfree(u);
return -ENOMEM;
---- head-2010-04-29.orig/drivers/xen/fbfront/xenfb.c 2010-03-24 15:12:46.000000000 +0100
-+++ head-2010-04-29/drivers/xen/fbfront/xenfb.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/fbfront/xenfb.c 2010-03-24 15:12:46.000000000 +0100
++++ head-2010-05-12/drivers/xen/fbfront/xenfb.c 2010-03-24 15:25:21.000000000 +0100
@@ -597,7 +597,7 @@ static int __devinit xenfb_probe(struct
fb_size = XENFB_DEFAULT_FB_LEN;
}
@@ -6001,8 +6071,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
int val;
switch (backend_state) {
---- head-2010-04-29.orig/drivers/xen/fbfront/xenkbd.c 2010-03-24 15:12:46.000000000 +0100
-+++ head-2010-04-29/drivers/xen/fbfront/xenkbd.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/fbfront/xenkbd.c 2010-03-24 15:12:46.000000000 +0100
++++ head-2010-05-12/drivers/xen/fbfront/xenkbd.c 2010-03-24 15:25:21.000000000 +0100
@@ -113,7 +113,7 @@ int __devinit xenkbd_probe(struct xenbus
xenbus_dev_fatal(dev, -ENOMEM, "allocating info structure");
return -ENOMEM;
@@ -6039,8 +6109,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
int ret, val;
switch (backend_state) {
---- head-2010-04-29.orig/drivers/xen/netback/accel.c 2010-03-24 15:06:12.000000000 +0100
-+++ head-2010-04-29/drivers/xen/netback/accel.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/netback/accel.c 2010-03-24 15:06:12.000000000 +0100
++++ head-2010-05-12/drivers/xen/netback/accel.c 2010-03-24 15:25:21.000000000 +0100
@@ -103,7 +103,7 @@ static int netback_accelerator_probe_bac
struct xenbus_device *xendev = to_xenbus_device(dev);
@@ -6059,8 +6129,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
if (be->accelerator == accelerator) {
be->accelerator->hooks->remove(xendev);
---- head-2010-04-29.orig/drivers/xen/netback/loopback.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-29/drivers/xen/netback/loopback.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/netback/loopback.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/drivers/xen/netback/loopback.c 2010-03-24 15:25:21.000000000 +0100
@@ -137,8 +137,8 @@ static int loopback_start_xmit(struct sk
return 0;
}
@@ -6072,8 +6142,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
skb_orphan(skb);
---- head-2010-04-29.orig/drivers/xen/netback/xenbus.c 2010-03-24 15:10:29.000000000 +0100
-+++ head-2010-04-29/drivers/xen/netback/xenbus.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/netback/xenbus.c 2010-03-24 15:10:29.000000000 +0100
++++ head-2010-05-12/drivers/xen/netback/xenbus.c 2010-03-24 15:25:21.000000000 +0100
@@ -35,7 +35,7 @@ static void backend_create_netif(struct
static int netback_remove(struct xenbus_device *dev)
@@ -6119,8 +6189,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
DPRINTK("%s", xenbus_strstate(frontend_state));
---- head-2010-04-29.orig/drivers/xen/netfront/netfront.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/drivers/xen/netfront/netfront.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/netfront/netfront.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/drivers/xen/netfront/netfront.c 2010-03-24 15:25:21.000000000 +0100
@@ -257,7 +257,7 @@ static int __devinit netfront_probe(stru
}
@@ -6181,8 +6251,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
struct net_device *netdev = np->netdev;
DPRINTK("%s\n", xenbus_strstate(backend_state));
---- head-2010-04-29.orig/drivers/xen/pciback/xenbus.c 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/drivers/xen/pciback/xenbus.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/pciback/xenbus.c 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/drivers/xen/pciback/xenbus.c 2010-03-24 15:25:21.000000000 +0100
@@ -24,7 +24,7 @@ static struct pciback_device *alloc_pdev
dev_dbg(&xdev->dev, "allocated pdev @ 0x%p\n", pdev);
@@ -6219,8 +6289,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
if (pdev != NULL)
free_pdev(pdev);
---- head-2010-04-29.orig/drivers/xen/pcifront/pci_op.c 2010-03-24 15:08:58.000000000 +0100
-+++ head-2010-04-29/drivers/xen/pcifront/pci_op.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/pcifront/pci_op.c 2010-03-24 15:08:58.000000000 +0100
++++ head-2010-05-12/drivers/xen/pcifront/pci_op.c 2010-03-24 15:25:21.000000000 +0100
@@ -416,7 +416,7 @@ void pci_frontend_disable_msi(struct pci
#endif /* CONFIG_PCI_MSI */
@@ -6239,8 +6309,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
}
int __devinit pcifront_scan_root(struct pcifront_device *pdev,
---- head-2010-04-29.orig/drivers/xen/pcifront/xenbus.c 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/drivers/xen/pcifront/xenbus.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/pcifront/xenbus.c 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/drivers/xen/pcifront/xenbus.c 2010-03-24 15:25:21.000000000 +0100
@@ -34,7 +34,7 @@ static struct pcifront_device *alloc_pde
/*Flag for registering PV AER handler*/
set_bit(_XEN_PCIB_AERHANDLER, (void*)&pdev->sh_info->flags);
@@ -6279,8 +6349,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
return 0;
}
---- head-2010-04-29.orig/drivers/xen/scsiback/scsiback.c 2010-03-24 15:10:29.000000000 +0100
-+++ head-2010-04-29/drivers/xen/scsiback/scsiback.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/scsiback/scsiback.c 2010-03-24 15:10:29.000000000 +0100
++++ head-2010-05-12/drivers/xen/scsiback/scsiback.c 2010-03-24 15:25:21.000000000 +0100
@@ -224,7 +224,7 @@ static void scsiback_cmd_done(struct req
int errors;
@@ -6459,8 +6529,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
scsiback_get(pending_req->info);
blk_execute_rq_nowait(rq->q, NULL, rq, 1, scsiback_cmd_done);
---- head-2010-04-29.orig/drivers/xen/scsiback/xenbus.c 2010-03-24 15:09:08.000000000 +0100
-+++ head-2010-04-29/drivers/xen/scsiback/xenbus.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/scsiback/xenbus.c 2010-03-24 15:09:08.000000000 +0100
++++ head-2010-05-12/drivers/xen/scsiback/xenbus.c 2010-03-24 15:25:21.000000000 +0100
@@ -224,7 +224,7 @@ static void scsiback_do_lun_hotplug(stru
static void scsiback_frontend_changed(struct xenbus_device *dev,
enum xenbus_state frontend_state)
@@ -6497,8 +6567,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
be->info = vscsibk_info_alloc(dev->otherend_id);
if (IS_ERR(be->info)) {
---- head-2010-04-29.orig/drivers/xen/scsifront/xenbus.c 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/drivers/xen/scsifront/xenbus.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/scsifront/xenbus.c 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/drivers/xen/scsifront/xenbus.c 2010-03-24 15:25:21.000000000 +0100
@@ -185,7 +185,7 @@ static int scsifront_probe(struct xenbus
info->host = host;
@@ -6526,8 +6596,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
DPRINTK("%p %u %u\n", dev, dev->state, backend_state);
---- head-2010-04-29.orig/drivers/xen/sfc_netback/accel_xenbus.c 2010-03-24 15:06:12.000000000 +0100
-+++ head-2010-04-29/drivers/xen/sfc_netback/accel_xenbus.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/sfc_netback/accel_xenbus.c 2010-03-24 15:06:12.000000000 +0100
++++ head-2010-05-12/drivers/xen/sfc_netback/accel_xenbus.c 2010-03-24 15:25:21.000000000 +0100
@@ -36,7 +36,7 @@
#define NODENAME_PATH_FMT "backend/vif/%d/%d"
@@ -6555,8 +6625,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
bend = (struct netback_accel *) binfo->netback_accel_priv;
DPRINTK("%s: dev %p bend %p\n", __FUNCTION__, dev, bend);
---- head-2010-04-29.orig/drivers/xen/sfc_netfront/accel_xenbus.c 2010-03-24 15:09:15.000000000 +0100
-+++ head-2010-04-29/drivers/xen/sfc_netfront/accel_xenbus.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/sfc_netfront/accel_xenbus.c 2010-03-24 15:09:15.000000000 +0100
++++ head-2010-05-12/drivers/xen/sfc_netfront/accel_xenbus.c 2010-03-24 15:25:21.000000000 +0100
@@ -727,8 +727,7 @@ int netfront_accel_probe(struct net_devi
int netfront_accel_remove(struct xenbus_device *dev)
@@ -6567,8 +6637,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
netfront_accel_vnic *vnic = (netfront_accel_vnic *)np->accel_priv;
DPRINTK("%s %s\n", __FUNCTION__, dev->nodename);
---- head-2010-04-29.orig/drivers/xen/sys-hypervisor.c 2010-04-29 09:29:49.000000000 +0200
-+++ head-2010-04-29/drivers/xen/sys-hypervisor.c 2010-04-15 10:08:27.000000000 +0200
+--- head-2010-05-12.orig/drivers/xen/sys-hypervisor.c 2010-05-12 08:55:23.000000000 +0200
++++ head-2010-05-12/drivers/xen/sys-hypervisor.c 2010-04-15 10:08:27.000000000 +0200
@@ -20,6 +20,8 @@
#include <xen/interface/xen.h>
#include <xen/interface/version.h>
@@ -6589,8 +6659,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
return -EBUSY;
vm = xenbus_read(XBT_NIL, "vm", "", NULL);
---- head-2010-04-29.orig/drivers/xen/tpmback/xenbus.c 2010-03-24 15:09:08.000000000 +0100
-+++ head-2010-04-29/drivers/xen/tpmback/xenbus.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/tpmback/xenbus.c 2010-03-24 15:09:08.000000000 +0100
++++ head-2010-05-12/drivers/xen/tpmback/xenbus.c 2010-03-24 15:25:21.000000000 +0100
@@ -54,7 +54,7 @@ long int tpmback_get_instance(struct bac
static int tpmback_remove(struct xenbus_device *dev)
@@ -6627,8 +6697,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
int err;
switch (frontend_state) {
---- head-2010-04-29.orig/drivers/xen/usbback/usbback.h 2010-03-24 15:06:12.000000000 +0100
-+++ head-2010-04-29/drivers/xen/usbback/usbback.h 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/usbback/usbback.h 2010-03-24 15:06:12.000000000 +0100
++++ head-2010-05-12/drivers/xen/usbback/usbback.h 2010-03-24 15:25:21.000000000 +0100
@@ -64,6 +64,12 @@
struct usbstub;
@@ -6651,8 +6721,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
domid_t domid;
unsigned int handle;
int portnum;
---- head-2010-04-29.orig/drivers/xen/usbback/usbstub.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/drivers/xen/usbback/usbstub.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/usbback/usbstub.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/drivers/xen/usbback/usbstub.c 2010-03-24 15:25:21.000000000 +0100
@@ -56,7 +56,7 @@ struct vusb_port_id *find_portid_by_busi
spin_lock_irqsave(&port_list_lock, flags);
@@ -6680,8 +6750,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
goto out; /* invalid call */
}
---- head-2010-04-29.orig/drivers/xen/usbback/xenbus.c 2010-03-24 15:09:08.000000000 +0100
-+++ head-2010-04-29/drivers/xen/usbback/xenbus.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/usbback/xenbus.c 2010-03-24 15:09:08.000000000 +0100
++++ head-2010-05-12/drivers/xen/usbback/xenbus.c 2010-03-24 15:25:21.000000000 +0100
@@ -112,7 +112,7 @@ again:
*/
portid = find_portid(usbif->domid, usbif->handle, i);
@@ -6727,8 +6797,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
int err;
switch (frontend_state) {
---- head-2010-04-29.orig/drivers/xen/usbfront/xenbus.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/drivers/xen/usbfront/xenbus.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/usbfront/xenbus.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/drivers/xen/usbfront/xenbus.c 2010-03-24 15:25:21.000000000 +0100
@@ -187,7 +187,7 @@ out:
static int connect(struct xenbus_device *dev)
@@ -6772,8 +6842,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
struct usb_hcd *hcd = info_to_hcd(info);
destroy_rings(info);
---- head-2010-04-29.orig/drivers/xen/xenbus/xenbus_probe.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/drivers/xen/xenbus/xenbus_probe.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/xenbus/xenbus_probe.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/drivers/xen/xenbus/xenbus_probe.c 2010-03-24 15:25:21.000000000 +0100
@@ -91,6 +91,11 @@ static int xenbus_probe_frontend(const c
static void xenbus_dev_shutdown(struct device *_dev);
@@ -6868,8 +6938,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
/* A flag to determine if xenstored is 'ready' (i.e. has started) */
atomic_t xenbus_xsd_state = ATOMIC_INIT(XENBUS_XSD_UNCOMMITTED);
---- head-2010-04-29.orig/drivers/xen/xenbus/xenbus_probe_backend.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/drivers/xen/xenbus/xenbus_probe_backend.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/xenbus/xenbus_probe_backend.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/drivers/xen/xenbus/xenbus_probe_backend.c 2010-03-24 15:25:21.000000000 +0100
@@ -73,7 +73,7 @@ static int read_frontend_details(struct
}
@@ -6890,8 +6960,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
return -ENOSPC;
return 0;
}
---- head-2010-04-29.orig/drivers/xen/xenbus/xenbus_xs.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-29/drivers/xen/xenbus/xenbus_xs.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/xenbus/xenbus_xs.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/drivers/xen/xenbus/xenbus_xs.c 2010-03-24 15:25:21.000000000 +0100
@@ -723,6 +723,10 @@ void xs_resume(void)
struct xenbus_watch *watch;
char token[sizeof(watch) * 2 + 1];
@@ -6903,8 +6973,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
mutex_unlock(&xs_state.response_mutex);
mutex_unlock(&xs_state.request_mutex);
transaction_resume();
---- head-2010-04-29.orig/include/Kbuild 2010-03-24 15:12:46.000000000 +0100
-+++ head-2010-04-29/include/Kbuild 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/include/Kbuild 2010-03-24 15:12:46.000000000 +0100
++++ head-2010-05-12/include/Kbuild 2010-03-24 15:25:21.000000000 +0100
@@ -8,6 +8,5 @@ header-y += mtd/
header-y += rdma/
header-y += video/
@@ -6912,13 +6982,13 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
-header-y += xen/public/
header-y += xen/
header-y += scsi/
---- head-2010-04-29.orig/include/xen/Kbuild 2010-04-29 09:29:49.000000000 +0200
-+++ head-2010-04-29/include/xen/Kbuild 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/include/xen/Kbuild 2010-05-12 08:55:23.000000000 +0200
++++ head-2010-05-12/include/xen/Kbuild 2010-03-24 15:25:21.000000000 +0100
@@ -1 +1 @@
-header-y += evtchn.h
+header-y += public/
---- head-2010-04-29.orig/include/xen/evtchn.h 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-29/include/xen/evtchn.h 2010-03-31 14:37:09.000000000 +0200
+--- head-2010-05-12.orig/include/xen/evtchn.h 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/include/xen/evtchn.h 2010-03-31 14:37:09.000000000 +0200
@@ -113,9 +113,6 @@ void irq_resume(void);
/* Entry point for notifications into Linux subsystems. */
asmlinkage void evtchn_do_upcall(struct pt_regs *regs);
@@ -6937,8 +7007,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
#ifdef CONFIG_SMP
void rebind_evtchn_to_cpu(int port, unsigned int cpu);
---- head-2010-04-29.orig/include/xen/xenbus.h 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-29/include/xen/xenbus.h 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/include/xen/xenbus.h 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/include/xen/xenbus.h 2010-03-24 15:25:21.000000000 +0100
@@ -104,8 +104,12 @@ struct xenbus_driver {
void (*otherend_changed)(struct xenbus_device *dev,
enum xenbus_state backend_state);
@@ -6952,8 +7022,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
int (*resume)(struct xenbus_device *dev);
int (*uevent)(struct xenbus_device *, struct kobj_uevent_env *);
struct device_driver driver;
---- head-2010-04-29.orig/lib/swiotlb-xen.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/lib/swiotlb-xen.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/lib/swiotlb-xen.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/lib/swiotlb-xen.c 2010-03-24 15:25:21.000000000 +0100
@@ -39,8 +39,8 @@ int swiotlb;
int swiotlb_force;
@@ -7204,8 +7274,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
}
EXPORT_SYMBOL(swiotlb_sync_sg_for_device);
---- head-2010-04-29.orig/mm/init-mm.c 2010-04-29 09:29:49.000000000 +0200
-+++ head-2010-04-29/mm/init-mm.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/mm/init-mm.c 2010-05-12 08:55:23.000000000 +0200
++++ head-2010-05-12/mm/init-mm.c 2010-03-24 15:25:21.000000000 +0100
@@ -8,6 +8,10 @@
#include <asm/atomic.h>
#include <asm/pgtable.h>
@@ -7217,8 +7287,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
struct mm_struct init_mm = {
.mm_rb = RB_ROOT,
.pgd = swapper_pg_dir,
---- head-2010-04-29.orig/mm/memory.c 2010-04-15 09:55:57.000000000 +0200
-+++ head-2010-04-29/mm/memory.c 2010-04-15 10:08:42.000000000 +0200
+--- head-2010-05-12.orig/mm/memory.c 2010-04-15 09:55:57.000000000 +0200
++++ head-2010-05-12/mm/memory.c 2010-04-15 10:08:42.000000000 +0200
@@ -1432,7 +1432,7 @@ int __get_user_pages(struct task_struct
vmas[i] = vma;
i++;
@@ -7228,8 +7298,8 @@ Automatically created from "patches.kernel.org/patch-2.6.31" by xen-port-patches
continue;
}
}
---- head-2010-04-29.orig/mm/page_alloc.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/mm/page_alloc.c 2010-03-24 15:25:21.000000000 +0100
+--- head-2010-05-12.orig/mm/page_alloc.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/mm/page_alloc.c 2010-03-24 15:25:21.000000000 +0100
@@ -611,6 +611,7 @@ static void __free_pages_ok(struct page
#ifdef CONFIG_XEN
diff --git a/patches.xen/xen3-patch-2.6.32 b/patches.xen/xen3-patch-2.6.32
index 8cbe794c9c..fe37b6c3d2 100644
--- a/patches.xen/xen3-patch-2.6.32
+++ b/patches.xen/xen3-patch-2.6.32
@@ -7,8 +7,8 @@ Patch-mainline: 2.6.32
Acked-by: Jeff Mahoney <jeffm@suse.com>
Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches.py
---- head-2010-04-29.orig/arch/x86/ia32/ia32entry-xen.S 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/ia32/ia32entry-xen.S 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/ia32/ia32entry-xen.S 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/ia32/ia32entry-xen.S 2010-03-24 15:32:27.000000000 +0100
@@ -20,18 +20,15 @@
#define AUDIT_ARCH_I386 (EM_386|__AUDIT_ARCH_LE)
#define __AUDIT_ARCH_LE 0x40000000
@@ -183,8 +183,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
- .quad sys_perf_counter_open
+ .quad sys_perf_event_open
ia32_syscall_end:
---- head-2010-04-29.orig/arch/x86/include/asm/time.h 2010-03-24 15:10:37.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/asm/time.h 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/asm/time.h 2010-03-24 15:10:37.000000000 +0100
++++ head-2010-05-12/arch/x86/include/asm/time.h 2010-03-24 15:32:27.000000000 +0100
@@ -8,8 +8,9 @@ extern void hpet_time_init(void);
extern void time_init(void);
@@ -196,8 +196,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
extern int xen_update_persistent_clock(void);
#endif
---- head-2010-04-29.orig/arch/x86/include/asm/uv/uv_hub.h 2010-04-29 09:29:49.000000000 +0200
-+++ head-2010-04-29/arch/x86/include/asm/uv/uv_hub.h 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/asm/uv/uv_hub.h 2010-05-12 08:55:23.000000000 +0200
++++ head-2010-05-12/arch/x86/include/asm/uv/uv_hub.h 2010-03-24 15:32:27.000000000 +0100
@@ -11,7 +11,7 @@
#ifndef _ASM_X86_UV_UV_HUB_H
#define _ASM_X86_UV_UV_HUB_H
@@ -207,8 +207,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
#include <linux/numa.h>
#include <linux/percpu.h>
#include <linux/timer.h>
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/agp.h 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/agp.h 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/agp.h 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/agp.h 2010-03-24 15:32:27.000000000 +0100
@@ -28,10 +28,7 @@
*/
#define flush_agp_cache() wbinvd()
@@ -221,8 +221,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
/* GATT allocation. Returns/accepts GATT kernel virtual address. */
#define alloc_gatt_pages(order) ({ \
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/desc.h 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/desc.h 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/desc.h 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/desc.h 2010-03-24 15:32:27.000000000 +0100
@@ -312,7 +312,14 @@ static inline void load_LDT(mm_context_t
static inline unsigned long get_desc_base(const struct desc_struct *desc)
@@ -252,8 +252,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
#ifndef CONFIG_X86_NO_IDT
static inline void _set_gate(int gate, unsigned type, void *addr,
unsigned dpl, unsigned ist, unsigned seg)
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/dma-mapping.h 2010-03-24 15:14:47.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/dma-mapping.h 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/dma-mapping.h 2010-03-24 15:14:47.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/dma-mapping.h 2010-03-24 15:32:27.000000000 +0100
@@ -1,11 +1,24 @@
#ifndef _ASM_X86_DMA_MAPPING_H_
@@ -282,8 +282,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
extern int range_straddles_page_boundary(paddr_t p, size_t size);
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/fixmap.h 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/fixmap.h 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/fixmap.h 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/fixmap.h 2010-03-24 15:32:27.000000000 +0100
@@ -139,6 +139,9 @@ enum fixed_addresses {
#ifdef CONFIG_X86_32
FIX_WP_TEST,
@@ -294,8 +294,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
__end_of_fixed_addresses
};
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/hypervisor.h 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/hypervisor.h 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/hypervisor.h 2010-03-24 15:32:27.000000000 +0100
@@ -70,6 +70,7 @@ extern start_info_t *xen_start_info;
#endif
@@ -312,8 +312,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
+#define uvm_multi(cpumask) ((unsigned long)cpumask_bits(cpumask) | UVMF_MULTI)
#endif /* __HYPERVISOR_H__ */
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/irqflags.h 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/irqflags.h 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/irqflags.h 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/irqflags.h 2010-03-24 15:32:27.000000000 +0100
@@ -1,7 +1,7 @@
#ifndef _X86_IRQFLAGS_H_
#define _X86_IRQFLAGS_H_
@@ -323,8 +323,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
#ifndef __ASSEMBLY__
/*
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/mmu_context.h 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/mmu_context.h 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/mmu_context.h 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/mmu_context.h 2010-03-24 15:32:27.000000000 +0100
@@ -88,12 +88,12 @@ static inline void switch_mm(struct mm_s
!PagePinned(virt_to_page(next->pgd)));
@@ -349,8 +349,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
/* We were in lazy tlb mode and leave_mm disabled
* tlb flush IPI delivery. We must reload CR3
* to make sure to use no freed page tables.
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/pci.h 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/pci.h 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/pci.h 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/pci.h 2010-03-24 15:32:27.000000000 +0100
@@ -151,7 +151,11 @@ static inline int __pcibus_to_node(const
static inline const struct cpumask *
cpumask_of_pcibus(const struct pci_bus *bus)
@@ -364,8 +364,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
}
#endif
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/pgtable.h 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/pgtable.h 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/pgtable.h 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/pgtable.h 2010-03-24 15:32:27.000000000 +0100
@@ -53,16 +53,6 @@ extern struct list_head pgd_list;
#define pte_update(mm, addr, ptep) do { } while (0)
#define pte_update_defer(mm, addr, ptep) do { } while (0)
@@ -443,8 +443,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
UVMF_INVLPG))) { \
__xen_pte_clear(__ptep); \
flush_tlb_page(vma, addr); \
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/pgtable_types.h 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/pgtable_types.h 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/pgtable_types.h 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/pgtable_types.h 2010-03-24 15:32:27.000000000 +0100
@@ -334,6 +334,7 @@ static inline pteval_t pte_flags(pte_t p
typedef struct page *pgtable_t;
@@ -468,8 +468,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
struct seq_file;
extern void arch_report_meminfo(struct seq_file *m);
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/processor.h 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/processor.h 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/processor.h 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/processor.h 2010-03-24 15:32:27.000000000 +0100
@@ -27,6 +27,7 @@ struct mm_struct;
#include <linux/cpumask.h>
#include <linux/cache.h>
@@ -561,7 +561,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
+
#endif /* _ASM_X86_PROCESSOR_H */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/setup.h 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/setup.h 2010-03-24 15:32:27.000000000 +0100
@@ -0,0 +1,8 @@
+#ifndef __ASSEMBLY__
+
@@ -572,7 +572,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
+
+#include_next <asm/setup.h>
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/smp-processor-id.h 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/smp-processor-id.h 2010-03-24 15:32:27.000000000 +0100
@@ -0,0 +1,36 @@
+#ifndef _ASM_X86_SMP_PROCESSOR_ID_H
+#define _ASM_X86_SMP_PROCESSOR_ID_H
@@ -610,8 +610,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
+#endif /* SMP && !__ASSEMBLY__ */
+
+#endif /* _ASM_X86_SMP_PROCESSOR_ID_H */
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/smp.h 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/smp.h 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/smp.h 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/smp.h 2010-03-24 15:32:27.000000000 +0100
@@ -121,7 +121,6 @@ static inline void arch_send_call_functi
smp_ops.send_call_func_single_ipi(cpu);
}
@@ -649,8 +649,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
#ifdef CONFIG_X86_LOCAL_APIC
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/system.h 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/system.h 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/system.h 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/system.h 2010-03-24 15:32:27.000000000 +0100
@@ -30,7 +30,7 @@ void __switch_to_xtra(struct task_struct
"movl %P[task_canary](%[next]), %%ebx\n\t" \
"movl %%ebx, "__percpu_arg([stack_canary])"\n\t"
@@ -694,8 +694,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
extern void xen_load_gs_index(unsigned);
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/tlbflush.h 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/tlbflush.h 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/tlbflush.h 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/tlbflush.h 2010-03-24 15:32:27.000000000 +0100
@@ -74,9 +74,9 @@ static inline void reset_lazy_tlbstate(v
#define local_flush_tlb() __flush_tlb()
@@ -709,8 +709,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
#define flush_tlb() flush_tlb_current_task()
---- head-2010-04-29.orig/arch/x86/kernel/Makefile 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/Makefile 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/Makefile 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/Makefile 2010-03-24 15:32:27.000000000 +0100
@@ -132,8 +132,6 @@ ifeq ($(CONFIG_X86_64),y)
obj-$(CONFIG_PCI_MMCONFIG) += mmconf-fam10h_64.o
@@ -720,8 +720,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
endif
disabled-obj-$(CONFIG_XEN) := %_uv.o crash.o early-quirks.o hpet.o i8253.o \
---- head-2010-04-29.orig/arch/x86/kernel/apic/io_apic-xen.c 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/apic/io_apic-xen.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/apic/io_apic-xen.c 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/apic/io_apic-xen.c 2010-03-24 15:32:27.000000000 +0100
@@ -79,6 +79,8 @@ unsigned long io_apic_irqs;
#endif /* CONFIG_XEN */
@@ -1508,8 +1508,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
+
+ nr_ioapics++;
+}
---- head-2010-04-29.orig/arch/x86/kernel/cpu/Makefile 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/cpu/Makefile 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/cpu/Makefile 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/cpu/Makefile 2010-03-24 15:32:27.000000000 +0100
@@ -34,7 +34,7 @@ obj-$(CONFIG_CPU_FREQ) += cpufreq/
obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o
@@ -1519,8 +1519,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
quiet_cmd_mkcapflags = MKCAP $@
cmd_mkcapflags = $(PERL) $(srctree)/$(src)/mkcapflags.pl $< $@
---- head-2010-04-29.orig/arch/x86/kernel/cpu/amd.c 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/cpu/amd.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/cpu/amd.c 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/cpu/amd.c 2010-03-24 15:32:27.000000000 +0100
@@ -313,7 +313,7 @@ static void __cpuinit amd_detect_cmp(str
int amd_get_nb_id(int cpu)
{
@@ -1541,8 +1541,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
#else
/*
---- head-2010-04-29.orig/arch/x86/kernel/cpu/common-xen.c 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/cpu/common-xen.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/cpu/common-xen.c 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/cpu/common-xen.c 2010-03-24 15:32:27.000000000 +0100
@@ -13,13 +13,13 @@
#include <linux/io.h>
@@ -1708,8 +1708,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
#endif
/* Make sure %fs and %gs are initialized properly in idle threads */
---- head-2010-04-29.orig/arch/x86/kernel/cpu/mcheck/mce-inject.c 2010-04-29 09:29:49.000000000 +0200
-+++ head-2010-04-29/arch/x86/kernel/cpu/mcheck/mce-inject.c 2010-04-15 10:10:43.000000000 +0200
+--- head-2010-05-12.orig/arch/x86/kernel/cpu/mcheck/mce-inject.c 2010-05-12 08:55:23.000000000 +0200
++++ head-2010-05-12/arch/x86/kernel/cpu/mcheck/mce-inject.c 2010-04-15 10:10:43.000000000 +0200
@@ -144,7 +144,7 @@ static void raise_mce(struct mce *m)
if (context == MCJ_CTX_RANDOM)
return;
@@ -1719,8 +1719,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
if (m->inject_flags & MCJ_NMI_BROADCAST) {
unsigned long start;
int cpu;
---- head-2010-04-29.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/cpu/mtrr/main-xen.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/cpu/mtrr/main-xen.c 2010-03-24 15:32:27.000000000 +0100
@@ -1,10 +1,9 @@
-#include <linux/init.h>
-#include <linux/proc_fs.h>
@@ -1810,8 +1810,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
EXPORT_SYMBOL(mtrr_del);
/*
---- head-2010-04-29.orig/arch/x86/kernel/e820-xen.c 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/e820-xen.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/e820-xen.c 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/e820-xen.c 2010-03-24 15:32:27.000000000 +0100
@@ -134,7 +134,7 @@ static void __init __e820_add_region(str
{
int x = e820x->nr_map;
@@ -1910,8 +1910,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
#ifdef CONFIG_XEN
if (is_initial_xendomain()) {
printk(KERN_INFO "Xen-provided machine memory map:\n");
---- head-2010-04-29.orig/arch/x86/kernel/early_printk-xen.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/early_printk-xen.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/early_printk-xen.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/early_printk-xen.c 2010-03-24 15:32:27.000000000 +0100
@@ -178,7 +178,6 @@ static __init void early_serial_init(cha
* mappings. Someone should fix this for domain 0. For now, use fake serial.
*/
@@ -2741,8 +2741,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
return 0;
}
---- head-2010-04-29.orig/arch/x86/kernel/entry_64-xen.S 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/entry_64-xen.S 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/entry_64-xen.S 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/entry_64-xen.S 2010-03-24 15:32:27.000000000 +0100
@@ -53,6 +53,7 @@
#include <asm/hw_irq.h>
#include <asm/page_types.h>
@@ -2818,8 +2818,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
apicinterrupt LOCAL_PENDING_VECTOR \
perf_pending_interrupt smp_perf_pending_interrupt
#endif
---- head-2010-04-29.orig/arch/x86/kernel/head-xen.c 2010-04-28 17:07:13.000000000 +0200
-+++ head-2010-04-29/arch/x86/kernel/head-xen.c 2010-04-15 10:10:51.000000000 +0200
+--- head-2010-05-12.orig/arch/x86/kernel/head-xen.c 2010-04-28 17:07:13.000000000 +0200
++++ head-2010-05-12/arch/x86/kernel/head-xen.c 2010-04-15 10:10:51.000000000 +0200
@@ -59,7 +59,6 @@ void __init reserve_ebda_region(void)
#include <asm/fixmap.h>
#include <asm/pgtable.h>
@@ -2837,8 +2837,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
{
int ret;
static const struct callback_register __initconst event = {
---- head-2010-04-29.orig/arch/x86/kernel/head32-xen.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/head32-xen.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/head32-xen.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/head32-xen.c 2010-03-24 15:32:27.000000000 +0100
@@ -9,11 +9,26 @@
#include <linux/start_kernel.h>
@@ -2894,8 +2894,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
xen_start_kernel();
#endif
---- head-2010-04-29.orig/arch/x86/kernel/head64-xen.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/head64-xen.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/head64-xen.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/head64-xen.c 2010-03-24 15:32:27.000000000 +0100
@@ -20,15 +20,14 @@
#include <asm/proto.h>
#include <asm/smp.h>
@@ -2913,8 +2913,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
#ifndef CONFIG_XEN
static void __init zap_identity_mappings(void)
---- head-2010-04-29.orig/arch/x86/kernel/head_32-xen.S 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/head_32-xen.S 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/head_32-xen.S 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/head_32-xen.S 2010-03-24 15:32:27.000000000 +0100
@@ -30,7 +30,7 @@
#define X86_CAPABILITY new_cpu_data+CPUINFO_x86_capability
#define X86_VENDOR_ID new_cpu_data+CPUINFO_x86_vendor_id
@@ -2941,8 +2941,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
.align PAGE_SIZE_asm
ENTRY(swapper_pg_fixmap)
.fill 1024,4,0
---- head-2010-04-29.orig/arch/x86/kernel/head_64-xen.S 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/head_64-xen.S 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/head_64-xen.S 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/head_64-xen.S 2010-03-24 15:32:27.000000000 +0100
@@ -23,7 +23,7 @@
#include <asm/percpu.h>
#include <xen/interface/elfnote.h>
@@ -2970,8 +2970,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
.align PAGE_SIZE
ENTRY(empty_zero_page)
.skip PAGE_SIZE
---- head-2010-04-29.orig/arch/x86/kernel/irq-xen.c 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/irq-xen.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/irq-xen.c 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/irq-xen.c 2010-03-24 15:32:27.000000000 +0100
@@ -67,10 +67,10 @@ static int show_other_interrupts(struct
for_each_online_cpu(j)
seq_printf(p, "%10u ", irq_stats(j)->irq_spurious_count);
@@ -3003,8 +3003,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
sum += per_cpu(mce_exception_count, cpu);
sum += per_cpu(mce_poll_count, cpu);
#endif
---- head-2010-04-29.orig/arch/x86/kernel/ldt-xen.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/ldt-xen.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/ldt-xen.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/ldt-xen.c 2010-03-24 15:32:27.000000000 +0100
@@ -70,8 +70,8 @@ static int alloc_ldt(mm_context_t *pc, i
XENFEAT_writable_descriptor_tables);
load_LDT(pc);
@@ -3016,8 +3016,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
smp_call_function(flush_ldt, current->mm, 1);
preempt_enable();
#endif
---- head-2010-04-29.orig/arch/x86/kernel/microcode_core-xen.c 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/microcode_core-xen.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/microcode_core-xen.c 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/microcode_core-xen.c 2010-03-24 15:32:27.000000000 +0100
@@ -97,8 +97,8 @@ static ssize_t microcode_write(struct fi
{
ssize_t ret = -EINVAL;
@@ -3038,8 +3038,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
.fops = &microcode_fops,
};
---- head-2010-04-29.orig/arch/x86/kernel/mpparse-xen.c 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/mpparse-xen.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/mpparse-xen.c 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/mpparse-xen.c 2010-03-24 15:32:27.000000000 +0100
@@ -51,6 +51,13 @@ static int __init mpf_checksum(unsigned
return sum & 0xFF;
}
@@ -3231,8 +3231,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
#ifdef CONFIG_X86_IO_APIC
static u8 __initdata irq_used[MAX_IRQ_SOURCES];
---- head-2010-04-29.orig/arch/x86/kernel/pci-dma-xen.c 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/pci-dma-xen.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/pci-dma-xen.c 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/pci-dma-xen.c 2010-03-24 15:32:27.000000000 +0100
@@ -3,6 +3,7 @@
#include <linux/dmar.h>
#include <linux/bootmem.h>
@@ -3311,8 +3311,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
#ifdef CONFIG_PCI
/* Many VIA bridges seem to corrupt data for DAC. Disable it here */
---- head-2010-04-29.orig/arch/x86/kernel/pci-nommu-xen.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/pci-nommu-xen.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/pci-nommu-xen.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/pci-nommu-xen.c 2010-03-24 15:32:27.000000000 +0100
@@ -36,7 +36,7 @@ gnttab_map_sg(struct device *hwdev, stru
sg->dma_address =
gnttab_dma_map_page(sg_page(sg)) + sg->offset;
@@ -3375,8 +3375,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
};
void __init no_iommu_init(void)
---- head-2010-04-29.orig/arch/x86/kernel/process-xen.c 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/process-xen.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/process-xen.c 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/process-xen.c 2010-03-24 15:32:27.000000000 +0100
@@ -9,7 +9,7 @@
#include <linux/pm.h>
#include <linux/clockchips.h>
@@ -3480,8 +3480,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
#endif
}
---- head-2010-04-29.orig/arch/x86/kernel/process_32-xen.c 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/process_32-xen.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/process_32-xen.c 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/process_32-xen.c 2010-03-24 15:32:27.000000000 +0100
@@ -66,9 +66,6 @@
asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");
asmlinkage void cstar_ret_from_fork(void) __asm__("cstar_ret_from_fork");
@@ -3570,8 +3570,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
/*
* Restore %gs if needed (which is common)
---- head-2010-04-29.orig/arch/x86/kernel/process_64-xen.c 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/process_64-xen.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/process_64-xen.c 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/process_64-xen.c 2010-03-24 15:32:27.000000000 +0100
@@ -64,9 +64,6 @@
asmlinkage extern void ret_from_fork(void);
@@ -3653,8 +3653,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
return prev_p;
}
---- head-2010-04-29.orig/arch/x86/kernel/quirks-xen.c 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/quirks-xen.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/quirks-xen.c 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/quirks-xen.c 2010-03-24 15:32:27.000000000 +0100
@@ -509,7 +509,7 @@ static void __init quirk_amd_nb_node(str
pci_read_config_dword(nb_ht, 0x60, &val);
@@ -3664,8 +3664,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
}
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB,
---- head-2010-04-29.orig/arch/x86/kernel/rtc.c 2010-03-24 15:10:37.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/rtc.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/rtc.c 2010-03-24 15:10:37.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/rtc.c 2010-03-24 15:32:27.000000000 +0100
@@ -189,8 +189,10 @@ void read_persistent_clock(struct timesp
unsigned long retval, flags;
@@ -3679,8 +3679,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
#endif
spin_lock_irqsave(&rtc_lock, flags);
retval = x86_platform.get_wallclock();
---- head-2010-04-29.orig/arch/x86/kernel/setup-xen.c 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/setup-xen.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/setup-xen.c 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/setup-xen.c 2010-03-24 15:32:27.000000000 +0100
@@ -27,6 +27,7 @@
#include <linux/screen_info.h>
#include <linux/ioport.h>
@@ -3945,8 +3945,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
#endif /* CONFIG_X86_32 */
#ifdef CONFIG_XEN
---- head-2010-04-29.orig/arch/x86/kernel/sfi.c 2010-04-29 09:29:49.000000000 +0200
-+++ head-2010-04-29/arch/x86/kernel/sfi.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/sfi.c 2010-05-12 08:55:23.000000000 +0200
++++ head-2010-05-12/arch/x86/kernel/sfi.c 2010-03-24 15:32:27.000000000 +0100
@@ -31,7 +31,7 @@
#include <asm/setup.h>
#include <asm/apic.h>
@@ -3978,8 +3978,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
mp_sfi_register_lapic_address(sfi_lapic_addr);
sfi_table_parse(SFI_SIG_CPUS, NULL, NULL, sfi_parse_cpus);
#endif
---- head-2010-04-29.orig/arch/x86/kernel/time-xen.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/time-xen.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/time-xen.c 2010-05-12 09:02:08.000000000 +0200
++++ head-2010-05-12/arch/x86/kernel/time-xen.c 2010-05-12 09:02:39.000000000 +0200
@@ -1,31 +1,12 @@
/*
- * Copyright (C) 1991, 1992, 1995 Linus Torvalds
@@ -4087,7 +4087,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
{
s64 delta, delta_cpu, stolen, blocked;
unsigned int i, cpu = smp_processor_id();
-@@ -566,8 +542,7 @@ irqreturn_t timer_interrupt(int irq, voi
+@@ -568,8 +544,7 @@ irqreturn_t timer_interrupt(int irq, voi
/* Local timer processing (see update_process_times()). */
run_local_timers();
@@ -4097,7 +4097,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
printk_tick();
scheduler_tick();
run_posix_cpu_timers(current);
-@@ -667,7 +642,7 @@ static void init_missing_ticks_accountin
+@@ -669,7 +644,7 @@ static void init_missing_ticks_accountin
runstate->time[RUNSTATE_offline];
}
@@ -4106,7 +4106,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
{
const shared_info_t *s = HYPERVISOR_shared_info;
u32 version, sec, nsec;
-@@ -684,7 +659,8 @@ unsigned long xen_read_persistent_clock(
+@@ -686,7 +661,8 @@ unsigned long xen_read_persistent_clock(
delta = local_clock() + (u64)sec * NSEC_PER_SEC + nsec;
do_div(delta, NSEC_PER_SEC);
@@ -4116,8 +4116,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
}
int xen_update_persistent_clock(void)
---- head-2010-04-29.orig/arch/x86/kernel/traps-xen.c 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/traps-xen.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/traps-xen.c 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/traps-xen.c 2010-03-24 15:32:27.000000000 +0100
@@ -14,7 +14,6 @@
#include <linux/spinlock.h>
#include <linux/kprobes.h>
@@ -4239,8 +4239,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
}
void __cpuinit smp_trap_init(trap_info_t *trap_ctxt)
---- head-2010-04-29.orig/arch/x86/kernel/vsyscall_64-xen.c 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/vsyscall_64-xen.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/vsyscall_64-xen.c 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/vsyscall_64-xen.c 2010-03-24 15:32:27.000000000 +0100
@@ -87,6 +87,7 @@ void update_vsyscall(struct timespec *wa
vsyscall_gtod_data.wall_time_sec = wall_time->tv_sec;
vsyscall_gtod_data.wall_time_nsec = wall_time->tv_nsec;
@@ -4271,7 +4271,7 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
};
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-04-29/arch/x86/kernel/x86_init-xen.c 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/x86_init-xen.c 2010-03-24 15:32:27.000000000 +0100
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2009 Thomas Gleixner <tglx@linutronix.de>
@@ -4343,8 +4343,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
+ .get_wallclock = mach_get_cmos_time,
+ .set_wallclock = mach_set_rtc_mmss,
+};
---- head-2010-04-29.orig/arch/x86/mm/fault-xen.c 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/mm/fault-xen.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/fault-xen.c 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/fault-xen.c 2010-03-24 15:32:27.000000000 +0100
@@ -10,7 +10,7 @@
#include <linux/bootmem.h> /* max_low_pfn */
#include <linux/kprobes.h> /* __kprobes, ... */
@@ -4511,8 +4511,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
regs, address);
}
---- head-2010-04-29.orig/arch/x86/mm/highmem_32-xen.c 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/mm/highmem_32-xen.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/highmem_32-xen.c 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/highmem_32-xen.c 2010-03-24 15:32:27.000000000 +0100
@@ -24,7 +24,7 @@ void kunmap(struct page *page)
* no global lock is needed and because the kmap code must perform a global TLB
* invalidation when the kmap pool wraps.
@@ -4532,8 +4532,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
EXPORT_SYMBOL(clear_highpage);
EXPORT_SYMBOL(copy_highpage);
---- head-2010-04-29.orig/arch/x86/mm/init-xen.c 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/mm/init-xen.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/init-xen.c 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/init-xen.c 2010-03-24 15:32:27.000000000 +0100
@@ -36,69 +36,6 @@ extern unsigned long extend_init_mapping
extern void xen_finish_init_mapping(void);
#endif
@@ -4604,8 +4604,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
static void __init find_early_table_space(unsigned long end, int use_pse,
int use_gbpages)
{
---- head-2010-04-29.orig/arch/x86/mm/init_32-xen.c 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/mm/init_32-xen.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/init_32-xen.c 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/init_32-xen.c 2010-03-24 15:32:27.000000000 +0100
@@ -87,7 +87,7 @@ static pmd_t * __init one_md_table_init(
#ifdef CONFIG_X86_PAE
if (!(__pgd_val(*pgd) & _PAGE_PRESENT)) {
@@ -4648,8 +4648,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
num_physpages << (PAGE_SHIFT-10),
codesize >> 10,
reservedpages << (PAGE_SHIFT-10),
---- head-2010-04-29.orig/arch/x86/mm/init_64-xen.c 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/mm/init_64-xen.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/init_64-xen.c 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/init_64-xen.c 2010-03-24 15:32:27.000000000 +0100
@@ -894,8 +894,7 @@ EXPORT_SYMBOL_GPL(memory_add_physaddr_to
#endif /* CONFIG_MEMORY_HOTPLUG */
@@ -4680,8 +4680,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
max_pfn << (PAGE_SHIFT-10),
codesize >> 10,
absent_pages << (PAGE_SHIFT-10),
---- head-2010-04-29.orig/arch/x86/mm/iomap_32-xen.c 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/mm/iomap_32-xen.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/iomap_32-xen.c 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/iomap_32-xen.c 2010-03-24 15:32:27.000000000 +0100
@@ -22,7 +22,7 @@
#include <linux/module.h>
#include <linux/highmem.h>
@@ -4723,8 +4723,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
void *kmap_atomic_prot_pfn(unsigned long pfn, enum km_type type, pgprot_t prot)
{
---- head-2010-04-29.orig/arch/x86/mm/ioremap-xen.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/mm/ioremap-xen.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/ioremap-xen.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/ioremap-xen.c 2010-03-24 15:32:27.000000000 +0100
@@ -23,81 +23,7 @@
#include <asm/pgalloc.h>
#include <asm/pat.h>
@@ -4882,8 +4882,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
}
/**
---- head-2010-04-29.orig/arch/x86/mm/pageattr-xen.c 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/mm/pageattr-xen.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/pageattr-xen.c 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/pageattr-xen.c 2010-03-24 15:32:27.000000000 +0100
@@ -12,6 +12,7 @@
#include <linux/seq_file.h>
#include <linux/debugfs.h>
@@ -4963,8 +4963,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
} else
cpa_flush_all(cache);
---- head-2010-04-29.orig/arch/x86/mm/pat-xen.c 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/mm/pat-xen.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/pat-xen.c 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/pat-xen.c 2010-03-24 15:32:27.000000000 +0100
@@ -15,6 +15,7 @@
#include <linux/gfp.h>
#include <linux/mm.h>
@@ -5550,8 +5550,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
.start = memtype_seq_start,
.next = memtype_seq_next,
.stop = memtype_seq_stop,
---- head-2010-04-29.orig/arch/x86/mm/pgtable-xen.c 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/mm/pgtable-xen.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/pgtable-xen.c 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/pgtable-xen.c 2010-03-24 15:32:27.000000000 +0100
@@ -692,8 +692,7 @@ int ptep_set_access_flags(struct vm_area
if (likely(vma->vm_mm == current->mm)) {
if (HYPERVISOR_update_va_mapping(address,
@@ -5562,8 +5562,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
BUG();
} else {
xen_l1_entry_update(ptep, entry);
---- head-2010-04-29.orig/arch/x86/mm/physaddr.c 2010-04-29 09:29:49.000000000 +0200
-+++ head-2010-04-29/arch/x86/mm/physaddr.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/physaddr.c 2010-05-12 08:55:23.000000000 +0200
++++ head-2010-05-12/arch/x86/mm/physaddr.c 2010-03-24 15:32:27.000000000 +0100
@@ -8,6 +8,10 @@
#ifdef CONFIG_X86_64
@@ -5575,8 +5575,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
unsigned long __phys_addr(unsigned long x)
{
if (x >= __START_KERNEL_map) {
---- head-2010-04-29.orig/drivers/acpi/processor_driver.c 2010-04-15 10:07:40.000000000 +0200
-+++ head-2010-04-29/drivers/acpi/processor_driver.c 2010-04-15 10:11:16.000000000 +0200
+--- head-2010-05-12.orig/drivers/acpi/processor_driver.c 2010-04-15 10:07:40.000000000 +0200
++++ head-2010-05-12/drivers/acpi/processor_driver.c 2010-04-15 10:11:16.000000000 +0200
@@ -658,7 +658,7 @@ static int __cpuinit acpi_processor_add(
result = processor_extcntl_prepare(pr);
@@ -5586,8 +5586,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
pr->cdev = thermal_cooling_device_register("Processor", device,
&processor_cooling_ops);
---- head-2010-04-29.orig/drivers/char/agp/agp.h 2010-04-29 09:29:49.000000000 +0200
-+++ head-2010-04-29/drivers/char/agp/agp.h 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/drivers/char/agp/agp.h 2010-05-12 08:55:23.000000000 +0200
++++ head-2010-05-12/drivers/char/agp/agp.h 2010-03-24 15:32:27.000000000 +0100
@@ -31,6 +31,10 @@
#include <asm/agp.h> /* for flush_agp_cache() */
@@ -5599,8 +5599,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
#define PFX "agpgart: "
//#define AGP_DEBUG 1
---- head-2010-04-29.orig/drivers/char/agp/amd-k7-agp.c 2010-04-29 09:29:49.000000000 +0200
-+++ head-2010-04-29/drivers/char/agp/amd-k7-agp.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/drivers/char/agp/amd-k7-agp.c 2010-05-12 08:55:23.000000000 +0200
++++ head-2010-05-12/drivers/char/agp/amd-k7-agp.c 2010-03-24 15:32:27.000000000 +0100
@@ -44,7 +44,7 @@ static int amd_create_page_map(struct am
#ifndef CONFIG_X86
SetPageReserved(virt_to_page(page_map->real));
@@ -5628,8 +5628,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
page_dir.remapped+GET_PAGE_DIR_OFF(addr));
readl(page_dir.remapped+GET_PAGE_DIR_OFF(addr)); /* PCI Posting. */
}
---- head-2010-04-29.orig/drivers/char/agp/amd64-agp.c 2010-04-29 09:29:49.000000000 +0200
-+++ head-2010-04-29/drivers/char/agp/amd64-agp.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/drivers/char/agp/amd64-agp.c 2010-05-12 08:55:23.000000000 +0200
++++ head-2010-05-12/drivers/char/agp/amd64-agp.c 2010-03-24 15:32:27.000000000 +0100
@@ -178,7 +178,7 @@ static const struct aper_size_info_32 am
static int amd_8151_configure(void)
@@ -5648,8 +5648,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
amd64_aperture_sizes[bridge->aperture_size_idx].size);
agp_remove_bridge(bridge);
agp_put_bridge(bridge);
---- head-2010-04-29.orig/drivers/char/agp/ati-agp.c 2010-04-29 09:29:49.000000000 +0200
-+++ head-2010-04-29/drivers/char/agp/ati-agp.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/drivers/char/agp/ati-agp.c 2010-05-12 08:55:23.000000000 +0200
++++ head-2010-05-12/drivers/char/agp/ati-agp.c 2010-03-24 15:32:27.000000000 +0100
@@ -360,7 +360,7 @@ static int ati_create_gatt_table(struct
agp_bridge->gatt_table_real = (u32 *)page_dir.real;
@@ -5668,8 +5668,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
page_dir.remapped+GET_PAGE_DIR_OFF(addr));
readl(page_dir.remapped+GET_PAGE_DIR_OFF(addr)); /* PCI Posting. */
}
---- head-2010-04-29.orig/drivers/char/agp/efficeon-agp.c 2010-04-29 09:29:49.000000000 +0200
-+++ head-2010-04-29/drivers/char/agp/efficeon-agp.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/drivers/char/agp/efficeon-agp.c 2010-05-12 08:55:23.000000000 +0200
++++ head-2010-05-12/drivers/char/agp/efficeon-agp.c 2010-03-24 15:32:27.000000000 +0100
@@ -226,7 +226,7 @@ static int efficeon_create_gatt_table(st
efficeon_private.l1_table[index] = page;
@@ -5679,8 +5679,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
pci_write_config_dword(agp_bridge->dev,
EFFICEON_ATTPAGE, value);
---- head-2010-04-29.orig/drivers/char/agp/generic.c 2010-04-29 09:29:49.000000000 +0200
-+++ head-2010-04-29/drivers/char/agp/generic.c 2010-04-15 10:11:24.000000000 +0200
+--- head-2010-05-12.orig/drivers/char/agp/generic.c 2010-05-12 08:55:23.000000000 +0200
++++ head-2010-05-12/drivers/char/agp/generic.c 2010-04-15 10:11:24.000000000 +0200
@@ -989,7 +989,7 @@ int agp_generic_create_gatt_table(struct
set_memory_uc((unsigned long)table, 1 << page_order);
bridge->gatt_table = (void *)table;
@@ -5699,8 +5699,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
/* AK: bogus, should encode addresses > 4GB */
for (i = 0; i < num_entries; i++) {
---- head-2010-04-29.orig/drivers/char/agp/sworks-agp.c 2010-04-29 09:29:49.000000000 +0200
-+++ head-2010-04-29/drivers/char/agp/sworks-agp.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/drivers/char/agp/sworks-agp.c 2010-05-12 08:55:23.000000000 +0200
++++ head-2010-05-12/drivers/char/agp/sworks-agp.c 2010-03-24 15:32:27.000000000 +0100
@@ -155,7 +155,7 @@ static int serverworks_create_gatt_table
/* Create a fake scratch directory */
for (i = 0; i < 1024; i++) {
@@ -5728,8 +5728,29 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
return 0;
}
---- head-2010-04-29.orig/drivers/net/Kconfig 2010-04-15 09:54:18.000000000 +0200
-+++ head-2010-04-29/drivers/net/Kconfig 2010-04-15 10:11:31.000000000 +0200
+--- head-2010-05-12.orig/drivers/gpu/drm/radeon/radeon_device.c 2010-04-29 09:18:06.000000000 +0200
++++ head-2010-05-12/drivers/gpu/drm/radeon/radeon_device.c 2010-05-07 11:25:36.000000000 +0200
+@@ -345,6 +345,18 @@ int radeon_dummy_page_init(struct radeon
+ rdev->dummy_page.page = alloc_page(GFP_DMA32 | GFP_KERNEL | __GFP_ZERO);
+ if (rdev->dummy_page.page == NULL)
+ return -ENOMEM;
++#ifdef CONFIG_XEN
++ {
++ int ret = xen_limit_pages_to_max_mfn(rdev->dummy_page.page,
++ 0, 32);
++
++ if (!ret)
++ clear_page(page_address(rdev->dummy_page.page));
++ else
++ dev_warn(rdev->dev,
++ "Error restricting dummy page: %d\n", ret);
++ }
++#endif
+ rdev->dummy_page.addr = pci_map_page(rdev->pdev, rdev->dummy_page.page,
+ 0, PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
+ if (!rdev->dummy_page.addr) {
+--- head-2010-05-12.orig/drivers/net/Kconfig 2010-04-15 09:54:18.000000000 +0200
++++ head-2010-05-12/drivers/net/Kconfig 2010-04-15 10:11:31.000000000 +0200
@@ -3313,7 +3313,7 @@ config VIRTIO_NET
config VMXNET3
@@ -5739,8 +5760,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
help
This driver supports VMware's vmxnet3 virtual ethernet NIC.
To compile this driver as a module, choose M here: the
---- head-2010-04-29.orig/drivers/pci/msi-xen.c 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/drivers/pci/msi-xen.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/drivers/pci/msi-xen.c 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/drivers/pci/msi-xen.c 2010-03-24 15:32:27.000000000 +0100
@@ -16,12 +16,11 @@
#include <linux/proc_fs.h>
#include <linux/msi.h>
@@ -5839,8 +5860,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
msi_dev_entry = get_msi_dev_pirq_list(dev);
---- head-2010-04-29.orig/drivers/pci/probe.c 2010-04-29 09:52:00.000000000 +0200
-+++ head-2010-04-29/drivers/pci/probe.c 2010-04-29 09:53:13.000000000 +0200
+--- head-2010-05-12.orig/drivers/pci/probe.c 2010-04-29 09:52:00.000000000 +0200
++++ head-2010-05-12/drivers/pci/probe.c 2010-04-29 09:53:13.000000000 +0200
@@ -1338,13 +1338,20 @@ int pci_scan_slot(struct pci_bus *bus, i
return 0; /* Already scanned the entire slot */
@@ -5864,8 +5885,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
else if (dev->multifunction)
next_fn = next_trad_fn;
---- head-2010-04-29.orig/drivers/sfi/sfi_core.c 2010-04-29 09:29:49.000000000 +0200
-+++ head-2010-04-29/drivers/sfi/sfi_core.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/drivers/sfi/sfi_core.c 2010-05-12 08:55:23.000000000 +0200
++++ head-2010-05-12/drivers/sfi/sfi_core.c 2010-03-24 15:32:27.000000000 +0100
@@ -387,6 +387,11 @@ void __init sfi_init(void)
if (!acpi_disabled)
disable_sfi();
@@ -5878,8 +5899,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
if (sfi_disabled)
return;
---- head-2010-04-29.orig/drivers/staging/hv/Kconfig 2010-04-29 09:29:49.000000000 +0200
-+++ head-2010-04-29/drivers/staging/hv/Kconfig 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/drivers/staging/hv/Kconfig 2010-05-12 08:55:23.000000000 +0200
++++ head-2010-05-12/drivers/staging/hv/Kconfig 2010-03-24 15:32:27.000000000 +0100
@@ -1,6 +1,6 @@
config HYPERV
tristate "Microsoft Hyper-V client drivers"
@@ -5888,8 +5909,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
default n
help
Select this option to run Linux as a Hyper-V client operating
---- head-2010-04-29.orig/drivers/xen/Kconfig 2010-03-31 13:35:09.000000000 +0200
-+++ head-2010-04-29/drivers/xen/Kconfig 2010-03-31 14:01:28.000000000 +0200
+--- head-2010-05-12.orig/drivers/xen/Kconfig 2010-03-31 13:35:09.000000000 +0200
++++ head-2010-05-12/drivers/xen/Kconfig 2010-03-31 14:01:28.000000000 +0200
@@ -22,6 +22,7 @@ config XEN_UNPRIVILEGED_GUEST
select PM
select PM_SLEEP
@@ -5898,8 +5919,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
select SUSPEND
config XEN_PRIVCMD
---- head-2010-04-29.orig/drivers/xen/Makefile 2010-04-19 14:53:25.000000000 +0200
-+++ head-2010-04-29/drivers/xen/Makefile 2010-04-19 14:53:46.000000000 +0200
+--- head-2010-05-12.orig/drivers/xen/Makefile 2010-04-19 14:53:25.000000000 +0200
++++ head-2010-05-12/drivers/xen/Makefile 2010-04-19 14:53:46.000000000 +0200
@@ -8,6 +8,11 @@ obj-$(CONFIG_XEN) += console/
obj-y += xenbus/
obj-$(CONFIG_XEN) += char/
@@ -5912,8 +5933,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
obj-$(CONFIG_XEN) += features.o util.o
obj-$(CONFIG_HOTPLUG_CPU) += $(xen-hotplug-y)
obj-$(CONFIG_XEN_XENCOMM) += xencomm.o
---- head-2010-04-29.orig/drivers/xen/balloon/balloon.c 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/drivers/xen/balloon/balloon.c 2010-04-15 10:11:45.000000000 +0200
+--- head-2010-05-12.orig/drivers/xen/balloon/balloon.c 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/drivers/xen/balloon/balloon.c 2010-04-15 10:11:45.000000000 +0200
@@ -77,6 +77,11 @@ static DEFINE_MUTEX(balloon_mutex);
*/
DEFINE_SPINLOCK(balloon_lock);
@@ -5984,8 +6005,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
goto err;
}
---- head-2010-04-29.orig/drivers/xen/blkfront/vbd.c 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/drivers/xen/blkfront/vbd.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/blkfront/vbd.c 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/drivers/xen/blkfront/vbd.c 2010-03-24 15:32:27.000000000 +0100
@@ -105,7 +105,7 @@ static struct xlbd_major_info *major_inf
#define XLBD_MAJOR_VBD_ALT(idx) ((idx) ^ XLBD_MAJOR_VBD_START ^ (XLBD_MAJOR_VBD_START + 1))
@@ -5995,8 +6016,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
{
.owner = THIS_MODULE,
.open = blkif_open,
---- head-2010-04-29.orig/drivers/xen/blktap2/device.c 2010-04-19 14:53:31.000000000 +0200
-+++ head-2010-04-29/drivers/xen/blktap2/device.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/blktap2/device.c 2010-04-19 14:53:31.000000000 +0200
++++ head-2010-05-12/drivers/xen/blktap2/device.c 2010-03-24 15:32:27.000000000 +0100
@@ -141,7 +141,7 @@ blktap_device_ioctl(struct block_device
return 0;
}
@@ -6006,8 +6027,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
.owner = THIS_MODULE,
.open = blktap_device_open,
.release = blktap_device_release,
---- head-2010-04-29.orig/drivers/xen/core/evtchn.c 2010-04-23 15:19:43.000000000 +0200
-+++ head-2010-04-29/drivers/xen/core/evtchn.c 2010-03-31 14:37:57.000000000 +0200
+--- head-2010-05-12.orig/drivers/xen/core/evtchn.c 2010-04-23 15:19:43.000000000 +0200
++++ head-2010-05-12/drivers/xen/core/evtchn.c 2010-03-31 14:37:57.000000000 +0200
@@ -144,13 +144,13 @@ unsigned int irq_from_evtchn(unsigned in
EXPORT_SYMBOL_GPL(irq_from_evtchn);
@@ -6024,8 +6045,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
#ifdef CONFIG_SMP
---- head-2010-04-29.orig/drivers/xen/core/reboot.c 2010-03-24 15:12:46.000000000 +0100
-+++ head-2010-04-29/drivers/xen/core/reboot.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/core/reboot.c 2010-03-24 15:12:46.000000000 +0100
++++ head-2010-05-12/drivers/xen/core/reboot.c 2010-03-24 15:32:27.000000000 +0100
@@ -83,7 +83,7 @@ static int xen_suspend(void *__unused)
int err, old_state;
@@ -6035,8 +6056,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
if (err) {
printk(KERN_ERR "Xen suspend can't run on CPU0 (%d)\n", err);
goto fail;
---- head-2010-04-29.orig/drivers/xen/netback/interface.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/drivers/xen/netback/interface.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/netback/interface.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/drivers/xen/netback/interface.c 2010-03-24 15:32:27.000000000 +0100
@@ -159,7 +159,7 @@ static void netbk_get_strings(struct net
}
}
@@ -6046,8 +6067,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
{
.get_drvinfo = netbk_get_drvinfo,
---- head-2010-04-29.orig/drivers/xen/netback/loopback.c 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/drivers/xen/netback/loopback.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/netback/loopback.c 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/drivers/xen/netback/loopback.c 2010-03-24 15:32:27.000000000 +0100
@@ -134,7 +134,7 @@ static int loopback_start_xmit(struct sk
if (!skb_remove_foreign_references(skb)) {
np->stats.tx_dropped++;
@@ -6075,8 +6096,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
{
.get_tx_csum = ethtool_op_get_tx_csum,
.set_tx_csum = ethtool_op_set_tx_csum,
---- head-2010-04-29.orig/drivers/xen/netback/netback.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/drivers/xen/netback/netback.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/netback/netback.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/drivers/xen/netback/netback.c 2010-03-24 15:32:27.000000000 +0100
@@ -340,12 +340,12 @@ int netif_be_start_xmit(struct sk_buff *
skb_queue_tail(&rx_queue, skb);
tasklet_schedule(&net_rx_tasklet);
@@ -6092,8 +6113,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
}
#if 0
---- head-2010-04-29.orig/drivers/xen/netfront/netfront.c 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/drivers/xen/netfront/netfront.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/netfront/netfront.c 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/drivers/xen/netfront/netfront.c 2010-03-24 15:32:27.000000000 +0100
@@ -953,7 +953,7 @@ static int network_start_xmit(struct sk_
if (np->accel_vif_state.hooks &&
np->accel_vif_state.hooks->start_xmit(skb, dev)) {
@@ -6127,8 +6148,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
{
.get_tx_csum = ethtool_op_get_tx_csum,
.set_tx_csum = ethtool_op_set_tx_csum,
---- head-2010-04-29.orig/drivers/xen/sfc_netback/accel_fwd.c 2010-03-24 15:10:29.000000000 +0100
-+++ head-2010-04-29/drivers/xen/sfc_netback/accel_fwd.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/sfc_netback/accel_fwd.c 2010-03-24 15:10:29.000000000 +0100
++++ head-2010-05-12/drivers/xen/sfc_netback/accel_fwd.c 2010-03-24 15:32:27.000000000 +0100
@@ -181,11 +181,10 @@ int netback_accel_fwd_add(const __u8 *ma
unsigned long flags;
cuckoo_hash_mac_key key = cuckoo_mac_to_key(mac);
@@ -6182,8 +6203,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
spin_lock_irqsave(&fwd_set->fwd_lock, flags);
/*
---- head-2010-04-29.orig/drivers/xen/sfc_netback/accel_msg.c 2010-03-24 15:10:29.000000000 +0100
-+++ head-2010-04-29/drivers/xen/sfc_netback/accel_msg.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/sfc_netback/accel_msg.c 2010-03-24 15:10:29.000000000 +0100
++++ head-2010-05-12/drivers/xen/sfc_netback/accel_msg.c 2010-03-24 15:32:27.000000000 +0100
@@ -57,11 +57,10 @@ static void netback_accel_msg_tx_localma
{
unsigned long lock_state;
@@ -6197,8 +6218,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
msg = net_accel_msg_start_send(bend->shared_page, &bend->to_domU,
&lock_state);
---- head-2010-04-29.orig/drivers/xen/sfc_netfront/accel_msg.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/drivers/xen/sfc_netfront/accel_msg.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/sfc_netfront/accel_msg.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/drivers/xen/sfc_netfront/accel_msg.c 2010-03-24 15:32:27.000000000 +0100
@@ -327,10 +327,8 @@ static int vnic_process_localmac_msg(net
cuckoo_hash_mac_key key;
@@ -6212,8 +6233,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
key = cuckoo_mac_to_key(msg->u.localmac.mac);
spin_lock_irqsave(&vnic->table_lock, flags);
/* Try to remove it, not a big deal if not there */
---- head-2010-04-29.orig/drivers/xen/sfc_netfront/accel_vi.c 2010-03-24 15:10:29.000000000 +0100
-+++ head-2010-04-29/drivers/xen/sfc_netfront/accel_vi.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/sfc_netfront/accel_vi.c 2010-03-24 15:10:29.000000000 +0100
++++ head-2010-05-12/drivers/xen/sfc_netfront/accel_vi.c 2010-03-24 15:32:27.000000000 +0100
@@ -643,10 +643,7 @@ netfront_accel_vi_tx_post(netfront_accel
(cuckoo_hash_key *)(&key), &value);
@@ -6239,8 +6260,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
if (ip->protocol == IPPROTO_TCP) {
struct tcphdr *tcp = (struct tcphdr *)
---- head-2010-04-29.orig/drivers/xen/xenbus/xenbus_dev.c 2009-05-29 10:25:53.000000000 +0200
-+++ head-2010-04-29/drivers/xen/xenbus/xenbus_dev.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/xenbus/xenbus_dev.c 2009-05-29 10:25:53.000000000 +0200
++++ head-2010-05-12/drivers/xen/xenbus/xenbus_dev.c 2010-03-24 15:32:27.000000000 +0100
@@ -36,6 +36,7 @@
#include <linux/errno.h>
#include <linux/uio.h>
@@ -6249,8 +6270,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
#include <linux/wait.h>
#include <linux/fs.h>
#include <linux/poll.h>
---- head-2010-04-29.orig/drivers/xen/xenbus/xenbus_probe.c 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/drivers/xen/xenbus/xenbus_probe.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/xenbus/xenbus_probe.c 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/drivers/xen/xenbus/xenbus_probe.c 2010-03-24 15:32:27.000000000 +0100
@@ -42,6 +42,7 @@
#include <linux/ctype.h>
#include <linux/fcntl.h>
@@ -6259,8 +6280,8 @@ Automatically created from "patches.kernel.org/patch-2.6.32" by xen-port-patches
#include <linux/proc_fs.h>
#include <linux/notifier.h>
#include <linux/mutex.h>
---- head-2010-04-29.orig/lib/swiotlb-xen.c 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/lib/swiotlb-xen.c 2010-03-24 15:32:27.000000000 +0100
+--- head-2010-05-12.orig/lib/swiotlb-xen.c 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/lib/swiotlb-xen.c 2010-03-24 15:32:27.000000000 +0100
@@ -111,79 +111,11 @@ setup_io_tlb_npages(char *str)
__setup("swiotlb=", setup_io_tlb_npages);
/* make io_tlb_overflow tunable too? */
diff --git a/patches.xen/xen3-patch-2.6.33 b/patches.xen/xen3-patch-2.6.33
index bdbb55364c..bfc8b63c30 100644
--- a/patches.xen/xen3-patch-2.6.33
+++ b/patches.xen/xen3-patch-2.6.33
@@ -7,8 +7,8 @@ Patch-mainline: 2.6.33
Acked-by: Jeff Mahoney <jeffm@suse.com>
Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches.py
---- head-2010-04-15.orig/arch/ia64/include/asm/xen/hypervisor.h 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-15/arch/ia64/include/asm/xen/hypervisor.h 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/ia64/include/asm/xen/hypervisor.h 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/ia64/include/asm/xen/hypervisor.h 2010-03-24 16:00:05.000000000 +0100
@@ -34,11 +34,11 @@
#define _ASM_IA64_XEN_HYPERVISOR_H
@@ -22,8 +22,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
#include <asm/xen/hypercall.h>
extern struct shared_info *HYPERVISOR_shared_info;
---- head-2010-04-15.orig/arch/x86/Kconfig 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-15/arch/x86/Kconfig 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/Kconfig 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/Kconfig 2010-03-24 16:00:05.000000000 +0100
@@ -51,7 +51,7 @@ config X86
select HAVE_KERNEL_GZIP
select HAVE_KERNEL_BZIP2 if !XEN
@@ -33,8 +33,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
select HAVE_HW_BREAKPOINT
select PERF_EVENTS
select ANON_INODES
---- head-2010-04-15.orig/arch/x86/ia32/ia32entry-xen.S 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-15/arch/x86/ia32/ia32entry-xen.S 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/ia32/ia32entry-xen.S 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/ia32/ia32entry-xen.S 2010-03-24 16:00:05.000000000 +0100
@@ -546,7 +546,7 @@ ia32_sys_call_table:
.quad compat_sys_writev
.quad sys_getsid
@@ -59,8 +59,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
.quad sys_perf_event_open
+ .quad compat_sys_recvmmsg
ia32_syscall_end:
---- head-2010-04-15.orig/arch/x86/include/asm/hw_irq.h 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-15/arch/x86/include/asm/hw_irq.h 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/asm/hw_irq.h 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/include/asm/hw_irq.h 2010-03-24 16:00:05.000000000 +0100
@@ -78,6 +78,7 @@ static inline void set_io_apic_irq_attr(
irq_attr->polarity = polarity;
}
@@ -79,8 +79,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
extern int assign_irq_vector(int, struct irq_cfg *, const struct cpumask *);
extern void send_cleanup_vector(struct irq_cfg *);
---- head-2010-04-15.orig/arch/x86/include/mach-xen/asm/pgtable.h 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-15/arch/x86/include/mach-xen/asm/pgtable.h 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/pgtable.h 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/pgtable.h 2010-03-24 16:00:05.000000000 +0100
@@ -16,6 +16,8 @@
#ifndef __ASSEMBLY__
@@ -102,8 +102,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
return 1;
/*
---- head-2010-04-15.orig/arch/x86/include/mach-xen/asm/processor.h 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-15/arch/x86/include/mach-xen/asm/processor.h 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/processor.h 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/processor.h 2010-03-24 16:00:05.000000000 +0100
@@ -31,6 +31,7 @@ struct mm_struct;
#include <linux/init.h>
#include <xen/interface/physdev.h>
@@ -150,8 +150,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
/* Fault info: */
unsigned long cr2;
unsigned long trap_no;
---- head-2010-04-15.orig/arch/x86/include/mach-xen/asm/spinlock.h 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-15/arch/x86/include/mach-xen/asm/spinlock.h 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/spinlock.h 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/spinlock.h 2010-03-24 16:00:05.000000000 +0100
@@ -44,10 +44,10 @@
int xen_spinlock_init(unsigned int cpu);
@@ -419,8 +419,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
/* The {read|write|spin}_lock() on x86 are full memory barriers. */
static inline void smp_mb__after_lock(void) { }
---- head-2010-04-15.orig/arch/x86/include/mach-xen/asm/spinlock_types.h 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-15/arch/x86/include/mach-xen/asm/spinlock_types.h 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/spinlock_types.h 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/spinlock_types.h 2010-03-24 16:00:05.000000000 +0100
@@ -42,14 +42,14 @@ typedef union {
#endif
#endif
@@ -440,8 +440,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
+#define __ARCH_RW_LOCK_UNLOCKED { RW_LOCK_BIAS }
#endif /* _ASM_X86_SPINLOCK_TYPES_H */
---- head-2010-04-15.orig/arch/x86/include/mach-xen/asm/swiotlb.h 2010-03-24 15:12:36.000000000 +0100
-+++ head-2010-04-15/arch/x86/include/mach-xen/asm/swiotlb.h 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/swiotlb.h 2010-03-24 15:12:36.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/swiotlb.h 2010-03-24 16:00:05.000000000 +0100
@@ -1,4 +1,6 @@
#include_next <asm/swiotlb.h>
@@ -449,8 +449,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
+
dma_addr_t swiotlb_map_single_phys(struct device *, phys_addr_t, size_t size,
int dir);
---- head-2010-04-15.orig/arch/x86/include/mach-xen/asm/system.h 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-15/arch/x86/include/mach-xen/asm/system.h 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/system.h 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/system.h 2010-03-24 16:00:05.000000000 +0100
@@ -12,9 +12,9 @@
#include <linux/irqflags.h>
@@ -516,8 +516,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
/*
* Save a segment register away
---- head-2010-04-15.orig/arch/x86/kernel/acpi/sleep-xen.c 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/acpi/sleep-xen.c 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/acpi/sleep-xen.c 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/acpi/sleep-xen.c 2010-03-24 16:00:05.000000000 +0100
@@ -81,12 +81,9 @@ int acpi_save_state_mem(void)
#ifndef CONFIG_64BIT
store_gdt((struct desc_ptr *)&header->pmode_gdt);
@@ -583,8 +583,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
str = strchr(str, ',');
if (str != NULL)
str += strspn(str, ", \t");
---- head-2010-04-15.orig/arch/x86/kernel/apic/Makefile 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/apic/Makefile 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/apic/Makefile 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/apic/Makefile 2010-03-24 16:00:05.000000000 +0100
@@ -22,5 +22,5 @@ obj-$(CONFIG_XEN) += nmi.o
probe_64-$(CONFIG_XEN) := probe_32.o
@@ -592,8 +592,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
-disabled-obj-$(CONFIG_XEN) := apic_flat_$(BITS).o
+disabled-obj-$(CONFIG_XEN) := apic_flat_$(BITS).o apic_noop.o
disabled-obj-$(filter-out $(CONFIG_SMP),$(CONFIG_XEN)) += ipi.o
---- head-2010-04-15.orig/arch/x86/kernel/apic/io_apic-xen.c 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/apic/io_apic-xen.c 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/apic/io_apic-xen.c 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/apic/io_apic-xen.c 2010-03-24 16:00:05.000000000 +0100
@@ -60,8 +60,6 @@
#include <asm/irq_remapping.h>
#include <asm/hpet.h>
@@ -1446,8 +1446,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
ioapic_res++;
}
}
---- head-2010-04-15.orig/arch/x86/kernel/cpu/Makefile 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/cpu/Makefile 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/cpu/Makefile 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/cpu/Makefile 2010-03-24 16:00:05.000000000 +0100
@@ -34,7 +34,7 @@ obj-$(CONFIG_CPU_FREQ) += cpufreq/
obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o
@@ -1457,8 +1457,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
quiet_cmd_mkcapflags = MKCAP $@
cmd_mkcapflags = $(PERL) $(srctree)/$(src)/mkcapflags.pl $< $@
---- head-2010-04-15.orig/arch/x86/kernel/cpu/common-xen.c 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/cpu/common-xen.c 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/cpu/common-xen.c 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/cpu/common-xen.c 2010-03-24 16:00:05.000000000 +0100
@@ -69,7 +69,7 @@ void __init setup_cpu_local_masks(void)
static void __cpuinit default_init(struct cpuinfo_x86 *c)
{
@@ -1645,8 +1645,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
(unsigned long)estacks;
}
}
---- head-2010-04-15.orig/arch/x86/kernel/e820-xen.c 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/e820-xen.c 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/e820-xen.c 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/e820-xen.c 2010-03-24 16:00:05.000000000 +0100
@@ -771,7 +771,7 @@ core_initcall(e820_mark_nvs_memory);
/*
* Early reserved memory areas.
@@ -1673,8 +1673,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
#endif
{}
};
---- head-2010-04-15.orig/arch/x86/kernel/entry_32-xen.S 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/entry_32-xen.S 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/entry_32-xen.S 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/entry_32-xen.S 2010-03-24 16:00:05.000000000 +0100
@@ -338,6 +338,10 @@ ENTRY(ret_from_fork)
END(ret_from_fork)
@@ -1857,8 +1857,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
#endif
#include <asm/alternative-asm.h>
---- head-2010-04-15.orig/arch/x86/kernel/entry_64-xen.S 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/entry_64-xen.S 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/entry_64-xen.S 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/entry_64-xen.S 2010-03-24 16:00:05.000000000 +0100
@@ -160,11 +160,11 @@ GLOBAL(return_to_handler)
call ftrace_return_to_handler
@@ -1973,8 +1973,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
#endif
END(error_entry)
---- head-2010-04-15.orig/arch/x86/kernel/head-xen.c 2010-04-15 10:10:51.000000000 +0200
-+++ head-2010-04-15/arch/x86/kernel/head-xen.c 2010-04-15 10:13:18.000000000 +0200
+--- head-2010-05-12.orig/arch/x86/kernel/head-xen.c 2010-04-15 10:10:51.000000000 +0200
++++ head-2010-05-12/arch/x86/kernel/head-xen.c 2010-04-15 10:13:18.000000000 +0200
@@ -1,5 +1,6 @@
#include <linux/kernel.h>
#include <linux/init.h>
@@ -2000,8 +2000,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
}
void __init xen_arch_setup(void)
---- head-2010-04-15.orig/arch/x86/kernel/head32-xen.c 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/head32-xen.c 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/head32-xen.c 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/head32-xen.c 2010-03-24 16:00:05.000000000 +0100
@@ -32,8 +32,6 @@ static void __init i386_default_early_se
void __init i386_start_kernel(void)
@@ -2011,8 +2011,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
reserve_early(__pa_symbol(&_text), __pa_symbol(&__bss_stop), "TEXT DATA BSS");
#ifndef CONFIG_XEN
---- head-2010-04-15.orig/arch/x86/kernel/head64-xen.c 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/head64-xen.c 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/head64-xen.c 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/head64-xen.c 2010-03-24 16:00:05.000000000 +0100
@@ -119,8 +119,6 @@ void __init x86_64_start_reservations(ch
{
copy_bootdata(__va(real_mode_data));
@@ -2022,8 +2022,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
reserve_early(__pa_symbol(&_text), __pa_symbol(&__bss_stop), "TEXT DATA BSS");
/*
---- head-2010-04-15.orig/arch/x86/kernel/head_64-xen.S 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/head_64-xen.S 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/head_64-xen.S 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/head_64-xen.S 2010-03-24 16:00:05.000000000 +0100
@@ -51,9 +51,9 @@ startup_64:
#define NEXT_PAGE(name) \
@@ -2045,8 +2045,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
CFI_STARTPROC
.rept 0x1000 / 0x20
.skip 1 /* push %rcx */
---- head-2010-04-15.orig/arch/x86/kernel/ioport-xen.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/ioport-xen.c 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/ioport-xen.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/ioport-xen.c 2010-03-24 16:00:05.000000000 +0100
@@ -75,8 +75,9 @@ asmlinkage long sys_ioperm(unsigned long
* beyond the 0x3ff range: to get the full 65536 ports bitmapped
* you'd need 8kB of bitmaps/process, which is a bit excessive.
@@ -2088,8 +2088,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
+
+ return 0;
}
---- head-2010-04-15.orig/arch/x86/kernel/irq-xen.c 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/irq-xen.c 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/irq-xen.c 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/irq-xen.c 2010-03-24 16:00:05.000000000 +0100
@@ -19,7 +19,7 @@ atomic_t irq_err_count;
#ifndef CONFIG_XEN
@@ -2252,8 +2252,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
+ }
+}
+#endif
---- head-2010-04-15.orig/arch/x86/kernel/microcode_core-xen.c 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/microcode_core-xen.c 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/microcode_core-xen.c 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/microcode_core-xen.c 2010-03-24 16:00:05.000000000 +0100
@@ -21,10 +21,12 @@
* as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version.
@@ -2313,8 +2313,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
return 0;
}
---- head-2010-04-15.orig/arch/x86/kernel/mpparse-xen.c 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/mpparse-xen.c 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/mpparse-xen.c 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/mpparse-xen.c 2010-03-24 16:00:05.000000000 +0100
@@ -371,13 +371,6 @@ static int __init smp_read_mpc(struct mp
x86_init.mpparse.mpc_record(1);
}
@@ -2431,8 +2431,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
mpc_new_phys = early_reserve_e820(startt, mpc_new_length, 4);
}
}
---- head-2010-04-15.orig/arch/x86/kernel/pci-dma-xen.c 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/pci-dma-xen.c 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/pci-dma-xen.c 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/pci-dma-xen.c 2010-03-24 16:00:05.000000000 +0100
@@ -11,10 +11,11 @@
#include <asm/gart.h>
#include <asm/calgary.h>
@@ -2526,8 +2526,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
/* Must execute after PCI subsystem */
rootfs_initcall(pci_iommu_init);
---- head-2010-04-15.orig/arch/x86/kernel/pci-nommu-xen.c 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/pci-nommu-xen.c 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/pci-nommu-xen.c 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/pci-nommu-xen.c 2010-03-24 16:00:05.000000000 +0100
@@ -112,12 +112,3 @@ struct dma_map_ops nommu_dma_ops = {
.sync_sg_for_device = nommu_sync_sg_for_device,
.dma_supported = nommu_dma_supported,
@@ -2541,8 +2541,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
- force_iommu = 0; /* no HW IOMMU */
- dma_ops = &nommu_dma_ops;
-}
---- head-2010-04-15.orig/arch/x86/kernel/process-xen.c 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/process-xen.c 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/process-xen.c 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/process-xen.c 2010-03-24 16:00:05.000000000 +0100
@@ -9,7 +9,11 @@
#include <linux/pm.h>
#include <linux/clockchips.h>
@@ -2718,8 +2718,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
/*
* Idle related variables and functions
---- head-2010-04-15.orig/arch/x86/kernel/process_32-xen.c 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/process_32-xen.c 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/process_32-xen.c 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/process_32-xen.c 2010-03-24 16:00:05.000000000 +0100
@@ -23,7 +23,6 @@
#include <linux/vmalloc.h>
#include <linux/user.h>
@@ -2916,8 +2916,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
#define top_esp (THREAD_SIZE - sizeof(unsigned long))
#define top_ebp (THREAD_SIZE - 2*sizeof(unsigned long))
---- head-2010-04-15.orig/arch/x86/kernel/process_64-xen.c 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/process_64-xen.c 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/process_64-xen.c 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/process_64-xen.c 2010-03-24 16:00:05.000000000 +0100
@@ -29,7 +29,6 @@
#include <linux/slab.h>
#include <linux/user.h>
@@ -3168,8 +3168,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
}
unsigned long get_wchan(struct task_struct *p)
---- head-2010-04-15.orig/arch/x86/kernel/quirks-xen.c 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/quirks-xen.c 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/quirks-xen.c 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/quirks-xen.c 2010-03-24 16:00:05.000000000 +0100
@@ -492,6 +492,19 @@ void force_hpet_resume(void)
break;
}
@@ -3213,8 +3213,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
pci_dev_put(nb_ht);
}
---- head-2010-04-15.orig/arch/x86/kernel/setup-xen.c 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/setup-xen.c 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/setup-xen.c 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/setup-xen.c 2010-03-24 16:00:05.000000000 +0100
@@ -73,6 +73,7 @@
#include <asm/mtrr.h>
@@ -3501,9 +3501,9 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
}
#ifdef CONFIG_X86_32
---- head-2010-04-15.orig/arch/x86/kernel/time-xen.c 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/time-xen.c 2010-03-24 16:00:05.000000000 +0100
-@@ -951,28 +951,23 @@ core_initcall(cpufreq_time_setup);
+--- head-2010-05-12.orig/arch/x86/kernel/time-xen.c 2010-05-12 09:02:39.000000000 +0200
++++ head-2010-05-12/arch/x86/kernel/time-xen.c 2010-05-12 09:02:50.000000000 +0200
+@@ -953,28 +953,23 @@ core_initcall(cpufreq_time_setup);
*/
static ctl_table xen_subtable[] = {
{
@@ -3532,8 +3532,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
.procname = "xen",
.mode = 0555,
.child = xen_subtable
---- head-2010-04-15.orig/arch/x86/kernel/traps-xen.c 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/traps-xen.c 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/traps-xen.c 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/traps-xen.c 2010-03-24 16:00:05.000000000 +0100
@@ -522,77 +522,56 @@ asmlinkage __kprobes struct pt_regs *syn
dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
{
@@ -3639,8 +3639,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
return;
}
---- head-2010-04-15.orig/arch/x86/kernel/vmlinux.lds.S 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/vmlinux.lds.S 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/vmlinux.lds.S 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/vmlinux.lds.S 2010-03-24 16:00:05.000000000 +0100
@@ -43,7 +43,7 @@ ENTRY(phys_startup_64)
jiffies_64 = jiffies;
#endif
@@ -3650,8 +3650,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
/*
* On 64-bit, align RODATA to 2MB so that even with CONFIG_DEBUG_RODATA
* we retain large page mappings for boundaries spanning kernel text, rodata
---- head-2010-04-15.orig/arch/x86/kernel/vsyscall_64-xen.c 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/vsyscall_64-xen.c 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/vsyscall_64-xen.c 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/vsyscall_64-xen.c 2010-03-24 16:00:05.000000000 +0100
@@ -73,7 +73,8 @@ void update_vsyscall_tz(void)
write_sequnlock_irqrestore(&vsyscall_gtod_data.lock, flags);
}
@@ -3680,8 +3680,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
.child = kernel_table2 },
{}
};
---- head-2010-04-15.orig/arch/x86/kernel/x8664_ksyms_64.c 2010-04-15 09:37:45.000000000 +0200
-+++ head-2010-04-15/arch/x86/kernel/x8664_ksyms_64.c 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/x8664_ksyms_64.c 2010-05-12 08:55:23.000000000 +0200
++++ head-2010-05-12/arch/x86/kernel/x8664_ksyms_64.c 2010-03-24 16:00:05.000000000 +0100
@@ -55,6 +55,6 @@ EXPORT_SYMBOL(__memcpy);
EXPORT_SYMBOL(empty_zero_page);
@@ -3690,8 +3690,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
+#if !defined(CONFIG_PARAVIRT_CPU) && !defined(CONFIG_XEN)
EXPORT_SYMBOL(native_load_gs_index);
#endif
---- head-2010-04-15.orig/arch/x86/kernel/x86_init-xen.c 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-15/arch/x86/kernel/x86_init-xen.c 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/x86_init-xen.c 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/x86_init-xen.c 2010-03-24 16:00:05.000000000 +0100
@@ -13,10 +13,13 @@
#include <asm/e820.h>
#include <asm/time.h>
@@ -3722,8 +3722,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
.set_wallclock = mach_set_rtc_mmss,
+ .is_untracked_pat_range = is_ISA_range,
};
---- head-2010-04-15.orig/arch/x86/mm/fault-xen.c 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-15/arch/x86/mm/fault-xen.c 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/fault-xen.c 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/fault-xen.c 2010-03-24 16:00:05.000000000 +0100
@@ -38,7 +38,8 @@ enum x86_pf_error_code {
* Returns 0 if mmiotrace is disabled, or if the fault is not
* handled by mmiotrace:
@@ -3779,8 +3779,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
spurious_fault(unsigned long error_code, unsigned long address)
{
pgd_t *pgd;
---- head-2010-04-15.orig/arch/x86/mm/init-xen.c 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-15/arch/x86/mm/init-xen.c 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/init-xen.c 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/init-xen.c 2010-03-24 16:00:05.000000000 +0100
@@ -163,10 +163,6 @@ unsigned long __init_refok init_memory_m
use_gbpages = direct_gbpages;
#endif
@@ -3792,8 +3792,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
/* Enable PSE if available */
if (cpu_has_pse)
set_in_cr4(X86_CR4_PSE);
---- head-2010-04-15.orig/arch/x86/mm/init_32-xen.c 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-15/arch/x86/mm/init_32-xen.c 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/init_32-xen.c 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/init_32-xen.c 2010-03-24 16:00:05.000000000 +0100
@@ -448,7 +448,7 @@ static void __init permanent_kmaps_init(
pkmap_page_table = pte;
}
@@ -3842,8 +3842,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
void set_kernel_text_rw(void)
{
---- head-2010-04-15.orig/arch/x86/mm/init_64-xen.c 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-15/arch/x86/mm/init_64-xen.c 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/init_64-xen.c 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/init_64-xen.c 2010-03-24 16:00:05.000000000 +0100
@@ -53,6 +53,7 @@
#include <asm/cacheflush.h>
#include <asm/init.h>
@@ -3969,8 +3969,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
}
#endif
---- head-2010-04-15.orig/arch/x86/mm/ioremap-xen.c 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-15/arch/x86/mm/ioremap-xen.c 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/ioremap-xen.c 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/ioremap-xen.c 2010-03-24 16:00:05.000000000 +0100
@@ -457,32 +457,6 @@ void __iomem *ioremap_cache(resource_siz
}
EXPORT_SYMBOL(ioremap_cache);
@@ -4013,8 +4013,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
if (addr)
addr = (void *)((unsigned long)addr | (phys & ~PAGE_MASK));
---- head-2010-04-15.orig/arch/x86/mm/pageattr-xen.c 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-15/arch/x86/mm/pageattr-xen.c 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/pageattr-xen.c 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/pageattr-xen.c 2010-03-24 16:00:05.000000000 +0100
@@ -281,6 +281,22 @@ static inline pgprot_t static_protection
__pa((unsigned long)__end_rodata) >> PAGE_SHIFT))
pgprot_val(forbidden) |= _PAGE_RW;
@@ -4057,8 +4057,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
return change_page_attr_set(&addr, numpages, __pgprot(_PAGE_NX), 0);
}
EXPORT_SYMBOL(set_memory_nx);
---- head-2010-04-15.orig/arch/x86/mm/pat-xen.c 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-15/arch/x86/mm/pat-xen.c 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/pat-xen.c 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/pat-xen.c 2010-03-24 16:00:05.000000000 +0100
@@ -20,6 +20,7 @@
#include <asm/cacheflush.h>
#include <asm/processor.h>
@@ -4139,8 +4139,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
return 0;
}
---- head-2010-04-15.orig/arch/x86/vdso/vdso32-setup-xen.c 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-15/arch/x86/vdso/vdso32-setup-xen.c 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/vdso/vdso32-setup-xen.c 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/vdso/vdso32-setup-xen.c 2010-03-24 16:00:05.000000000 +0100
@@ -436,7 +436,6 @@ static ctl_table abi_table2[] = {
static ctl_table abi_root_table2[] = {
@@ -4149,8 +4149,26 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
.procname = "abi",
.mode = 0555,
.child = abi_table2
---- head-2010-04-15.orig/drivers/gpu/drm/vmwgfx/Kconfig 2010-04-15 09:37:45.000000000 +0200
-+++ head-2010-04-15/drivers/gpu/drm/vmwgfx/Kconfig 2010-04-15 10:13:09.000000000 +0200
+--- head-2010-05-12.orig/drivers/gpu/drm/nouveau/nouveau_sgdma.c 2010-04-15 09:29:04.000000000 +0200
++++ head-2010-05-12/drivers/gpu/drm/nouveau/nouveau_sgdma.c 2010-05-05 15:19:54.000000000 +0200
+@@ -267,6 +267,15 @@ nouveau_sgdma_init(struct drm_device *de
+
+ dev_priv->gart_info.sg_dummy_page =
+ alloc_page(GFP_KERNEL|__GFP_DMA32);
++#ifdef CONFIG_XEN
++ if (!dev_priv->gart_info.sg_dummy_page)
++ ret = ENOMEM;
++ else
++ ret = xen_limit_pages_to_max_mfn(
++ dev_priv->gart_info.sg_dummy_page, 0, 32);
++ if (ret)
++ NV_WARN(dev, "Error restricting SG dummy page: %d\n", ret);
++#endif
+ set_bit(PG_locked, &dev_priv->gart_info.sg_dummy_page->flags);
+ dev_priv->gart_info.sg_dummy_bus =
+ pci_map_page(dev->pdev, dev_priv->gart_info.sg_dummy_page, 0,
+--- head-2010-05-12.orig/drivers/gpu/drm/vmwgfx/Kconfig 2010-05-12 08:55:23.000000000 +0200
++++ head-2010-05-12/drivers/gpu/drm/vmwgfx/Kconfig 2010-04-15 10:13:09.000000000 +0200
@@ -1,6 +1,6 @@
config DRM_VMWGFX
tristate "DRM driver for VMware Virtual GPU"
@@ -4159,8 +4177,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
select FB_DEFERRED_IO
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
---- head-2010-04-15.orig/drivers/oprofile/cpu_buffer.c 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/drivers/oprofile/cpu_buffer.c 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/drivers/oprofile/cpu_buffer.c 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/drivers/oprofile/cpu_buffer.c 2010-03-24 16:00:05.000000000 +0100
@@ -449,7 +449,7 @@ void oprofile_add_pc(unsigned long pc, i
*/
void oprofile_add_mode(int cpu_mode)
@@ -4170,8 +4188,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
if (op_add_code(cpu_buf, 1, cpu_mode, current))
cpu_buf->sample_lost_overflow++;
---- head-2010-04-15.orig/drivers/pci/Kconfig 2010-03-24 15:06:12.000000000 +0100
-+++ head-2010-04-15/drivers/pci/Kconfig 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/drivers/pci/Kconfig 2010-03-24 15:06:12.000000000 +0100
++++ head-2010-05-12/drivers/pci/Kconfig 2010-03-24 16:00:05.000000000 +0100
@@ -82,7 +82,7 @@ config PCI_IOV
config PCI_IOAPIC
@@ -4181,8 +4199,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
depends on ACPI
depends on HOTPLUG
default y
---- head-2010-04-15.orig/drivers/scsi/Kconfig 2010-04-15 09:37:45.000000000 +0200
-+++ head-2010-04-15/drivers/scsi/Kconfig 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/drivers/scsi/Kconfig 2010-05-12 08:55:23.000000000 +0200
++++ head-2010-05-12/drivers/scsi/Kconfig 2010-03-24 16:00:05.000000000 +0100
@@ -650,7 +650,7 @@ config SCSI_FLASHPOINT
config VMWARE_PVSCSI
@@ -4192,8 +4210,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
help
This driver supports VMware's para virtualized SCSI HBA.
To compile this driver as a module, choose M here: the
---- head-2010-04-15.orig/drivers/xen/blktap2/sysfs.c 2010-03-24 15:12:46.000000000 +0100
-+++ head-2010-04-15/drivers/xen/blktap2/sysfs.c 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/blktap2/sysfs.c 2010-03-24 15:12:46.000000000 +0100
++++ head-2010-05-12/drivers/xen/blktap2/sysfs.c 2010-03-24 16:00:05.000000000 +0100
@@ -39,11 +39,11 @@ blktap_sysfs_exit(struct blktap *tap)
static ssize_t blktap_sysfs_pause_device(struct device *,
struct device_attribute *,
@@ -4237,8 +4255,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
int
blktap_sysfs_create(struct blktap *tap)
---- head-2010-04-15.orig/drivers/xen/char/mem.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-15/drivers/xen/char/mem.c 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/char/mem.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/drivers/xen/char/mem.c 2010-03-24 16:00:05.000000000 +0100
@@ -5,7 +5,7 @@
*
* Added devfs support.
@@ -4324,8 +4342,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
if (!range_is_allowed(p >> PAGE_SHIFT, sz))
return -EPERM;
---- head-2010-04-15.orig/drivers/xen/core/spinlock.c 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-15/drivers/xen/core/spinlock.c 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/core/spinlock.c 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/drivers/xen/core/spinlock.c 2010-03-24 16:00:05.000000000 +0100
@@ -18,7 +18,7 @@ static DEFINE_PER_CPU(int, spinlock_irq)
static char spinlock_name[NR_CPUS][15];
@@ -4429,8 +4447,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
raw_local_irq_restore(flags);
if (unlikely(spinning)) {
---- head-2010-04-15.orig/drivers/xen/evtchn.c 2010-04-15 10:08:13.000000000 +0200
-+++ head-2010-04-15/drivers/xen/evtchn.c 2010-04-15 10:13:26.000000000 +0200
+--- head-2010-05-12.orig/drivers/xen/evtchn.c 2010-04-15 10:08:13.000000000 +0200
++++ head-2010-05-12/drivers/xen/evtchn.c 2010-04-15 10:13:26.000000000 +0200
@@ -48,15 +48,14 @@
#include <linux/mutex.h>
#include <linux/cpu.h>
@@ -4448,8 +4466,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
#define bind_evtchn_to_irqhandler bind_caller_port_to_irqhandler
#endif
---- head-2010-04-15.orig/drivers/xen/netback/interface.c 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-15/drivers/xen/netback/interface.c 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/netback/interface.c 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/drivers/xen/netback/interface.c 2010-03-24 16:00:05.000000000 +0100
@@ -131,9 +131,13 @@ static const struct netif_stat {
{ "copied_skbs", offsetof(netif_t, nr_copied_skbs) },
};
@@ -4475,8 +4493,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
.get_ethtool_stats = netbk_get_ethtool_stats,
.get_strings = netbk_get_strings,
};
---- head-2010-04-15.orig/drivers/xen/privcmd/compat_privcmd.c 2010-03-24 15:06:12.000000000 +0100
-+++ head-2010-04-15/drivers/xen/privcmd/compat_privcmd.c 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/privcmd/compat_privcmd.c 2010-03-24 15:06:12.000000000 +0100
++++ head-2010-05-12/drivers/xen/privcmd/compat_privcmd.c 2010-03-24 16:00:05.000000000 +0100
@@ -26,17 +26,16 @@
#include <xen/public/privcmd.h>
#include <xen/compat_ioctl.h>
@@ -4536,8 +4554,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
p = compat_alloc_user_space(sizeof(*p));
if (copy_from_user(&n32, p32, sizeof(n32)) ||
put_user(n32.num, &p->num) ||
---- head-2010-04-15.orig/drivers/xen/xenbus/xenbus_probe.c 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-15/drivers/xen/xenbus/xenbus_probe.c 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/xenbus/xenbus_probe.c 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/drivers/xen/xenbus/xenbus_probe.c 2010-03-24 16:00:05.000000000 +0100
@@ -62,6 +62,8 @@
#endif
#else
@@ -4556,9 +4574,9 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
int xenbus_probe_node(struct xen_bus_type *bus,
const char *type,
---- head-2010-04-15.orig/fs/compat_ioctl.c 2010-03-24 14:53:41.000000000 +0100
-+++ head-2010-04-15/fs/compat_ioctl.c 2010-03-24 16:00:05.000000000 +0100
-@@ -1530,9 +1530,6 @@ IGNORE_IOCTL(FBIOGCURSOR32)
+--- head-2010-05-12.orig/fs/compat_ioctl.c 2010-05-12 08:57:55.000000000 +0200
++++ head-2010-05-12/fs/compat_ioctl.c 2010-05-12 09:02:56.000000000 +0200
+@@ -1527,9 +1527,6 @@ IGNORE_IOCTL(FBIOGCURSOR32)
#endif
#ifdef CONFIG_XEN
@@ -4568,7 +4586,7 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
COMPATIBLE_IOCTL(IOCTL_PRIVCMD_HYPERCALL)
COMPATIBLE_IOCTL(IOCTL_EVTCHN_BIND_VIRQ)
COMPATIBLE_IOCTL(IOCTL_EVTCHN_BIND_INTERDOMAIN)
-@@ -1608,6 +1605,12 @@ static long do_ioctl_trans(int fd, unsig
+@@ -1605,6 +1602,12 @@ static long do_ioctl_trans(int fd, unsig
return do_video_stillpicture(fd, cmd, argp);
case VIDEO_SET_SPU_PALETTE:
return do_video_set_spu_palette(fd, cmd, argp);
@@ -4581,8 +4599,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
}
/*
---- head-2010-04-15.orig/include/acpi/processor.h 2010-03-24 15:17:58.000000000 +0100
-+++ head-2010-04-15/include/acpi/processor.h 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/include/acpi/processor.h 2010-03-24 15:17:58.000000000 +0100
++++ head-2010-05-12/include/acpi/processor.h 2010-03-24 16:00:05.000000000 +0100
@@ -324,7 +324,7 @@ static inline void acpi_processor_ppc_ex
return;
}
@@ -4605,8 +4623,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
#endif /* CONFIG_CPU_FREQ */
---- head-2010-04-15.orig/include/xen/compat_ioctl.h 2010-01-18 15:23:12.000000000 +0100
-+++ head-2010-04-15/include/xen/compat_ioctl.h 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/include/xen/compat_ioctl.h 2010-01-18 15:23:12.000000000 +0100
++++ head-2010-05-12/include/xen/compat_ioctl.h 2010-03-24 16:00:05.000000000 +0100
@@ -29,7 +29,7 @@
#define xen_pfn32_t __u32
#endif
@@ -4616,8 +4634,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
struct privcmd_mmap_32 {
int num;
domid_t dom;
---- head-2010-04-15.orig/include/xen/evtchn.h 2010-03-31 14:37:09.000000000 +0200
-+++ head-2010-04-15/include/xen/evtchn.h 2010-03-31 14:02:34.000000000 +0200
+--- head-2010-05-12.orig/include/xen/evtchn.h 2010-03-31 14:37:09.000000000 +0200
++++ head-2010-05-12/include/xen/evtchn.h 2010-03-31 14:02:34.000000000 +0200
@@ -48,6 +48,7 @@
* LOW-LEVEL DEFINITIONS
*/
@@ -4636,8 +4654,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
/*
* Dynamically bind an event source to an IRQ-like callback handler.
---- head-2010-04-15.orig/include/xen/xen.h 2010-04-15 09:37:45.000000000 +0200
-+++ head-2010-04-15/include/xen/xen.h 2010-03-31 14:03:59.000000000 +0200
+--- head-2010-05-12.orig/include/xen/xen.h 2010-05-12 08:55:23.000000000 +0200
++++ head-2010-05-12/include/xen/xen.h 2010-03-31 14:03:59.000000000 +0200
@@ -7,8 +7,10 @@ enum xen_domain_type {
XEN_HVM_DOMAIN, /* running in a Xen hvm domain */
};
@@ -4659,8 +4677,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
#else /* !CONFIG_XEN_DOM0 */
#define xen_initial_domain() (0)
#endif /* CONFIG_XEN_DOM0 */
---- head-2010-04-15.orig/kernel/sysctl_binary.c 2010-04-15 09:55:52.000000000 +0200
-+++ head-2010-04-15/kernel/sysctl_binary.c 2010-04-15 10:13:33.000000000 +0200
+--- head-2010-05-12.orig/kernel/sysctl_binary.c 2010-04-15 09:55:52.000000000 +0200
++++ head-2010-05-12/kernel/sysctl_binary.c 2010-04-15 10:13:33.000000000 +0200
@@ -875,9 +875,10 @@ static const struct bin_table bin_bus_ta
@@ -4684,8 +4702,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
#endif
/* CTL_ARLAN "arlan" no longer used */
{ CTL_DIR, CTL_S390DBF, "s390dbf", bin_s390dbf_table },
---- head-2010-04-15.orig/kernel/sysctl_check.c 2010-03-24 15:10:29.000000000 +0100
-+++ head-2010-04-15/kernel/sysctl_check.c 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/kernel/sysctl_check.c 2010-03-24 15:10:29.000000000 +0100
++++ head-2010-05-12/kernel/sysctl_check.c 2010-03-24 16:00:05.000000000 +0100
@@ -4,7 +4,6 @@
#include <linux/sunrpc/debug.h>
#include <linux/string.h>
@@ -4694,8 +4712,8 @@ Automatically created from "patches.kernel.org/patch-2.6.33" by xen-port-patches
static int sysctl_depth(struct ctl_table *table)
---- head-2010-04-15.orig/lib/swiotlb-xen.c 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-15/lib/swiotlb-xen.c 2010-03-24 16:00:05.000000000 +0100
+--- head-2010-05-12.orig/lib/swiotlb-xen.c 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/lib/swiotlb-xen.c 2010-03-24 16:00:05.000000000 +0100
@@ -106,6 +106,7 @@ setup_io_tlb_npages(char *str)
swiotlb_force = 1;
else if (!strcmp(str, "off"))
diff --git a/patches.xen/xen3-patch-2.6.34-rc2 b/patches.xen/xen3-patch-2.6.34-rc2
index 2fe1f6c464..0103bb509f 100644
--- a/patches.xen/xen3-patch-2.6.34-rc2
+++ b/patches.xen/xen3-patch-2.6.34-rc2
@@ -7,8 +7,8 @@ Patch-mainline: 2.6.34-rc2
Acked-by: Jeff Mahoney <jeffm@suse.com>
Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-patches.py
---- head-2010-04-29.orig/arch/x86/Kconfig 2010-03-24 16:00:05.000000000 +0100
-+++ head-2010-04-29/arch/x86/Kconfig 2010-03-25 16:41:03.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/Kconfig 2010-03-24 16:00:05.000000000 +0100
++++ head-2010-05-12/arch/x86/Kconfig 2010-03-25 16:41:03.000000000 +0100
@@ -106,7 +106,7 @@ config SBUS
bool
@@ -18,8 +18,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
config GENERIC_ISA_DMA
def_bool y
---- head-2010-04-29.orig/arch/x86/ia32/ia32entry-xen.S 2010-03-24 16:00:05.000000000 +0100
-+++ head-2010-04-29/arch/x86/ia32/ia32entry-xen.S 2010-03-25 10:38:31.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/ia32/ia32entry-xen.S 2010-03-24 16:00:05.000000000 +0100
++++ head-2010-05-12/arch/x86/ia32/ia32entry-xen.S 2010-03-25 10:38:31.000000000 +0100
@@ -456,7 +456,7 @@ ia32_sys_call_table:
.quad quiet_ni_syscall /* old mpx syscall holder */
.quad sys_setpgid
@@ -47,8 +47,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
.quad stub32_iopl /* 110 */
.quad sys_vhangup
.quad quiet_ni_syscall /* old "idle" system call */
---- head-2010-04-29.orig/arch/x86/include/asm/i8259.h 2010-04-29 09:29:49.000000000 +0200
-+++ head-2010-04-29/arch/x86/include/asm/i8259.h 2010-03-25 11:31:58.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/asm/i8259.h 2010-05-12 08:55:23.000000000 +0200
++++ head-2010-05-12/arch/x86/include/asm/i8259.h 2010-03-25 11:31:58.000000000 +0100
@@ -54,11 +54,13 @@ extern struct irq_chip i8259A_chip;
struct legacy_pic {
@@ -63,8 +63,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
void (*make_irq)(unsigned int irq);
};
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/fixmap.h 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/fixmap.h 2010-03-25 16:41:03.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/fixmap.h 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/fixmap.h 2010-03-25 16:41:03.000000000 +0100
@@ -125,14 +125,20 @@ enum fixed_addresses {
* 256 temporary boot-time mappings, used by early_ioremap(),
* before ioremap() is functional.
@@ -91,8 +91,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
#ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT
FIX_OHCI1394_BASE,
#endif
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/io.h 2010-03-24 15:25:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/io.h 2010-03-25 10:43:42.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/io.h 2010-03-24 15:25:06.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/io.h 2010-03-25 10:43:42.000000000 +0100
@@ -1,8 +1,42 @@
#ifndef _ASM_X86_IO_H
#define _ASM_X86_IO_H
@@ -269,8 +269,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
#endif
extern void *xlate_dev_mem_ptr(unsigned long phys);
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/irq_vectors.h 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/irq_vectors.h 2010-03-29 18:11:31.000000000 +0200
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/irq_vectors.h 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/irq_vectors.h 2010-03-29 18:11:31.000000000 +0200
@@ -3,11 +3,9 @@
#define MCE_VECTOR 0x12
@@ -319,8 +319,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
# endif
#elif defined(CONFIG_XEN_PCIDEV_FRONTEND)
# define NR_PIRQS (NR_VECTORS + CPU_VECTOR_LIMIT)
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/pci.h 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/pci.h 2010-03-25 17:13:42.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/pci.h 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/pci.h 2010-03-25 17:13:42.000000000 +0100
@@ -48,8 +48,15 @@ static inline int pci_proc_domain(struct
#ifdef CONFIG_PCI
@@ -382,8 +382,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
/* implement the pci_ DMA API in terms of the generic device dma_ one */
#include <asm-generic/pci-dma-compat.h>
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/pgalloc.h 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/pgalloc.h 2010-03-25 16:41:03.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/pgalloc.h 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/pgalloc.h 2010-03-25 16:41:03.000000000 +0100
@@ -27,6 +27,11 @@ pmd_t *early_get_pmd(unsigned long va);
#endif
@@ -396,8 +396,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
* Allocate and free page tables.
*/
extern pgd_t *pgd_alloc(struct mm_struct *);
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/pgtable_32.h 2010-03-25 10:38:31.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/pgtable_32.h 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/pgtable_32.h 2010-03-25 10:38:31.000000000 +0100
@@ -79,7 +79,7 @@ do { \
* The i386 doesn't have any external MMU info: the kernel page
* tables contain all the necessary information.
@@ -407,8 +407,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
void make_lowmem_page_readonly(void *va, unsigned int feature);
void make_lowmem_page_writable(void *va, unsigned int feature);
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/pgtable_64.h 2010-03-25 16:41:03.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/pgtable_64.h 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/pgtable_64.h 2010-03-25 16:41:03.000000000 +0100
@@ -136,7 +136,7 @@ static inline int pgd_large(pgd_t pgd) {
#define pte_unmap(pte) /* NOP */
#define pte_unmap_nested(pte) /* NOP */
@@ -418,8 +418,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
/* Encode and de-code a swap entry */
#if _PAGE_BIT_FILE < _PAGE_BIT_PROTNONE
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/smp.h 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/smp.h 2010-04-26 11:32:06.000000000 +0200
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/smp.h 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/smp.h 2010-04-26 11:32:06.000000000 +0200
@@ -135,6 +135,8 @@ int native_cpu_disable(void);
void native_cpu_die(unsigned int cpu);
void native_play_dead(void);
@@ -449,8 +449,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
extern unsigned disabled_cpus __cpuinitdata;
#include <asm/smp-processor-id.h>
---- head-2010-04-29.orig/arch/x86/include/mach-xen/asm/system.h 2010-03-24 16:00:05.000000000 +0100
-+++ head-2010-04-29/arch/x86/include/mach-xen/asm/system.h 2010-03-25 16:41:14.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/system.h 2010-03-24 16:00:05.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/system.h 2010-03-25 16:41:14.000000000 +0100
@@ -31,7 +31,7 @@ extern void show_regs_common(void);
"movl %P[task_canary](%[next]), %%ebx\n\t" \
"movl %%ebx, "__percpu_arg([stack_canary])"\n\t"
@@ -487,8 +487,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
__switch_canary_iparam \
: "memory", "cc" __EXTRA_CLOBBER)
#endif
---- head-2010-04-29.orig/arch/x86/kernel/apic/io_apic-xen.c 2010-03-24 16:00:05.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/apic/io_apic-xen.c 2010-03-25 17:45:38.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/apic/io_apic-xen.c 2010-03-24 16:00:05.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/apic/io_apic-xen.c 2010-03-25 17:45:38.000000000 +0100
@@ -69,9 +69,12 @@
#include <xen/evtchn.h>
@@ -1355,9 +1355,9 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
+ setup_IO_APIC_irq(0, 0, 0, desc, 0, 0);
+}
+#endif
---- head-2010-04-29.orig/arch/x86/kernel/cpu/intel.c 2010-04-29 09:29:49.000000000 +0200
-+++ head-2010-04-29/arch/x86/kernel/cpu/intel.c 2010-03-25 17:43:33.000000000 +0100
-@@ -70,7 +70,9 @@ static void __cpuinit early_init_intel(s
+--- head-2010-05-12.orig/arch/x86/kernel/cpu/intel.c 2010-05-12 08:55:23.000000000 +0200
++++ head-2010-05-12/arch/x86/kernel/cpu/intel.c 2010-05-12 09:03:21.000000000 +0200
+@@ -91,7 +91,9 @@ static void __cpuinit early_init_intel(s
if (c->x86_power & (1 << 8)) {
set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC);
set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC);
@@ -1367,8 +1367,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
sched_clock_stable = 1;
}
---- head-2010-04-29.orig/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-03-24 15:06:06.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-04-28 16:13:23.000000000 +0200
+--- head-2010-05-12.orig/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-03-24 15:06:06.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-04-28 16:13:23.000000000 +0200
@@ -301,7 +301,7 @@ struct _cache_attr {
ssize_t (*store)(struct _cpuid4_info *, const char *, size_t count);
};
@@ -1387,8 +1387,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
&cache_disable_0.attr,
&cache_disable_1.attr,
#endif
---- head-2010-04-29.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/cpu/mtrr/main-xen.c 2010-03-25 11:33:03.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/cpu/mtrr/main-xen.c 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/cpu/mtrr/main-xen.c 2010-03-25 11:33:03.000000000 +0100
@@ -25,12 +25,12 @@ void generic_get_mtrr(unsigned int reg,
*type = op.u.read_memtype.type;
}
@@ -1404,8 +1404,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
unsigned int num_var_ranges;
unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES];
---- head-2010-04-29.orig/arch/x86/kernel/e820-xen.c 2010-03-24 16:00:05.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/e820-xen.c 2010-03-25 16:41:03.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/e820-xen.c 2010-03-24 16:00:05.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/e820-xen.c 2010-03-25 16:41:03.000000000 +0100
@@ -12,17 +12,10 @@
#include <linux/types.h>
#include <linux/init.h>
@@ -1829,8 +1829,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
reserve_region_with_split(&iomem_resource, start, end,
"RAM buffer");
}
---- head-2010-04-29.orig/arch/x86/kernel/head32-xen.c 2010-03-24 16:00:05.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/head32-xen.c 2010-03-25 10:38:31.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/head32-xen.c 2010-03-24 16:00:05.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/head32-xen.c 2010-03-25 10:38:31.000000000 +0100
@@ -32,6 +32,16 @@ static void __init i386_default_early_se
void __init i386_start_kernel(void)
@@ -1848,8 +1848,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
reserve_early(__pa_symbol(&_text), __pa_symbol(&__bss_stop), "TEXT DATA BSS");
#ifndef CONFIG_XEN
---- head-2010-04-29.orig/arch/x86/kernel/head_32-xen.S 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/head_32-xen.S 2010-03-25 11:52:54.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/head_32-xen.S 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/head_32-xen.S 2010-03-25 11:52:54.000000000 +0100
@@ -67,8 +67,8 @@ ENTRY(startup_32)
* The linker can't handle this by relocation. Manually set
* base address in stack canary segment descriptor.
@@ -1879,8 +1879,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
movl $__HYPERVISOR_update_va_mapping, %eax
int $0x82
---- head-2010-04-29.orig/arch/x86/kernel/pci-dma-xen.c 2010-03-24 16:00:05.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/pci-dma-xen.c 2010-03-25 16:41:14.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/pci-dma-xen.c 2010-03-24 16:00:05.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/pci-dma-xen.c 2010-03-25 16:41:14.000000000 +0100
@@ -38,7 +38,7 @@ int iommu_detected __read_mostly = 0;
* This variable becomes 1 if iommu=pt is passed on the kernel command line.
* If this variable is 1, IOMMU implementations do no DMA translation for
@@ -1926,8 +1926,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
if (pci_swiotlb_detect())
goto out;
---- head-2010-04-29.orig/arch/x86/kernel/process-xen.c 2010-03-24 16:00:05.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/process-xen.c 2010-03-25 16:41:14.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/process-xen.c 2010-03-24 16:00:05.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/process-xen.c 2010-03-25 16:41:14.000000000 +0100
@@ -94,6 +94,13 @@ void exit_thread(void)
}
}
@@ -1951,8 +1951,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
" performance may degrade.\n");
}
#endif
---- head-2010-04-29.orig/arch/x86/kernel/process_32-xen.c 2010-03-24 16:00:05.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/process_32-xen.c 2010-03-25 10:38:31.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/process_32-xen.c 2010-03-24 16:00:05.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/process_32-xen.c 2010-03-25 10:38:31.000000000 +0100
@@ -179,12 +179,6 @@ void __show_regs(struct pt_regs *regs, i
d6, d7);
}
@@ -1966,8 +1966,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
void release_thread(struct task_struct *dead_task)
{
BUG_ON(dead_task->mm);
---- head-2010-04-29.orig/arch/x86/kernel/process_64-xen.c 2010-03-24 16:00:05.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/process_64-xen.c 2010-03-25 10:38:31.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/process_64-xen.c 2010-03-24 16:00:05.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/process_64-xen.c 2010-03-25 10:38:31.000000000 +0100
@@ -219,12 +219,6 @@ void __show_regs(struct pt_regs *regs, i
printk(KERN_DEFAULT "DR3: %016lx DR6: %016lx DR7: %016lx\n", d3, d6, d7);
}
@@ -1981,8 +1981,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
void xen_load_gs_index(unsigned gs)
{
WARN_ON(HYPERVISOR_set_segment_base(SEGBASE_GS_USER_SEL, gs));
---- head-2010-04-29.orig/arch/x86/kernel/setup-xen.c 2010-03-24 16:00:05.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/setup-xen.c 2010-03-25 16:41:03.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/setup-xen.c 2010-03-24 16:00:05.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/setup-xen.c 2010-03-25 16:41:03.000000000 +0100
@@ -151,7 +151,9 @@ EXPORT_SYMBOL(xen_start_info);
unsigned long max_low_pfn_mapped;
unsigned long max_pfn_mapped;
@@ -2047,9 +2047,9 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
reserve_ibft_region();
---- head-2010-04-29.orig/arch/x86/kernel/time-xen.c 2010-03-24 16:00:05.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/time-xen.c 2010-03-25 16:46:06.000000000 +0100
-@@ -595,7 +595,7 @@ static cycle_t xen_clocksource_read(stru
+--- head-2010-05-12.orig/arch/x86/kernel/time-xen.c 2010-05-12 09:02:50.000000000 +0200
++++ head-2010-05-12/arch/x86/kernel/time-xen.c 2010-05-12 09:03:15.000000000 +0200
+@@ -597,7 +597,7 @@ static cycle_t xen_clocksource_read(stru
#endif
}
@@ -2058,7 +2058,7 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
{
extern void time_resume(void);
-@@ -617,18 +617,18 @@ static struct clocksource clocksource_xe
+@@ -619,18 +619,18 @@ static struct clocksource clocksource_xe
struct vcpu_runstate_info *setup_runstate_area(unsigned int cpu)
{
struct vcpu_register_runstate_memory_area area;
@@ -2081,8 +2081,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
}
static void init_missing_ticks_accounting(unsigned int cpu)
---- head-2010-04-29.orig/arch/x86/kernel/traps-xen.c 2010-03-24 16:00:05.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/traps-xen.c 2010-03-25 16:41:03.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/traps-xen.c 2010-03-24 16:00:05.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/traps-xen.c 2010-03-25 16:41:03.000000000 +0100
@@ -527,6 +527,9 @@ dotraplinkage void __kprobes do_debug(st
get_debugreg(dr6, 6);
@@ -2093,8 +2093,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
/* Catch kmemcheck conditions first of all! */
if ((dr6 & DR_STEP) && kmemcheck_trap(regs))
return;
---- head-2010-04-29.orig/arch/x86/kernel/vsyscall_64-xen.c 2010-03-24 16:00:05.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/vsyscall_64-xen.c 2010-03-25 10:38:31.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/vsyscall_64-xen.c 2010-03-24 16:00:05.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/vsyscall_64-xen.c 2010-03-25 10:38:31.000000000 +0100
@@ -308,7 +308,8 @@ static int __init vsyscall_init(void)
register_sysctl_table(kernel_root_table2);
#endif
@@ -2105,8 +2105,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
return 0;
}
---- head-2010-04-29.orig/arch/x86/kernel/x86_init-xen.c 2010-03-24 16:00:05.000000000 +0100
-+++ head-2010-04-29/arch/x86/kernel/x86_init-xen.c 2010-03-25 17:21:48.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/kernel/x86_init-xen.c 2010-03-24 16:00:05.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/x86_init-xen.c 2010-03-25 17:21:48.000000000 +0100
@@ -5,8 +5,12 @@
*/
#include <linux/bitmap.h>
@@ -2133,8 +2133,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
};
struct x86_platform_ops x86_platform = {
---- head-2010-04-29.orig/arch/x86/lib/Makefile 2010-03-24 15:01:37.000000000 +0100
-+++ head-2010-04-29/arch/x86/lib/Makefile 2010-04-28 16:13:29.000000000 +0200
+--- head-2010-05-12.orig/arch/x86/lib/Makefile 2010-03-24 15:01:37.000000000 +0100
++++ head-2010-05-12/arch/x86/lib/Makefile 2010-04-28 16:13:29.000000000 +0200
@@ -15,6 +15,7 @@ $(obj)/inat.o: $(obj)/inat-tables.c
clean-files := inat-tables.c
@@ -2144,8 +2144,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
lib-y := delay.o
lib-y += thunk_$(BITS).o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2010-04-29/arch/x86/lib/cache-smp-xen.c 2010-04-29 09:36:56.000000000 +0200
-@@ -0,0 +1,29 @@
++++ head-2010-05-12/arch/x86/lib/cache-smp-xen.c 2010-05-07 11:12:27.000000000 +0200
+@@ -0,0 +1,27 @@
+#include <linux/smp.h>
+#include <linux/module.h>
+#include <asm/hypervisor.h>
@@ -2165,18 +2165,16 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
+
+int wbinvd_on_all_cpus(void)
+{
-+#ifdef MMUEXT_FLUSH_CACHE_GLOBAL /* XXX remove */
+ struct mmuext_op op = { .cmd = MMUEXT_FLUSH_CACHE_GLOBAL };
+
+ if (HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) == 0)
+ return 0;
-+#endif
+ /* Best effort as fallback. */
+ return on_each_cpu(__wbinvd, NULL, 1);
+}
+EXPORT_SYMBOL(wbinvd_on_all_cpus);
---- head-2010-04-29.orig/arch/x86/mm/init-xen.c 2010-03-24 16:00:05.000000000 +0100
-+++ head-2010-04-29/arch/x86/mm/init-xen.c 2010-03-25 16:41:02.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/init-xen.c 2010-03-24 16:00:05.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/init-xen.c 2010-03-25 16:41:02.000000000 +0100
@@ -283,12 +283,7 @@ unsigned long __init_refok init_memory_m
if (!after_bootmem)
find_early_table_space(end, use_pse, use_gbpages);
@@ -2206,8 +2204,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
#ifdef CONFIG_X86_32
early_ioremap_page_table_range_init();
---- head-2010-04-29.orig/arch/x86/mm/init_32-xen.c 2010-03-24 16:00:05.000000000 +0100
-+++ head-2010-04-29/arch/x86/mm/init_32-xen.c 2010-03-25 16:41:14.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/init_32-xen.c 2010-03-24 16:00:05.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/init_32-xen.c 2010-03-25 16:41:14.000000000 +0100
@@ -257,6 +257,7 @@ kernel_physical_mapping_init(unsigned lo
unsigned long page_size_mask)
{
@@ -2288,8 +2286,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
after_bootmem = 1;
}
---- head-2010-04-29.orig/arch/x86/mm/init_64-xen.c 2010-03-24 16:00:05.000000000 +0100
-+++ head-2010-04-29/arch/x86/mm/init_64-xen.c 2010-04-29 09:53:28.000000000 +0200
+--- head-2010-05-12.orig/arch/x86/mm/init_64-xen.c 2010-03-24 16:00:05.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/init_64-xen.c 2010-04-29 09:53:28.000000000 +0200
@@ -403,9 +403,13 @@ static inline int __meminit make_readonl
* No need for writable mapping of kernel image. This also ensures that
* page and descriptor tables embedded inside don't have writable
@@ -2345,8 +2343,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
if (!p)
return -ENOMEM;
---- head-2010-04-29.orig/arch/x86/mm/ioremap-xen.c 2010-03-24 16:00:05.000000000 +0100
-+++ head-2010-04-29/arch/x86/mm/ioremap-xen.c 2010-03-25 13:55:08.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/ioremap-xen.c 2010-03-24 16:00:05.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/ioremap-xen.c 2010-03-25 13:55:08.000000000 +0100
@@ -142,6 +142,11 @@ int direct_kernel_remap_pfn_range(unsign
}
EXPORT_SYMBOL(direct_kernel_remap_pfn_range);
@@ -2416,8 +2414,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
if (pmd != early_ioremap_pmd(fix_to_virt(FIX_BTMAP_END))) {
WARN_ON(1);
printk(KERN_WARNING "pmd %p != %p\n",
---- head-2010-04-29.orig/arch/x86/mm/pageattr-xen.c 2010-03-24 16:00:05.000000000 +0100
-+++ head-2010-04-29/arch/x86/mm/pageattr-xen.c 2010-03-25 16:41:14.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/pageattr-xen.c 2010-03-24 16:00:05.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/pageattr-xen.c 2010-03-25 16:41:14.000000000 +0100
@@ -293,8 +293,29 @@ static inline pgprot_t static_protection
*/
if (kernel_set_to_readonly &&
@@ -2450,8 +2448,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
#endif
prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
---- head-2010-04-29.orig/arch/x86/mm/pgtable-xen.c 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-29/arch/x86/mm/pgtable-xen.c 2010-03-25 16:41:03.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/mm/pgtable-xen.c 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/pgtable-xen.c 2010-03-25 16:41:03.000000000 +0100
@@ -10,6 +10,14 @@
#define PGALLOC_GFP GFP_KERNEL | __GFP_NOTRACK | __GFP_REPEAT | __GFP_ZERO
@@ -2504,8 +2502,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
void __pte_free(pgtable_t pte)
{
if (!PageHighMem(pte)) {
---- head-2010-04-29.orig/arch/x86/pci/irq-xen.c 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/arch/x86/pci/irq-xen.c 2010-03-25 10:38:31.000000000 +0100
+--- head-2010-05-12.orig/arch/x86/pci/irq-xen.c 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/arch/x86/pci/irq-xen.c 2010-03-25 10:38:31.000000000 +0100
@@ -53,7 +53,7 @@ struct irq_router_handler {
int (*probe)(struct irq_router *r, struct pci_dev *router, u16 device);
};
@@ -2569,8 +2567,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
}
static void pirq_penalize_isa_irq(int irq, int active)
---- head-2010-04-29.orig/drivers/xen/Kconfig 2010-03-31 14:01:28.000000000 +0200
-+++ head-2010-04-29/drivers/xen/Kconfig 2010-03-31 14:08:31.000000000 +0200
+--- head-2010-05-12.orig/drivers/xen/Kconfig 2010-03-31 14:01:28.000000000 +0200
++++ head-2010-05-12/drivers/xen/Kconfig 2010-03-31 14:08:31.000000000 +0200
@@ -23,6 +23,7 @@ config XEN_UNPRIVILEGED_GUEST
select PM_SLEEP
select PM_SLEEP_SMP if SMP
@@ -2598,8 +2596,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
default PARAVIRT_XEN || XEN_PRIVILEGED_GUEST || m
help
The evtchn driver allows a userspace process to triger event
---- head-2010-04-29.orig/drivers/xen/blkfront/vbd.c 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-29/drivers/xen/blkfront/vbd.c 2010-03-25 16:41:12.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/blkfront/vbd.c 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/drivers/xen/blkfront/vbd.c 2010-03-25 16:41:12.000000000 +0100
@@ -314,15 +314,14 @@ xlvbd_init_blk_queue(struct gendisk *gd,
/* Hard sector size and max sectors impersonate the equiv. hardware. */
@@ -2618,8 +2616,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
/* Make sure buffer addresses are sector-aligned. */
blk_queue_dma_alignment(rq, 511);
---- head-2010-04-29.orig/drivers/xen/blktap2/device.c 2010-03-24 15:32:27.000000000 +0100
-+++ head-2010-04-29/drivers/xen/blktap2/device.c 2010-04-19 14:54:02.000000000 +0200
+--- head-2010-05-12.orig/drivers/xen/blktap2/device.c 2010-03-24 15:32:27.000000000 +0100
++++ head-2010-05-12/drivers/xen/blktap2/device.c 2010-04-19 14:54:02.000000000 +0200
@@ -991,15 +991,14 @@ blktap_device_configure(struct blktap *t
/* Hard sector size and max sectors impersonate the equiv. hardware. */
@@ -2638,8 +2636,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
/* Make sure buffer addresses are sector-aligned. */
blk_queue_dma_alignment(rq, 511);
---- head-2010-04-29.orig/drivers/xen/blktap2/sysfs.c 2010-03-24 16:00:05.000000000 +0100
-+++ head-2010-04-29/drivers/xen/blktap2/sysfs.c 2010-03-25 18:00:15.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/blktap2/sysfs.c 2010-03-24 16:00:05.000000000 +0100
++++ head-2010-05-12/drivers/xen/blktap2/sysfs.c 2010-03-25 18:00:15.000000000 +0100
@@ -377,13 +377,15 @@ blktap_sysfs_destroy(struct blktap *tap)
}
@@ -2668,8 +2666,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
{
int i, ret;
struct blktap *tap;
---- head-2010-04-29.orig/drivers/xen/char/mem.c 2010-03-24 16:00:05.000000000 +0100
-+++ head-2010-04-29/drivers/xen/char/mem.c 2010-03-25 10:38:31.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/char/mem.c 2010-03-24 16:00:05.000000000 +0100
++++ head-2010-05-12/drivers/xen/char/mem.c 2010-03-25 10:38:31.000000000 +0100
@@ -3,7 +3,7 @@
*
* Copyright (C) 1991, 1992 Linus Torvalds
@@ -2754,8 +2752,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
}
mutex_unlock(&file->f_path.dentry->d_inode->i_mutex);
return ret;
---- head-2010-04-29.orig/drivers/xen/core/hypervisor_sysfs.c 2010-03-24 15:10:37.000000000 +0100
-+++ head-2010-04-29/drivers/xen/core/hypervisor_sysfs.c 2010-03-25 14:27:48.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/core/hypervisor_sysfs.c 2010-03-24 15:10:37.000000000 +0100
++++ head-2010-05-12/drivers/xen/core/hypervisor_sysfs.c 2010-03-25 14:27:48.000000000 +0100
@@ -36,7 +36,7 @@ static ssize_t hyp_sysfs_store(struct ko
return 0;
}
@@ -2765,8 +2763,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
.show = hyp_sysfs_show,
.store = hyp_sysfs_store,
};
---- head-2010-04-29.orig/drivers/xen/core/spinlock.c 2010-03-24 16:00:05.000000000 +0100
-+++ head-2010-04-29/drivers/xen/core/spinlock.c 2010-04-15 10:14:50.000000000 +0200
+--- head-2010-05-12.orig/drivers/xen/core/spinlock.c 2010-03-24 16:00:05.000000000 +0100
++++ head-2010-05-12/drivers/xen/core/spinlock.c 2010-04-15 10:14:50.000000000 +0200
@@ -22,7 +22,7 @@ struct spinning {
unsigned int ticket;
struct spinning *prev;
@@ -2815,8 +2813,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
smp_rmb();
while (spinning) {
if (spinning->lock == lock && spinning->ticket == token)
---- head-2010-04-29.orig/drivers/xen/scsiback/xenbus.c 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/drivers/xen/scsiback/xenbus.c 2010-03-25 14:20:20.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/scsiback/xenbus.c 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/drivers/xen/scsiback/xenbus.c 2010-03-25 14:20:20.000000000 +0100
@@ -353,7 +353,7 @@ fail:
}
@@ -2826,8 +2824,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
{ "vscsi" },
{ "" }
};
---- head-2010-04-29.orig/drivers/xen/scsifront/xenbus.c 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/drivers/xen/scsifront/xenbus.c 2010-03-25 16:41:03.000000000 +0100
+--- head-2010-05-12.orig/drivers/xen/scsifront/xenbus.c 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/drivers/xen/scsifront/xenbus.c 2010-03-25 16:41:03.000000000 +0100
@@ -393,7 +393,7 @@ static void scsifront_backend_changed(st
}
@@ -2837,8 +2835,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
{ "vscsi" },
{ "" }
};
---- head-2010-04-29.orig/fs/proc/kcore.c 2010-04-29 09:29:49.000000000 +0200
-+++ head-2010-04-29/fs/proc/kcore.c 2010-04-15 10:15:01.000000000 +0200
+--- head-2010-05-12.orig/fs/proc/kcore.c 2010-05-12 08:55:23.000000000 +0200
++++ head-2010-05-12/fs/proc/kcore.c 2010-04-15 10:15:01.000000000 +0200
@@ -130,7 +130,7 @@ static void __kcore_update_ram(struct li
}
@@ -2860,8 +2858,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
ent->type = KCORE_RAM;
list_add(&ent->list, &head);
__kcore_update_ram(&head);
---- head-2010-04-29.orig/kernel/early_res.c 2010-04-29 09:29:49.000000000 +0200
-+++ head-2010-04-29/kernel/early_res.c 2010-04-15 10:17:11.000000000 +0200
+--- head-2010-05-12.orig/kernel/early_res.c 2010-05-12 08:55:23.000000000 +0200
++++ head-2010-05-12/kernel/early_res.c 2010-04-15 10:17:11.000000000 +0200
@@ -321,11 +321,19 @@ void __init free_early(u64 start, u64 en
i = find_overlapped_early(start, end);
@@ -2907,8 +2905,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
if (mem == -1ULL)
panic("can not find more space for range free");
---- head-2010-04-29.orig/kernel/resource.c 2010-04-29 09:29:49.000000000 +0200
-+++ head-2010-04-29/kernel/resource.c 2010-04-15 10:17:16.000000000 +0200
+--- head-2010-05-12.orig/kernel/resource.c 2010-05-12 08:55:23.000000000 +0200
++++ head-2010-05-12/kernel/resource.c 2010-04-15 10:17:16.000000000 +0200
@@ -343,6 +343,7 @@ int walk_system_ram_range(unsigned long
#endif
@@ -2925,8 +2923,8 @@ Automatically created from "patches.kernel.org/patch-2.6.34-rc2" by xen-port-pat
/*
* Find empty slot in the resource tree given range and alignment.
---- head-2010-04-29.orig/mm/page_alloc.c 2010-03-24 15:25:21.000000000 +0100
-+++ head-2010-04-29/mm/page_alloc.c 2010-03-25 16:31:14.000000000 +0100
+--- head-2010-05-12.orig/mm/page_alloc.c 2010-03-24 15:25:21.000000000 +0100
++++ head-2010-05-12/mm/page_alloc.c 2010-03-25 16:31:14.000000000 +0100
@@ -4696,7 +4696,8 @@ static void __setup_per_zone_wmarks(void
high = percpu_pagelist_fraction
? zone->present_pages / percpu_pagelist_fraction
diff --git a/patches.xen/xen3-patch-2.6.34-rc5-git8 b/patches.xen/xen3-patch-2.6.34-rc5-git8
deleted file mode 100644
index dd0e29cfd7..0000000000
--- a/patches.xen/xen3-patch-2.6.34-rc5-git8
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
-Subject: Linux: 2.6.34-rc5-git8
-Patch-mainline: 2.6.34-rc5-git8
-
- This patch contains the differences between 2.6.34-rc5 and -rc5-git8.
-
-Acked-by: Jeff Mahoney <jeffm@suse.com>
-Automatically created from "patches.kernel.org/patch-2.6.34-rc5-git8" by xen-port-patches.py
-
---- head-2010-04-29.orig/arch/x86/ia32/ia32entry-xen.S 2010-03-25 10:38:31.000000000 +0100
-+++ head-2010-04-29/arch/x86/ia32/ia32entry-xen.S 2010-04-29 10:00:02.000000000 +0200
-@@ -519,7 +519,7 @@ ia32_sys_call_table:
- .quad stub32_sigreturn
- .quad stub32_clone /* 120 */
- .quad sys_setdomainname
-- .quad sys_uname
-+ .quad sys_newuname
- .quad sys_modify_ldt
- .quad compat_sys_adjtimex
- .quad sys32_mprotect /* 125 */
---- head-2010-04-29.orig/drivers/misc/Kconfig 2010-04-29 09:18:14.000000000 +0200
-+++ head-2010-04-29/drivers/misc/Kconfig 2010-04-29 10:01:27.000000000 +0200
-@@ -313,7 +313,7 @@ config TI_DAC7512
-
- config VMWARE_BALLOON
- tristate "VMware Balloon Driver"
-- depends on X86
-+ depends on X86 && !XEN
- help
- This is VMware physical memory management driver which acts
- like a "balloon" that can be inflated to reclaim physical pages
diff --git a/patches.xen/xen3-patch-2.6.34-rc5-rc6 b/patches.xen/xen3-patch-2.6.34-rc5-rc6
new file mode 100644
index 0000000000..e555f7f769
--- /dev/null
+++ b/patches.xen/xen3-patch-2.6.34-rc5-rc6
@@ -0,0 +1,48 @@
+From: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
+Subject: Linux: 2.6.34-rc6
+Patch-mainline: 2.6.34-rc6
+
+ This patch contains the differences between 2.6.34-rc5 and -rc6.
+
+Acked-by: Jeff Mahoney <jeffm@suse.com>
+Automatically created from "patches.kernel.org/patch-2.6.34-rc5-rc6" by xen-port-patches.py
+
+--- head-2010-05-12.orig/arch/x86/ia32/ia32entry-xen.S 2010-03-25 10:38:31.000000000 +0100
++++ head-2010-05-12/arch/x86/ia32/ia32entry-xen.S 2010-05-12 09:08:52.000000000 +0200
+@@ -519,7 +519,7 @@ ia32_sys_call_table:
+ .quad stub32_sigreturn
+ .quad stub32_clone /* 120 */
+ .quad sys_setdomainname
+- .quad sys_uname
++ .quad sys_newuname
+ .quad sys_modify_ldt
+ .quad compat_sys_adjtimex
+ .quad sys32_mprotect /* 125 */
+--- head-2010-05-12.orig/arch/x86/kernel/process_64-xen.c 2010-03-25 10:38:31.000000000 +0100
++++ head-2010-05-12/arch/x86/kernel/process_64-xen.c 2010-05-12 09:09:00.000000000 +0200
+@@ -289,12 +289,12 @@ int copy_thread(unsigned long clone_flag
+
+ set_tsk_thread_flag(p, TIF_FORK);
+
+- p->thread.fs = me->thread.fs;
+- p->thread.gs = me->thread.gs;
+ p->thread.io_bitmap_ptr = NULL;
+
+ savesegment(gs, p->thread.gsindex);
++ p->thread.gs = p->thread.gsindex ? 0 : me->thread.gs;
+ savesegment(fs, p->thread.fsindex);
++ p->thread.fs = p->thread.fsindex ? 0 : me->thread.fs;
+ savesegment(es, p->thread.es);
+ savesegment(ds, p->thread.ds);
+
+--- head-2010-05-12.orig/drivers/misc/Kconfig 2010-05-12 08:55:23.000000000 +0200
++++ head-2010-05-12/drivers/misc/Kconfig 2010-04-29 10:01:27.000000000 +0200
+@@ -313,7 +313,7 @@ config TI_DAC7512
+
+ config VMWARE_BALLOON
+ tristate "VMware Balloon Driver"
+- depends on X86
++ depends on X86 && !XEN
+ help
+ This is VMware physical memory management driver which acts
+ like a "balloon" that can be inflated to reclaim physical pages
diff --git a/patches.xen/xen3-patch-2.6.34-rc6-rc7 b/patches.xen/xen3-patch-2.6.34-rc6-rc7
new file mode 100644
index 0000000000..560e1e0988
--- /dev/null
+++ b/patches.xen/xen3-patch-2.6.34-rc6-rc7
@@ -0,0 +1,66 @@
+From: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
+Subject: Linux: 2.6.34-rc7
+Patch-mainline: 2.6.34-rc7
+
+ This patch contains the differences between 2.6.34-rc6 and -rc7.
+
+Acked-by: Jeff Mahoney <jeffm@suse.com>
+Automatically created from "patches.kernel.org/patch-2.6.34-rc6-rc7" by xen-port-patches.py
+
+--- head-2010-05-12.orig/arch/x86/include/mach-xen/asm/io.h 2010-03-25 10:43:42.000000000 +0100
++++ head-2010-05-12/arch/x86/include/mach-xen/asm/io.h 2010-05-12 09:09:25.000000000 +0200
+@@ -352,6 +352,7 @@ extern void __iomem *early_ioremap(resou
+ extern void __iomem *early_memremap(resource_size_t phys_addr,
+ unsigned long size);
+ extern void early_iounmap(void __iomem *addr, unsigned long size);
++extern void fixup_early_ioremap(void);
+
+ #define IO_SPACE_LIMIT 0xffff
+
+--- head-2010-05-12.orig/arch/x86/kernel/apic/io_apic-xen.c 2010-04-15 10:48:32.000000000 +0200
++++ head-2010-05-12/arch/x86/kernel/apic/io_apic-xen.c 2010-05-12 09:09:25.000000000 +0200
+@@ -2640,6 +2640,9 @@ void irq_force_complete_move(int irq)
+ struct irq_desc *desc = irq_to_desc(irq);
+ struct irq_cfg *cfg = desc->chip_data;
+
++ if (!cfg)
++ return;
++
+ __irq_complete_move(&desc, cfg->vector);
+ }
+ #else
+--- head-2010-05-12.orig/arch/x86/mm/ioremap-xen.c 2010-03-25 13:55:08.000000000 +0100
++++ head-2010-05-12/arch/x86/mm/ioremap-xen.c 2010-05-12 09:13:00.000000000 +0200
+@@ -635,6 +635,22 @@ static inline void __init early_clear_fi
+ static void __iomem *prev_map[FIX_BTMAPS_SLOTS] __initdata;
+ static unsigned long prev_size[FIX_BTMAPS_SLOTS] __initdata;
+
++#ifndef CONFIG_XEN
++void __init fixup_early_ioremap(void)
++{
++ int i;
++
++ for (i = 0; i < FIX_BTMAPS_SLOTS; i++) {
++ if (prev_map[i]) {
++ WARN_ON(1);
++ break;
++ }
++ }
++
++ early_ioremap_init();
++}
++#endif
++
+ static int __init check_early_ioremap_leak(void)
+ {
+ int count = 0;
+--- head-2010-05-12.orig/arch/x86/mm/pgtable_32-xen.c 2010-04-15 10:48:32.000000000 +0200
++++ head-2010-05-12/arch/x86/mm/pgtable_32-xen.c 2010-05-12 09:09:25.000000000 +0200
+@@ -141,6 +141,7 @@ static int __init parse_reservetop(char
+
+ address = memparse(arg, &arg);
+ reserve_top_address(address);
++ fixup_early_ioremap();
+ return 0;
+ }
+ early_param("reservetop", parse_reservetop);
diff --git a/series.conf b/series.conf
index cbb35463bb..b639997abb 100644
--- a/series.conf
+++ b/series.conf
@@ -831,7 +831,8 @@
patches.xen/xen3-patch-2.6.34-rc2
patches.xen/xen3-patch-2.6.34-rc2-rc3
patches.xen/xen3-patch-2.6.34-rc3-rc4
- patches.xen/xen3-patch-2.6.34-rc5-git8
+ patches.xen/xen3-patch-2.6.34-rc5-rc6
+ patches.xen/xen3-patch-2.6.34-rc6-rc7
patches.xen/xen3-seccomp-disable-tsc-option
patches.xen/xen3-x86-mcp51-no-dac
patches.xen/xen3-x86-mark_rodata_rw.patch