* [TRIVIAL/PATCH] ARM: hw_breakpoint: Fix newlines in WARN messages
@ 2011-02-24 18:55 Stephen Boyd
2011-02-25 6:38 ` Lothar Waßmann
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Boyd @ 2011-02-24 18:55 UTC (permalink / raw)
To: linux-arm-kernel
These warnings are missing newlines and spaces causing confusing
looking output when they trigger.
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
arch/arm/kernel/hw_breakpoint.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/arch/arm/kernel/hw_breakpoint.c b/arch/arm/kernel/hw_breakpoint.c
index d600bd3..5aab00e 100644
--- a/arch/arm/kernel/hw_breakpoint.c
+++ b/arch/arm/kernel/hw_breakpoint.c
@@ -238,8 +238,8 @@ static int enable_monitor_mode(void)
ARM_DBG_READ(c1, 0, dscr);
/* Ensure that halting mode is disabled. */
- if (WARN_ONCE(dscr & ARM_DSCR_HDBGEN, "halting debug mode enabled."
- "Unable to access hardware resources.")) {
+ if (WARN_ONCE(dscr & ARM_DSCR_HDBGEN, "halting debug mode enabled. "
+ "Unable to access hardware resources.\n")) {
ret = -EPERM;
goto out;
}
@@ -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;
goto out;
}
@@ -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;
/* Reset the control register. */
@@ -635,7 +635,7 @@ int arch_validate_hwbkpt_settings(struct perf_event *bp)
if (WARN_ONCE(!bp->overflow_handler &&
(arch_check_bp_in_kernelspace(bp) || !core_has_mismatch_brps()
|| !bp->hw.bp_target),
- "overflow handler required but none found")) {
+ "overflow handler required but none found\n")) {
ret = -EINVAL;
}
out:
@@ -917,7 +917,8 @@ static int __init arch_hw_breakpoint_init(void)
if (dscr & ARM_DSCR_HDBGEN) {
max_watchpoint_len = 4;
pr_warning("halting debug mode enabled. Assuming maximum "
- "watchpoint size of %u bytes.", max_watchpoint_len);
+ "watchpoint size of %u bytes.\n",
+ max_watchpoint_len);
} else {
/* Work out the maximum supported watchpoint length. */
max_watchpoint_len = get_max_wp_len();
--
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
^ permalink raw reply related [flat|nested] 6+ messages in thread* [TRIVIAL/PATCH] ARM: hw_breakpoint: Fix newlines in WARN messages
2011-02-24 18:55 [TRIVIAL/PATCH] ARM: hw_breakpoint: Fix newlines in WARN messages Stephen Boyd
@ 2011-02-25 6:38 ` Lothar Waßmann
2011-02-25 11:31 ` Will Deacon
0 siblings, 1 reply; 6+ messages in thread
From: Lothar Waßmann @ 2011-02-25 6:38 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
Stephen Boyd writes:
> These warnings are missing newlines and spaces causing confusing
> looking output when they trigger.
>
> Cc: Will Deacon <will.deacon@arm.com>
> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
> ---
> arch/arm/kernel/hw_breakpoint.c | 13 +++++++------
> 1 files changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm/kernel/hw_breakpoint.c b/arch/arm/kernel/hw_breakpoint.c
> index d600bd3..5aab00e 100644
> --- a/arch/arm/kernel/hw_breakpoint.c
> +++ b/arch/arm/kernel/hw_breakpoint.c
> @@ -238,8 +238,8 @@ static int enable_monitor_mode(void)
> ARM_DBG_READ(c1, 0, dscr);
>
> /* Ensure that halting mode is disabled. */
> - if (WARN_ONCE(dscr & ARM_DSCR_HDBGEN, "halting debug mode enabled."
> - "Unable to access hardware resources.")) {
> + if (WARN_ONCE(dscr & ARM_DSCR_HDBGEN, "halting debug mode enabled. "
> + "Unable to access hardware resources.\n")) {
>
I'd prefer the message text not to be line wrapped, even if it
violates the general line length rule, because that makes it easier to
grep for the message in the source code.
Lothar Wa?mann
--
___________________________________________________________
Ka-Ro electronics GmbH | Pascalstra?e 22 | D - 52076 Aachen
Phone: +49 2408 1402-0 | Fax: +49 2408 1402-10
Gesch?ftsf?hrer: Matthias Kaussen
Handelsregistereintrag: Amtsgericht Aachen, HRB 4996
www.karo-electronics.de | info at karo-electronics.de
___________________________________________________________
^ permalink raw reply [flat|nested] 6+ messages in thread* [TRIVIAL/PATCH] ARM: hw_breakpoint: Fix newlines in WARN messages
2011-02-25 6:38 ` Lothar Waßmann
@ 2011-02-25 11:31 ` Will Deacon
2011-02-26 4:06 ` [PATCH] ARM: hw_breakpoint: Fix newlines in WARNings Stephen Boyd
0 siblings, 1 reply; 6+ messages in thread
From: Will Deacon @ 2011-02-25 11:31 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, 2011-02-25 at 06:38 +0000, Lothar Wa?mann wrote:
> Hi,
>
Hello,
> Stephen Boyd writes:
> > These warnings are missing newlines and spaces causing confusing
> > looking output when they trigger.
> >
> > Cc: Will Deacon <will.deacon@arm.com>
> > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
> > ---
> > arch/arm/kernel/hw_breakpoint.c | 13 +++++++------
> > 1 files changed, 7 insertions(+), 6 deletions(-)
> >
> > diff --git a/arch/arm/kernel/hw_breakpoint.c b/arch/arm/kernel/hw_breakpoint.c
> > index d600bd3..5aab00e 100644
> > --- a/arch/arm/kernel/hw_breakpoint.c
> > +++ b/arch/arm/kernel/hw_breakpoint.c
> > @@ -238,8 +238,8 @@ static int enable_monitor_mode(void)
> > ARM_DBG_READ(c1, 0, dscr);
> >
> > /* Ensure that halting mode is disabled. */
> > - if (WARN_ONCE(dscr & ARM_DSCR_HDBGEN, "halting debug mode enabled."
> > - "Unable to access hardware resources.")) {
> > + if (WARN_ONCE(dscr & ARM_DSCR_HDBGEN, "halting debug mode enabled. "
> > + "Unable to access hardware resources.\n")) {
> >
> I'd prefer the message text not to be line wrapped, even if it
> violates the general line length rule, because that makes it easier to
> grep for the message in the source code.
Ok, that's understandable. Moving the text onto its own line will limit
the damage to the line length too. Stephen - are you happy to make these
changes as part of your previous patch?
Thanks,
Will
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH] ARM: hw_breakpoint: Fix newlines in WARNings
2011-02-25 11:31 ` Will Deacon
@ 2011-02-26 4:06 ` Stephen Boyd
2011-03-09 19:36 ` Stephen Boyd
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Boyd @ 2011-02-26 4:06 UTC (permalink / raw)
To: linux-arm-kernel
These warnings are missing newlines and spaces causing confusing
looking output when they trigger.
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
Will Deacon wrote:
> > I'd prefer the message text not to be line wrapped, even if it
> > violates the general line length rule, because that makes it easier to
> > grep for the message in the source code.
>
> Ok, that's understandable. Moving the text onto its own line will limit
> the damage to the line length too. Stephen - are you happy to make these
> changes as part of your previous patch?
Sure.
arch/arm/kernel/hw_breakpoint.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/arm/kernel/hw_breakpoint.c b/arch/arm/kernel/hw_breakpoint.c
index d600bd3..6da9132 100644
--- a/arch/arm/kernel/hw_breakpoint.c
+++ b/arch/arm/kernel/hw_breakpoint.c
@@ -238,8 +238,8 @@ static int enable_monitor_mode(void)
ARM_DBG_READ(c1, 0, dscr);
/* Ensure that halting mode is disabled. */
- if (WARN_ONCE(dscr & ARM_DSCR_HDBGEN, "halting debug mode enabled."
- "Unable to access hardware resources.")) {
+ if (WARN_ONCE(dscr & ARM_DSCR_HDBGEN,
+ "halting debug mode enabled. Unable to access hardware resources.\n")) {
ret = -EPERM;
goto out;
}
@@ -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;
goto out;
}
@@ -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;
/* Reset the control register. */
@@ -635,7 +635,7 @@ int arch_validate_hwbkpt_settings(struct perf_event *bp)
if (WARN_ONCE(!bp->overflow_handler &&
(arch_check_bp_in_kernelspace(bp) || !core_has_mismatch_brps()
|| !bp->hw.bp_target),
- "overflow handler required but none found")) {
+ "overflow handler required but none found\n")) {
ret = -EINVAL;
}
out:
@@ -916,8 +916,8 @@ static int __init arch_hw_breakpoint_init(void)
ARM_DBG_READ(c1, 0, dscr);
if (dscr & ARM_DSCR_HDBGEN) {
max_watchpoint_len = 4;
- pr_warning("halting debug mode enabled. Assuming maximum "
- "watchpoint size of %u bytes.", max_watchpoint_len);
+ pr_warning("halting debug mode enabled. Assuming maximum watchpoint size of %u bytes.\n",
+ max_watchpoint_len);
} else {
/* Work out the maximum supported watchpoint length. */
max_watchpoint_len = get_max_wp_len();
--
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] ARM: hw_breakpoint: Fix newlines in WARNings
2011-02-26 4:06 ` [PATCH] ARM: hw_breakpoint: Fix newlines in WARNings Stephen Boyd
@ 2011-03-09 19:36 ` Stephen Boyd
2011-03-09 21:58 ` Will Deacon
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Boyd @ 2011-03-09 19:36 UTC (permalink / raw)
To: linux-arm-kernel
Will,
On 02/25/2011 08:06 PM, Stephen Boyd wrote:
> Will Deacon wrote:
>>> I'd prefer the message text not to be line wrapped, even if it
>>> violates the general line length rule, because that makes it easier to
>>> grep for the message in the source code.
>> Ok, that's understandable. Moving the text onto its own line will limit
>> the damage to the line length too. Stephen - are you happy to make these
>> changes as part of your previous patch?
>
Do you want to take this? I'm going to submit it to the patch tracker
tomorrow otherwise.
--
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] ARM: hw_breakpoint: Fix newlines in WARNings
2011-03-09 19:36 ` Stephen Boyd
@ 2011-03-09 21:58 ` Will Deacon
0 siblings, 0 replies; 6+ messages in thread
From: Will Deacon @ 2011-03-09 21:58 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, 2011-03-09 at 19:36 +0000, Stephen Boyd wrote:
> Will,
Hi Stephen,
>
> On 02/25/2011 08:06 PM, Stephen Boyd wrote:
> > Will Deacon wrote:
> >>> I'd prefer the message text not to be line wrapped, even if it
> >>> violates the general line length rule, because that makes it easier to
> >>> grep for the message in the source code.
> >> Ok, that's understandable. Moving the text onto its own line will limit
> >> the damage to the line length too. Stephen - are you happy to make these
> >> changes as part of your previous patch?
> >
>
> Do you want to take this? I'm going to submit it to the patch tracker
> tomorrow otherwise.
Please submit it to the patch system with my ack:
Acked-by: Will Deacon <will.deacon@arm.com>
Thanks,
Will
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-03-09 21:58 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-24 18:55 [TRIVIAL/PATCH] ARM: hw_breakpoint: Fix newlines in WARN messages Stephen Boyd
2011-02-25 6:38 ` Lothar Waßmann
2011-02-25 11:31 ` Will Deacon
2011-02-26 4:06 ` [PATCH] ARM: hw_breakpoint: Fix newlines in WARNings Stephen Boyd
2011-03-09 19:36 ` Stephen Boyd
2011-03-09 21:58 ` Will Deacon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).