hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[S390] sclp: don't call local_bh_disable/_local_bh_enable if in_interrupt() 

local_bh_disable/_local_bh_enable must not be called if in_irq() is
true. Besides that if in_interrupt() is true bottom halves are
disabled anyway.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Heiko Carstens 2007-02-05 21:17:16 +01:00 committed by Martin Schwidefsky
parent 444f0e5489
commit c59d744bd8
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/s390/char/sclp.c
View File

@ -402,6 +402,7 @@ sclp_sync_wait(void)
unsigned long flags; unsigned long flags;
unsigned long cr0, cr0_sync; unsigned long cr0, cr0_sync;
u64 timeout; u64 timeout;
int irq_context;
/* We'll be disabling timer interrupts, so we need a custom timeout /* We'll be disabling timer interrupts, so we need a custom timeout
* mechanism */ * mechanism */
@ -414,7 +415,9 @@ sclp_sync_wait(void)
} }
local_irq_save(flags); local_irq_save(flags);
/* Prevent bottom half from executing once we force interrupts open */ /* Prevent bottom half from executing once we force interrupts open */
local_bh_disable(); irq_context = in_interrupt();
if (!irq_context)
local_bh_disable();
/* Enable service-signal interruption, disable timer interrupts */ /* Enable service-signal interruption, disable timer interrupts */
trace_hardirqs_on(); trace_hardirqs_on();
__ctl_store(cr0, 0, 0); __ctl_store(cr0, 0, 0);
@ -435,7 +438,8 @@ sclp_sync_wait(void)
} }
local_irq_disable(); local_irq_disable();
__ctl_load(cr0, 0, 0); __ctl_load(cr0, 0, 0);
_local_bh_enable(); if (!irq_context)
_local_bh_enable();
local_irq_restore(flags); local_irq_restore(flags);
} }