Skip to content

Commit

Permalink
[PATCH] powerpc: Remove unused iommu_off logic from pSeries_init_early()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Michael Ellerman authored and Paul Mackerras committed Mar 22, 2006
1 parent caf80e5 commit 4152024
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions arch/powerpc/platforms/pseries/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

0 comments on commit 4152024

Please sign in to comment.