[PATCH] m32r: make userspace headers platform-independent

The m32r kernel 2.6.18-rc1 or after cause build errors of "unknown isa
configuration" for userspace application programs, such as glibc, gdb, etc.

This is because the recent kernel do not include linux/config.h not to expose
kernel headers for userspace.

To fix the above compile errors, this patch fixes two headers ptrace.h and
sigcontext.h for m32r and makes them platform-independent.

Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 6 insertions, 35 deletions

diff --git a/include/asm-m32r/ptrace.h b/include/asm-m32r/ptrace.h
index 2d2a6c97331e..632b4ce4269a 100644
--- a/include/asm-m32r/ptrace.h
+++ b/include/asm-m32r/ptrace.h
@@ -33,21 +33,10 @@
 #define PT_R15          PT_SP
 
 /* processor status and miscellaneous context registers.  */
-#if defined(CONFIG_ISA_M32R2) && defined(CONFIG_ISA_DSP_LEVEL2)
 #define PT_ACC0H        15
 #define PT_ACC0L        16
-#define PT_ACC1H        17
-#define PT_ACC1L        18
-#define PT_ACCH         PT_ACC0H
-#define PT_ACCL         PT_ACC0L
-#elif defined(CONFIG_ISA_M32R2) || defined(CONFIG_ISA_M32R)
-#define PT_ACCH         15
-#define PT_ACCL         16
-#define PT_DUMMY_ACC1H  17
-#define PT_DUMMY_ACC1L  18
-#else
-#error unknown isa conifiguration
-#endif
+#define PT_ACC1H        17      /* ISA_DSP_LEVEL2 only */
+#define PT_ACC1L        18      /* ISA_DSP_LEVEL2 only */
 #define PT_PSW          19
 #define PT_BPC          20
 #define PT_BBPSW        21
@@ -103,19 +92,10 @@ struct pt_regs {
         long syscall_nr;
 
         /* Saved main processor status and miscellaneous context registers. */
-#if defined(CONFIG_ISA_M32R2) && defined(CONFIG_ISA_DSP_LEVEL2)
         unsigned long acc0h;
         unsigned long acc0l;
-        unsigned long acc1h;
-        unsigned long acc1l;
-#elif defined(CONFIG_ISA_M32R2) || defined(CONFIG_ISA_M32R)
-        unsigned long acch;
-        unsigned long accl;
-        unsigned long dummy_acc1h;
-        unsigned long dummy_acc1l;
-#else
-#error unknown isa configuration
-#endif
+        unsigned long acc1h;    /* ISA_DSP_LEVEL2 only */
+        unsigned long acc1l;    /* ISA_DSP_LEVEL2 only */
         unsigned long psw;
         unsigned long bpc;              /* saved PC for TRAP syscalls */
         unsigned long bbpsw;
diff --git a/include/asm-m32r/sigcontext.h b/include/asm-m32r/sigcontext.h
index 73025c0c41a1..62537dc4dec9 100644
--- a/include/asm-m32r/sigcontext.h
+++ b/include/asm-m32r/sigcontext.h
@@ -23,19 +23,10 @@ struct sigcontext {
         unsigned long sc_r12;
 
         /* Saved main processor status and miscellaneous context registers. */
-#if defined(CONFIG_ISA_M32R2) && defined(CONFIG_ISA_DSP_LEVEL2)
         unsigned long sc_acc0h;
         unsigned long sc_acc0l;
-        unsigned long sc_acc1h;
-        unsigned long sc_acc1l;
-#elif defined(CONFIG_ISA_M32R2) || defined(CONFIG_ISA_M32R)
-        unsigned long sc_acch;
-        unsigned long sc_accl;
-        unsigned long sc_dummy_acc1h;
-        unsigned long sc_dummy_acc1l;
-#else
-#error unknown isa configuration
-#endif
+        unsigned long sc_acc1h; /* ISA_DSP_LEVEL2 only */
+        unsigned long sc_acc1l; /* ISA_DSP_LEVEL2 only */
         unsigned long sc_psw;
         unsigned long sc_bpc;           /* saved PC for TRAP syscalls */
         unsigned long sc_bbpsw;