git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'ceph-for-4.14-rc4' of git://github.com/ceph/ceph-client
[sfrench/cifs-2.6.git]
/
arch
/
parisc
/
kernel
/
process.c
diff --git
a/arch/parisc/kernel/process.c
b/arch/parisc/kernel/process.c
index a45a67d526f8ca8001fd1d06625b3b233d5a3835..30f92391a93ef6d5a90970b81921a2133d5e2eb0 100644
(file)
--- a/
arch/parisc/kernel/process.c
+++ b/
arch/parisc/kernel/process.c
@@
-146,7
+146,7
@@
void machine_power_off(void)
/* prevent soft lockup/stalled CPU messages for endless loop. */
rcu_sysrq_start();
- lockup_detector_s
uspend
();
+ lockup_detector_s
oft_poweroff
();
for (;;);
}