diff -urN uml-ref/arch/um/kernel/time.c uml/arch/um/kernel/time.c
--- uml-ref/arch/um/kernel/time.c	Fri Mar 29 21:08:27 2002
+++ uml/arch/um/kernel/time.c	Fri Mar 29 21:09:02 2002
@@ -17,7 +17,7 @@
 #include "process.h"
 #include "signal_user.h"
 
-extern struct timeval xtime;
+extern volatile struct timeval xtime;
 
 void timer_handler(int sig, struct uml_pt_regs *regs)
 {
diff -urN uml-ref/arch/um/kernel/trap_kern.c uml/arch/um/kernel/trap_kern.c
--- uml-ref/arch/um/kernel/trap_kern.c	Fri Mar 29 21:08:27 2002
+++ uml/arch/um/kernel/trap_kern.c	Fri Mar 29 21:08:43 2002
@@ -48,7 +48,7 @@
 	if(!vma) goto bad;
 	else if(vma->vm_start <= address) goto good_area;
 	else if(!(vma->vm_flags & VM_GROWSDOWN)) goto bad;
-	else if(expand_stack(vma, address)) goto bad;
+	else if(expand_stack(vma, address, NULL)) goto bad;
 
  good_area:
 	si.si_code = SEGV_ACCERR;
diff -urN uml-ref/include/asm-um/page.h uml/include/asm-um/page.h
--- uml-ref/include/asm-um/page.h	Fri Mar 29 21:08:27 2002
+++ uml/include/asm-um/page.h	Fri Mar 29 21:09:17 2002
@@ -45,4 +45,7 @@
 extern struct page *arch_validate(struct page *page, int mask, int order);
 #define HAVE_ARCH_VALIDATE
 
+#define VM_DATA_DEFAULT_FLAGS	(VM_READ | VM_WRITE | VM_EXEC | \
+				 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+
 #endif
diff -urN uml-ref/include/asm-um/pgtable.h uml/include/asm-um/pgtable.h
--- uml-ref/include/asm-um/pgtable.h	Fri Mar 29 21:08:27 2002
+++ uml/include/asm-um/pgtable.h	Fri Mar 29 21:08:43 2002
@@ -16,6 +16,7 @@
 #define flush_dcache_page(page)	do ; while (0)
 #define flush_icache_range(from, to) do ; while (0)
 #define flush_icache_page(vma,pg) do ; while (0)
+#define flush_icache_user_range(vma,pg,adr,len)	do { } while (0)
 
 extern void pte_free(pte_t *pte);
 
diff -urN uml-ref/include/asm-um/rwsem.h uml/include/asm-um/rwsem.h
--- uml-ref/include/asm-um/rwsem.h	Fri Mar 29 21:08:27 2002
+++ uml/include/asm-um/rwsem.h	Thu Jan  1 01:00:00 1970
@@ -1,10 +0,0 @@
-#ifndef __UM_RWSEM_H__
-#define __UM_RWSEM_H__
-
-#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)
-#define __builtin_expect(exp,c) (exp)
-#endif
-
-#include "asm/arch/rwsem.h"
-
-#endif
diff -urN uml-ref/include/asm-um/rwsem_xchgadd.h uml/include/asm-um/rwsem_xchgadd.h
--- uml-ref/include/asm-um/rwsem_xchgadd.h	Thu Jan  1 01:00:00 1970
+++ uml/include/asm-um/rwsem_xchgadd.h	Fri Mar 29 21:08:43 2002
@@ -0,0 +1,6 @@
+#ifndef __UM_RWSEM_H__
+#define __UM_RWSEM_H__
+
+#include "asm/arch/rwsem_xchgadd.h"
+
+#endif
diff -urN uml-ref/include/asm-um/timex.h uml/include/asm-um/timex.h
--- uml-ref/include/asm-um/timex.h	Fri Mar 29 21:08:27 2002
+++ uml/include/asm-um/timex.h	Fri Mar 29 21:08:43 2002
@@ -12,4 +12,8 @@
 	return 0;
 }
 
+typedef long last_schedule_t;
+#define get_last_schedule() ({ jiffies; })
+#define last_schedule_before(a, b)	({ a < b; })
+
 #endif