diff options
| author | Fedora Kernel Team <kernel-team@fedoraproject.org> | 2021-02-16 19:22:36 +0300 |
|---|---|---|
| committer | Fu Wei <fu.wei@linaro.org> | 2021-02-16 19:22:36 +0300 |
| commit | 89362d176113d6aad13e750e0c32d5982bf5a9da (patch) | |
| tree | 9f8b30fcd7f1d1eff414cbab05e736b0ef4fff71 /arch/powerpc/xmon | |
| parent | 2c85ebc57b3e1817b6ce1a6b703928e113a90442 (diff) | |
| download | linux-89362d176113d6aad13e750e0c32d5982bf5a9da.tar.xz | |
Stable update
Diffstat (limited to 'arch/powerpc/xmon')
| -rw-r--r-- | arch/powerpc/xmon/nonstdio.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/xmon/xmon.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/xmon/nonstdio.c b/arch/powerpc/xmon/nonstdio.c index 5c1a50912229..9b0d85bff021 100644 --- a/arch/powerpc/xmon/nonstdio.c +++ b/arch/powerpc/xmon/nonstdio.c @@ -178,7 +178,7 @@ void xmon_printf(const char *format, ...) if (n && rc == 0) { /* No udbg hooks, fallback to printk() - dangerous */ - printk("%s", xmon_outbuf); + pr_cont("%s", xmon_outbuf); } } diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c index 55c43a6c9111..5559edf36756 100644 --- a/arch/powerpc/xmon/xmon.c +++ b/arch/powerpc/xmon/xmon.c @@ -1383,6 +1383,7 @@ static long check_bp_loc(unsigned long addr) return 1; } +#ifndef CONFIG_PPC_8xx static int find_free_data_bpt(void) { int i; @@ -1394,6 +1395,7 @@ static int find_free_data_bpt(void) printf("Couldn't find free breakpoint register\n"); return -1; } +#endif static void print_data_bpts(void) { |