Commit 7d85d61f authored by Stephen Boyd's avatar Stephen Boyd Committed by Russell King

ARM: 6797/1: hw_breakpoint: Fix newlines in WARNings

These warnings are missing newlines and spaces causing confusing
looking output when they trigger.
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 35d34df7
...@@ -238,8 +238,8 @@ static int enable_monitor_mode(void) ...@@ -238,8 +238,8 @@ static int enable_monitor_mode(void)
ARM_DBG_READ(c1, 0, dscr); ARM_DBG_READ(c1, 0, dscr);
/* Ensure that halting mode is disabled. */ /* Ensure that halting mode is disabled. */
if (WARN_ONCE(dscr & ARM_DSCR_HDBGEN, "halting debug mode enabled." if (WARN_ONCE(dscr & ARM_DSCR_HDBGEN,
"Unable to access hardware resources.")) { "halting debug mode enabled. Unable to access hardware resources.\n")) {
ret = -EPERM; ret = -EPERM;
goto out; goto out;
} }
...@@ -377,7 +377,7 @@ int arch_install_hw_breakpoint(struct perf_event *bp) ...@@ -377,7 +377,7 @@ int arch_install_hw_breakpoint(struct perf_event *bp)
} }
} }
if (WARN_ONCE(i == max_slots, "Can't find any breakpoint slot")) { if (WARN_ONCE(i == max_slots, "Can't find any breakpoint slot\n")) {
ret = -EBUSY; ret = -EBUSY;
goto out; goto out;
} }
...@@ -423,7 +423,7 @@ void arch_uninstall_hw_breakpoint(struct perf_event *bp) ...@@ -423,7 +423,7 @@ void arch_uninstall_hw_breakpoint(struct perf_event *bp)
} }
} }
if (WARN_ONCE(i == max_slots, "Can't find any breakpoint slot")) if (WARN_ONCE(i == max_slots, "Can't find any breakpoint slot\n"))
return; return;
/* Reset the control register. */ /* Reset the control register. */
...@@ -635,7 +635,7 @@ int arch_validate_hwbkpt_settings(struct perf_event *bp) ...@@ -635,7 +635,7 @@ int arch_validate_hwbkpt_settings(struct perf_event *bp)
if (WARN_ONCE(!bp->overflow_handler && if (WARN_ONCE(!bp->overflow_handler &&
(arch_check_bp_in_kernelspace(bp) || !core_has_mismatch_brps() (arch_check_bp_in_kernelspace(bp) || !core_has_mismatch_brps()
|| !bp->hw.bp_target), || !bp->hw.bp_target),
"overflow handler required but none found")) { "overflow handler required but none found\n")) {
ret = -EINVAL; ret = -EINVAL;
} }
out: out:
...@@ -936,8 +936,8 @@ static int __init arch_hw_breakpoint_init(void) ...@@ -936,8 +936,8 @@ static int __init arch_hw_breakpoint_init(void)
ARM_DBG_READ(c1, 0, dscr); ARM_DBG_READ(c1, 0, dscr);
if (dscr & ARM_DSCR_HDBGEN) { if (dscr & ARM_DSCR_HDBGEN) {
max_watchpoint_len = 4; max_watchpoint_len = 4;
pr_warning("halting debug mode enabled. Assuming maximum " pr_warning("halting debug mode enabled. Assuming maximum watchpoint size of %u bytes.\n",
"watchpoint size of %u bytes.", max_watchpoint_len); max_watchpoint_len);
} else { } else {
/* Work out the maximum supported watchpoint length. */ /* Work out the maximum supported watchpoint length. */
max_watchpoint_len = get_max_wp_len(); max_watchpoint_len = get_max_wp_len();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment