korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 12:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

powerpc fixes for 6.0 #5

Browse Source 
- 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, Dan Horák.
 -----BEGIN PGP SIGNATURE-----
 
 iQJHBAABCAAxFiEEJFGtCPCthwEv2Y/bUevqPMjhpYAFAmMbHjkTHG1wZUBlbGxl
 cm1hbi5pZC5hdQAKCRBR6+o8yOGlgIpEEACG6fcip9a7GDZq1mQiwPpScLKh3NcR
 GWi7dQrIF5ZosMuCuQCMs2842E0y/n8KWjVO9TubaqVLB5tdWpN2TPk2sz2WWpuy
 ZvG1dQwtAyW5HhBjBxrZRSIeRKgjZGvVyOy3nfNCkxbDTt5k2KPz5cKe4gk2joNB
 koM6Uuiyn9fa9n9xYvXZdSDsJg7EGfZJX7NFGFgiss1lKop2xghBkQPg1dRYBLDf
 kgGQi1zyaHB+c6D6GqnRxmjq1j5Yp3oVwEEyf7jehVkZoEEdeueUAjIOoYUTwgi3
 kuscL0EyvEDOFcosQiCsWd4SwhLptMEdIk5M6ld1dRLmW3pChb2M4nojdq3tF/m2
 6DopTN8APohtIAgZ05YUQXyVRlbQap6O58ylQlcdTbhkkv4qz9VJUoGdvl8OlGfa
 m66LLeYxOtBH4AtdPWvwozqtP4jfIL1bhMxEj4fCZm7pfU//h5Yk4lVQ7uVPq38K
 BEQfGQTOIm5RWXix1uxNG0XUA9W0hjRtmNN2hnH5sEwqXvENyzVGTBNmsK3mgpgk
 lHLaJNhTTrDIouRY+TDGNDfCg4pVQujjqlba6ArdleiTViZenQdg5eL9G579PT2j
 r6gSvRnRfSmVa254x5TLE9O6QlAxvNpKz7ITRnnWNbzS2l1RZtlgroZWQRs/G+rw
 tLmSwtr8b/qG+g==
 =cP4v
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2022-09-09 14:00:45 -04:00
commit 2fc1171d34
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/powerpc/platforms/pseries/plpks.c
View File

@ -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);