aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.38/941-ocf_20100325.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2011-05-15 17:23:02 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2011-05-15 17:23:02 +0000
commita4c0645326f05e9e69e6422f0d76f2141aea16b3 (patch)
tree466d79b0d857a146d7c581ba64f1049b9ef8dfc9 /target/linux/generic/patches-2.6.38/941-ocf_20100325.patch
parentec05877491ee0e7dcb6269ebb7e0293584694e3b (diff)
downloadupstream-a4c0645326f05e9e69e6422f0d76f2141aea16b3.tar.gz
upstream-a4c0645326f05e9e69e6422f0d76f2141aea16b3.tar.bz2
upstream-a4c0645326f05e9e69e6422f0d76f2141aea16b3.zip
kernel: update kernel from 2.6.38.2 to 2.6.38.6 and refresh patches
Thank you Peter Wagner for the patch. I refreshed the kernel patches and added the md5sum of the kernel. SVN-Revision: 26905
Diffstat (limited to 'target/linux/generic/patches-2.6.38/941-ocf_20100325.patch')
-rw-r--r--target/linux/generic/patches-2.6.38/941-ocf_20100325.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-2.6.38/941-ocf_20100325.patch b/target/linux/generic/patches-2.6.38/941-ocf_20100325.patch
index a1c088a9a8..deab36bc31 100644
--- a/target/linux/generic/patches-2.6.38/941-ocf_20100325.patch
+++ b/target/linux/generic/patches-2.6.38/941-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
-@@ -424,6 +424,7 @@ struct task_struct *find_task_by_vpid(pi
+@@ -427,6 +427,7 @@ struct task_struct *find_task_by_vpid(pi
{
return find_task_by_pid_ns(vnr, current->nsproxy->pid_ns);
}