x86/reboot: Correct pr_info() log message in the set_bios/pci/kbd_reboot() (6d9153bb) · Commits · 戴 / test

commit: x86/debug: Add KERN_<LEVEL> to bare printks, convert printks to pr_<level> broke the log messages in the set_bios/pci/kbd_reboot() functions, by putting the reboot method string and quirk entry's ident string in the wrong order. This patch fixes it. Signed-off-by:

Lan Tianyu <tianyu.lan@intel.com> Cc: holt@sgi.com Cc: davej@fedoraproject.org Cc: lenb@kernel.org Cc: rjw@rjwysocki.net Cc: awilliam@redhat.com Link: http://lkml.kernel.org/r/1382598693-29334-1-git-send-email-tianyu.lan@intel.com Signed-off-by:

Ingo Molnar <mingo@kernel.org>

arch/x86/kernel/reboot.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -61,7 +61,7 @@ static int __init set_bios_reboot(const struct dmi_system_id *d)
		if (reboot_type != BOOT_BIOS) {
		reboot_type = BOOT_BIOS;
		pr_info("%s series board detected. Selecting %s-method for reboots.\n",
		"BIOS", d->ident);
		d->ident, "BIOS");
		}
		return 0;
		}
		@@ -117,7 +117,7 @@ static int __init set_pci_reboot(const struct dmi_system_id *d)
		if (reboot_type != BOOT_CF9) {
		reboot_type = BOOT_CF9;
		pr_info("%s series board detected. Selecting %s-method for reboots.\n",
		"PCI", d->ident);
		d->ident, "PCI");
		}
		return 0;
		}
		@@ -127,7 +127,7 @@ static int __init set_kbd_reboot(const struct dmi_system_id *d)
		if (reboot_type != BOOT_KBD) {
		reboot_type = BOOT_KBD;
		pr_info("%s series board detected. Selecting %s-method for reboot.\n",
		"KBD", d->ident);
		d->ident, "KBD");
		}
		return 0;
		}

Admin message