Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2011-09-26 04:01:25 -0400
committerJeff Mahoney <jeffm@suse.com>2011-09-26 04:01:25 -0400
commitee8cc90d708d00daa875c99f43c628b1d5a93fef (patch)
tree6b0abd5748ea71f2ae7f42d8b21a8cbfb6d3ff1b
parent0ac4276a2e71a20cdbcb5f3dbaf45fb00e7703d5 (diff)
- Update to 3.1-rc7.
-rw-r--r--patches.xen/xen3-patch-3.021
-rw-r--r--rpm/config.sh2
2 files changed, 3 insertions, 20 deletions
diff --git a/patches.xen/xen3-patch-3.0 b/patches.xen/xen3-patch-3.0
index 3676895033..5fbbd1c02f 100644
--- a/patches.xen/xen3-patch-3.0
+++ b/patches.xen/xen3-patch-3.0
@@ -6,6 +6,8 @@ Patch-mainline: 3.0
This patch contains the differences between 2.6.39 and 3.0.
+Update jeffm: 3.1-rc7 contains the vmalloc_sync_all call.
+
Acked-by: jbeulich@novell.com
--- head-2011-09-07.orig/arch/x86/Kconfig 2011-09-07 16:11:16.000000000 +0200
@@ -3466,22 +3468,3 @@ Acked-by: jbeulich@novell.com
/* Note that this doesn't work with highmem page */
static dma_addr_t swiotlb_virt_to_bus(struct device *hwdev,
volatile void *address)
---- head-2011-09-07.orig/mm/vmalloc.c 2011-09-07 16:06:16.000000000 +0200
-+++ head-2011-09-07/mm/vmalloc.c 2011-09-07 16:19:18.000000000 +0200
-@@ -2159,6 +2159,16 @@ struct vm_struct *alloc_vm_area(size_t s
- return NULL;
- }
-
-+#ifdef CONFIG_XEN
-+ /*
-+ * If the allocated address space is passed to a hypercall
-+ * before being used then we cannot rely on a page fault to
-+ * trigger an update of the page tables. So sync all the page
-+ * tables here.
-+ */
-+ vmalloc_sync_all();
-+#endif
-+
- return area;
- }
- EXPORT_SYMBOL_GPL(alloc_vm_area);
diff --git a/rpm/config.sh b/rpm/config.sh
index 0154805531..57dbdf368a 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=3.1-rc6
+SRCVERSION=3.1-rc7
# variant of the kernel-source package, either empty or "-rt"
VARIANT=
# buildservice projects to build the kernel against