aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.32/980-vm_exports.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-08-22 17:07:37 +0000
committerFlorian Fainelli <florian@openwrt.org>2010-08-22 17:07:37 +0000
commit53fe275b46d02e08a2bd663ed59e61204a3d6b05 (patch)
tree37e0fea28a44d04ab9e38e3e7027f86e6e90725e /target/linux/generic/patches-2.6.32/980-vm_exports.patch
parentf812b42a7fdc4ff5c756726d51f8b68ac50b92f3 (diff)
downloadupstream-53fe275b46d02e08a2bd663ed59e61204a3d6b05.tar.gz
upstream-53fe275b46d02e08a2bd663ed59e61204a3d6b05.tar.bz2
upstream-53fe275b46d02e08a2bd663ed59e61204a3d6b05.zip
[kernel] update to 2.6.32.20
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22766 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 b80eb25198..5319fe337c 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
-@@ -6113,6 +6113,7 @@ int can_nice(const struct task_struct *p
+@@ -6165,6 +6165,7 @@ int can_nice(const struct task_struct *p
return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
capable(CAP_SYS_NICE));
}
@@ -86,7 +86,7 @@
/**
* zap_vma_ptes - remove ptes mapping the vma
-@@ -2486,6 +2487,7 @@ int vmtruncate_range(struct inode *inode
+@@ -2496,6 +2497,7 @@ int vmtruncate_range(struct inode *inode
return 0;
}