---

yaml --- r: 123349 b: refs/heads/master c: b5db854 h: refs/heads/master i: 123347: 0c2efbc v: v3
git-mirror · Dec 4, 2008 · e14a62e · e14a62e
1 parent 58970da
commit e14a62e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git 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
@@ -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
@@ -1 +1 @@
-/* Dummy asm-offsets.c file. Required by kbuild and ready to be used - hint! */
+#include "../../sparc/kernel/asm-offsets.c"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		/* Dummy asm-offsets.c file. Required by kbuild and ready to be used - hint! */
		#include "../../sparc/kernel/asm-offsets.c"