Merge branch 'fixes' into next
Merge our fixes branch. In particular this brings in commit9864816180("powerpc/book3e: Fix PUD allocation size in map_kernel_page()") which fixes a build failure in next, because commit2db2008e63("powerpc/64e: Rewrite p4d_populate() as a static inline function") depends on it.
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user