Minor build fixes to the last batch of skas merges.

arch/um/kernel/skas/Makefile

@@ -3,8 +3,9 @@
 # Licensed under the GPL
 #
 
-obj-y = exec_kern.o exec_user.o mem_user.o mmu.o process.o process_kern.o \
-	syscall_kern.o syscall_user.o time.o trap_user.o sys-$(SUBARCH)/
+obj-y = exec_kern.o exec_user.o mem.o mem_user.o mmu.o process.o \
+	process_kern.o syscall_kern.o syscall_user.o time.o trap_user.o \
+	sys-$(SUBARCH)/
 
 USER_OBJS = $(filter %_user.o,$(obj-y)) process.o time.o
 USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file))

arch/um/kernel/skas/mem.c

+/* 
+ * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
+ * Licensed under the GPL
+ */
+
+#include "linux/config.h"
+#include "linux/mm.h"
+#include "mem_user.h"
+
+unsigned long set_task_sizes_skas(int arg, unsigned long *host_size_out, 
+				  unsigned long *task_size_out)
+{
+	/* Round up to the nearest 4M */
+	unsigned long top = ROUND_4M((unsigned long) &arg);
+
+	*host_size_out = top;
+	*task_size_out = top;
+	return(((unsigned long) set_task_sizes_skas) & ~0xffffff);
+}
+
+struct page *arch_validate_skas(struct page *page, int mask, int order)
+{
+	return(page);
+}
+
+/*
+ * Overrides for Emacs so that we follow Linus's tabbing style.
+ * Emacs will notice this stuff at the end of the file and automatically
+ * adjust the settings for this buffer only.  This must remain at the end
+ * of the file.
+ * ---------------------------------------------------------------------------
+ * Local variables:
+ * c-file-style: "linux"
+ * End:
+ */

arch/um/kernel/tt/syscall_kern.c

@@ -98,9 +98,6 @@ static int check_bogosity(struct pt_regs *regs)
 	return(0);
 }
 
-/*  Unlocked, I don't care if this is a bit off */
-int nsyscalls = 0;
-
 extern syscall_handler_t *sys_call_table[];
 
 long execute_syscall_tt(void *r)

include/asm-um/ptrace-generic.h

@@ -8,6 +8,8 @@
 
 #ifndef __ASSEMBLY__
 
+#include "linux/config.h"
+#include "skas_ptrace.h"
 #include "asm/current.h"
 
 #define pt_regs pt_regs_subarch