Merge with Linux 2.4.2.

5 files changed, 20 insertions, 59 deletions

diff --git a/include/asm-alpha/errno.h b/include/asm-alpha/errno.h
index fd5b8fafc..724f03b77 100644
--- a/include/asm-alpha/errno.h
+++ b/include/asm-alpha/errno.h
@@ -139,6 +139,4 @@
 #define ENOMEDIUM	129	/* No medium found */
 #define EMEDIUMTYPE	130	/* Wrong medium type */
 
-#define EHASHCOLLISION  131     /* Number of hash collisons exceeds maximum generation counter value.  */
-
 #endif
diff --git a/include/asm-alpha/io.h b/include/asm-alpha/io.h
index 35a9dafc3..ddbdedfa2 100644
--- a/include/asm-alpha/io.h
+++ b/include/asm-alpha/io.h
@@ -440,6 +440,22 @@ out:
 	return retval;
 }
 
+
+/*
+ * ISA space is mapped to some machine-specific location on Alpha.
+ * Call into the existing hooks to get the address translated.
+ */
+#define isa_readb(a)			readb(__ioremap(a))
+#define isa_readw(a)			readw(__ioremap(a))
+#define isa_readl(a)			readl(__ioremap(a))
+#define isa_writeb(b,a)			writeb((b),__ioremap(a))
+#define isa_writew(w,a)			writew((w),__ioremap(a))
+#define isa_writel(l,a)			writel((l),__ioremap(a))
+#define isa_memset_io(a,b,c)		memset_io(__ioremap(a),(b),(c))
+#define isa_memcpy_fromio(a,b,c)	memcpy_fromio((a),__ioremap(b),(c))
+#define isa_memcpy_toio(a,b,c)		memcpy_toio(__ioremap(a),(b),(c))
+
+
 /*
  * The Alpha Jensen hardware for some rather strange reason puts
  * the RTC clock at 0x170 instead of 0x70. Probably due to some
diff --git a/include/asm-alpha/page.h b/include/asm-alpha/page.h
index 41afdcbd8..fbae9324f 100644
--- a/include/asm-alpha/page.h
+++ b/include/asm-alpha/page.h
@@ -12,64 +12,10 @@
 
 #define STRICT_MM_TYPECHECKS
 
-/*
- * A _lot_ of the kernel time is spent clearing pages, so
- * do this as fast as we possibly can. Also, doing this
- * as a separate inline function (rather than memset())
- * results in clearer kernel profiles as we see _who_ is
- * doing page clearing or copying.
- */
-static inline void clear_page(void * page)
-{
-	unsigned long count = PAGE_SIZE/64;
-	unsigned long *ptr = (unsigned long *)page;
-
-	do {
-		ptr[0] = 0;
-		ptr[1] = 0;
-		ptr[2] = 0;
-		ptr[3] = 0;
-		count--;
-		ptr[4] = 0;
-		ptr[5] = 0;
-		ptr[6] = 0;
-		ptr[7] = 0;
-		ptr += 8;
-	} while (count);
-}
-
+extern void clear_page(void *page);
 #define clear_user_page(page, vaddr)	clear_page(page)
 
-static inline void copy_page(void * _to, void * _from)
-{
-	unsigned long count = PAGE_SIZE/64;
-	unsigned long *to = (unsigned long *)_to;
-	unsigned long *from = (unsigned long *)_from;
-
-	do {
-		unsigned long a,b,c,d,e,f,g,h;
-		a = from[0];
-		b = from[1];
-		c = from[2];
-		d = from[3];
-		e = from[4];
-		f = from[5];
-		g = from[6];
-		h = from[7];
-		count--;
-		from += 8;
-		to[0] = a;
-		to[1] = b;
-		to[2] = c;
-		to[3] = d;
-		to[4] = e;
-		to[5] = f;
-		to[6] = g;
-		to[7] = h;
-		to += 8;
-	} while (count);
-}
-
+extern void copy_page(void * _to, void * _from);
 #define copy_user_page(to, from, vaddr)	copy_page(to, from)
 
 #ifdef STRICT_MM_TYPECHECKS
diff --git a/include/asm-alpha/socket.h b/include/asm-alpha/socket.h
index 637889c3f..b87863c34 100644
--- a/include/asm-alpha/socket.h
+++ b/include/asm-alpha/socket.h
@@ -29,6 +29,7 @@
 #define	SO_SNDLOWAT	0x1011
 #define	SO_RCVTIMEO	0x1012
 #define	SO_SNDTIMEO	0x1013
+#define SO_ACCEPTCONN	0x1014
 
 /* linux-specific, might as well be the same as on i386 */
 #define SO_NO_CHECK	11
diff --git a/include/asm-alpha/termios.h b/include/asm-alpha/termios.h
index 670576b84..374793646 100644
--- a/include/asm-alpha/termios.h
+++ b/include/asm-alpha/termios.h
@@ -78,7 +78,7 @@ struct termio {
 #define N_MASC		8	/* Reserved for Mobitex module <kaz@cafe.net> */
 #define N_R3964		9	/* Reserved for Simatic R3964 module */
 #define N_PROFIBUS_FDL	10	/* Reserved for Profibus <Dave@mvhi.com> */
-#define N_IRDA		11	/* Linux IrDa - http://www.cs.uit.no/~dagb/irda/irda.html */
+#define N_IRDA		11	/* Linux IrDa - http://irda.sourceforge.net/ */
 #define N_SMSBLOCK	12	/* SMS block mode - for talking to GSM data cards about SMS messages */
 #define N_HDLC		13	/* synchronous HDLC */
 #define N_SYNC_PPP	14