Merge with Linux 2.2.1.

7 files changed, 23 insertions, 34 deletions

diff --git a/include/asm-arm/arch-ebsa110/a.out.h b/include/asm-arm/arch-ebsa110/a.out.h
index 0123eb29a..2746584c8 100644
--- a/include/asm-arm/arch-ebsa110/a.out.h
+++ b/include/asm-arm/arch-ebsa110/a.out.h
@@ -9,7 +9,6 @@
 
 #ifdef __KERNEL__
 #define STACK_TOP		((current->personality==PER_LINUX_32BIT)? 0xc0000000 : 0x04000000)
-#define LIBRARY_START_TEXT	(0x00c00000)
 #endif
 
 #endif
diff --git a/include/asm-arm/arch-ebsa110/dma.h b/include/asm-arm/arch-ebsa110/dma.h
index 96a265927..971369789 100644
--- a/include/asm-arm/arch-ebsa110/dma.h
+++ b/include/asm-arm/arch-ebsa110/dma.h
@@ -14,15 +14,6 @@
  * bytes of RAM.
  */
 #define MAX_DMA_ADDRESS		0xd0000000
-
-/*
- * DMA modes - we have two, IN and OUT
- */
-typedef enum {
-	DMA_MODE_READ,
-	DMA_MODE_WRITE
-} dmamode_t;
-
 #define MAX_DMA_CHANNELS	8
 
 #endif /* _ASM_ARCH_DMA_H */
diff --git a/include/asm-arm/arch-ebsa110/hardware.h b/include/asm-arm/arch-ebsa110/hardware.h
index 61ac7492e..e502b0fc6 100644
--- a/include/asm-arm/arch-ebsa110/hardware.h
+++ b/include/asm-arm/arch-ebsa110/hardware.h
@@ -28,9 +28,8 @@
 /*
  * Mapping areas
  */
-#define IO_END			0xffffffff
 #define IO_BASE			0xe0000000
-#define IO_SIZE			(IO_END - IO_BASE)
+#define IO_SIZE			0x20000000
 #define IO_START		0xe0000000
 
 /*
@@ -39,7 +38,7 @@
 #define MAPTOPHYS(a)		((unsigned long)(a) - PAGE_OFFSET)
 #define KERNTOPHYS(a)		((unsigned long)(&a))
 #define KERNEL_BASE		(0xc0008000)
-#define SAFE_ADDR		0x40000000
+#define FLUSH_BASE_PHYS		0x40000000
 
 #else
 
diff --git a/include/asm-arm/arch-ebsa110/io.h b/include/asm-arm/arch-ebsa110/io.h
index 39f574d55..32fc49c1a 100644
--- a/include/asm-arm/arch-ebsa110/io.h
+++ b/include/asm-arm/arch-ebsa110/io.h
@@ -36,7 +36,7 @@ extern __inline__ void __out##fnsuffix (unsigned int value, unsigned int port)	\
 	"tst	%2, #0x80000000\n\t"						\
 	"mov	%0, %4\n\t"							\
 	"addeq	%0, %0, %3\n\t"							\
-	"str" ##instr## "	%1, [%0, %2, lsl #2]"				\
+	"str" ##instr## "	%1, [%0, %2, lsl #2]	@ out"###fnsuffix	\
 	: "=&r" (temp)								\
 	: "r" (value), "r" (port), "Ir" (PCIO_BASE - IO_BASE), "Ir" (IO_BASE)	\
 	: "cc");								\
@@ -50,7 +50,7 @@ extern __inline__ unsigned sz __in##fnsuffix (unsigned int port)		\
 	"tst	%2, #0x80000000\n\t"						\
 	"mov	%0, %4\n\t"							\
 	"addeq	%0, %0, %3\n\t"							\
-	"ldr" ##instr## "	%1, [%0, %2, lsl #2]"				\
+	"ldr" ##instr## "	%1, [%0, %2, lsl #2]	@ in"###fnsuffix	\
 	: "=&r" (temp), "=r" (value)						\
 	: "r" (port), "Ir" (PCIO_BASE - IO_BASE), "Ir" (IO_BASE)		\
 	: "cc");								\
@@ -87,11 +87,11 @@ DECLARE_IO(long,l,"")
 ({										\
 	if (__PORT_PCIO((port)))						\
 		__asm__ __volatile__(						\
-		"strb	%0, [%1, %2]"						\
+		"strb	%0, [%1, %2]		@ outbc"			\
 		: : "r" (value), "r" (PCIO_BASE), "Jr" ((port) << 2));		\
 	else									\
 		__asm__ __volatile__(						\
-		"strb	%0, [%1, %2]"						\
+		"strb	%0, [%1, %2]		@ outbc"			\
 		: : "r" (value), "r" (IO_BASE), "r" ((port) << 2));		\
 })
 
@@ -100,11 +100,11 @@ DECLARE_IO(long,l,"")
 	unsigned char result;							\
 	if (__PORT_PCIO((port)))						\
 		__asm__ __volatile__(						\
-		"ldrb	%0, [%1, %2]"						\
+		"ldrb	%0, [%1, %2]		@ inbc"				\
 		: "=r" (result) : "r" (PCIO_BASE), "Jr" ((port) << 2));		\
 	else									\
 		__asm__ __volatile__(						\
-		"ldrb	%0, [%1, %2]"						\
+		"ldrb	%0, [%1, %2]		@ inbc"				\
 		: "=r" (result) : "r" (IO_BASE), "r" ((port) << 2));		\
 	result;									\
 })
@@ -114,11 +114,11 @@ DECLARE_IO(long,l,"")
 	unsigned long v = value;						\
 	if (__PORT_PCIO((port)))						\
 		__asm__ __volatile__(						\
-		"str	%0, [%1, %2]"						\
+		"str	%0, [%1, %2]		@ outwc"			\
 		: : "r" (v|v<<16), "r" (PCIO_BASE), "Jr" ((port) << 2));	\
 	else									\
 		__asm__ __volatile__(						\
-		"str	%0, [%1, %2]"						\
+		"str	%0, [%1, %2]		@ outwc"			\
 		: : "r" (v|v<<16), "r" (IO_BASE), "r" ((port) << 2));		\
 })
 
@@ -127,11 +127,11 @@ DECLARE_IO(long,l,"")
 	unsigned short result;							\
 	if (__PORT_PCIO((port)))						\
 		__asm__ __volatile__(						\
-		"ldr	%0, [%1, %2]"						\
+		"ldr	%0, [%1, %2]		@ inwc"				\
 		: "=r" (result) : "r" (PCIO_BASE), "Jr" ((port) << 2));		\
 	else									\
 		__asm__ __volatile__(						\
-		"ldr	%0, [%1, %2]"						\
+		"ldr	%0, [%1, %2]		@ inwc"				\
 		: "=r" (result) : "r" (IO_BASE), "r" ((port) << 2));		\
 	result & 0xffff;							\
 })
@@ -141,11 +141,11 @@ DECLARE_IO(long,l,"")
 	unsigned long v = value;						\
 	if (__PORT_PCIO((port)))						\
 		__asm__ __volatile__(						\
-		"str	%0, [%1, %2]"						\
+		"str	%0, [%1, %2]		@ outlc"			\
 		: : "r" (v), "r" (PCIO_BASE), "Jr" ((port) << 2));		\
 	else									\
 		__asm__ __volatile__(						\
-		"str	%0, [%1, %2]"						\
+		"str	%0, [%1, %2]		@ outlc"			\
 		: : "r" (v), "r" (IO_BASE), "r" ((port) << 2));			\
 })
 
@@ -154,11 +154,11 @@ DECLARE_IO(long,l,"")
 	unsigned long result;							\
 	if (__PORT_PCIO((port)))						\
 		__asm__ __volatile__(						\
-		"ldr	%0, [%1, %2]"						\
+		"ldr	%0, [%1, %2]		@ inlc"				\
 		: "=r" (result) : "r" (PCIO_BASE), "Jr" ((port) << 2));		\
 	else									\
 		__asm__ __volatile__(						\
-		"ldr	%0, [%1, %2]"						\
+		"ldr	%0, [%1, %2]		@ inlc"				\
 		: "=r" (result) : "r" (IO_BASE), "r" ((port) << 2));		\
 	result;									\
 })
diff --git a/include/asm-arm/arch-ebsa110/processor.h b/include/asm-arm/arch-ebsa110/processor.h
index bf1f6d384..e98d1ff33 100644
--- a/include/asm-arm/arch-ebsa110/processor.h
+++ b/include/asm-arm/arch-ebsa110/processor.h
@@ -23,12 +23,7 @@
 /* This decides where the kernel will search for a free chunk of vm
  * space during mmap's.
  */
-#if 0
-#define TASK_UNMAPPED_BASE(off)	(TASK_SIZE / 3)
-#else
 #define TASK_UNMAPPED_BASE (TASK_SIZE / 3)
-#endif
-#define TASK_UNMAPPED_ALIGN(addr, off)	PAGE_ALIGN(addr)
 
 #define INIT_MMAP \
 { &init_mm, 0, 0, PAGE_SHARED, VM_READ | VM_WRITE | VM_EXEC, NULL, &init_mm.mmap }
diff --git a/include/asm-arm/arch-ebsa110/system.h b/include/asm-arm/arch-ebsa110/system.h
index a28161cb2..ba0c99258 100644
--- a/include/asm-arm/arch-ebsa110/system.h
+++ b/include/asm-arm/arch-ebsa110/system.h
@@ -6,13 +6,12 @@
 #ifndef __ASM_ARCH_SYSTEM_H
 #define __ASM_ARCH_SYSTEM_H
 
-extern __inline__ void arch_hard_reset (void)
+extern __inline__ void arch_reset(char mode)
 {
 	/*
 	 * loop endlessly
 	 */
 	cli();
-	while (1);
 }
 
 #endif
diff --git a/include/asm-arm/arch-ebsa110/time.h b/include/asm-arm/arch-ebsa110/time.h
index 5b1447b7e..1f21a02e6 100644
--- a/include/asm-arm/arch-ebsa110/time.h
+++ b/include/asm-arm/arch-ebsa110/time.h
@@ -9,8 +9,10 @@
  *  10-Oct-1996	RMK	Created
  *  04-Dec-1997	RMK	Updated for new arch/arm/kernel/time.c
  *  07-Aug-1998	RMK	Updated for arch/arm/kernel/leds.c
+ *  28-Dec-1998	APH	Made leds code optional
  */
 
+#include <linux/config.h>
 #include <asm/leds.h>
 
 #define IRQ_TIMER IRQ_EBSA110_TIMER0
@@ -47,15 +49,19 @@ extern __inline__ int reset_timer (void)
 extern __inline__ int reset_timer (void)
 {
 	static unsigned int divisor;
+#ifdef CONFIG_LEDS	
 	static int count = 50;
+#endif
 
 	*PIT_T1 = (PIT1_COUNT) & 0xff;
 	*PIT_T1 = (PIT1_COUNT) >> 8;
 
+#ifdef CONFIG_LEDS
 	if (--count == 0) {
 		count = 50;
 		leds_event(led_timer);
 	}
+#endif
 
 	if (divisor == 0) {
 		divisor = DIVISOR - 1;