dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

acpi: use KERN_CONT in printk() continuation lines 

Cc: Len Brown <lenb@kernel.org>
Signed-off-by: Kay Sievers <kay@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Kay Sievers 2012-05-08 17:24:20 +02:00 committed by Greg Kroah-Hartman
parent 2c03ead66a
commit be96447e0d
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/acpi/pci_link.c
View File

@ -720,21 +720,21 @@ static int acpi_pci_link_add(struct acpi_device *device)
acpi_device_bid(device)); acpi_device_bid(device));
for (i = 0; i < link->irq.possible_count; i++) { for (i = 0; i < link->irq.possible_count; i++) {
if (link->irq.active == link->irq.possible[i]) { if (link->irq.active == link->irq.possible[i]) {
printk(" *%d", link->irq.possible[i]); printk(KERN_CONT " *%d", link->irq.possible[i]);
found = 1; found = 1;
} else } else
printk(" %d", link->irq.possible[i]); printk(KERN_CONT " %d", link->irq.possible[i]);
} }
printk(")"); printk(KERN_CONT ")");
if (!found) if (!found)
printk(" *%d", link->irq.active); printk(KERN_CONT " *%d", link->irq.active);
if (!link->device->status.enabled) if (!link->device->status.enabled)
printk(", disabled."); printk(KERN_CONT ", disabled.");
printk("\n"); printk(KERN_CONT "\n");
list_add_tail(&link->list, &acpi_link_list); list_add_tail(&link->list, &acpi_link_list);

8
drivers/acpi/sleep.c
View File

@ -887,7 +887,7 @@ int __init acpi_sleep_init(void)
status = acpi_get_sleep_type_data(i, &type_a, &type_b); status = acpi_get_sleep_type_data(i, &type_a, &type_b);
if (ACPI_SUCCESS(status)) { if (ACPI_SUCCESS(status)) {
sleep_states[i] = 1; sleep_states[i] = 1;
printk(" S%d", i); printk(KERN_CONT " S%d", i);
} }
} }
@ -901,7 +901,7 @@ int __init acpi_sleep_init(void)
hibernation_set_ops(old_suspend_ordering ? hibernation_set_ops(old_suspend_ordering ?
&acpi_hibernation_ops_old : &acpi_hibernation_ops); &acpi_hibernation_ops_old : &acpi_hibernation_ops);
sleep_states[ACPI_STATE_S4] = 1; sleep_states[ACPI_STATE_S4] = 1;
printk(" S4"); printk(KERN_CONT " S4");
if (!nosigcheck) { if (!nosigcheck) {
acpi_get_table(ACPI_SIG_FACS, 1, acpi_get_table(ACPI_SIG_FACS, 1,
(struct acpi_table_header **)&facs); (struct acpi_table_header **)&facs);
@ -914,11 +914,11 @@ int __init acpi_sleep_init(void)
status = acpi_get_sleep_type_data(ACPI_STATE_S5, &type_a, &type_b); status = acpi_get_sleep_type_data(ACPI_STATE_S5, &type_a, &type_b);
if (ACPI_SUCCESS(status)) { if (ACPI_SUCCESS(status)) {
sleep_states[ACPI_STATE_S5] = 1; sleep_states[ACPI_STATE_S5] = 1;
printk(" S5"); printk(KERN_CONT " S5");
pm_power_off_prepare = acpi_power_off_prepare; pm_power_off_prepare = acpi_power_off_prepare;
pm_power_off = acpi_power_off; pm_power_off = acpi_power_off;
} }
printk(")\n"); printk(KERN_CONT ")\n");
/* /*
* Register the tts_notifier to reboot notifier list so that the _TTS * Register the tts_notifier to reboot notifier list so that the _TTS
* object can also be evaluated when the system enters S5. * object can also be evaluated when the system enters S5.