Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 415202447d31d0f458cca256ad7e0ed777d993d9

Authored by Michael Ellerman
Committed by Paul Mackerras
1 parent caf80e579b
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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

Showing 1 changed file with 1 additions and 6 deletions Side-by-side Diff

arch/powerpc/platforms/pseries/setup.c
Diff comments   View file @ 4152024
... ... @@ -320,19 +320,14 @@
320 320 */
321 321 static void __init pSeries_init_early(void)
322 322 {
323   - int iommu_off = 0;
324   -
325 323 DBG(" -> pSeries_init_early()\n");
326 324  
327 325 fw_feature_init();
328 326  
329 327 if (platform_is_lpar())
330 328 hpte_init_lpar();
331   - else {
  329 + else
332 330 hpte_init_native();
333   - iommu_off = (of_chosen &&
334   - get_property(of_chosen, "linux,iommu-off", NULL));
335   - }
336 331  
337 332 if (platform_is_lpar())
338 333 find_udbg_vterm();