summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.32/980-vm_exports.patch
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-10-31 13:10:35 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-10-31 13:10:35 +0000
commit53da46dce6ff54487ba4c33ac44ddfaf516449b6 (patch)
tree0c72f35ab53bc157a8c9ef79376121e52f8ca28d /target/linux/generic/patches-2.6.32/980-vm_exports.patch
parent6437e99fd61addf977aec0aabdd839d49d05c12b (diff)
[kernel] refresh 2.6.32 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23735 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.32/980-vm_exports.patch')
-rw-r--r--target/linux/generic/patches-2.6.32/980-vm_exports.patch4
1 files changed, 2 insertions, 2 deletions
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 5319fe337..5d55fa964 100644
--- 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);