Commit 41520244 authored Mar 21, 2006 by Michael Ellerman Committed by Paul Mackerras Mar 22, 2006

[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>

parent caf80e57

arch/powerpc/platforms/pseries/setup.c

+1 −6

Original line number	Diff line number	Diff line
		@@ -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();

Admin message