diff -Naur -X exclude-files ac_orig/arch/um/ptproxy/ptrace.c ac/arch/um/ptproxy/ptrace.c
--- ac_orig/arch/um/ptproxy/ptrace.c	Fri Jun  1 20:00:29 2001
+++ ac/arch/um/ptproxy/ptrace.c	Fri Jun  1 20:02:41 2001
@@ -15,8 +15,6 @@
 #include <sys/ptrace.h>
 
 #include "ptproxy.h"
-#include "user_util.h"
-#include "debug.h"
 
 struct {
 	int op;
diff -Naur -X exclude-files ac_orig/include/asm-um/processor.h ac/include/asm-um/processor.h
--- ac_orig/include/asm-um/processor.h	Fri Jun  1 20:00:31 2001
+++ ac/include/asm-um/processor.h	Fri Jun  1 20:02:57 2001
@@ -219,7 +219,7 @@
 
 #define my_cpu_data		cpu_data[smp_processor_id()]
 
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 extern struct cpuinfo_um cpu_data[];
 #define current_cpu_data cpu_data[smp_processor_id()]
 #else
diff -Naur -X exclude-files ac_orig/include/asm-um/spinlock.h ac/include/asm-um/spinlock.h
--- ac_orig/include/asm-um/spinlock.h	Fri Jun  1 20:00:31 2001
+++ ac/include/asm-um/spinlock.h	Fri Jun  1 20:03:19 2001
@@ -1,7 +1,7 @@
 #ifndef __UM_SPINLOCK_H
 #define __UM_SPINLOCK_H
 
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 #include "asm/arch/spinlock.h"
 #endif