diff options
author | Lan Tianyu <tianyu.lan@intel.com> | 2013-10-24 03:11:33 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-10-25 06:45:04 -0400 |
commit | 6d9153bbce50d41802ad2e20ce52daf699a3e8ad (patch) | |
tree | f13a5f9e2acd243320f934e3dc7a5a9ec46ce404 | |
parent | e56e57f6613d5ed5c3127419341d1aa989a11971 (diff) |
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@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>
-rw-r--r-- | arch/x86/kernel/reboot.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index 76925208f50b..da1fe1c0590b 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) | |||
61 | if (reboot_type != BOOT_BIOS) { | 61 | if (reboot_type != BOOT_BIOS) { |
62 | reboot_type = BOOT_BIOS; | 62 | reboot_type = BOOT_BIOS; |
63 | pr_info("%s series board detected. Selecting %s-method for reboots.\n", | 63 | pr_info("%s series board detected. Selecting %s-method for reboots.\n", |
64 | "BIOS", d->ident); | 64 | d->ident, "BIOS"); |
65 | } | 65 | } |
66 | return 0; | 66 | return 0; |
67 | } | 67 | } |
@@ -117,7 +117,7 @@ static int __init set_pci_reboot(const struct dmi_system_id *d) | |||
117 | if (reboot_type != BOOT_CF9) { | 117 | if (reboot_type != BOOT_CF9) { |
118 | reboot_type = BOOT_CF9; | 118 | reboot_type = BOOT_CF9; |
119 | pr_info("%s series board detected. Selecting %s-method for reboots.\n", | 119 | pr_info("%s series board detected. Selecting %s-method for reboots.\n", |
120 | "PCI", d->ident); | 120 | d->ident, "PCI"); |
121 | } | 121 | } |
122 | return 0; | 122 | return 0; |
123 | } | 123 | } |
@@ -127,7 +127,7 @@ static int __init set_kbd_reboot(const struct dmi_system_id *d) | |||
127 | if (reboot_type != BOOT_KBD) { | 127 | if (reboot_type != BOOT_KBD) { |
128 | reboot_type = BOOT_KBD; | 128 | reboot_type = BOOT_KBD; |
129 | pr_info("%s series board detected. Selecting %s-method for reboot.\n", | 129 | pr_info("%s series board detected. Selecting %s-method for reboot.\n", |
130 | "KBD", d->ident); | 130 | d->ident, "KBD"); |
131 | } | 131 | } |
132 | return 0; | 132 | return 0; |
133 | } | 133 | } |