diff options
| author | Michael Ellerman <michael@ellerman.id.au> | 2006-03-21 10:45:58 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-22 05:04:12 +0100 |
| commit | 415202447d31d0f458cca256ad7e0ed777d993d9 (patch) | |
| tree | 3f12c25557a7f631852e2bda9831dc7fc9b5b5fc /arch | |
| parent | [PATCH] powerpc: Unconfuse htab_bolt_mapping() callers (diff) | |
| download | linux-415202447d31d0f458cca256ad7e0ed777d993d9.tar.xz linux-415202447d31d0f458cca256ad7e0ed777d993d9.zip | |
[PATCH] powerpc: Remove unused iommu_off logic from pSeries_init_early()
When iommu_init_early_pSeries() was added, ages ago, we forgot to remove
the code that checks /chosen/linux,iommu-off in pSeries_init_early(). We
do it now in iommu_init_early_pSeries().
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Acked-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/platforms/pseries/setup.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index b5996a7060f4..149751a3742a 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c @@ -320,19 +320,14 @@ static int pseries_set_xdabr(unsigned long dabr) */ static void __init pSeries_init_early(void) { - int iommu_off = 0; - DBG(" -> pSeries_init_early()\n"); fw_feature_init(); if (platform_is_lpar()) hpte_init_lpar(); - else { + else hpte_init_native(); - iommu_off = (of_chosen && - get_property(of_chosen, "linux,iommu-off", NULL)); - } if (platform_is_lpar()) find_udbg_vterm(); |