Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e6ae70c authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Greg Kroah-Hartman
Browse files

random: remove unused irq_flags argument from add_interrupt_randomness() 



commit 703f7066f40599c290babdb79dd61319264987e9 upstream.

Since commit
   ee3e00e9 ("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 <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Dexuan Cui <decui@microsoft.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: K. Y. Srinivasan <kys@microsoft.com>
Cc: Stephen Hemminger <sthemmin@microsoft.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Wei Liu <wei.liu@kernel.org>
Cc: linux-hyperv@vger.kernel.org
Cc: x86@kernel.org
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Acked-by: default avatarWei Liu <wei.liu@kernel.org>
Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2580b0b3

arch/x86/kernel/cpu/mshyperv.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ __visible void __irq_entry hv_stimer0_vector_handler(struct pt_regs *regs) 
	inc_irq_stat(hyperv_stimer0_count);

	if (hv_stimer0_handler)

		hv_stimer0_handler();

	add_interrupt_randomness(HYPERV_STIMER0_VECTOR, 0);

	add_interrupt_randomness(HYPERV_STIMER0_VECTOR);

	ack_APIC_irq();



	exiting_irq();

drivers/char/random.c

+2 −2
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ 
 *	void add_device_randomness(const void *buf, unsigned int size);

 * 	void add_input_randomness(unsigned int type, unsigned int code,

 *                                unsigned int value);

 *	void add_interrupt_randomness(int irq, int irq_flags);

 *	void add_interrupt_randomness(int irq);

 * 	void add_disk_randomness(struct gendisk *disk);

 *	void add_hwgenerator_randomness(const char *buffer, size_t count,

 *					size_t entropy);
@@ -1273,7 +1273,7 @@ static __u32 get_reg(struct fast_pool *f, struct pt_regs *regs) 
	return *ptr;

}



void add_interrupt_randomness(int irq, int irq_flags)

void add_interrupt_randomness(int irq)

{

	struct entropy_store	*r;

	struct fast_pool	*fast_pool = this_cpu_ptr(&irq_randomness);

drivers/hv/vmbus_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -1303,7 +1303,7 @@ static void vmbus_isr(void) 
			tasklet_schedule(&hv_cpu->msg_dpc);

	}



	add_interrupt_randomness(HYPERVISOR_CALLBACK_VECTOR, 0);

	add_interrupt_randomness(HYPERVISOR_CALLBACK_VECTOR);

}



/*

include/linux/random.h

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ static inline void add_latent_entropy(void) {} 


extern void add_input_randomness(unsigned int type, unsigned int code,

				 unsigned int value) __latent_entropy;

extern void add_interrupt_randomness(int irq, int irq_flags) __latent_entropy;

extern void add_interrupt_randomness(int irq) __latent_entropy;



extern void get_random_bytes(void *buf, int nbytes);

extern int wait_for_random_bytes(void);

kernel/irq/handle.c

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ irqreturn_t handle_irq_event_percpu(struct irq_desc *desc) 


	retval = __handle_irq_event_percpu(desc, &flags);



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

	add_interrupt_randomness(desc->irq_data.irq);



	if (!noirqdebug)

		note_interrupt(desc, retval);