Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+2
-1
+2
-1
arch/powerpc/platforms/pseries/plpks.c
+2
-1
arch/powerpc/platforms/pseries/plpks.c
···
17
17
#include <linux/string.h>
18
18
#include <linux/types.h>
19
19
#include <asm/hvcall.h>
20
+
#include <asm/machdep.h>
20
21
21
22
#include "plpks.h"
22
23
···
458
457
459
458
return rc;
460
459
}
461
-
arch_initcall(pseries_plpks_init);
460
+
machine_arch_initcall(pseries, pseries_plpks_init);