From: Sam Ravnborg <sam@ravnborg.org>
Date: Sun, 30 Nov 2008 05:51:05 +0000 (-0800)
Subject: sparc,sparc64: unify asm-offsets.c
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b5db854a91d93c46c6904506ef73ce0d0b074b44;p=linux-beck.git

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>
---

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"