aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/kernel/skas/mem.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/um/kernel/skas/mem.c')
-rw-r--r--arch/um/kernel/skas/mem.c19
1 files changed, 4 insertions, 15 deletions
diff --git a/arch/um/kernel/skas/mem.c b/arch/um/kernel/skas/mem.c
index 88ab96c609ce..7e5b8f165cf2 100644
--- a/arch/um/kernel/skas/mem.c
+++ b/arch/um/kernel/skas/mem.c
@@ -9,14 +9,14 @@
9#include "mem_user.h" 9#include "mem_user.h"
10#include "skas.h" 10#include "skas.h"
11 11
12unsigned long set_task_sizes_skas(int arg, unsigned long *host_size_out, 12unsigned long set_task_sizes_skas(unsigned long *host_size_out,
13 unsigned long *task_size_out) 13 unsigned long *task_size_out)
14{ 14{
15 /* Round up to the nearest 4M */ 15 /* Round up to the nearest 4M */
16 unsigned long top = ROUND_4M((unsigned long) &arg); 16 unsigned long top = ROUND_4M((unsigned long) &host_size_out);
17 17
18#ifdef CONFIG_HOST_TASK_SIZE 18#ifdef CONFIG_HOST_TASK_SIZE
19 *host_size_out = CONFIG_HOST_TASK_SIZE; 19 *host_size_out = ROUND_4M(CONFIG_HOST_TASK_SIZE);
20 *task_size_out = CONFIG_HOST_TASK_SIZE; 20 *task_size_out = CONFIG_HOST_TASK_SIZE;
21#else 21#else
22 *host_size_out = top; 22 *host_size_out = top;
@@ -24,16 +24,5 @@ unsigned long set_task_sizes_skas(int arg, unsigned long *host_size_out,
24 *task_size_out = top; 24 *task_size_out = top;
25 else *task_size_out = CONFIG_STUB_START & PGDIR_MASK; 25 else *task_size_out = CONFIG_STUB_START & PGDIR_MASK;
26#endif 26#endif
27 return(((unsigned long) set_task_sizes_skas) & ~0xffffff); 27 return ((unsigned long) set_task_sizes_skas) & ~0xffffff;
28} 28}
29
30/*
31 * Overrides for Emacs so that we follow Linus's tabbing style.
32 * Emacs will notice this stuff at the end of the file and automatically
33 * adjust the settings for this buffer only. This must remain at the end
34 * of the file.
35 * ---------------------------------------------------------------------------
36 * Local variables:
37 * c-file-style: "linux"
38 * End:
39 */