[PATCH] fix sparc32 kdebug changes

[PATCH] fix sparc32 kdebug changes

[Robert Reif]

[-- Attachment #1: Type: text/plain, Size: 169 bytes --]

Fix recent kdebug changes to compile on sparc32.

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

Signed-off-by: Robert Reif <reif@earthlink.net>


[-- Attachment #2: kdebug.diff --]
[-- Type: text/x-diff, Size: 1001 bytes --]

diff --git a/arch/sparc/kernel/head.S b/arch/sparc/kernel/head.S
index 97da13c..9a219e8 100644
--- a/arch/sparc/kernel/head.S
+++ b/arch/sparc/kernel/head.S
@@ -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>
diff --git a/include/asm-sparc/kdebug.h b/include/asm-sparc/kdebug.h
index 404d807..631f15f 100644
--- a/include/asm-sparc/kdebug.h
+++ b/include/asm-sparc/kdebug.h
@@ -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) */

Re: [PATCH] fix sparc32 kdebug changes

[David Miller]

From: Robert Reif <reif@earthlink.net>
Date: Fri, 11 May 2007 06:51:11 -0400

> Fix recent kdebug changes to compile on sparc32.
> 
> Compile tested only because recent smp.h changes also break sparc32.
> 
> Signed-off-by: Robert Reif <reif@earthlink.net>

Applied, thanks Robert.

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

Re: [PATCH] fix sparc32 kdebug changes

[David Miller]

From: David Miller <davem@davemloft.net>
Date: Mon, 14 May 2007 03:22:34 -0700 (PDT)

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

This gets UP sparc32 building again:

commit 6e46507d0178ad4b33ed3bfcc72dc6e1e8a17790
Author: David S. Miller <davem@sunset.davemloft.net>
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 <davem@davemloft.net>

diff --git a/include/asm-sparc/system.h b/include/asm-sparc/system.h
index 8b6d9c9..8b4e23b 100644
--- a/include/asm-sparc/system.h
+++ b/include/asm-sparc/system.h
@@ -11,6 +11,7 @@
 #include <asm/psr.h>
 #include <asm/ptrace.h>
 #include <asm/btfixup.h>
+#include <asm/smp.h>
 
 #ifndef __ASSEMBLY__