Patched in Tegra support.

1 files changed, 49 insertions, 30 deletions

diff --git a/include/linux/random.h b/include/linux/random.h
index d9846088c2c..d13059f3ea3 100644
--- a/include/linux/random.h
+++ b/include/linux/random.h
@@ -3,19 +3,58 @@
  *
  * Include file for the random number generator.
  */
+
 #ifndef _LINUX_RANDOM_H
 #define _LINUX_RANDOM_H
 
-#include <uapi/linux/random.h>
+#include <linux/types.h>
+#include <linux/ioctl.h>
+#include <linux/irqnr.h>
+
+/* ioctl()'s for the random number generator */
+
+/* Get the entropy count. */
+#define RNDGETENTCNT    _IOR( 'R', 0x00, int )
+
+/* Add to (or subtract from) the entropy count.  (Superuser only.) */
+#define RNDADDTOENTCNT  _IOW( 'R', 0x01, int )
+
+/* Get the contents of the entropy pool.  (Superuser only.) */
+#define RNDGETPOOL      _IOR( 'R', 0x02, int [2] )
+
+/* 
+ * Write bytes into the entropy pool and add to the entropy count.
+ * (Superuser only.)
+ */
+#define RNDADDENTROPY   _IOW( 'R', 0x03, int [2] )
+
+/* Clear entropy count to 0.  (Superuser only.) */
+#define RNDZAPENTCNT    _IO( 'R', 0x04 )
+
+/* Clear the entropy pool and associated counters.  (Superuser only.) */
+#define RNDCLEARPOOL    _IO( 'R', 0x06 )
+
+struct rand_pool_info {
+        int     entropy_count;
+        int     buf_size;
+        __u32   buf[0];
+};
+
+struct rnd_state {
+        __u32 s1, s2, s3;
+};
 
+/* Exported functions */
+
+#ifdef __KERNEL__
+
+extern void rand_initialize_irq(int irq);
 
-extern void add_device_randomness(const void *, unsigned int);
 extern void add_input_randomness(unsigned int type, unsigned int code,
                                  unsigned int value);
-extern void add_interrupt_randomness(int irq, int irq_flags);
+extern void add_interrupt_randomness(int irq);
 
 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]);
 
 #ifndef MODULE
@@ -25,19 +64,10 @@ extern const struct file_operations random_fops, urandom_fops;
 unsigned int get_random_int(void);
 unsigned long randomize_range(unsigned long start, unsigned long end, unsigned long len);
 
-u32 prandom_u32(void);
-void prandom_bytes(void *buf, int nbytes);
-void prandom_seed(u32 seed);
-
-/*
- * These macros are preserved for backward compatibility and should be
- * removed as soon as a transition is finished.
- */
-#define random32() prandom_u32()
-#define srandom32(seed) prandom_seed(seed)
+u32 random32(void);
+void srandom32(u32 seed);
 
-u32 prandom_u32_state(struct rnd_state *);
-void prandom_bytes_state(struct rnd_state *state, void *buf, int nbytes);
+u32 prandom32(struct rnd_state *);
 
 /*
  * Handle minimum values for seeds
@@ -48,11 +78,11 @@ static inline u32 __seed(u32 x, u32 m)
 }
 
 /**
- * prandom_seed_state - set seed for prandom_u32_state().
+ * prandom32_seed - set seed for prandom32().
  * @state: pointer to state structure to receive the seed.
  * @seed: arbitrary 64-bit value to use as a seed.
  */
-static inline void prandom_seed_state(struct rnd_state *state, u64 seed)
+static inline void prandom32_seed(struct rnd_state *state, u64 seed)
 {
         u32 i = (seed >> 32) ^ (seed << 10) ^ seed;
 
@@ -61,17 +91,6 @@ static inline void prandom_seed_state(struct rnd_state *state, u64 seed)
         state->s3 = __seed(i, 15);
 }
 
-#ifdef CONFIG_ARCH_RANDOM
-# include <asm/archrandom.h>
-#else
-static inline int arch_get_random_long(unsigned long *v)
-{
-        return 0;
-}
-static inline int arch_get_random_int(unsigned int *v)
-{
-        return 0;
-}
-#endif
+#endif /* __KERNEL___ */
 
 #endif /* _LINUX_RANDOM_H */