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/pseries.h | |
| parent | 54c15ec3b738c6086f2be001dae962ec412640e5 (diff) | |
| parent | 887502826549caa7e4215fd9e628f48f14c0825a (diff) | |
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/pseries.h')
| -rw-r--r-- | arch/powerpc/platforms/pseries/pseries.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/pseries/pseries.h b/arch/powerpc/platforms/pseries/pseries.h index f5c916c839c9..1d75b7742ef0 100644 --- a/arch/powerpc/platforms/pseries/pseries.h +++ b/arch/powerpc/platforms/pseries/pseries.h @@ -122,4 +122,6 @@ void pseries_lpar_read_hblkrm_characteristics(void); static inline void pseries_lpar_read_hblkrm_characteristics(void) { } #endif +void pseries_rng_init(void); + #endif /* _PSERIES_PSERIES_H */ |