diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2022-07-09 19:29:34 +1000 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2022-07-09 19:29:34 +1000 |
commit | 7e74dabc3daf0c217cb5e8e849a8f6c02927950f (patch) | |
tree | 8620e5d95e732952473eeb764aee17693e4458bd /arch/powerpc/platforms/pseries/setup.c | |
parent | powerpc: dts: Add DTS file for CZ.NIC Turris 1.x routers (diff) | |
parent | powerpc/powernv: delay rng platform device creation until later in boot (diff) | |
download | linux-dev-7e74dabc3daf0c217cb5e8e849a8f6c02927950f.tar.xz linux-dev-7e74dabc3daf0c217cb5e8e849a8f6c02927950f.zip |
Merge branch 'fixes' into next
Merge our fixes branch. In particular this brings in commit
986481618023 ("powerpc/book3e: Fix PUD allocation size in
map_kernel_page()") which fixes a build failure in next, because commit
2db2008e6363 ("powerpc/64e: Rewrite p4d_populate() as a static inline
function") depends on it.
Diffstat (limited to 'arch/powerpc/platforms/pseries/setup.c')
-rw-r--r-- | arch/powerpc/platforms/pseries/setup.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index 4f08161f09b9..a74c425be624 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c @@ -839,6 +839,7 @@ static void __init pSeries_setup_arch(void) } ppc_md.pcibios_root_bridge_prepare = pseries_root_bridge_prepare; + pseries_rng_init(); } static void pseries_panic(char *str) |