Merge branches 'acpi-scan', 'acpi-bus', 'acpi-osl' and 'acpi-pm'

[mirror_ubuntu-artful-kernel.git] / drivers / acpi / bus.c

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index a212cefae524f8d2daaa2b4161ee16c2fae90cf8..891c42d1cd652c732f4957fc8bb2c2f20a5fc470 100644 (file)
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -180,14 +180,15 @@ static void acpi_print_osc_error(acpi_handle handle,
        int i;
 
        if (ACPI_FAILURE(acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer)))
-               printk(KERN_DEBUG "%s\n", error);
+               printk(KERN_DEBUG "%s: %s\n", context->uuid_str, error);
        else {
-               printk(KERN_DEBUG "%s:%s\n", (char *)buffer.pointer, error);
+               printk(KERN_DEBUG "%s (%s): %s\n",
+                      (char *)buffer.pointer, context->uuid_str, error);
                kfree(buffer.pointer);
        }
-       printk(KERN_DEBUG"_OSC request data:");
+       printk(KERN_DEBUG "_OSC request data:");
        for (i = 0; i < context->cap.length; i += sizeof(u32))
-               printk("%x ", *((u32 *)(context->cap.pointer + i)));
+               printk(" %x", *((u32 *)(context->cap.pointer + i)));
        printk("\n");
 }
 
@@ -1094,6 +1095,7 @@ static int __init acpi_init(void)
        acpi_debugfs_init();
        acpi_sleep_proc_init();
        acpi_wakeup_device_init();
+       acpi_debugger_init();
        return 0;
 }