diff options
author | Michael Ellerman <michael@ellerman.id.au> | 2006-06-23 04:16:38 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-06-27 21:59:47 -0400 |
commit | 7d0daae4ae1a3e80d78b83cddf414a3b98a962f4 (patch) | |
tree | f8dcd24a598212b58652c771a5e81c8a167bb3d1 /arch/powerpc/platforms/iseries/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/iseries/setup.c')
-rw-r--r-- | arch/powerpc/platforms/iseries/setup.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c index 973f5aa71657..66c77e4f8ec2 100644 --- a/arch/powerpc/platforms/iseries/setup.c +++ b/arch/powerpc/platforms/iseries/setup.c | |||
@@ -319,11 +319,6 @@ static void __init iSeries_init_early(void) | |||
319 | iSeries_recal_titan = HvCallXm_loadTod(); | 319 | iSeries_recal_titan = HvCallXm_loadTod(); |
320 | 320 | ||
321 | /* | 321 | /* |
322 | * Initialize the hash table management pointers | ||
323 | */ | ||
324 | hpte_init_iSeries(); | ||
325 | |||
326 | /* | ||
327 | * Initialize the DMA/TCE management | 322 | * Initialize the DMA/TCE management |
328 | */ | 323 | */ |
329 | iommu_init_early_iSeries(); | 324 | iommu_init_early_iSeries(); |
@@ -671,6 +666,8 @@ static int __init iseries_probe(void) | |||
671 | */ | 666 | */ |
672 | virt_irq_max = 255; | 667 | virt_irq_max = 255; |
673 | 668 | ||
669 | hpte_init_iSeries(); | ||
670 | |||
674 | return 1; | 671 | return 1; |
675 | } | 672 | } |
676 | 673 | ||