aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.32/980-vm_exports.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2011-02-19 12:44:23 +0000
committerFlorian Fainelli <florian@openwrt.org>2011-02-19 12:44:23 +0000
commitbca0340476f5da3f11943d18e77fef3b1e4c5546 (patch)
tree75dd8eb3f04053fe7de9b978ddeac3654c0613b2 /target/linux/generic/patches-2.6.32/980-vm_exports.patch
parent0a5005e8245d1058074b96b54b5b2d8d65cc20c4 (diff)
downloadupstream-bca0340476f5da3f11943d18e77fef3b1e4c5546.tar.gz
upstream-bca0340476f5da3f11943d18e77fef3b1e4c5546.tar.bz2
upstream-bca0340476f5da3f11943d18e77fef3b1e4c5546.zip
[kernel] update to 2.6.32.29
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25583 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.patch6
1 files changed, 3 insertions, 3 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 d0d98b2e40..0dfa07f915 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
@@ -40,7 +40,7 @@
{
--- a/kernel/exit.c
+++ b/kernel/exit.c
-@@ -507,6 +507,7 @@ struct files_struct *get_files_struct(st
+@@ -514,6 +514,7 @@ struct files_struct *get_files_struct(st
return files;
}
@@ -48,7 +48,7 @@
void put_files_struct(struct files_struct *files)
{
-@@ -526,6 +527,7 @@ void put_files_struct(struct files_struc
+@@ -533,6 +534,7 @@ void put_files_struct(struct files_struc
free_fdtable(fdt);
}
}
@@ -68,7 +68,7 @@
* macro override instead of weak attribute alias, to workaround
--- a/kernel/sched.c
+++ b/kernel/sched.c
-@@ -6223,6 +6223,7 @@ int can_nice(const struct task_struct *p
+@@ -6362,6 +6362,7 @@ int can_nice(const struct task_struct *p
return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
capable(CAP_SYS_NICE));
}