X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Ffrv%2Fkernel%2Ftraps.c;h=9eb84b2e6abc498362f57762a1e5e8e3c0c24b58;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=2e6098c855787de54e82953bb740110be9ed0011;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/arch/frv/kernel/traps.c b/arch/frv/kernel/traps.c
index 2e6098c85..9eb84b2e6 100644
--- a/arch/frv/kernel/traps.c
+++ b/arch/frv/kernel/traps.c
@@ -9,6 +9,7 @@
  * 2 of the License, or (at your option) any later version.
  */
 
+#include <linux/config.h>
 #include <linux/sched.h>
 #include <linux/signal.h>
 #include <linux/kernel.h>
@@ -20,7 +21,6 @@
 #include <linux/init.h>
 #include <linux/module.h>
 
-#include <asm/asm-offsets.h>
 #include <asm/setup.h>
 #include <asm/fpu.h>
 #include <asm/system.h>
@@ -280,20 +280,20 @@ static const char *regnames[] = {
 
 void show_regs(struct pt_regs *regs)
 {
-	unsigned long *reg;
+	uint32_t *reg;
 	int loop;
 
 	printk("\n");
 
-	printk("Frame: @%08lx [%s]\n",
-	       (unsigned long) regs,
+	printk("Frame: @%08x [%s]\n",
+	       (uint32_t) regs,
 	       regs->psr & PSR_S ? "kernel" : "user");
 
-	reg = (unsigned long *) regs;
-	for (loop = 0; loop < NR_PT_REGS; loop++) {
-		printk("%s %08lx", regnames[loop + 0], reg[loop + 0]);
+	reg = (uint32_t *) regs;
+	for (loop = 0; loop < REG__END; loop++) {
+		printk("%s %08x", regnames[loop + 0], reg[loop + 0]);
 
-		if (loop == NR_PT_REGS - 1 || loop % 5 == 4)
+		if (loop == REG__END - 1 || loop % 5 == 4)
 			printk("\n");
 		else
 			printk(" | ");
@@ -329,7 +329,7 @@ void die_if_kernel(const char *str, ...)
  */
 static void show_backtrace_regs(struct pt_regs *frame)
 {
-	unsigned long *reg;
+	uint32_t *reg;
 	int loop;
 
 	/* print the registers for this frame */
@@ -337,11 +337,11 @@ static void show_backtrace_regs(struct pt_regs *frame)
 	       frame->psr & PSR_S ? "Kernel Mode" : "User Mode",
 	       frame);
 
-	reg = (unsigned long *) frame;
-	for (loop = 0; loop < NR_PT_REGS; loop++) {
-		printk("%s %08lx", regnames[loop + 0], reg[loop + 0]);
+	reg = (uint32_t *) frame;
+	for (loop = 0; loop < REG__END; loop++) {
+		printk("%s %08x", regnames[loop + 0], reg[loop + 0]);
 
-		if (loop == NR_PT_REGS - 1 || loop % 5 == 4)
+		if (loop == REG__END - 1 || loop % 5 == 4)
 			printk("\n");
 		else
 			printk(" | ");