aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.1/950-vm_exports.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2011-08-16 21:42:15 +0000
committerJonas Gorski <jogo@openwrt.org>2011-08-16 21:42:15 +0000
commit3e94ee96425e0f311fb8e35749386b04053173ea (patch)
treec8a6c13d88c995d4a7dce8db50610c7b8eb739f6 /target/linux/generic/patches-3.1/950-vm_exports.patch
parentd132f4c1c214997bf7c3979db193fcb05e4448bd (diff)
downloadupstream-3e94ee96425e0f311fb8e35749386b04053173ea.tar.gz
upstream-3e94ee96425e0f311fb8e35749386b04053173ea.tar.bz2
upstream-3e94ee96425e0f311fb8e35749386b04053173ea.zip
kernel: generic: refresh patches for 3.1-rc2
SVN-Revision: 28021
Diffstat (limited to 'target/linux/generic/patches-3.1/950-vm_exports.patch')
-rw-r--r--target/linux/generic/patches-3.1/950-vm_exports.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.1/950-vm_exports.patch b/target/linux/generic/patches-3.1/950-vm_exports.patch
index afb3f2f15b..7b8e089672 100644
--- a/target/linux/generic/patches-3.1/950-vm_exports.patch
+++ b/target/linux/generic/patches-3.1/950-vm_exports.patch
@@ -89,7 +89,7 @@
* We enter with non-exclusive mmap_sem (to exclude vma changes,
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
-@@ -1231,6 +1231,7 @@ void unmap_kernel_range(unsigned long ad
+@@ -1232,6 +1232,7 @@ void unmap_kernel_range(unsigned long ad
vunmap_page_range(addr, end);
flush_tlb_kernel_range(addr, end);
}
@@ -97,7 +97,7 @@
int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
{
-@@ -1346,6 +1347,7 @@ struct vm_struct *get_vm_area(unsigned l
+@@ -1347,6 +1348,7 @@ struct vm_struct *get_vm_area(unsigned l
return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END,
-1, GFP_KERNEL, __builtin_return_address(0));
}