Skip to contentSkip to conversation

x86/reboot: Correct pr_info log message in the set_bios/pci/kbd_reboot()

PATCH New Lan Tianyu 2 participants 2 messages Oct 24, 2013 – Oct 25, 2013 x86

lore
Share & tools
lore

Lan Tianyu

author
#0 lore raw

PATCH 1/1 x86/reboot: Correct pr_info log message in the set_bios/pci/kbd_reboot()

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.

---
 arch/x86/kernel/reboot.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/x86/kernel/reboot.c +3 -3
index 083ade7..c93280d 100644
@@ -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;
 }
Signature · 1 line
1.8.4.rc0.1.g8f6a3e5.dirty
#1 lore raw

[tip:x86/reboot] x86/reboot: Correct pr_info() log message in the set_bios/pci/kbd_reboot()

x86/reboot: Correct pr_info() log message in the set_bios/pci/kbd_reboot()
Commit-ID:  6d9153bbce50d41802ad2e20ce52daf699a3e8ad
Gitweb:     http://git.kernel.org/tip/6d9153bbce50d41802ad2e20ce52daf699a3e8ad
Author:     Lan Tianyu <[email protected]>
AuthorDate: Thu, 24 Oct 2013 15:11:33 +0800
Committer:  Ingo Molnar <[email protected]>
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.

---
 arch/x86/kernel/reboot.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/x86/kernel/reboot.c +3 -3
index 7692520..da1fe1c 100644
@@ -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;
 }