summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.0/950-vm_exports.patch
diff options
context:
space:
mode:
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-06-28 20:25:39 +0000
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-06-28 20:25:39 +0000
commita89d3f1a9b4415a29eb23a7831b2d012f316889c (patch)
tree1ac1de0b18cb9a20db27a1a2dbad170dd033f8ec /target/linux/generic/patches-3.0/950-vm_exports.patch
parent6936562161eb76de44dc0a8dc1017fcad3db49ba (diff)
kernel: refresh patches for kernel 3.0-rc5
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27300 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.0/950-vm_exports.patch')
-rw-r--r--target/linux/generic/patches-3.0/950-vm_exports.patch9
1 files changed, 5 insertions, 4 deletions
diff --git a/target/linux/generic/patches-3.0/950-vm_exports.patch b/target/linux/generic/patches-3.0/950-vm_exports.patch
index 4693c53f9..0ba09166c 100644
--- a/target/linux/generic/patches-3.0/950-vm_exports.patch
+++ b/target/linux/generic/patches-3.0/950-vm_exports.patch
@@ -1,6 +1,6 @@
--- a/mm/shmem.c
+++ b/mm/shmem.c
-@@ -2944,6 +2944,16 @@ out:
+@@ -2951,6 +2951,16 @@ out:
/* common code */
@@ -17,7 +17,7 @@
/**
* shmem_file_setup - get an unlinked file living in tmpfs
* @name: name for dentry (to be seen in /proc/<pid>/maps
-@@ -3021,10 +3031,7 @@ int shmem_zero_setup(struct vm_area_stru
+@@ -3028,11 +3038,8 @@ int shmem_zero_setup(struct vm_area_stru
if (IS_ERR(file))
return PTR_ERR(file);
@@ -30,6 +30,7 @@
+
return 0;
}
+
--- a/fs/file.c
+++ b/fs/file.c
@@ -268,6 +268,7 @@ int expand_files(struct files_struct *fi
@@ -78,8 +79,8 @@
/**
* zap_vma_ptes - remove ptes mapping the vma
-@@ -2821,6 +2822,7 @@ int vmtruncate_range(struct inode *inode
-
+@@ -3014,6 +3015,7 @@ static inline int check_stack_guard_page
+ }
return 0;
}
+EXPORT_SYMBOL_GPL(vmtruncate_range);