X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fgeneric%2Fpatches-3.3%2F941-ocf_20120127.patch;h=794627a85489493450afb01e2c835cbeac487224;hb=7d9a07b8551f0a3ec2e5a24c31ea1a60ecac2cad;hp=366a2586d4a4a34c34ab9ee405d520f5d7d7b5cb;hpb=94a17b96c4b537258b3d338ac00c0757c4936c01;p=openwrt.git

diff --git a/target/linux/generic/patches-3.3/941-ocf_20120127.patch b/target/linux/generic/patches-3.3/941-ocf_20120127.patch
index 366a2586d4..794627a854 100644
--- a/target/linux/generic/patches-3.3/941-ocf_20120127.patch
+++ b/target/linux/generic/patches-3.3/941-ocf_20120127.patch
@@ -1,7 +1,7 @@
 --- a/drivers/char/random.c
 +++ b/drivers/char/random.c
-@@ -130,6 +130,9 @@
-  * 	void add_interrupt_randomness(int irq);
+@@ -131,6 +131,9 @@
+  *	void add_interrupt_randomness(int irq, int irq_flags);
   * 	void add_disk_randomness(struct gendisk *disk);
   *
 + *      void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
@@ -10,7 +10,7 @@
   * add_input_randomness() uses the input layer interrupt timing, as well as
   * the event type information from the hardware.
   *
-@@ -147,6 +150,13 @@
+@@ -152,6 +155,13 @@
   * seek times do not make for good sources of entropy, as their seek
   * times are usually fairly consistent.
   *
@@ -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.
-@@ -726,6 +736,63 @@ void add_disk_randomness(struct gendisk
+@@ -796,6 +806,63 @@ void add_disk_randomness(struct gendisk
  }
  #endif
  
@@ -40,7 +40,7 @@
 + */
 +void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
 +{
-+	mix_pool_bytes(&input_pool, buf, wordcount*4);
++	mix_pool_bytes(&input_pool, buf, wordcount*4, NULL);
 +
 +	credit_entropy_bits(&input_pool, ent_count);
 +
@@ -141,17 +141,17 @@
  struct rand_pool_info {
  	int	entropy_count;
  	int	buf_size;
-@@ -54,6 +78,10 @@ extern void add_input_randomness(unsigne
+@@ -53,6 +77,10 @@ extern void add_input_randomness(unsigne
  				 unsigned int value);
- extern void add_interrupt_randomness(int irq);
+ extern void add_interrupt_randomness(int irq, int irq_flags);
  
 +extern void random_input_words(__u32 *buf, size_t wordcount, int ent_count);
 +extern int random_input_wait(void);
 +#define HAS_RANDOM_INPUT_WAIT 1
 +
  extern void get_random_bytes(void *buf, int nbytes);
+ extern void get_random_bytes_arch(void *buf, int nbytes);
  void generate_random_uuid(unsigned char uuid_out[16]);
- 
 --- a/kernel/pid.c
 +++ b/kernel/pid.c
 @@ -430,6 +430,7 @@ struct task_struct *find_task_by_vpid(pi