Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / arch / tile / kernel / hardwall.c

diff --git a/arch/tile/kernel/hardwall.c b/arch/tile/kernel/hardwall.c
index aca6000..c4646bb 100644 (file)
--- 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();