Merge branch 'for-5.5-pr-warn' into for-5.5 (fd612402) · Commits · 戴 / test

arch/alpha/kernel/perf_event.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -824,7 +824,7 @@ static void alpha_perf_event_irq_handler(unsigned long la_ptr,
		if (unlikely(la_ptr >= alpha_pmu->num_pmcs)) {
		/* This should never occur! */
		irq_err_count++;
		pr_warning("PMI: silly index %ld\n", la_ptr);
		pr_warn("PMI: silly index %ld\n", la_ptr);
		wrperfmon(PERFMON_CMD_ENABLE, cpuc->idx_mask);
		return;
		}
		@@ -847,7 +847,7 @@ static void alpha_perf_event_irq_handler(unsigned long la_ptr,
		if (unlikely(!event)) {
		/* This should never occur! */
		irq_err_count++;
		pr_warning("PMI: No event at index %d!\n", idx);
		pr_warn("PMI: No event at index %d!\n", idx);
		wrperfmon(PERFMON_CMD_ENABLE, cpuc->idx_mask);
		return;
		}

+4 −4

Original line number	Diff line number	Diff line
		@@ -51,7 +51,7 @@ int hw_breakpoint_slots(int type)
		case TYPE_DATA:
		return get_num_wrps();
		default:
		pr_warning("unknown slot type: %d\n", type);
		pr_warn("unknown slot type: %d\n", type);
		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_WCR, AARCH64_DBG_REG_NAME_WCR, val);
		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;
		@@ -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_WCR, AARCH64_DBG_REG_NAME_WCR, val);
		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();
		}
		@@ -145,7 +145,7 @@ static enum dbg_active_el debug_exception_level(int privilege)
		case AARCH64_BREAKPOINT_EL1:
		return DBG_ACTIVE_EL1;
		default:
		pr_warning("invalid breakpoint privilege level %d\n", privilege);
		pr_warn("invalid breakpoint privilege level %d\n", privilege);
		return -EINVAL;
		}
		}

+5 −6

Original line number	Diff line number	Diff line
		@@ -343,8 +343,7 @@ void __cpu_die(unsigned int cpu)
		*/
		err = op_cpu_kill(cpu);
		if (err)
		pr_warn("CPU%d may not have shut down cleanly: %d\n",
		cpu, err);
		pr_warn("CPU%d may not have shut down cleanly: %d\n", cpu, err);
		}

		/*
		@@ -979,7 +978,7 @@ void smp_send_stop(void)
		udelay(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));

		sdei_mask_local_cpu();
		@@ -1020,7 +1019,7 @@ void crash_smp_send_stop(void)
		udelay(1);

		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));

		sdei_mask_local_cpu();

+1 −1

Original line number	Diff line number	Diff line
		@@ -286,7 +286,7 @@ static void __init setup_crashkernel(unsigned long total, int *n)
		}

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -315,7 +315,7 @@ int apply_relocate_add(Elf_Shdr sechdrs, const char strtab,
		/* Ignore unresolved weak symbol */
		if (ELF_ST_BIND(sym->st_info) == STB_WEAK)
		continue;
		pr_warning("%s: Unknown symbol %s\n",
		pr_warn("%s: Unknown symbol %s\n",
		me->name, strtab + sym->st_name);
		return -ENOENT;
		}