diff options
Diffstat (limited to 'arch/um/kernel/skas/mem.c')
-rw-r--r-- | arch/um/kernel/skas/mem.c | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/arch/um/kernel/skas/mem.c b/arch/um/kernel/skas/mem.c index 88ab96c609ce..27bbf54b1e52 100644 --- a/arch/um/kernel/skas/mem.c +++ b/arch/um/kernel/skas/mem.c | |||
@@ -9,31 +9,19 @@ | |||
9 | #include "mem_user.h" | 9 | #include "mem_user.h" |
10 | #include "skas.h" | 10 | #include "skas.h" |
11 | 11 | ||
12 | unsigned long set_task_sizes_skas(int arg, unsigned long *host_size_out, | 12 | unsigned long set_task_sizes_skas(unsigned long *task_size_out) |
13 | unsigned long *task_size_out) | ||
14 | { | 13 | { |
15 | /* Round up to the nearest 4M */ | 14 | /* Round up to the nearest 4M */ |
16 | unsigned long top = ROUND_4M((unsigned long) &arg); | 15 | unsigned long host_task_size = ROUND_4M((unsigned long) |
16 | &host_task_size); | ||
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; | ||
23 | if (!skas_needs_stub) | 22 | if (!skas_needs_stub) |
24 | *task_size_out = top; | 23 | *task_size_out = host_task_size; |
25 | else *task_size_out = CONFIG_STUB_START & PGDIR_MASK; | 24 | else *task_size_out = CONFIG_STUB_START & PGDIR_MASK; |
26 | #endif | 25 | #endif |
27 | return(((unsigned long) set_task_sizes_skas) & ~0xffffff); | 26 | return host_task_size; |
28 | } | 27 | } |
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 | */ | ||