* [PATCH] x86/reboot: Correct pr_info log message in the set_bios/pci/kbd_reboot()
@ 2013-10-24 7:11 Lan Tianyu
2013-10-25 11:48 ` [tip:x86/reboot] x86/reboot: Correct pr_info() " tip-bot for Lan Tianyu
0 siblings, 1 reply; 2+ messages in thread
From: Lan Tianyu @ 2013-10-24 7:11 UTC (permalink / raw)
To: mingo, hpa, x86, holt, davej, lenb, rjw, awilliam
Cc: Lan Tianyu, linux-kernel
commit c767a54ba broke log message in the set_bios/pci/kbd_reboot. Put
reboot method string and quirk entry's ident string in the wrong order.
This patch is to fix it.
Signed-off-by: Lan Tianyu <tianyu.lan@intel.com>
---
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 083ade7..c93280d 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;
}
--
1.8.4.rc0.1.g8f6a3e5.dirty
^ permalink raw reply [flat|nested] 2+ messages in thread* [tip:x86/reboot] x86/reboot: Correct pr_info() log message in the set_bios/pci/kbd_reboot()
2013-10-24 7:11 [PATCH] x86/reboot: Correct pr_info log message in the set_bios/pci/kbd_reboot() Lan Tianyu
@ 2013-10-25 11:48 ` tip-bot for Lan Tianyu
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Lan Tianyu @ 2013-10-25 11:48 UTC (permalink / raw)
To: linux-tip-commits; +Cc: linux-kernel, hpa, mingo, tglx, tianyu.lan
Commit-ID: 6d9153bbce50d41802ad2e20ce52daf699a3e8ad
Gitweb: http://git.kernel.org/tip/6d9153bbce50d41802ad2e20ce52daf699a3e8ad
Author: Lan Tianyu <tianyu.lan@intel.com>
AuthorDate: Thu, 24 Oct 2013 15:11:33 +0800
Committer: Ingo Molnar <mingo@kernel.org>
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@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 | 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;
}
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-10-25 11:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-10-24 7:11 [PATCH] x86/reboot: Correct pr_info log message in the set_bios/pci/kbd_reboot() Lan Tianyu
2013-10-25 11:48 ` [tip:x86/reboot] x86/reboot: Correct pr_info() " tip-bot for Lan Tianyu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome