diff options
| author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-11-25 10:48:00 -0800 |
|---|---|---|
| committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-11-25 10:48:00 -0800 |
| commit | 27f6cbecbf60e2dd2be49a945e9966ed6b20b2de (patch) | |
| tree | 2416ab37445ec5ec8e669016a2d1f5573863d73c /include/linux/random.h | |
| parent | 7cf095f46f0ca52773a431db8ac0bf4a07a3501b (diff) | |
| parent | eb1852b10593dc3ca73e02bf9ac4753a5a464905 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into wireless-next
Diffstat (limited to 'include/linux/random.h')
| -rw-r--r-- | include/linux/random.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/linux/random.h b/include/linux/random.h index d13059f3ea32..8f74538c96db 100644 --- a/include/linux/random.h +++ b/include/linux/random.h @@ -91,6 +91,19 @@ static inline void prandom32_seed(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 */ |