Merge branch '2020-05-18-reduce-size-of-common.h'

[oweals/u-boot.git] / arch / m68k / lib / traps.c

diff --git a/arch/m68k/lib/traps.c b/arch/m68k/lib/traps.c
index 1ca94dc55f7479a49124eed2d4ee3cbc3346e2d6..c49141f376d3b46ce155e77fef5deabdc1b117da 100644 (file)
--- a/arch/m68k/lib/traps.c
+++ b/arch/m68k/lib/traps.c
@@ -1,33 +1,18 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2003
  * Josef Baumgartner <josef.baumgartner@telex.de>
  *
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
  */
 
 #include <common.h>
+#include <init.h>
 #include <watchdog.h>
 #include <command.h>
 #include <asm/processor.h>
+#include <asm/ptrace.h>
 
 
 extern void _exc_handler(void);
@@ -36,7 +21,7 @@ extern void _int_handler(void);
 static void show_frame(struct pt_regs *fp)
 {
        printf ("Vector Number: %d  Format: %02x  Fault Status: %01x\n\n", (fp->vector & 0x3fc) >> 2,
-               fp->format, (fp->vector & 0x3) | ((fp->vector & 0xc00) >> 8));
+               fp->format, (fp->vector & 0x3) | ((fp->vector & 0xc00) >> 8));
        printf ("PC: %08lx    SR: %08lx    SP: %08lx\n", fp->pc, (long) fp->sr, (long) fp);
        printf ("D0: %08lx    D1: %08lx    D2: %08lx    D3: %08lx\n",
                fp->d0, fp->d1, fp->d2, fp->d3);