diff options
| author | Michael Ellerman | 2016-08-04 07:32:06 +0200 |
|---|---|---|
| committer | Michael Ellerman | 2016-08-04 12:22:34 +0200 |
| commit | eea8148c69f3aecbf297b12943a591467a1fb432 (patch) | |
| tree | e965347d6008f53dc8b14ebf136e95170cf03dda /arch/powerpc/mm/pgtable-radix.c | |
| parent | powerpc/perf: Fix incorrect event codes in power9-event-list (diff) | |
| download | kernel-qcow2-linux-eea8148c69f3aecbf297b12943a591467a1fb432.tar.gz kernel-qcow2-linux-eea8148c69f3aecbf297b12943a591467a1fb432.tar.xz kernel-qcow2-linux-eea8148c69f3aecbf297b12943a591467a1fb432.zip | |
powerpc/mm: Move register_process_table() out of ppc_md
We want to initialise register_process_table() before ppc_md is setup,
so that it can be called as part of MMU init (at least on Radix ATM).
That no longer works because probe_machine() requires that ppc_md be
empty before it's called, and we now do probe_machine() much later.
So make register_process_table a global for now. It will probably move
into a mmu_radix_ops struct at some point in the future.
This was broken by me when applying commit 7025776ed1eb "powerpc/mm:
Move hash table ops to a separate structure" due to conflicts with other
patches.
Fixes: 7025776ed1eb ("powerpc/mm: Move hash table ops to a separate structure")
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/mm/pgtable-radix.c')
| -rw-r--r-- | arch/powerpc/mm/pgtable-radix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/mm/pgtable-radix.c b/arch/powerpc/mm/pgtable-radix.c index f34ccdbe0fbd..af897d91d09f 100644 --- a/arch/powerpc/mm/pgtable-radix.c +++ b/arch/powerpc/mm/pgtable-radix.c @@ -171,7 +171,7 @@ redo: * of process table here. But our linear mapping also enable us to use * physical address here. */ - ppc_md.register_process_table(__pa(process_tb), 0, PRTB_SIZE_SHIFT - 12); + register_process_table(__pa(process_tb), 0, PRTB_SIZE_SHIFT - 12); pr_info("Process table %p and radix root for kernel: %p\n", process_tb, init_mm.pgd); } @@ -198,7 +198,7 @@ static void __init radix_init_partition_table(void) void __init radix_init_native(void) { - ppc_md.register_process_table = native_register_process_table; + register_process_table = native_register_process_table; } static int __init get_idx_from_shift(unsigned int shift) |