Commit 1084562e authored by Sven Schnelle's avatar Sven Schnelle Committed by Alexander Gordeev
Browse files

s390/irq: Set CIF_NOHZ_DELAY in do_io_irq() 



Both do_airq_interrupt() and do_io_interrupt() set
CIF_NOHZ_DELAY. Move it to do_io_irq() to simplify
the code.

Reviewed-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarSven Schnelle <svens@linux.ibm.com>
Signed-off-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
parent f2ebdadd

arch/s390/kernel/irq.c

+1 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ void noinstr do_io_irq(struct pt_regs *regs) 
	if (from_idle)

		account_idle_time_irq();



	set_cpu_flag(CIF_NOHZ_DELAY);

	do {

		regs->tpi_info = S390_lowcore.tpi_info;

		if (S390_lowcore.tpi_info.adapter_IO)

drivers/s390/cio/airq.c

+0 −1
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ static irqreturn_t do_airq_interrupt(int irq, void *dummy) 
	struct airq_struct *airq;

	struct hlist_head *head;



	set_cpu_flag(CIF_NOHZ_DELAY);

	tpi_info = &get_irq_regs()->tpi_info;

	trace_s390_cio_adapter_int(tpi_info);

	head = &airq_lists[tpi_info->isc];

drivers/s390/cio/cio.c

+0 −1
Original line number Diff line number Diff line
@@ -535,7 +535,6 @@ static irqreturn_t do_cio_interrupt(int irq, void *dummy) 
	struct subchannel *sch;

	struct irb *irb;



	set_cpu_flag(CIF_NOHZ_DELAY);

	tpi_info = &get_irq_regs()->tpi_info;

	trace_s390_cio_interrupt(tpi_info);

	irb = this_cpu_ptr(&cio_irb);