diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-10-14 00:50:31 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-10-14 00:50:31 +0200 |
| commit | 69f658e399f3d9cb9c9680afb714ba23860d7ccb (patch) | |
| tree | 13fbc42f466cb10d319514e4ddec53def8c554f6 /arch/parisc/kernel/process.c | |
| parent | 9867999f3a85b52f96ef05fca00cc8128eed01ce (diff) | |
| parent | 42f6284ae602469762ee721ec31ddfc6170e00bc (diff) | |
| download | linux-69f658e399f3d9cb9c9680afb714ba23860d7ccb.tar.bz2 | |
Merge branch 'pm-domains' into pm-opp
Diffstat (limited to 'arch/parisc/kernel/process.c')
| -rw-r--r-- | arch/parisc/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c index a45a67d526f8..30f92391a93e 100644 --- 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_suspend(); + lockup_detector_soft_poweroff(); for (;;); } |