diff options
| author | Joe Perches <joe@perches.com> | 2014-10-31 10:50:46 -0700 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2014-11-11 15:51:42 -0500 |
| commit | f47436734dc89ece62654d4db8d08163a89dd7ca (patch) | |
| tree | 1977a1e352588c026c87cc1fc34c93fabba6f2b7 /arch/tile/kernel/hardwall.c | |
| parent | ebd25caf7d511312d1a9724ab5752e9e661dfe60 (diff) | |
| download | talos-obmc-linux-f47436734dc89ece62654d4db8d08163a89dd7ca.tar.gz talos-obmc-linux-f47436734dc89ece62654d4db8d08163a89dd7ca.zip | |
tile: Use the more common pr_warn instead of pr_warning
And other message logging neatening.
Other miscellanea:
o coalesce formats
o realign arguments
o standardize a couple of macros
o use __func__ instead of embedding the function name
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Diffstat (limited to 'arch/tile/kernel/hardwall.c')
| -rw-r--r-- | arch/tile/kernel/hardwall.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/tile/kernel/hardwall.c b/arch/tile/kernel/hardwall.c index aca6000bca75..c4646bb99342 100644 --- a/arch/tile/kernel/hardwall.c +++ b/arch/tile/kernel/hardwall.c @@ -365,8 +365,7 @@ void __kprobes do_hardwall_trap(struct pt_regs* regs, int fault_num) * to quiesce. */ if (rect->teardown_in_progress) { - pr_notice("cpu %d: detected %s hardwall violation %#lx" - " while teardown already in progress\n", + pr_notice("cpu %d: detected %s hardwall violation %#lx while teardown already in progress\n", cpu, hwt->name, (long)mfspr_XDN(hwt, DIRECTION_PROTECT)); goto done; @@ -630,8 +629,7 @@ static void _hardwall_deactivate(struct hardwall_type *hwt, struct thread_struct *ts = &task->thread; if (cpumask_weight(&task->cpus_allowed) != 1) { - pr_err("pid %d (%s) releasing %s hardwall with" - " an affinity mask containing %d cpus!\n", + pr_err("pid %d (%s) releasing %s hardwall with an affinity mask containing %d cpus!\n", task->pid, task->comm, hwt->name, cpumask_weight(&task->cpus_allowed)); BUG(); |
