From e14a62e67660f49274af94b0c157991fea576684 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Sat, 29 Nov 2008 21:51:05 -0800
Subject: [PATCH] --- yaml --- r: 123349 b: refs/heads/master c:
 b5db854a91d93c46c6904506ef73ce0d0b074b44 h: refs/heads/master i:   123347:
 0c2efbcfa2956b4e57f35616ea3409dcbb6bfb47 v: v3

---
 [refs]                                  |  2 +-
 trunk/arch/sparc/kernel/asm-offsets.c   | 19 ++++++++++++++++---
 trunk/arch/sparc64/kernel/asm-offsets.c |  2 +-
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 90a762dc0a3b..4af94b9f3ebd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 104495a1ceea7cacff50fa33b48f3c0b6f8d307a
+refs/heads/master: b5db854a91d93c46c6904506ef73ce0d0b074b44
diff --git a/trunk/arch/sparc/kernel/asm-offsets.c b/trunk/arch/sparc/kernel/asm-offsets.c
index b5bb99ed892c..68f7e1118e9b 100644
--- a/trunk/arch/sparc/kernel/asm-offsets.c
+++ b/trunk/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/trunk/arch/sparc64/kernel/asm-offsets.c b/trunk/arch/sparc64/kernel/asm-offsets.c
index 9e263112a6e2..8cbd958d50bd 100644
--- a/trunk/arch/sparc64/kernel/asm-offsets.c
+++ b/trunk/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"