diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2008-11-29 21:51:05 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-04 09:17:12 -0800 |
commit | b5db854a91d93c46c6904506ef73ce0d0b074b44 (patch) | |
tree | 817117496b69e30c73b65361655519c4b3d48507 /arch | |
parent | 104495a1ceea7cacff50fa33b48f3c0b6f8d307a (diff) | |
download | blackbird-op-linux-b5db854a91d93c46c6904506ef73ce0d0b074b44.tar.gz blackbird-op-linux-b5db854a91d93c46c6904506ef73ce0d0b074b44.zip |
sparc,sparc64: unify asm-offsets.c
sparc64 does not use constants generated from asm-offsets
but to prepare it to do so the parts that could be
shared do now generate constants for sparc64 too.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sparc/kernel/asm-offsets.c | 19 | ||||
-rw-r--r-- | arch/sparc64/kernel/asm-offsets.c | 2 |
2 files changed, 17 insertions, 4 deletions
diff --git a/arch/sparc/kernel/asm-offsets.c b/arch/sparc/kernel/asm-offsets.c index b5bb99ed892c..68f7e1118e9b 100644 --- a/arch/sparc/kernel/asm-offsets.c +++ b/arch/sparc/kernel/asm-offsets.c @@ -14,15 +14,28 @@ // #include <linux/mm.h> #include <linux/kbuild.h> -int foo(void) +#ifdef CONFIG_SPARC32 +int sparc32_foo(void) { - DEFINE(AOFF_task_thread, offsetof(struct task_struct, thread)); - BLANK(); DEFINE(AOFF_thread_fork_kpsr, offsetof(struct thread_struct, fork_kpsr)); + return 0; +} +#else +int sparc64_foo(void) +{ + return 0; +} +#endif + +int foo(void) +{ + BLANK(); + DEFINE(AOFF_task_thread, offsetof(struct task_struct, thread)); BLANK(); DEFINE(AOFF_mm_context, offsetof(struct mm_struct, context)); /* DEFINE(NUM_USER_SEGMENTS, TASK_SIZE>>28); */ return 0; } + diff --git a/arch/sparc64/kernel/asm-offsets.c b/arch/sparc64/kernel/asm-offsets.c index 9e263112a6e2..8cbd958d50bd 100644 --- a/arch/sparc64/kernel/asm-offsets.c +++ b/arch/sparc64/kernel/asm-offsets.c @@ -1 +1 @@ -/* Dummy asm-offsets.c file. Required by kbuild and ready to be used - hint! */ +#include "../../sparc/kernel/asm-offsets.c" |