Commit 5932ef07 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds

[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: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a07562e0
...@@ -508,6 +508,7 @@ void __init sbus_arch_bus_ranges_init(struct device_node *pn, struct sbus_bus *s ...@@ -508,6 +508,7 @@ void __init sbus_arch_bus_ranges_init(struct device_node *pn, struct sbus_bus *s
void __init sbus_setup_iommu(struct sbus_bus *sbus, struct device_node *dp) void __init sbus_setup_iommu(struct sbus_bus *sbus, struct device_node *dp)
{ {
#ifndef CONFIG_SUN4
struct device_node *parent = dp->parent; struct device_node *parent = dp->parent;
if (sparc_cpu_model != sun4d && if (sparc_cpu_model != sun4d &&
...@@ -524,6 +525,7 @@ void __init sbus_setup_iommu(struct sbus_bus *sbus, struct device_node *dp) ...@@ -524,6 +525,7 @@ void __init sbus_setup_iommu(struct sbus_bus *sbus, struct device_node *dp)
iounit_init(dp->node, parent->node, sbus); iounit_init(dp->node, parent->node, sbus);
} }
#endif
} }
void __init sbus_setup_arch_props(struct sbus_bus *sbus, struct device_node *dp) void __init sbus_setup_arch_props(struct sbus_bus *sbus, struct device_node *dp)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment