diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2011-06-28 20:25:39 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2011-06-28 20:25:39 +0000 |
commit | 3f0eed15a2c8140943f66e31806054c7550377ae (patch) | |
tree | 7995b40c3a102fc47b3541417990ddda01b3d8e5 /target/linux/generic/patches-3.0/950-vm_exports.patch | |
parent | 2af4f6f634492487a02685e2ad4184b98d574572 (diff) | |
download | master-31e0f0ae-3f0eed15a2c8140943f66e31806054c7550377ae.tar.gz master-31e0f0ae-3f0eed15a2c8140943f66e31806054c7550377ae.tar.bz2 master-31e0f0ae-3f0eed15a2c8140943f66e31806054c7550377ae.zip |
kernel: refresh patches for kernel 3.0-rc5
SVN-Revision: 27300
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.patch | 9 |
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 4693c53f9b..0ba09166c0 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); |