Skip to content

Commit 1084562

Browse files
svens-s390Alexander Gordeev
authored andcommitted
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: Heiko Carstens <[email protected]> Signed-off-by: Sven Schnelle <[email protected]> Signed-off-by: Alexander Gordeev <[email protected]>
1 parent f2ebdad commit 1084562

File tree

3 files changed

+1
-2
lines changed

3 files changed

+1
-2
lines changed

arch/s390/kernel/irq.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ void noinstr do_io_irq(struct pt_regs *regs)
150150
if (from_idle)
151151
account_idle_time_irq();
152152

153+
set_cpu_flag(CIF_NOHZ_DELAY);
153154
do {
154155
regs->tpi_info = S390_lowcore.tpi_info;
155156
if (S390_lowcore.tpi_info.adapter_IO)

drivers/s390/cio/airq.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ static irqreturn_t do_airq_interrupt(int irq, void *dummy)
9090
struct airq_struct *airq;
9191
struct hlist_head *head;
9292

93-
set_cpu_flag(CIF_NOHZ_DELAY);
9493
tpi_info = &get_irq_regs()->tpi_info;
9594
trace_s390_cio_adapter_int(tpi_info);
9695
head = &airq_lists[tpi_info->isc];

drivers/s390/cio/cio.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,6 @@ static irqreturn_t do_cio_interrupt(int irq, void *dummy)
535535
struct subchannel *sch;
536536
struct irb *irb;
537537

538-
set_cpu_flag(CIF_NOHZ_DELAY);
539538
tpi_info = &get_irq_regs()->tpi_info;
540539
trace_s390_cio_interrupt(tpi_info);
541540
irb = this_cpu_ptr(&cio_irb);

0 commit comments

Comments
 (0)