diff options
Diffstat (limited to 'drivers/acpi/acpica/nsinit.c')
| -rw-r--r-- | drivers/acpi/acpica/nsinit.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/drivers/acpi/acpica/nsinit.c b/drivers/acpi/acpica/nsinit.c index 13501cb81863..2adfcf329e15 100644 --- a/drivers/acpi/acpica/nsinit.c +++ b/drivers/acpi/acpica/nsinit.c | |||
| @@ -103,7 +103,8 @@ acpi_status acpi_ns_initialize_objects(void) | |||
| 103 | } | 103 | } |
| 104 | 104 | ||
| 105 | ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT, | 105 | ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT, |
| 106 | "\nInitialized %hd/%hd Regions %hd/%hd Fields %hd/%hd Buffers %hd/%hd Packages (%hd nodes)\n", | 106 | "\nInitialized %hd/%hd Regions %hd/%hd Fields %hd/%hd " |
| 107 | "Buffers %hd/%hd Packages (%hd nodes)\n", | ||
| 107 | info.op_region_init, info.op_region_count, | 108 | info.op_region_init, info.op_region_count, |
| 108 | info.field_init, info.field_count, | 109 | info.field_init, info.field_count, |
| 109 | info.buffer_init, info.buffer_count, | 110 | info.buffer_init, info.buffer_count, |
| @@ -148,7 +149,8 @@ acpi_status acpi_ns_initialize_devices(void) | |||
| 148 | info.num_INI = 0; | 149 | info.num_INI = 0; |
| 149 | 150 | ||
| 150 | ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT, | 151 | ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT, |
| 151 | "Initializing Device/Processor/Thermal objects by executing _INI methods:")); | 152 | "Initializing Device/Processor/Thermal objects " |
| 153 | "by executing _INI methods:")); | ||
| 152 | 154 | ||
| 153 | /* Tree analysis: find all subtrees that contain _INI methods */ | 155 | /* Tree analysis: find all subtrees that contain _INI methods */ |
| 154 | 156 | ||
| @@ -180,7 +182,8 @@ acpi_status acpi_ns_initialize_devices(void) | |||
| 180 | } | 182 | } |
| 181 | 183 | ||
| 182 | ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT, | 184 | ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT, |
| 183 | "\nExecuted %hd _INI methods requiring %hd _STA executions (examined %hd objects)\n", | 185 | "\nExecuted %hd _INI methods requiring %hd _STA executions " |
| 186 | "(examined %hd objects)\n", | ||
| 184 | info.num_INI, info.num_STA, info.device_count)); | 187 | info.num_INI, info.num_STA, info.device_count)); |
| 185 | 188 | ||
| 186 | return_ACPI_STATUS(status); | 189 | return_ACPI_STATUS(status); |
| @@ -263,16 +266,14 @@ acpi_ns_init_one_object(acpi_handle obj_handle, | |||
| 263 | return (AE_OK); | 266 | return (AE_OK); |
| 264 | } | 267 | } |
| 265 | 268 | ||
| 266 | /* | 269 | /* If the object is already initialized, nothing else to do */ |
| 267 | * If the object is already initialized, nothing else to do | 270 | |
| 268 | */ | ||
| 269 | if (obj_desc->common.flags & AOPOBJ_DATA_VALID) { | 271 | if (obj_desc->common.flags & AOPOBJ_DATA_VALID) { |
| 270 | return (AE_OK); | 272 | return (AE_OK); |
| 271 | } | 273 | } |
| 272 | 274 | ||
| 273 | /* | 275 | /* Must lock the interpreter before executing AML code */ |
| 274 | * Must lock the interpreter before executing AML code | 276 | |
| 275 | */ | ||
| 276 | acpi_ex_enter_interpreter(); | 277 | acpi_ex_enter_interpreter(); |
| 277 | 278 | ||
| 278 | /* | 279 | /* |
