Skip to contentSkip to conversation

fix sparc32 kdebug changes

PATCH Applied Robert Reif 2 participants 3 messages May 11, 2007 – May 14, 2007 SPARC + UltraSPARC (sparc/sparc64)

lore
Share & tools
lore

Robert Reif

author
#0 lore raw

PATCH 1/1 fix sparc32 kdebug changes

Fix recent kdebug changes to compile on sparc32.

Compile tested only because recent smp.h changes also break sparc32.

Signed-off-by Robert Reif <[email protected]>
arch/sparc/kernel/head.S +1 -1
index 97da13c..9a219e8 100644
@@ -19,7 +19,7 @@ #include <asm/contregs.h>
 #include <asm/ptrace.h>
 #include <asm/psr.h>
 #include <asm/page.h>
-#include <linux/kdebug.h>
+#include <asm/kdebug.h>
 #include <asm/winmacro.h>
 #include <asm/thread_info.h>	/* TI_UWINMASK */
 #include <asm/errno.h>
include/asm-sparc/kdebug.h +4 -4
index 404d807..631f15f 100644
@@ -58,6 +58,10 @@ #define SP_ENTER_DEBUGGER do { \
 	       sp_enter_debugger(); \
 		       } while(0)
 
+enum die_val {
+	DIE_UNUSED,
+};
+
 #endif /* !(__ASSEMBLY__) */
 
 /* Some nice offset defines for assembler code. */

@@ -66,8 +70,4 @@ #define KDEBUG_DUNNO_OFF    0x4
 #define KDEBUG_DUNNO2_OFF   0x8
 #define KDEBUG_TEACH_OFF    0xc
 
-enum die_val {
-	DIE_UNUSED,
-};
-
 #endif /* !(_SPARC_KDEBUG_H) */
maintainer Applied
#1 lore raw

From: Robert Reif <[email protected]>
Date: Fri, 11 May 2007 06:51:11 -0400

Quoted 5 lines

Fix recent kdebug changes to compile on sparc32.

Compile tested only because recent smp.h changes also break sparc32.

Signed-off-by Robert Reif <[email protected]>

Applied, thanks Robert.

I'll see if I can work out the SMP build breakage.

maintainer
#2 lore raw
In reply to Robert Reif

From: David Miller <[email protected]>
Date: Mon, 14 May 2007 03:22:34 -0700 (PDT)

Quoted 1 line

I'll see if I can work out the SMP build breakage.

This gets UP sparc32 building again:

commit 6e46507d0178ad4b33ed3bfcc72dc6e1e8a17790

Author: David S. Miller <[email protected]>
Date:   Mon May 14 03:53:47 2007 -0700

[SPARC32]: asm/system.h needs asm/smp.h

To get hard_smp_processor_id() even on UP builds.

Signed-off-by David S. Miller <[email protected]>
include/asm-sparc/system.h +1 -0
index 8b6d9c9..8b4e23b 100644
@@ -11,6 +11,7 @@
 #include <asm/psr.h>
 #include <asm/ptrace.h>
 #include <asm/btfixup.h>
+#include <asm/smp.h>
 
 #ifndef __ASSEMBLY__