This commit was manufactured by cvs2svn to create tag

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

diff --git a/arch/um/kernel/skas/mem.c b/arch/um/kernel/skas/mem.c
index ec169a8..88ab96c 100644 (file)
--- a/arch/um/kernel/skas/mem.c
+++ b/arch/um/kernel/skas/mem.c
@@ -5,7 +5,9 @@
 
 #include "linux/config.h"
 #include "linux/mm.h"
+#include "asm/pgtable.h"
 #include "mem_user.h"
+#include "skas.h"
 
 unsigned long set_task_sizes_skas(int arg, unsigned long *host_size_out, 
                                  unsigned long *task_size_out)
@@ -13,8 +15,15 @@ unsigned long set_task_sizes_skas(int arg, unsigned long *host_size_out,
        /* Round up to the nearest 4M */
        unsigned long top = ROUND_4M((unsigned long) &arg);
 
+#ifdef CONFIG_HOST_TASK_SIZE
+       *host_size_out = CONFIG_HOST_TASK_SIZE;
+       *task_size_out = CONFIG_HOST_TASK_SIZE;
+#else
        *host_size_out = top;
-       *task_size_out = top;
+       if (!skas_needs_stub)
+               *task_size_out = top;
+       else *task_size_out = CONFIG_STUB_START & PGDIR_MASK;
+#endif
        return(((unsigned long) set_task_sizes_skas) & ~0xffffff);
 }