From ddc9a3831734e5b805a9f87139f70e68dcb7f112 Mon Sep 17 00:00:00 2001 From: Jeff Dike Date: Sat, 10 Feb 2007 01:44:15 -0800 Subject: [PATCH] --- yaml --- r: 47470 b: refs/heads/master c: 92b4202f38cf630350a9e1eb0ab23ca4fc5b687b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/um/kernel/skas/mem.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 8c3a554a30f4..847a69da4309 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0d0d0ed426f8f5ba6b74ba30fcdcd27c54ce4724 +refs/heads/master: 92b4202f38cf630350a9e1eb0ab23ca4fc5b687b diff --git a/trunk/arch/um/kernel/skas/mem.c b/trunk/arch/um/kernel/skas/mem.c index 0d2cce621134..7c18dfcd7d8e 100644 --- a/trunk/arch/um/kernel/skas/mem.c +++ b/trunk/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; }