diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2009-11-11 17:26:30 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-12 10:25:56 -0500 |
commit | 15f3c476589c8778b0c10f1fb5160f9107c69556 (patch) | |
tree | a9f5fcd33201843aafc0aecafdf4f24a2bf1d6e2 /arch | |
parent | 71ccb83cfc487354d2647e315c8196e5872198ab (diff) |
alpha: move THREAD_SIZE definition outside #ifndef ASSEMBLY
arch/alpha/kernel/vmlinux.lds.S uses it:
arch/alpha/kernel/vmlinux.lds:241: undefined symbol `THREAD_SIZE' referenced in expression
Seems to have been caused by
commit 9d93f00580243cc059510d9d6ac4d2f5e97e5b83
Author: Geoffrey Thomas <geofft@ksplice.com>
AuthorDate: Thu Sep 24 10:36:26 2009 -0400
Commit: Linus Torvalds <torvalds@linux-foundation.org>
CommitDate: Thu Sep 24 17:16:22 2009 -0700
alpha: Clean up linker script using new linker script macros.
Note that .data.page_aligned and .data.cacheline_aligned are now after
_data; it was probably a bug that they were before it.
Also, some explicit ALIGN(8)'s between various initcall sections were
removed; this should be harmless as the implicit alignment of
initcall_t was already 8.
Cc: Geoffrey Thomas <geofft@ksplice.com>
Cc: Tim Abbott <tabbott@ksplice.com>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Richard Henderson <rth@twiddle.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/alpha/include/asm/thread_info.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/alpha/include/asm/thread_info.h b/arch/alpha/include/asm/thread_info.h index 5076a8860b18..815680b585ed 100644 --- a/arch/alpha/include/asm/thread_info.h +++ b/arch/alpha/include/asm/thread_info.h | |||
@@ -50,12 +50,12 @@ struct thread_info { | |||
50 | register struct thread_info *__current_thread_info __asm__("$8"); | 50 | register struct thread_info *__current_thread_info __asm__("$8"); |
51 | #define current_thread_info() __current_thread_info | 51 | #define current_thread_info() __current_thread_info |
52 | 52 | ||
53 | #endif /* __ASSEMBLY__ */ | ||
54 | |||
53 | /* Thread information allocation. */ | 55 | /* Thread information allocation. */ |
54 | #define THREAD_SIZE_ORDER 1 | 56 | #define THREAD_SIZE_ORDER 1 |
55 | #define THREAD_SIZE (2*PAGE_SIZE) | 57 | #define THREAD_SIZE (2*PAGE_SIZE) |
56 | 58 | ||
57 | #endif /* __ASSEMBLY__ */ | ||
58 | |||
59 | #define PREEMPT_ACTIVE 0x40000000 | 59 | #define PREEMPT_ACTIVE 0x40000000 |
60 | 60 | ||
61 | /* | 61 | /* |