Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Kay Sievers and committed by
Greg Kroah-Hartman
be96447e 2c03ead6

+10 -10
+6 -6
drivers/acpi/pci_link.c
··· 720 720 acpi_device_bid(device)); 721 721 for (i = 0; i < link->irq.possible_count; i++) { 722 722 if (link->irq.active == link->irq.possible[i]) { 723 - printk(" *%d", link->irq.possible[i]); 723 + printk(KERN_CONT " *%d", link->irq.possible[i]); 724 724 found = 1; 725 725 } else 726 - printk(" %d", link->irq.possible[i]); 726 + printk(KERN_CONT " %d", link->irq.possible[i]); 727 727 } 728 728 729 - printk(")"); 729 + printk(KERN_CONT ")"); 730 730 731 731 if (!found) 732 - printk(" *%d", link->irq.active); 732 + printk(KERN_CONT " *%d", link->irq.active); 733 733 734 734 if (!link->device->status.enabled) 735 - printk(", disabled."); 735 + printk(KERN_CONT ", disabled."); 736 736 737 - printk("\n"); 737 + printk(KERN_CONT "\n"); 738 738 739 739 list_add_tail(&link->list, &acpi_link_list); 740 740
+4 -4
drivers/acpi/sleep.c
··· 887 887 status = acpi_get_sleep_type_data(i, &type_a, &type_b); 888 888 if (ACPI_SUCCESS(status)) { 889 889 sleep_states[i] = 1; 890 - printk(" S%d", i); 890 + printk(KERN_CONT " S%d", i); 891 891 } 892 892 } 893 893 ··· 901 901 hibernation_set_ops(old_suspend_ordering ? 902 902 &acpi_hibernation_ops_old : &acpi_hibernation_ops); 903 903 sleep_states[ACPI_STATE_S4] = 1; 904 - printk(" S4"); 904 + printk(KERN_CONT " S4"); 905 905 if (!nosigcheck) { 906 906 acpi_get_table(ACPI_SIG_FACS, 1, 907 907 (struct acpi_table_header **)&facs); ··· 914 914 status = acpi_get_sleep_type_data(ACPI_STATE_S5, &type_a, &type_b); 915 915 if (ACPI_SUCCESS(status)) { 916 916 sleep_states[ACPI_STATE_S5] = 1; 917 - printk(" S5"); 917 + printk(KERN_CONT " S5"); 918 918 pm_power_off_prepare = acpi_power_off_prepare; 919 919 pm_power_off = acpi_power_off; 920 920 } 921 - printk(")\n"); 921 + printk(KERN_CONT ")\n"); 922 922 /* 923 923 * Register the tts_notifier to reboot notifier list so that the _TTS 924 924 * object can also be evaluated when the system enters S5.