summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.36/971-ocf_20100325.patch
diff options
context:
space:
mode:
authorAlexandros C. Couloumbis <alex@ozo.com>2010-10-05 08:50:54 +0000
committerAlexandros C. Couloumbis <alex@ozo.com>2010-10-05 08:50:54 +0000
commit11c45f64fe699fc2dd97fa1a0015f28a7ba4f4da (patch)
treecdfe45082cf11d9c3d0d51f1315c08b833b4813f /target/linux/generic/patches-2.6.36/971-ocf_20100325.patch
parent978ecae6855efdd2806c2975b85b22c9b2833862 (diff)
downloadmaster-31e0f0ae-11c45f64fe699fc2dd97fa1a0015f28a7ba4f4da.tar.gz
master-31e0f0ae-11c45f64fe699fc2dd97fa1a0015f28a7ba4f4da.tar.bz2
master-31e0f0ae-11c45f64fe699fc2dd97fa1a0015f28a7ba4f4da.zip
linux/generic: refresh 2.6.36 kernel patches
SVN-Revision: 23237
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.patch4
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);
}