From: Lan Tianyu <tianyu.lan@intel.com>
To: mingo@kernel.org, hpa@zytor.com, x86@kernel.org, holt@sgi.com,
davej@fedoraproject.org, lenb@kernel.org, rjw@rjwysocki.net,
awilliam@redhat.com
Cc: Lan Tianyu <tianyu.lan@intel.com>, linux-kernel@vger.kernel.org
Subject: [PATCH] x86/reboot: Correct pr_info log message in the set_bios/pci/kbd_reboot()
Date: Thu, 24 Oct 2013 15:11:33 +0800 [thread overview]
Message-ID: <1382598693-29334-1-git-send-email-tianyu.lan@intel.com> (raw)
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
next reply other threads:[~2013-10-24 7:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-24 7:11 Lan Tianyu [this message]
2013-10-25 11:48 ` [tip:x86/reboot] x86/reboot: Correct pr_info() " tip-bot for Lan Tianyu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1382598693-29334-1-git-send-email-tianyu.lan@intel.com \
--to=tianyu.lan@intel.com \
--cc=awilliam@redhat.com \
--cc=davej@fedoraproject.org \
--cc=holt@sgi.com \
--cc=hpa@zytor.com \
--cc=lenb@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=rjw@rjwysocki.net \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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