[PATCH] uml: fix static binary segfault

When UML is built as a static binary, it segfaults when run.  The reason is
that a memory hole that is present in dynamic binaries isn't there in static
binaries, and it contains essential stuff.

This fix removes the code which maps some anonymous memory into that hole and
cleans up some related code.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 5 insertions, 6 deletions

diff --git a/arch/um/kernel/skas/mem.c b/arch/um/kernel/skas/mem.c
index 7e5b8f165cf2..27bbf54b1e52 100644
--- a/arch/um/kernel/skas/mem.c
+++ b/arch/um/kernel/skas/mem.c
@@ -9,20 +9,19 @@
 #include "mem_user.h"
 #include "skas.h"
 
-unsigned long set_task_sizes_skas(unsigned long *host_size_out,
-                                  unsigned long *task_size_out)
+unsigned long set_task_sizes_skas(unsigned long *task_size_out)
 {
         /* Round up to the nearest 4M */
-        unsigned long top = ROUND_4M((unsigned long) &host_size_out);
+        unsigned long host_task_size = ROUND_4M((unsigned long)
+                                                &host_task_size);
 
 #ifdef CONFIG_HOST_TASK_SIZE
         *host_size_out = ROUND_4M(CONFIG_HOST_TASK_SIZE);
         *task_size_out = CONFIG_HOST_TASK_SIZE;
 #else
-        *host_size_out = top;
         if (!skas_needs_stub)
-                *task_size_out = top;
+                *task_size_out = host_task_size;
         else *task_size_out = CONFIG_STUB_START & PGDIR_MASK;
 #endif
-        return ((unsigned long) set_task_sizes_skas) & ~0xffffff;
+        return host_task_size;
 }