Merge tag 'printk-for-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/printk...

[platform/kernel/linux-rpi.git] / arch / powerpc / xmon / xmon.c

diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index dd0e0aa..bf7d696 100644 (file)
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -1383,7 +1383,6 @@ static long check_bp_loc(unsigned long addr)
        return 1;
 }
 
-#ifndef CONFIG_PPC_8xx
 static int find_free_data_bpt(void)
 {
        int i;
@@ -1395,7 +1394,6 @@ static int find_free_data_bpt(void)
        printf("Couldn't find free breakpoint register\n");
        return -1;
 }
-#endif
 
 static void print_data_bpts(void)
 {
@@ -1435,7 +1433,6 @@ bpt_cmds(void)
        cmd = inchar();
 
        switch (cmd) {
-#ifndef CONFIG_PPC_8xx
        static const char badaddr[] = "Only kernel addresses are permitted for breakpoints\n";
        int mode;
        case 'd':       /* bd - hardware data breakpoint */
@@ -1497,7 +1494,6 @@ bpt_cmds(void)
                        force_enable_xmon();
                }
                break;
-#endif
 
        case 'c':
                if (!scanhex(&a)) {
@@ -3723,7 +3719,7 @@ void dump_segments(void)
 
        printf("sr0-15 =");
        for (i = 0; i < 16; ++i)
-               printf(" %x", mfsrin(i << 28));
+               printf(" %x", mfsr(i << 28));
        printf("\n");
 }
 #endif