aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.39/941-ocf_20100325.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2011-05-25 19:32:00 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2011-05-25 19:32:00 +0000
commitc69f2d8788919032dd1046983eb820198571bc97 (patch)
treea46a4f3811defd4c10c58cd708d4da5c78a5bcba /target/linux/generic/patches-2.6.39/941-ocf_20100325.patch
parent8137e35a5dd952d3e5b57679d8f3d9627889c236 (diff)
downloadupstream-c69f2d8788919032dd1046983eb820198571bc97.tar.gz
upstream-c69f2d8788919032dd1046983eb820198571bc97.tar.bz2
upstream-c69f2d8788919032dd1046983eb820198571bc97.zip
kernel: some updates for kernel 2.6.39
* add md5sum for kernel * add some missing config symbols * add some ssb patches to make compat-wireless compile Thank you Peter Wagner for the patch SVN-Revision: 27009
Diffstat (limited to 'target/linux/generic/patches-2.6.39/941-ocf_20100325.patch')
-rw-r--r--target/linux/generic/patches-2.6.39/941-ocf_20100325.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-2.6.39/941-ocf_20100325.patch b/target/linux/generic/patches-2.6.39/941-ocf_20100325.patch
index 537f9ed374..e640bc1c55 100644
--- a/target/linux/generic/patches-2.6.39/941-ocf_20100325.patch
+++ b/target/linux/generic/patches-2.6.39/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.
-@@ -722,6 +732,61 @@ void add_disk_randomness(struct gendisk
+@@ -722,6 +732,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);
}