diff options
author | David Howells <dhowells@redhat.com> | 2008-02-08 07:19:26 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 12:22:29 -0500 |
commit | 922a70d327bd4b11342c2afd08e20d35f52064c3 (patch) | |
tree | aff7e43fa600363128c15c4b9a1ceba3869aac15 /include/asm-mips | |
parent | 3eb056764dd806bbe84eb604e45e7470feeaafd8 (diff) |
aout: move STACK_TOP[_MAX] to asm/processor.h
Move STACK_TOP[_MAX] out of asm/a.out.h and into asm/processor.h as they're
required whether or not A.OUT format is available.
Signed-off-by: David Howells <dhowells@redhat.com>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-mips')
-rw-r--r-- | include/asm-mips/a.out.h | 13 | ||||
-rw-r--r-- | include/asm-mips/processor.h | 7 |
2 files changed, 7 insertions, 13 deletions
diff --git a/include/asm-mips/a.out.h b/include/asm-mips/a.out.h index bf55a5b34bef..cad8371422ab 100644 --- a/include/asm-mips/a.out.h +++ b/include/asm-mips/a.out.h | |||
@@ -32,17 +32,4 @@ struct exec | |||
32 | #define N_DRSIZE(a) ((a).a_drsize) | 32 | #define N_DRSIZE(a) ((a).a_drsize) |
33 | #define N_SYMSIZE(a) ((a).a_syms) | 33 | #define N_SYMSIZE(a) ((a).a_syms) |
34 | 34 | ||
35 | #ifdef __KERNEL__ | ||
36 | |||
37 | #ifdef CONFIG_32BIT | ||
38 | #define STACK_TOP TASK_SIZE | ||
39 | #endif | ||
40 | #ifdef CONFIG_64BIT | ||
41 | #define STACK_TOP \ | ||
42 | (test_thread_flag(TIF_32BIT_ADDR) ? TASK_SIZE32 : TASK_SIZE) | ||
43 | #endif | ||
44 | #define STACK_TOP_MAX TASK_SIZE | ||
45 | |||
46 | #endif | ||
47 | |||
48 | #endif /* _ASM_A_OUT_H */ | 35 | #endif /* _ASM_A_OUT_H */ |
diff --git a/include/asm-mips/processor.h b/include/asm-mips/processor.h index 36f42de59409..58cbac5a64e4 100644 --- a/include/asm-mips/processor.h +++ b/include/asm-mips/processor.h | |||
@@ -39,6 +39,7 @@ extern unsigned int vced_count, vcei_count; | |||
39 | * so don't change it unless you know what you are doing. | 39 | * so don't change it unless you know what you are doing. |
40 | */ | 40 | */ |
41 | #define TASK_SIZE 0x7fff8000UL | 41 | #define TASK_SIZE 0x7fff8000UL |
42 | #define STACK_TOP TASK_SIZE | ||
42 | 43 | ||
43 | /* | 44 | /* |
44 | * This decides where the kernel will search for a free chunk of vm | 45 | * This decides where the kernel will search for a free chunk of vm |
@@ -57,6 +58,8 @@ extern unsigned int vced_count, vcei_count; | |||
57 | */ | 58 | */ |
58 | #define TASK_SIZE32 0x7fff8000UL | 59 | #define TASK_SIZE32 0x7fff8000UL |
59 | #define TASK_SIZE 0x10000000000UL | 60 | #define TASK_SIZE 0x10000000000UL |
61 | #define STACK_TOP \ | ||
62 | (test_thread_flag(TIF_32BIT_ADDR) ? TASK_SIZE32 : TASK_SIZE) | ||
60 | 63 | ||
61 | /* | 64 | /* |
62 | * This decides where the kernel will search for a free chunk of vm | 65 | * This decides where the kernel will search for a free chunk of vm |
@@ -69,6 +72,10 @@ extern unsigned int vced_count, vcei_count; | |||
69 | (test_tsk_thread_flag(tsk, TIF_32BIT_ADDR) ? TASK_SIZE32 : TASK_SIZE) | 72 | (test_tsk_thread_flag(tsk, TIF_32BIT_ADDR) ? TASK_SIZE32 : TASK_SIZE) |
70 | #endif | 73 | #endif |
71 | 74 | ||
75 | #ifdef __KERNEL__ | ||
76 | #define STACK_TOP_MAX TASK_SIZE | ||
77 | #endif | ||
78 | |||
72 | #define NUM_FPU_REGS 32 | 79 | #define NUM_FPU_REGS 32 |
73 | 80 | ||
74 | typedef __u64 fpureg_t; | 81 | typedef __u64 fpureg_t; |