Skip to content

Commit 703f706

Browse files
Sebastian Andrzej Siewiorzx2c4
authored andcommitted
random: remove unused irq_flags argument from add_interrupt_randomness()
Since commit ee3e00e ("random: use registers from interrupted code for CPU's w/o a cycle counter") the irq_flags argument is no longer used. Remove unused irq_flags. Cc: Borislav Petkov <[email protected]> Cc: Dave Hansen <[email protected]> Cc: Dexuan Cui <[email protected]> Cc: H. Peter Anvin <[email protected]> Cc: Haiyang Zhang <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: K. Y. Srinivasan <[email protected]> Cc: Stephen Hemminger <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Wei Liu <[email protected]> Cc: [email protected] Cc: [email protected] Signed-off-by: Sebastian Andrzej Siewior <[email protected]> Acked-by: Wei Liu <[email protected]> Signed-off-by: Jason A. Donenfeld <[email protected]>
1 parent 2b6c6e3 commit 703f706

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

arch/x86/kernel/cpu/mshyperv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ DEFINE_IDTENTRY_SYSVEC(sysvec_hyperv_stimer0)
7979
inc_irq_stat(hyperv_stimer0_count);
8080
if (hv_stimer0_handler)
8181
hv_stimer0_handler();
82-
add_interrupt_randomness(HYPERV_STIMER0_VECTOR, 0);
82+
add_interrupt_randomness(HYPERV_STIMER0_VECTOR);
8383
ack_APIC_irq();
8484

8585
set_irq_regs(old_regs);

drivers/char/random.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@
200200
* void add_device_randomness(const void *buf, unsigned int size);
201201
* void add_input_randomness(unsigned int type, unsigned int code,
202202
* unsigned int value);
203-
* void add_interrupt_randomness(int irq, int irq_flags);
203+
* void add_interrupt_randomness(int irq);
204204
* void add_disk_randomness(struct gendisk *disk);
205205
* void add_hwgenerator_randomness(const char *buffer, size_t count,
206206
* size_t entropy);
@@ -1253,7 +1253,7 @@ static __u32 get_reg(struct fast_pool *f, struct pt_regs *regs)
12531253
return *ptr;
12541254
}
12551255

1256-
void add_interrupt_randomness(int irq, int irq_flags)
1256+
void add_interrupt_randomness(int irq)
12571257
{
12581258
struct entropy_store *r;
12591259
struct fast_pool *fast_pool = this_cpu_ptr(&irq_randomness);

drivers/hv/vmbus_drv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1381,7 +1381,7 @@ static void vmbus_isr(void)
13811381
tasklet_schedule(&hv_cpu->msg_dpc);
13821382
}
13831383

1384-
add_interrupt_randomness(vmbus_interrupt, 0);
1384+
add_interrupt_randomness(vmbus_interrupt);
13851385
}
13861386

13871387
static irqreturn_t vmbus_percpu_isr(int irq, void *dev_id)

include/linux/random.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ static inline void add_latent_entropy(void) {}
3535

3636
extern void add_input_randomness(unsigned int type, unsigned int code,
3737
unsigned int value) __latent_entropy;
38-
extern void add_interrupt_randomness(int irq, int irq_flags) __latent_entropy;
38+
extern void add_interrupt_randomness(int irq) __latent_entropy;
3939

4040
extern void get_random_bytes(void *buf, int nbytes);
4141
extern int wait_for_random_bytes(void);

kernel/irq/handle.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ irqreturn_t handle_irq_event_percpu(struct irq_desc *desc)
197197

198198
retval = __handle_irq_event_percpu(desc, &flags);
199199

200-
add_interrupt_randomness(desc->irq_data.irq, flags);
200+
add_interrupt_randomness(desc->irq_data.irq);
201201

202202
if (!irq_settings_no_debug(desc))
203203
note_interrupt(desc, retval);

0 commit comments

Comments
 (0)