acpi_os_vprintf: Use printk_get_level() to avoid unnecessary KERN_CONT

acpi_os_vprintf currently always uses a KERN_CONT prefix which may be
followed immediately by a proper KERN_<LEVEL>.  Check if the buffer
already has a KERN_<LEVEL> at the start of the buffer and avoid the
unnecessary KERN_CONT.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

1 files changed, 10 insertions, 3 deletions

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 4305ee9db4b2..416953a42510 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -162,11 +162,18 @@ void acpi_os_vprintf(const char *fmt, va_list args)
         if (acpi_in_debugger) {
                 kdb_printf("%s", buffer);
         } else {
-                printk(KERN_CONT "%s", buffer);
+                if (printk_get_level(buffer))
+                        printk("%s", buffer);
+                else
+                        printk(KERN_CONT "%s", buffer);
         }
 #else
-        if (acpi_debugger_write_log(buffer) < 0)
-                printk(KERN_CONT "%s", buffer);
+        if (acpi_debugger_write_log(buffer) < 0) {
+                if (printk_get_level(buffer))
+                        printk("%s", buffer);
+                else
+                        printk(KERN_CONT "%s", buffer);
+        }
 #endif
 }