diff options
author | Alexandros C. Couloumbis <alex@ozo.com> | 2010-10-05 08:50:54 +0000 |
---|---|---|
committer | Alexandros C. Couloumbis <alex@ozo.com> | 2010-10-05 08:50:54 +0000 |
commit | 76f0b54cd5e718183374acb8bd4e0e00eb91ca17 (patch) | |
tree | 0c8716c5e67d2f8142dc9e18a5bac307c709c041 /target/linux/generic/patches-2.6.36/971-ocf_20100325.patch | |
parent | 3784ca2da7f11cd7f8301e52a475459331a8fc5a (diff) | |
download | upstream-76f0b54cd5e718183374acb8bd4e0e00eb91ca17.tar.gz upstream-76f0b54cd5e718183374acb8bd4e0e00eb91ca17.tar.bz2 upstream-76f0b54cd5e718183374acb8bd4e0e00eb91ca17.zip |
linux/generic: refresh 2.6.36 kernel patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23237 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.36/971-ocf_20100325.patch')
-rw-r--r-- | target/linux/generic/patches-2.6.36/971-ocf_20100325.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-2.6.36/971-ocf_20100325.patch b/target/linux/generic/patches-2.6.36/971-ocf_20100325.patch index fe96d7937a..e3ecbbeaa0 100644 --- a/target/linux/generic/patches-2.6.36/971-ocf_20100325.patch +++ b/target/linux/generic/patches-2.6.36/971-ocf_20100325.patch @@ -24,7 +24,7 @@ * All of these routines try to estimate how many bits of randomness a * particular randomness source. They do this by keeping track of the * first and second order deltas of the event timings. -@@ -715,6 +725,61 @@ void add_disk_randomness(struct gendisk +@@ -715,6 +725,61 @@ void add_disk_randomness(struct gendisk } #endif @@ -160,7 +160,7 @@ --- a/kernel/pid.c +++ b/kernel/pid.c -@@ -389,6 +389,7 @@ struct task_struct *find_task_by_vpid(pi +@@ -423,6 +423,7 @@ struct task_struct *find_task_by_vpid(pi { return find_task_by_pid_ns(vnr, current->nsproxy->pid_ns); } |