linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / um / kernel / tt / mem.c

diff --git a/arch/um/kernel/tt/mem.c b/arch/um/kernel/tt/mem.c
index 4d1929d..bcb8796 100644 (file)
--- a/arch/um/kernel/tt/mem.c
+++ b/arch/um/kernel/tt/mem.c
@@ -4,6 +4,7 @@
  */
 
 #include "linux/stddef.h"
+#include "linux/config.h"
 #include "linux/mm.h"
 #include "asm/uaccess.h"
 #include "mem_user.h"
@@ -23,13 +24,22 @@ void before_mem_tt(unsigned long brk_start)
 #define SIZE ((CONFIG_NEST_LEVEL + CONFIG_KERNEL_HALF_GIGS) * 0x20000000)
 #define START (CONFIG_TOP_ADDR - SIZE)
 
-unsigned long set_task_sizes_tt(unsigned long *task_size_out)
+unsigned long set_task_sizes_tt(int arg, unsigned long *host_size_out, 
+                               unsigned long *task_size_out)
 {
-       unsigned long host_task_size;
-
        /* Round up to the nearest 4M */
-       host_task_size = ROUND_4M((unsigned long) &host_task_size);
+       *host_size_out = ROUND_4M((unsigned long) &arg);
        *task_size_out = START;
-
-       return host_task_size;
+       return(START);
 }
+
+/*
+ * 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:
+ */