[kernel] refresh 2.6.32 patches

[openwrt/svn-archive/archive.git] / target / linux / generic / patches-2.6.32 / 980-vm_exports.patch

diff --git a/target/linux/generic/patches-2.6.32/980-vm_exports.patch b/target/linux/generic/patches-2.6.32/980-vm_exports.patch
index 5319fe337c840c247b2f4bb6cb3666903327d460..5d55fa964241990458ac7941ff26d557ed20f9f1 100644 (file)
--- a/target/linux/generic/patches-2.6.32/980-vm_exports.patch
+++ b/target/linux/generic/patches-2.6.32/980-vm_exports.patch
@@ -68,7 +68,7 @@
   * macro override instead of weak attribute alias, to workaround
 --- a/kernel/sched.c
 +++ b/kernel/sched.c
-@@ -6165,6 +6165,7 @@ int can_nice(const struct task_struct *p
+@@ -6224,6 +6224,7 @@ int can_nice(const struct task_struct *p
        return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
                capable(CAP_SYS_NICE));
  }
@@ -114,7 +114,7 @@
                                void *caller)
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
-@@ -713,6 +713,7 @@ extern void show_free_areas(void);
+@@ -717,6 +717,7 @@ extern void show_free_areas(void);
  
  int shmem_lock(struct file *file, int lock, struct user_struct *user);
  struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags);