Skip to content

Commit fd61240

Browse files
committed
Merge branch 'for-5.5-pr-warn' into for-5.5
2 parents 57f5677 + c405c37 commit fd61240

69 files changed

Lines changed: 249 additions & 268 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

arch/alpha/kernel/perf_event.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -824,7 +824,7 @@ static void alpha_perf_event_irq_handler(unsigned long la_ptr,
824824
if (unlikely(la_ptr >= alpha_pmu->num_pmcs)) {
825825
/* This should never occur! */
826826
irq_err_count++;
827-
pr_warning("PMI: silly index %ld\n", la_ptr);
827+
pr_warn("PMI: silly index %ld\n", la_ptr);
828828
wrperfmon(PERFMON_CMD_ENABLE, cpuc->idx_mask);
829829
return;
830830
}
@@ -847,7 +847,7 @@ static void alpha_perf_event_irq_handler(unsigned long la_ptr,
847847
if (unlikely(!event)) {
848848
/* This should never occur! */
849849
irq_err_count++;
850-
pr_warning("PMI: No event at index %d!\n", idx);
850+
pr_warn("PMI: No event at index %d!\n", idx);
851851
wrperfmon(PERFMON_CMD_ENABLE, cpuc->idx_mask);
852852
return;
853853
}

arch/arm64/kernel/hw_breakpoint.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ int hw_breakpoint_slots(int type)
5151
case TYPE_DATA:
5252
return get_num_wrps();
5353
default:
54-
pr_warning("unknown slot type: %d\n", type);
54+
pr_warn("unknown slot type: %d\n", type);
5555
return 0;
5656
}
5757
}
@@ -112,7 +112,7 @@ static u64 read_wb_reg(int reg, int n)
112112
GEN_READ_WB_REG_CASES(AARCH64_DBG_REG_WVR, AARCH64_DBG_REG_NAME_WVR, val);
113113
GEN_READ_WB_REG_CASES(AARCH64_DBG_REG_WCR, AARCH64_DBG_REG_NAME_WCR, val);
114114
default:
115-
pr_warning("attempt to read from unknown breakpoint register %d\n", n);
115+
pr_warn("attempt to read from unknown breakpoint register %d\n", n);
116116
}
117117

118118
return val;
@@ -127,7 +127,7 @@ static void write_wb_reg(int reg, int n, u64 val)
127127
GEN_WRITE_WB_REG_CASES(AARCH64_DBG_REG_WVR, AARCH64_DBG_REG_NAME_WVR, val);
128128
GEN_WRITE_WB_REG_CASES(AARCH64_DBG_REG_WCR, AARCH64_DBG_REG_NAME_WCR, val);
129129
default:
130-
pr_warning("attempt to write to unknown breakpoint register %d\n", n);
130+
pr_warn("attempt to write to unknown breakpoint register %d\n", n);
131131
}
132132
isb();
133133
}
@@ -145,7 +145,7 @@ static enum dbg_active_el debug_exception_level(int privilege)
145145
case AARCH64_BREAKPOINT_EL1:
146146
return DBG_ACTIVE_EL1;
147147
default:
148-
pr_warning("invalid breakpoint privilege level %d\n", privilege);
148+
pr_warn("invalid breakpoint privilege level %d\n", privilege);
149149
return -EINVAL;
150150
}
151151
}

arch/arm64/kernel/smp.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -343,8 +343,7 @@ void __cpu_die(unsigned int cpu)
343343
*/
344344
err = op_cpu_kill(cpu);
345345
if (err)
346-
pr_warn("CPU%d may not have shut down cleanly: %d\n",
347-
cpu, err);
346+
pr_warn("CPU%d may not have shut down cleanly: %d\n", cpu, err);
348347
}
349348

350349
/*
@@ -979,8 +978,8 @@ void smp_send_stop(void)
979978
udelay(1);
980979

981980
if (num_online_cpus() > 1)
982-
pr_warning("SMP: failed to stop secondary CPUs %*pbl\n",
983-
cpumask_pr_args(cpu_online_mask));
981+
pr_warn("SMP: failed to stop secondary CPUs %*pbl\n",
982+
cpumask_pr_args(cpu_online_mask));
984983

985984
sdei_mask_local_cpu();
986985
}
@@ -1020,8 +1019,8 @@ void crash_smp_send_stop(void)
10201019
udelay(1);
10211020

10221021
if (atomic_read(&waiting_for_crash_ipi) > 0)
1023-
pr_warning("SMP: failed to stop secondary CPUs %*pbl\n",
1024-
cpumask_pr_args(&mask));
1022+
pr_warn("SMP: failed to stop secondary CPUs %*pbl\n",
1023+
cpumask_pr_args(&mask));
10251024

10261025
sdei_mask_local_cpu();
10271026
}

arch/ia64/kernel/setup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ static void __init setup_crashkernel(unsigned long total, int *n)
286286
}
287287

288288
if (!check_crashkernel_memory(base, size)) {
289-
pr_warning("crashkernel: There would be kdump memory "
289+
pr_warn("crashkernel: There would be kdump memory "
290290
"at %ld GB but this is unusable because it "
291291
"must\nbe below 4 GB. Change the memory "
292292
"configuration of the machine.\n",

arch/riscv/kernel/module.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,8 +315,8 @@ int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab,
315315
/* Ignore unresolved weak symbol */
316316
if (ELF_ST_BIND(sym->st_info) == STB_WEAK)
317317
continue;
318-
pr_warning("%s: Unknown symbol %s\n",
319-
me->name, strtab + sym->st_name);
318+
pr_warn("%s: Unknown symbol %s\n",
319+
me->name, strtab + sym->st_name);
320320
return -ENOENT;
321321
}
322322

arch/sh/boards/mach-sdk7786/nmi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ static int __init nmi_mode_setup(char *str)
3737
nmi_mode = NMI_MODE_ANY;
3838
else {
3939
nmi_mode = NMI_MODE_UNKNOWN;
40-
pr_warning("Unknown NMI mode %s\n", str);
40+
pr_warn("Unknown NMI mode %s\n", str);
4141
}
4242

4343
printk("Set NMI mode to %d\n", nmi_mode);

arch/sh/drivers/pci/fixups-sdk7786.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ static int __init sdk7786_pci_init(void)
5353

5454
/* Warn about forced rerouting if slot#3 is occupied */
5555
if ((data & PCIECR_PRST3) == 0) {
56-
pr_warning("Unreachable card detected in slot#3\n");
56+
pr_warn("Unreachable card detected in slot#3\n");
5757
return -EBUSY;
5858
}
5959
} else

arch/sh/kernel/io_trapped.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ int register_trapped_io(struct trapped_io *tiop)
9999

100100
return 0;
101101
bad:
102-
pr_warning("unable to install trapped io filter\n");
102+
pr_warn("unable to install trapped io filter\n");
103103
return -1;
104104
}
105105
EXPORT_SYMBOL_GPL(register_trapped_io);

arch/sh/kernel/setup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ void __init setup_arch(char **cmdline_p)
354354
/* processor boot mode configuration */
355355
int generic_mode_pins(void)
356356
{
357-
pr_warning("generic_mode_pins(): missing mode pin configuration\n");
357+
pr_warn("generic_mode_pins(): missing mode pin configuration\n");
358358
return 0;
359359
}
360360

arch/sh/mm/consistent.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ int __init platform_resource_setup_memory(struct platform_device *pdev,
4343

4444
r = pdev->resource + pdev->num_resources - 1;
4545
if (r->flags) {
46-
pr_warning("%s: unable to find empty space for resource\n",
47-
name);
46+
pr_warn("%s: unable to find empty space for resource\n", name);
4847
return -EINVAL;
4948
}
5049

@@ -54,7 +53,7 @@ int __init platform_resource_setup_memory(struct platform_device *pdev,
5453

5554
buf = dma_alloc_coherent(&pdev->dev, memsize, &dma_handle, GFP_KERNEL);
5655
if (!buf) {
57-
pr_warning("%s: unable to allocate memory\n", name);
56+
pr_warn("%s: unable to allocate memory\n", name);
5857
return -ENOMEM;
5958
}
6059

0 commit comments

Comments
 (0)