aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.35/980-vm_exports.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2011-02-19 12:44:16 +0000
committerFlorian Fainelli <florian@openwrt.org>2011-02-19 12:44:16 +0000
commit0a5005e8245d1058074b96b54b5b2d8d65cc20c4 (patch)
tree0f33142d2ba4fdc39911cee27247d12885f42c7e /target/linux/generic/patches-2.6.35/980-vm_exports.patch
parent61e86ac4c35a3d1c6c99ac66861223fe480035af (diff)
downloadupstream-0a5005e8245d1058074b96b54b5b2d8d65cc20c4.tar.gz
upstream-0a5005e8245d1058074b96b54b5b2d8d65cc20c4.tar.bz2
upstream-0a5005e8245d1058074b96b54b5b2d8d65cc20c4.zip
[kernel] update to 2.6.35.11
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25582 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.35/980-vm_exports.patch')
-rw-r--r--target/linux/generic/patches-2.6.35/980-vm_exports.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-2.6.35/980-vm_exports.patch b/target/linux/generic/patches-2.6.35/980-vm_exports.patch
index 5ca94b25a2..169bf43010 100644
--- a/target/linux/generic/patches-2.6.35/980-vm_exports.patch
+++ b/target/linux/generic/patches-2.6.35/980-vm_exports.patch
@@ -48,7 +48,7 @@
{
--- a/kernel/exit.c
+++ b/kernel/exit.c
-@@ -506,6 +506,7 @@ struct files_struct *get_files_struct(st
+@@ -514,6 +514,7 @@ struct files_struct *get_files_struct(st
return files;
}
@@ -56,7 +56,7 @@
void put_files_struct(struct files_struct *files)
{
-@@ -527,6 +528,7 @@ void put_files_struct(struct files_struc
+@@ -535,6 +536,7 @@ void put_files_struct(struct files_struc
rcu_read_unlock();
}
}
@@ -76,7 +76,7 @@
* macro override instead of weak attribute alias, to workaround
--- a/kernel/sched.c
+++ b/kernel/sched.c
-@@ -4262,6 +4262,7 @@ int can_nice(const struct task_struct *p
+@@ -4390,6 +4390,7 @@ int can_nice(const struct task_struct *p
return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
capable(CAP_SYS_NICE));
}