[ALPHA] Turn off GENERIC_IOMAP. Arrange for iomap routines

to be linked unconditionally.

arch/alpha/Kconfig

@@ -34,7 +34,7 @@ config GENERIC_ISA_DMA
 
 config GENERIC_IOMAP
 	bool
-	default y
+	default n
 
 source "init/Kconfig"
 

arch/alpha/kernel/Makefile

@@ -8,7 +8,7 @@ EXTRA_CFLAGS	:= -Werror -Wno-sign-compare
 
 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 \
-	    alpha_ksyms.o systbls.o err_common.o
+	    alpha_ksyms.o systbls.o err_common.o io.o
 
 obj-$(CONFIG_VGA_HOSE)	+= console.o
 obj-$(CONFIG_SMP)	+= smp.o

arch/alpha/lib/io.c → arch/alpha/kernel/io.c

 /*
- * Alpha IO and memory functions.. Just expand the inlines in the header
- * files..
+ * Alpha IO and memory functions.
  */
 
 #include <linux/kernel.h>

arch/alpha/lib/Makefile

@@ -17,7 +17,6 @@ lib-y =	__divqu.o __remqu.o __divlu.o __remlu.o \
 	$(ev6-y)memset.o \
 	$(ev6-y)memcpy.o \
 	memmove.o \
-	io.o \
 	checksum.o \
 	csum_partial_copy.o \
 	$(ev67-y)strlen.o \

include/asm-alpha/io.h

@@ -265,8 +265,9 @@ extern void		__raw_writeq(u64 b, volatile void __iomem *addr);
  * Mapping from port numbers to __iomem space is pretty easy.
  */
 
-/* These two have to be extern inline so that we don't get redefinition
-   errors building lib/iomap.c.  Which we don't want anyway, but...  */
+/* These two have to be extern inline because of the extern prototype from
+   <asm-generic/iomap.h>.  It is not legal to mix "extern" and "static" for
+   the same declaration.  */
 extern inline void __iomem *ioport_map(unsigned long port, unsigned int size)
 {
 	return IO_CONCAT(__IO_PREFIX,ioportmap) (port);