diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2006-09-23 01:26:02 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-22 17:48:57 -0700 |
| commit | 5932ef077716e3e798eaba6738ef874849f62a17 (patch) | |
| tree | aef525063c75811002dc97033cfa6a9933e026ff /arch | |
| parent | a07562e03a3f4a1276931e3fb3cb532622a6c616 (diff) | |
| download | linux-3.10-5932ef077716e3e798eaba6738ef874849f62a17.tar.gz linux-3.10-5932ef077716e3e798eaba6738ef874849f62a17.tar.bz2 linux-3.10-5932ef077716e3e798eaba6738ef874849f62a17.zip | |
[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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc/kernel/ioport.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c index 8654b446ac9..d33f8a07cca 100644 --- a/arch/sparc/kernel/ioport.c +++ b/arch/sparc/kernel/ioport.c @@ -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) { +#ifndef CONFIG_SUN4 struct device_node *parent = dp->parent; if (sparc_cpu_model != sun4d && @@ -524,6 +525,7 @@ void __init sbus_setup_iommu(struct sbus_bus *sbus, struct device_node *dp) iounit_init(dp->node, parent->node, sbus); } +#endif } void __init sbus_setup_arch_props(struct sbus_bus *sbus, struct device_node *dp) |