summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.7/950-vm_exports.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2012-12-12 22:42:18 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2012-12-12 22:42:18 +0000
commit1bd8db0bd63d1c11bb2a73a41835f7d1eb3ca068 (patch)
tree3e1be3d06231d100c7133e2413cda80d9a74a9b8 /target/linux/generic/patches-3.7/950-vm_exports.patch
parentd085aad2880f799cc09b03a3329635ad84551d3b (diff)
downloadmaster-31e0f0ae-1bd8db0bd63d1c11bb2a73a41835f7d1eb3ca068.tar.gz
master-31e0f0ae-1bd8db0bd63d1c11bb2a73a41835f7d1eb3ca068.tar.bz2
master-31e0f0ae-1bd8db0bd63d1c11bb2a73a41835f7d1eb3ca068.zip
kernel: update bcma and ssb to master-2012-12-11-2 from wireless-testing
SVN-Revision: 34651
Diffstat (limited to 'target/linux/generic/patches-3.7/950-vm_exports.patch')
-rw-r--r--target/linux/generic/patches-3.7/950-vm_exports.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.7/950-vm_exports.patch b/target/linux/generic/patches-3.7/950-vm_exports.patch
index eaf3e23331..5957d0c045 100644
--- a/target/linux/generic/patches-3.7/950-vm_exports.patch
+++ b/target/linux/generic/patches-3.7/950-vm_exports.patch
@@ -1,6 +1,6 @@
--- a/mm/shmem.c
+++ b/mm/shmem.c
-@@ -2769,6 +2769,15 @@ EXPORT_SYMBOL_GPL(shmem_truncate_range);
+@@ -2775,6 +2775,15 @@ EXPORT_SYMBOL_GPL(shmem_truncate_range);
/* common code */
@@ -16,7 +16,7 @@
/**
* shmem_file_setup - get an unlinked file living in tmpfs
* @name: name for dentry (to be seen in /proc/<pid>/maps
-@@ -2845,11 +2854,8 @@ int shmem_zero_setup(struct vm_area_stru
+@@ -2851,11 +2860,8 @@ int shmem_zero_setup(struct vm_area_stru
file = shmem_file_setup("dev/zero", size, vma->vm_flags);
if (IS_ERR(file))
return PTR_ERR(file);