diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-17 22:45:01 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-17 22:45:01 +0300 |
| commit | bce3b5d6764b1e8cd8e24f4ced54ec0c42a64c32 (patch) | |
| tree | a9b7b34d0106c6511c9f8a502d940944180d0e7a /drivers | |
| parent | 47ce834fbb6ce6cb9e802f651b647b8030c5fc7f (diff) | |
| parent | 6472036581f947109b20664121db1d143e916f0b (diff) | |
| download | linux-bce3b5d6764b1e8cd8e24f4ced54ec0c42a64c32.tar.xz | |
Merge tag 'parisc-for-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc updates from Helge Deller:
"Two small fixes for the parisc architecture:
- Fix PDC address calculation with narrow firmware (64-bit kernel on
32-bit firmware)
- Fix kthread which checks power button get started on qemu too"
* tag 'parisc-for-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc/power: Fix power soft-off button emulation on qemu
parisc/firmware: Fix F-extend for PDC addresses
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/parisc/power.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parisc/power.c b/drivers/parisc/power.c index bb0d92461b08..7a6a3e7f2825 100644 --- a/drivers/parisc/power.c +++ b/drivers/parisc/power.c @@ -213,7 +213,7 @@ static int __init power_init(void) if (running_on_qemu && soft_power_reg) register_sys_off_handler(SYS_OFF_MODE_POWER_OFF, SYS_OFF_PRIO_DEFAULT, qemu_power_off, (void *)soft_power_reg); - else + if (!running_on_qemu || soft_power_reg) power_task = kthread_run(kpowerswd, (void*)soft_power_reg, KTHREAD_NAME); if (IS_ERR(power_task)) { |