diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2009-04-29 20:46:49 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2009-04-29 20:46:49 +0000 |
| commit | 2f6c2f7598bee196a0366f7e1747caa033d57681 (patch) | |
| tree | 6bbaec90a57039e79d523dfd8e1cc528613b221b /target/linux/generic-2.6/patches-2.6.30/980-vm_exports.patch | |
| parent | 879b0f22f123fc174d5a73531c560344475c43d0 (diff) | |
| download | master-187ad058-2f6c2f7598bee196a0366f7e1747caa033d57681.tar.gz master-187ad058-2f6c2f7598bee196a0366f7e1747caa033d57681.tar.bz2 master-187ad058-2f6c2f7598bee196a0366f7e1747caa033d57681.zip | |
resync patches for 2.6.30-rc3
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15494 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.30/980-vm_exports.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.30/980-vm_exports.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.30/980-vm_exports.patch b/target/linux/generic-2.6/patches-2.6.30/980-vm_exports.patch index ca2f052a4a..6777383515 100644 --- a/target/linux/generic-2.6/patches-2.6.30/980-vm_exports.patch +++ b/target/linux/generic-2.6/patches-2.6.30/980-vm_exports.patch @@ -1,6 +1,6 @@ --- a/mm/shmem.c +++ b/mm/shmem.c -@@ -2587,6 +2587,16 @@ int shmem_unuse(swp_entry_t entry, struc +@@ -2602,6 +2602,16 @@ int shmem_unuse(swp_entry_t entry, struc /* common code */ @@ -17,7 +17,7 @@ /** * shmem_file_setup - get an unlinked file living in tmpfs * @name: name for dentry (to be seen in /proc/<pid>/maps -@@ -2665,11 +2675,7 @@ int shmem_zero_setup(struct vm_area_stru +@@ -2680,11 +2690,7 @@ int shmem_zero_setup(struct vm_area_stru if (IS_ERR(file)) return PTR_ERR(file); @@ -70,7 +70,7 @@ * macro override instead of weak attribute alias, to workaround --- a/kernel/sched.c +++ b/kernel/sched.c -@@ -5600,6 +5600,7 @@ int can_nice(const struct task_struct *p +@@ -5665,6 +5665,7 @@ int can_nice(const struct task_struct *p return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur || capable(CAP_SYS_NICE)); } |