From c6ad3067fef3cc5a6c56fd96494f633096c171a6 Mon Sep 17 00:00:00 2001 From: Bob Moore Date: Wed, 26 May 2010 11:48:22 +0800 Subject: [PATCH] --- yaml --- r: 206751 b: refs/heads/master c: 5821f75421aa7c7bafdec291223153597f649934 h: refs/heads/master i: 206749: e2497450146bcdbba0a7706673bc4b8e887e223b 206747: c581400830b10e2e9efb2fb7642fd29e9f735e57 206743: 9ca6bb7b1a9ffe376d8e18fcf7706149e16715bc 206735: 9cdf035d203b1ae41c866713df876c97df16d3b4 206719: a3e47171f452abecebba3400005a7e0e27db32ef v: v3 --- [refs] | 2 +- trunk/drivers/acpi/acpica/acstruct.h | 6 +++--- trunk/drivers/acpi/acpica/nsinit.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 869c486248ac..4dcf2b8c0496 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b27d65975c252ff774edff8e01f0a9fd46d8ab62 +refs/heads/master: 5821f75421aa7c7bafdec291223153597f649934 diff --git a/trunk/drivers/acpi/acpica/acstruct.h b/trunk/drivers/acpi/acpica/acstruct.h index 0e2c66af3c9d..6e5dd97949fe 100644 --- a/trunk/drivers/acpi/acpica/acstruct.h +++ b/trunk/drivers/acpi/acpica/acstruct.h @@ -201,11 +201,11 @@ struct acpi_evaluate_info { /* Info used by acpi_ns_initialize_devices */ struct acpi_device_walk_info { - u16 device_count; - u16 num_STA; - u16 num_INI; struct acpi_table_desc *table_desc; struct acpi_evaluate_info *evaluate_info; + u32 device_count; + u32 num_STA; + u32 num_INI; }; /* TBD: [Restructure] Merge with struct above */ diff --git a/trunk/drivers/acpi/acpica/nsinit.c b/trunk/drivers/acpi/acpica/nsinit.c index 88145820d887..f0e49df7c13b 100644 --- a/trunk/drivers/acpi/acpica/nsinit.c +++ b/trunk/drivers/acpi/acpica/nsinit.c @@ -208,8 +208,8 @@ acpi_status acpi_ns_initialize_devices(void) } ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT, - "\nExecuted %hd _INI methods requiring %hd _STA executions " - "(examined %hd objects)\n", + "\nExecuted %u _INI methods requiring %u _STA executions " + "(examined %u objects)\n", info.num_INI, info.num_STA, info.device_count)); return_ACPI_STATUS(status);