Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 5932ef077716e3e798eaba6738ef874849f62a17

Authored by Al Viro
Committed by Linus Torvalds
1 parent a07562e03a
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] sun4: fix sbus_setup_iommu() 

iommu_init() and iounit_init() are never called for sun4, but that's not
enough - these calls should be ifdefed out since the functions in question
simply do not exist for CONFIG_SUN4 kernel.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

arch/sparc/kernel/ioport.c
Diff comments   View file @ 5932ef0
... ... @@ -508,6 +508,7 @@
508 508  
509 509 void __init sbus_setup_iommu(struct sbus_bus *sbus, struct device_node *dp)
510 510 {
  511 +#ifndef CONFIG_SUN4
511 512 struct device_node *parent = dp->parent;
512 513  
513 514 if (sparc_cpu_model != sun4d &&
... ... @@ -524,6 +525,7 @@
524 525  
525 526 iounit_init(dp->node, parent->node, sbus);
526 527 }
  528 +#endif
527 529 }
528 530  
529 531 void __init sbus_setup_arch_props(struct sbus_bus *sbus, struct device_node *dp)