[tip:x86/reboot] x86/reboot: Correct pr_info() log message in the set_bios/pci/kbd_reboot()
From: tip-bot for Lan Tianyu
Date: Fri Oct 25 2013 - 07:48:45 EST
Commit-ID: 6d9153bbce50d41802ad2e20ce52daf699a3e8ad
Gitweb: http://git.kernel.org/tip/6d9153bbce50d41802ad2e20ce52daf699a3e8ad
Author: Lan Tianyu <tianyu.lan@xxxxxxxxx>
AuthorDate: Thu, 24 Oct 2013 15:11:33 +0800
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitDate: Fri, 25 Oct 2013 12:45:04 +0200
x86/reboot: Correct pr_info() log message in the set_bios/pci/kbd_reboot()
commit:
c767a54ba065 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@xxxxxxxxx>
Cc: holt@xxxxxxx
Cc: davej@xxxxxxxxxxxxxxxxx
Cc: lenb@xxxxxxxxxx
Cc: rjw@xxxxxxxxxxxxx
Cc: awilliam@xxxxxxxxxx
Link: http://lkml.kernel.org/r/1382598693-29334-1-git-send-email-tianyu.lan@xxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
---
arch/x86/kernel/reboot.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index 7692520..da1fe1c 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -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;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/