##  crypto includes asm/kmap_types.h

diff -urNX /usr/src/dontdiff linux-2.4.23/include/asm-parisc/kmap_types.h linux-2.4.23-hppa/include/asm-parisc/kmap_types.h
--- linux-2.4.23/include/asm-parisc/kmap_types.h	Thu Jan  1 01:00:00 1970
+++ linux-2.4.23-hppa/include/asm-parisc/kmap_types.h	Sat Dec 20 23:40:46 2003
@@ -0,0 +1,18 @@
+#ifdef __KERNEL__
+#ifndef _ASM_KMAP_TYPES_H
+#define _ASM_KMAP_TYPES_H
+
+enum km_type {
+	KM_BOUNCE_READ,
+	KM_SKB_SUNRPC_DATA,
+	KM_SKB_DATA_SOFTIRQ,
+	KM_USER0,
+	KM_USER1,
+	KM_BH_IRQ,
+	KM_SOFTIRQ0,
+	KM_SOFTIRQ1,
+	KM_TYPE_NR
+};
+
+#endif
+#endif /* __KERNEL__ */


##  net/sunrpc/{clnt.c,sunrpc.c} use smp_rmb()

diff -urNX /usr/src/dontdiff linux-2.4.23/include/asm-parisc/system.h linux-2.4.23-hppa/include/asm-parisc/system.h
--- linux-2.4.23/include/asm-parisc/system.h	Sat Dec 20 19:03:07 2003
+++ linux-2.4.23-hppa/include/asm-parisc/system.h	Sat Dec 20 19:03:07 2003
@@ -142,6 +142,7 @@
 #define rmb()		mb()
 #define wmb()		mb()
 #define smp_mb()	mb()
+#define smp_rmb()	mb()
 #define smp_wmb()	mb()
 
 #define set_mb(var, value) do { var = value; mb(); } while (0)


##  arch/parisc/kernel/pdc_cons.c needs to access printk.c:{con_start,log_end}

diff -urNX /usr/src/dontdiff linux-2.4.23/kernel/printk.c linux-2.4.23-hppa/kernel/printk.c
--- linux-2.4.23/kernel/printk.c	Sat Dec  6 09:24:05 2003
+++ linux-2.4.23-hppa/kernel/printk.c	Sun Dec 21 16:26:14 2003
@@ -90,8 +90,8 @@
  * must be masked before subscripting
  */
 static unsigned long log_start;			/* Index into log_buf: next char to be read by syslog() */
-static unsigned long con_start;			/* Index into log_buf: next char to be sent to consoles */
-static unsigned long log_end;			/* Index into log_buf: most-recently-written-char + 1 */
+unsigned long con_start = 0;			/* Index into log_buf: next char to be sent to consoles */
+unsigned long log_end = 0;			/* Index into log_buf: most-recently-written-char + 1 */
 static unsigned long logged_chars;		/* Number of chars produced since last read+clear operation */
 
 struct console_cmdline console_cmdline[MAX_CMDLINECONSOLES];