kernel: update bcma and ssb to master-2012-12-11-2 from wireless-testing

[openwrt/staging/yousong.git] / target / linux / generic / patches-3.7 / 950-vm_exports.patch

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 eaf3e23331d0827cdb65f901714fbf474cf05916..5957d0c045c2acee53804d4892852e53d0959621 100644 (file)
--- 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);