linux/generic: refresh 2.6.36 kernel patches

[openwrt/svn-archive/archive.git] / target / linux / generic / patches-2.6.36 / 971-ocf_20100325.patch

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 fe96d7937a22c0971b94bdead0f2bb999159a118..e3ecbbeaa07a8509c5d36b56d5b97ad0ea548e51 100644 (file)
--- 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);
  }