diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-11-19 02:13:10 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-11-19 02:13:10 +0300 |
commit | 2254005ef1474d59b706f2ea574d8552071631b1 (patch) | |
tree | 9cbc34797b6ec3cdce666cb1a8215e4f2959968f /drivers | |
parent | b8f1fa2419c19c81bc386a6b350879ba54a573e1 (diff) | |
parent | 793838138c157d4c49f4fb744b170747e3dabf58 (diff) | |
download | linux-2254005ef1474d59b706f2ea574d8552071631b1.tar.xz |
Merge tag 'parisc-for-6.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc fixes from Helge Deller:
"On parisc we still sometimes need writeable stacks, e.g. if programs
aren't compiled with gcc-14. To avoid issues with the upcoming
systemd-254 we therefore have to disable prctl(PR_SET_MDWE) for now
(for parisc only).
The other two patches are minor: a bugfix for the soft power-off on
qemu with 64-bit kernel and prefer strscpy() over strlcpy():
- Fix power soft-off on qemu
- Disable prctl(PR_SET_MDWE) since parisc sometimes still needs
writeable stacks
- Use strscpy instead of strlcpy in show_cpuinfo()"
* tag 'parisc-for-6.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
prctl: Disable prctl(PR_SET_MDWE) on parisc
parisc/power: Fix power soft-off when running on qemu
parisc: Replace strlcpy() with strscpy()
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 539d8920c202..bb0d92461b08 100644 --- a/drivers/parisc/power.c +++ b/drivers/parisc/power.c @@ -176,7 +176,7 @@ static struct notifier_block parisc_panic_block = { static int qemu_power_off(struct sys_off_data *data) { /* this turns the system off via SeaBIOS */ - *(int *)data->cb_data = 0; + gsc_writel(0, (unsigned long) data->cb_data); pdc_soft_power_button(1); return NOTIFY_DONE; } |