git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[S390] magic sysrq: check for in_atomic before doing an console_unblank
[safe/jmp/linux-2.6]
/
arch
/
s390
/
kernel
/
setup.c
diff --git
a/arch/s390/kernel/setup.c
b/arch/s390/kernel/setup.c
index
7e1bfb9
..
c4131a8
100644
(file)
--- a/
arch/s390/kernel/setup.c
+++ b/
arch/s390/kernel/setup.c
@@
-347,7
+347,7
@@
void (*_machine_power_off)(void) = do_machine_power_off_nonsmp;
void machine_restart(char *command)
{
void machine_restart(char *command)
{
- if (
!in_interrupt(
) || oops_in_progress)
+ if (
(!in_interrupt() && !in_atomic()
) || oops_in_progress)
/*
* Only unblank the console if we are called in enabled
* context or a bust_spinlocks cleared the way for us.
/*
* Only unblank the console if we are called in enabled
* context or a bust_spinlocks cleared the way for us.