--- ./linux-2.4.0-test4-rmk1/include/asm-arm/proc-armo/cache.h.predag	Sun Jul 30 12:59:23 2000
+++ ./linux-2.4.0-test4-rmk1/include/asm-arm/proc-armo/cache.h	Sun Jul 30 12:59:43 2000
@@ -9,6 +9,9 @@
 #define flush_icache_page(vma,page)		do { } while (0)
 #define flush_icache_range(start,end)		do { } while (0)
 
+/* DAG: ARM3 will flush cache on MEMC updates anyway? so don't bother */
+#define clean_cache_area(_start,_size) do { } while (0)
+
 /*
  * TLB flushing:
  *
--- ./linux-2.4.0-test4-rmk1/arch/arm/kernel/armksyms.c.predag	Sun Jul 30 14:27:59 2000
+++ ./linux-2.4.0-test4-rmk1/arch/arm/kernel/armksyms.c	Sun Jul 30 14:28:11 2000
@@ -189,16 +189,17 @@
 EXPORT_SYMBOL(__arch_copy_to_user);
 EXPORT_SYMBOL(__arch_clear_user);
 EXPORT_SYMBOL(__arch_strnlen_user);
-#elif defined(CONFIG_CPU_26)
-EXPORT_SYMBOL(uaccess_kernel);
-EXPORT_SYMBOL(uaccess_user);
-#endif
 
 	/* consistent area handling */
 EXPORT_SYMBOL(pci_alloc_consistent);
 EXPORT_SYMBOL(consistent_alloc);
 EXPORT_SYMBOL(consistent_free);
 EXPORT_SYMBOL(consistent_sync);
+
+#elif defined(CONFIG_CPU_26)
+EXPORT_SYMBOL(uaccess_kernel);
+EXPORT_SYMBOL(uaccess_user);
+#endif
 
 	/* gcc lib functions */
 EXPORT_SYMBOL_NOVERS(__gcc_bcmp);
--- ./linux-2.4.0-test4-rmk1/arch/arm/kernel/oldlatches.c.predag	Sun Jul 30 14:48:50 2000
+++ ./linux-2.4.0-test4-rmk1/arch/arm/kernel/oldlatches.c	Sun Jul 30 17:19:58 2000
@@ -6,9 +6,11 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/sched.h>
 
 #include <asm/io.h>
 #include <asm/hardware.h>
+#include <asm/system.h>
 #include <asm/arch/oldlatches.h>
 
 static unsigned char latch_a_copy;
--- ./linux-2.4.0-test4-rmk1/arch/arm/mm/Makefile.predag	Sun Jul 30 14:10:16 2000
+++ ./linux-2.4.0-test4-rmk1/arch/arm/mm/Makefile	Sun Jul 30 14:10:17 2000
@@ -8,7 +8,7 @@
 # Note 2! The CFLAGS definition is now in the main makefile...
 
 O_TARGET	:= mm.o
-O_OBJS		:= consistent.o extable.o fault-$(PROCESSOR).o init.o \
+O_OBJS		:= extable.o fault-$(PROCESSOR).o init.o \
 		   mm-$(PROCESSOR).o small_page.o
 
 ifeq ($(CONFIG_CPU_26),y)
@@ -31,7 +31,7 @@
   ifeq ($(CONFIG_CPU_SA1100),y)
     P_OBJS	+= proc-sa110.o
   endif
-  O_OBJS	+= mm-$(MACHINE).o ioremap.o $(sort $(P_OBJS))
+  O_OBJS	+= mm-$(MACHINE).o consistent.o ioremap.o $(sort $(P_OBJS))
 endif
 
 include $(TOPDIR)/Rules.make