Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...

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

diff --git a/arch/um/kernel/skas/mem.c b/arch/um/kernel/skas/mem.c
index 27bbf54b1e52a1b84fff2fd11f866582a95bb685..7c18dfcd7d8eee3446457ca928a867136cf880e2 100644 (file)
--- a/arch/um/kernel/skas/mem.c
+++ b/arch/um/kernel/skas/mem.c
@@ -3,7 +3,6 @@
  * Licensed under the GPL
  */
 
-#include "linux/config.h"
 #include "linux/mm.h"
 #include "asm/pgtable.h"
 #include "mem_user.h"
@@ -15,13 +14,9 @@ unsigned long set_task_sizes_skas(unsigned long *task_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
        if (!skas_needs_stub)
                *task_size_out = host_task_size;
        else *task_size_out = CONFIG_STUB_START & PGDIR_MASK;
-#endif
+
        return host_task_size;
 }