ath9k: add missing chunk to the BlockAckReq fix (fixes a compile error)

[openwrt.git] / target / linux / generic / patches-3.0 / 950-vm_exports.patch

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 4693c53..a37be04 100644 (file)
--- 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
 --- a/mm/shmem.c
 +++ b/mm/shmem.c

-@@ -2944,6 +2944,16 @@ out:
+@@ -2951,6 +2951,16 @@ out:

  
  /* common code */
  
  
  /* 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
  /**
   * 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);
  
        if (IS_ERR(file))
                return PTR_ERR(file);
  


@@ -30,6 +30,7 @@
 +
        return 0;
  }
 +
        return 0;
  }

+ 

 --- a/fs/file.c
 +++ b/fs/file.c
 @@ -268,6 +268,7 @@ int expand_files(struct files_struct *fi
 --- a/fs/file.c
 +++ b/fs/file.c
 @@ -268,6 +268,7 @@ int expand_files(struct files_struct *fi


@@ -60,7 +61,7 @@
  {
 --- a/kernel/sched.c
 +++ b/kernel/sched.c
  {
 --- a/kernel/sched.c
 +++ b/kernel/sched.c

-@@ -4905,6 +4905,7 @@ int can_nice(const struct task_struct *p
+@@ -4937,6 +4937,7 @@ int can_nice(const struct task_struct *p

        return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
                capable(CAP_SYS_NICE));
  }
        return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
                capable(CAP_SYS_NICE));
  }


@@ -70,7 +71,7 @@
  
 --- a/mm/memory.c
 +++ b/mm/memory.c
  
 --- a/mm/memory.c
 +++ b/mm/memory.c

-@@ -1395,6 +1395,7 @@ unsigned long zap_page_range(struct vm_a
+@@ -1396,6 +1396,7 @@ unsigned long zap_page_range(struct vm_a

        tlb_finish_mmu(&tlb, address, end);
        return end;
  }
        tlb_finish_mmu(&tlb, address, end);
        return end;
  }


@@ -78,8 +79,8 @@
  
  /**
   * zap_vma_ptes - remove ptes mapping the vma
  
  /**
   * zap_vma_ptes - remove ptes mapping the vma

-@@ -2821,6 +2822,7 @@ int vmtruncate_range(struct inode *inode
- 
+@@ -3015,6 +3016,7 @@ static inline int check_stack_guard_page
+       }

        return 0;
  }
 +EXPORT_SYMBOL_GPL(vmtruncate_range);
        return 0;
  }
 +EXPORT_SYMBOL_GPL(vmtruncate_range);