--- x/arch/um/kernel/process_kern.c.~1~	2003-05-29 09:33:50.000000000 +0200
+++ x/arch/um/kernel/process_kern.c	2003-05-29 11:10:14.000000000 +0200
@@ -101,14 +101,14 @@ unsigned long alloc_stack(int order, int
 	return(page);
 }
 
-int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
+int arch_kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
 {
 	int pid;
 
 	current->thread.request.u.thread.proc = fn;
 	current->thread.request.u.thread.arg = arg;
 	pid = do_fork(CLONE_VM | flags, 0, NULL, 0);
-	if(pid < 0) panic("do_fork failed in kernel_thread");
+	if(pid < 0) panic("do_fork failed in arch_kernel_thread");
 	return(pid);
 }
 
--- x/include/asm-um/processor-generic.h.~1~	2003-05-29 09:34:14.000000000 +0200
+++ x/include/asm-um/processor-generic.h	2003-05-29 11:10:45.000000000 +0200
@@ -107,7 +107,7 @@ extern void free_task_struct(struct task
 #define get_task_struct(tsk)      atomic_inc(&virt_to_page(tsk)->count)
 
 extern void release_thread(struct task_struct *);
-extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
+extern int arch_kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
 extern void dump_thread(struct pt_regs *regs, struct user *u);
 
 extern unsigned long thread_saved_pc(struct thread_struct *t);