Merge branch 'master' into for_paulus

[linux-drm-fsl-dcu.git] / arch / um / kernel / skas / mem.c

diff --git a/arch/um/kernel/skas/mem.c b/arch/um/kernel/skas/mem.c
index 0d2cce621134b98e315c958f6addd43a8d0d1bf1..7c18dfcd7d8eee3446457ca928a867136cf880e2 100644 (file)
--- a/arch/um/kernel/skas/mem.c
+++ b/arch/um/kernel/skas/mem.c
@@ -14,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;
 }