diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2022-09-09 14:00:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-09-09 14:00:45 -0400 |
| commit | 2fc1171d34deff70bf3a8338adab8ce46138aae3 (patch) | |
| tree | 84e173922f6cd53e61990e433cc60b36ef2e2284 /arch | |
| parent | Merge tag 'for-6.0-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux (diff) | |
| parent | powerpc/pseries: Fix plpks crash on non-pseries (diff) | |
| download | linux-dev-2fc1171d34deff70bf3a8338adab8ce46138aae3.tar.xz linux-dev-2fc1171d34deff70bf3a8338adab8ce46138aae3.zip | |
Merge tag 'powerpc-6.0-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fix from Michael Ellerman:
- Fix crashes on bare metal due to the new plkps driver trying to probe
and call the hypervisor on non-pseries machines.
Thanks to Nathan Chancellor and Dan Horák.
* tag 'powerpc-6.0-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
powerpc/pseries: Fix plpks crash on non-pseries
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/platforms/pseries/plpks.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pseries/plpks.c b/arch/powerpc/platforms/pseries/plpks.c index 52aaa2894606..f4b5b5a64db3 100644 --- a/arch/powerpc/platforms/pseries/plpks.c +++ b/arch/powerpc/platforms/pseries/plpks.c @@ -17,6 +17,7 @@ #include <linux/string.h> #include <linux/types.h> #include <asm/hvcall.h> +#include <asm/machdep.h> #include "plpks.h" @@ -457,4 +458,4 @@ static __init int pseries_plpks_init(void) return rc; } -arch_initcall(pseries_plpks_init); +machine_arch_initcall(pseries, pseries_plpks_init); |