[ALPHA] Use direct calls to titan_ioremap/unmap when building

a titan specific kernel.

diff --git a/arch/alpha/kernel/Makefile b/arch/alpha/kernel/Makefile
index 781fe4aa3f069792a5b3309aee6aa5d4411ba173..62680754792f79863132a4398d19f8c0f3efd7c7 100644 (file)
--- a/arch/alpha/kernel/Makefile
+++ b/arch/alpha/kernel/Makefile
@@ -6,7 +6,7 @@ EXTRA_TARGETS   := head.o
 
 EXTRA_AFLAGS   := $(CFLAGS)
 
-export-objs := alpha_ksyms.o
+export-objs := alpha_ksyms.o core_titan.o
 
 obj-y    := entry.o traps.o process.o init_task.o osf_sys.o irq.o \
            irq_alpha.o signal.o setup.o ptrace.o time.o semaphore.o \

diff --git a/arch/alpha/kernel/core_titan.c b/arch/alpha/kernel/core_titan.c
index 321ad0e92ddd63f6e8e1e8d7f74107fe31296b23..20fd7957aadd88f01010dcc57f51b60c739439bd 100644 (file)
--- a/arch/alpha/kernel/core_titan.c
+++ b/arch/alpha/kernel/core_titan.c
@@ -5,6 +5,7 @@
  */
 
 #include <linux/config.h>
+#include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/pci.h>
@@ -564,6 +565,8 @@ titan_iounmap(unsigned long addr)
        if (addr) return vfree((void *)(PAGE_MASK & addr)); 
 }
 
+EXPORT_SYMBOL(titan_ioremap);
+EXPORT_SYMBOL(titan_iounmap);
 \f
 /*
  * AGP GART Support

diff --git a/include/asm-alpha/core_titan.h b/include/asm-alpha/core_titan.h
index 2e71daa32db20336b90cd27611f5c04f57a09d57..39959ed0e5355bb62edc41f6e3be0bb2fdc5abde 100644 (file)
--- a/include/asm-alpha/core_titan.h
+++ b/include/asm-alpha/core_titan.h
@@ -499,8 +499,8 @@ __EXTERN_INLINE void titan_writeq(u64 b, unsigned long addr)
 #define __writew(x,a)          titan_writew((x),(unsigned long)(a))
 #define __writel(x,a)          titan_writel((x),(unsigned long)(a))
 #define __writeq(x,a)          titan_writeq((x),(unsigned long)(a))
-#define __ioremap(a,s)         alpha_mv.mv_ioremap((unsigned long)(a),(s))
-#define __iounmap(a)           alpha_mv.mv_iounmap((unsigned long)(a))
+#define __ioremap(a,s)         titan_ioremap((unsigned long)(a),(s))
+#define __iounmap(a)           titan_iounmap((unsigned long)(a))
 #define __is_ioaddr(a)         titan_is_ioaddr((unsigned long)(a))
 
 #define inb(port)              __inb((port))