Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-22 10:56:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

arm64: Use pr_warn instead of pr_warning

Browse Source 
As said in commit f2c2cbcc35 ("powerpc: Use pr_warn instead of
pr_warning"), removing pr_warning so all logging messages use a
consistent <prefix>_warn style. Let's do it.

Link: http://lkml.kernel.org/r/20191018031850.48498-2-wangkefeng.wang@huawei.com
To: linux-kernel@vger.kernel.org
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Acked-by: Will Deacon <will@kernel.org>
Reviewed-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Signed-off-by: Petr Mladek <pmladek@suse.com>
This commit is contained in:
Kefeng Wang 2019-10-18 11:18:19 +08:00 committed by Petr Mladek
parent a7590d68e9
commit a74ec64af2
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm64/kernel/hw_breakpoint.c
View File

@ -51,7 +51,7 @@ int hw_breakpoint_slots(int type)
case TYPE_DATA: case TYPE_DATA:
return get_num_wrps(); return get_num_wrps();
default: default:
pr_warning("unknown slot type: %d\n", type); pr_warn("unknown slot type: %d\n", type);
return 0; return 0;
} }
} }
@ -112,7 +112,7 @@ static u64 read_wb_reg(int reg, int n)
GEN_READ_WB_REG_CASES(AARCH64_DBG_REG_WVR, AARCH64_DBG_REG_NAME_WVR, val); GEN_READ_WB_REG_CASES(AARCH64_DBG_REG_WVR, AARCH64_DBG_REG_NAME_WVR, val);
GEN_READ_WB_REG_CASES(AARCH64_DBG_REG_WCR, AARCH64_DBG_REG_NAME_WCR, val); GEN_READ_WB_REG_CASES(AARCH64_DBG_REG_WCR, AARCH64_DBG_REG_NAME_WCR, val);
default: default:
pr_warning("attempt to read from unknown breakpoint register %d\n", n); pr_warn("attempt to read from unknown breakpoint register %d\n", n);
} }
return val; return val;
@ -127,7 +127,7 @@ static void write_wb_reg(int reg, int n, u64 val)
GEN_WRITE_WB_REG_CASES(AARCH64_DBG_REG_WVR, AARCH64_DBG_REG_NAME_WVR, val); GEN_WRITE_WB_REG_CASES(AARCH64_DBG_REG_WVR, AARCH64_DBG_REG_NAME_WVR, val);
GEN_WRITE_WB_REG_CASES(AARCH64_DBG_REG_WCR, AARCH64_DBG_REG_NAME_WCR, val); GEN_WRITE_WB_REG_CASES(AARCH64_DBG_REG_WCR, AARCH64_DBG_REG_NAME_WCR, val);
default: default:
pr_warning("attempt to write to unknown breakpoint register %d\n", n); pr_warn("attempt to write to unknown breakpoint register %d\n", n);
} }
isb(); isb();
} }
@ -145,7 +145,7 @@ static enum dbg_active_el debug_exception_level(int privilege)
case AARCH64_BREAKPOINT_EL1: case AARCH64_BREAKPOINT_EL1:
return DBG_ACTIVE_EL1; return DBG_ACTIVE_EL1;
default: default:
pr_warning("invalid breakpoint privilege level %d\n", privilege); pr_warn("invalid breakpoint privilege level %d\n", privilege);
return -EINVAL; return -EINVAL;
} }
} }

11
arch/arm64/kernel/smp.c
View File

@ -343,8 +343,7 @@ void __cpu_die(unsigned int cpu)
*/ */
err = op_cpu_kill(cpu); err = op_cpu_kill(cpu);
if (err) if (err)
pr_warn("CPU%d may not have shut down cleanly: %d\n", pr_warn("CPU%d may not have shut down cleanly: %d\n", cpu, err);
cpu, err);
} }
/* /*
@ -979,8 +978,8 @@ void smp_send_stop(void)
udelay(1); udelay(1);
if (num_online_cpus() > 1) if (num_online_cpus() > 1)
pr_warning("SMP: failed to stop secondary CPUs %*pbl\n", pr_warn("SMP: failed to stop secondary CPUs %*pbl\n",
cpumask_pr_args(cpu_online_mask)); cpumask_pr_args(cpu_online_mask));
sdei_mask_local_cpu(); sdei_mask_local_cpu();
} }
@ -1020,8 +1019,8 @@ void crash_smp_send_stop(void)
udelay(1); udelay(1);
if (atomic_read(&waiting_for_crash_ipi) > 0) if (atomic_read(&waiting_for_crash_ipi) > 0)
pr_warning("SMP: failed to stop secondary CPUs %*pbl\n", pr_warn("SMP: failed to stop secondary CPUs %*pbl\n",
cpumask_pr_args(&mask)); cpumask_pr_args(&mask));
sdei_mask_local_cpu(); sdei_mask_local_cpu();
} }