diff options
| author | Michael Ellerman <michael@ellerman.id.au> | 2006-06-23 18:16:38 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-06-28 11:59:47 +1000 |
| commit | 7d0daae4ae1a3e80d78b83cddf414a3b98a962f4 (patch) | |
| tree | f8dcd24a598212b58652c771a5e81c8a167bb3d1 /arch/powerpc/platforms/powermac/setup.c | |
| parent | 7a4571ae553e2972b7958306fd796a2fd24fd7d1 (diff) | |
[POWERPC] powerpc: Initialise ppc_md htab pointers earlier
Initialise the ppc_md htab callbacks earlier, in the probe routines. This
allows us to call htab_finish_init() from htab_initialize(), and makes it
private to hash_utils_64.c. Move htab_finish_init() and make_bl() above
htab_initialize() to avoid forward declarations.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms/powermac/setup.c')
| -rw-r--r-- | arch/powerpc/platforms/powermac/setup.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c index 9cc7db7a8bd..89c5775f83b 100644 --- a/arch/powerpc/platforms/powermac/setup.c +++ b/arch/powerpc/platforms/powermac/setup.c @@ -600,13 +600,6 @@ pmac_halt(void) */ static void __init pmac_init_early(void) { -#ifdef CONFIG_PPC64 - /* Initialize hash table, from now on, we can take hash faults - * and call ioremap - */ - hpte_init_native(); -#endif - /* Enable early btext debug if requested */ if (strstr(cmd_line, "btextdbg")) { udbg_adb_init_early(); @@ -683,6 +676,8 @@ static int __init pmac_probe(void) * part of the cacheable linar mapping */ alloc_dart_table(); + + hpte_init_native(); #endif #ifdef CONFIG_PPC32 |