History

random: remove extern from functions in header

Accoriding to the kernel style guide, having `extern` on functions in headers is old school and deprecated, and doesn't add anything. So remove them from random.h, and tidy up the file a little bit too.

Jason A. Donenfeld committed 4 years ago

Commit 7782cfe1 parent f5bda351 file · +31 −46Browse files

Unified · Split

include/linux/random.h+31−46
@@ -12,13 +12,12 @@ · 11 unmodified lines
12 12
13struct notifier_block;13struct notifier_block;
14 14
15extern void add_device_randomness(const void *, size_t);15void add_device_randomness(const void *, size_t);
16extern void add_bootloader_randomness(const void *, size_t);16void add_bootloader_randomness(const void *, size_t);
17extern void add_input_randomness(unsigned int type, unsigned int code,17void add_input_randomness(unsigned int type, unsigned int code,
18 unsigned int value) __latent_entropy;18 unsigned int value) __latent_entropy;
19extern void add_interrupt_randomness(int irq) __latent_entropy;19void add_interrupt_randomness(int irq) __latent_entropy;
20extern void add_hwgenerator_randomness(const void *buffer, size_t count,20void add_hwgenerator_randomness(const void *buffer, size_t count, size_t entropy);
21 size_t entropy);
22 21
23#if defined(LATENT_ENTROPY_PLUGIN) && !defined(__CHECKER__)22#if defined(LATENT_ENTROPY_PLUGIN) && !defined(__CHECKER__)
24static inline void add_latent_entropy(void)23static inline void add_latent_entropy(void)
@@ -26,30 +25,20 @@ static inline void add_latent_entropy(void) · 1 unmodified line
26 add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));25 add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
27}26}
28#else27#else
29static inline void add_latent_entropy(void) {}28static inline void add_latent_entropy(void) { }
30#endif29#endif
31 30
32#if IS_ENABLED(CONFIG_VMGENID)31#if IS_ENABLED(CONFIG_VMGENID)
33extern void add_vmfork_randomness(const void *unique_vm_id, size_t size);32void add_vmfork_randomness(const void *unique_vm_id, size_t size);
34extern int register_random_vmfork_notifier(struct notifier_block *nb);33int register_random_vmfork_notifier(struct notifier_block *nb);
35extern int unregister_random_vmfork_notifier(struct notifier_block *nb);34int unregister_random_vmfork_notifier(struct notifier_block *nb);
36#else35#else
37static inline int register_random_vmfork_notifier(struct notifier_block *nb) { return 0; }36static inline int register_random_vmfork_notifier(struct notifier_block *nb) { return 0; }
38static inline int unregister_random_vmfork_notifier(struct notifier_block *nb) { return 0; }37static inline int unregister_random_vmfork_notifier(struct notifier_block *nb) { return 0; }
39#endif38#endif
40 39
41extern void get_random_bytes(void *buf, size_t nbytes);40void get_random_bytes(void *buf, size_t nbytes);
42extern int wait_for_random_bytes(void);41size_t __must_check get_random_bytes_arch(void *buf, size_t nbytes);
43extern int __init random_init(const char *command_line);
44extern bool rng_is_initialized(void);
45extern int register_random_ready_notifier(struct notifier_block *nb);
46extern int unregister_random_ready_notifier(struct notifier_block *nb);
47extern size_t __must_check get_random_bytes_arch(void *buf, size_t nbytes);
48
49#ifndef MODULE
50extern const struct file_operations random_fops, urandom_fops;
51#endif
52
53u32 get_random_u32(void);42u32 get_random_u32(void);
54u64 get_random_u64(void);43u64 get_random_u64(void);
55static inline unsigned int get_random_int(void)44static inline unsigned int get_random_int(void)
@@ -81,11 +70,17 @@ static inline unsigned long get_random_long(void) · 25 unmodified lines
81 70
82static inline unsigned long get_random_canary(void)71static inline unsigned long get_random_canary(void)
83{72{
84 unsigned long val = get_random_long();73 return get_random_long() & CANARY_MASK;
85
86 return val & CANARY_MASK;
87}74}
88 75
76unsigned long randomize_page(unsigned long start, unsigned long range);
77
78int __init random_init(const char *command_line);
79bool rng_is_initialized(void);
80int wait_for_random_bytes(void);
81int register_random_ready_notifier(struct notifier_block *nb);
82int unregister_random_ready_notifier(struct notifier_block *nb);
83
89/* Calls wait_for_random_bytes() and then calls get_random_bytes(buf, nbytes).84/* Calls wait_for_random_bytes() and then calls get_random_bytes(buf, nbytes).
90 * Returns the result of the call to wait_for_random_bytes. */85 * Returns the result of the call to wait_for_random_bytes. */
91static inline int get_random_bytes_wait(void *buf, size_t nbytes)86static inline int get_random_bytes_wait(void *buf, size_t nbytes)
@@ -109,8 +104,6 @@ declare_get_random_var_wait(int) · 17 unmodified lines
109declare_get_random_var_wait(long)104declare_get_random_var_wait(long)
110#undef declare_get_random_var105#undef declare_get_random_var
111 106
112unsigned long randomize_page(unsigned long start, unsigned long range);
113
114/*107/*
115 * This is designed to be standalone for just prandom108 * This is designed to be standalone for just prandom
116 * users, but for now we include it from <linux/random.h>109 * users, but for now we include it from <linux/random.h>
@@ -121,22 +114,10 @@ unsigned long randomize_page(unsigned long start, unsigned long range); · 4 unmodified lines
121#ifdef CONFIG_ARCH_RANDOM114#ifdef CONFIG_ARCH_RANDOM
122# include <asm/archrandom.h>115# include <asm/archrandom.h>
123#else116#else
124static inline bool __must_check arch_get_random_long(unsigned long *v)117static inline bool __must_check arch_get_random_long(unsigned long *v) { return false; }
125{118static inline bool __must_check arch_get_random_int(unsigned int *v) { return false; }
126 return false;119static inline bool __must_check arch_get_random_seed_long(unsigned long *v) { return false; }
127}120static inline bool __must_check arch_get_random_seed_int(unsigned int *v) { return false; }
128static inline bool __must_check arch_get_random_int(unsigned int *v)
129{
130 return false;
131}
132static inline bool __must_check arch_get_random_seed_long(unsigned long *v)
133{
134 return false;
135}
136static inline bool __must_check arch_get_random_seed_int(unsigned int *v)
137{
138 return false;
139}
140#endif121#endif
141 122
142/*123/*
@@ -160,8 +141,12 @@ static inline bool __init arch_get_random_long_early(unsigned long *v) · 17 unmodified lines
160#endif141#endif
161 142
162#ifdef CONFIG_SMP143#ifdef CONFIG_SMP
163extern int random_prepare_cpu(unsigned int cpu);144int random_prepare_cpu(unsigned int cpu);
164extern int random_online_cpu(unsigned int cpu);145int random_online_cpu(unsigned int cpu);
146#endif
147
148#ifndef MODULE
149extern const struct file_operations random_fops, urandom_fops;
165#endif150#endif
166 151
167#endif /* _LINUX_RANDOM_H */152#endif /* _LINUX_RANDOM_H */