diff options
author | Bob Moore <robert.moore@intel.com> | 2006-10-03 00:00:00 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-04-01 01:26:39 -0500 |
commit | 8313524a0d466f451a62709aaedf988d8257b21c (patch) | |
tree | d612fc796ae07d8a39542c95eec0f5169c9f64eb /drivers/acpi/tables/tbxfroot.c | |
parent | ea936b78f46cbe089a4ac363e1682dee7d427096 (diff) |
ACPI: ACPICA 20060310
Tagged all external interfaces to the subsystem with the
new ACPI_EXPORT_SYMBOL macro. This macro can be defined
as necessary to assist kernel integration. For Linux,
the macro resolves to the EXPORT_SYMBOL macro. The default
definition is NULL.
Added the ACPI_THREAD_ID type for the return value from
acpi_os_get_thread_id(). This allows the host to define this
as necessary to simplify kernel integration. The default
definition is ACPI_NATIVE_UINT.
Valery Podrezov fixed two interpreter problems related
to error processing, the deletion of objects, and placing
invalid pointers onto the internal operator result stack.
http://bugzilla.kernel.org/show_bug.cgi?id=6028
http://bugzilla.kernel.org/show_bug.cgi?id=6151
Increased the reference count threshold where a warning is
emitted for large reference counts in order to eliminate
unnecessary warnings on systems with large namespaces
(especially 64-bit.) Increased the value from 0x400
to 0x800.
Due to universal disagreement as to the meaning of the
'c' in the calloc() function, the ACPI_MEM_CALLOCATE
macro has been renamed to ACPI_ALLOCATE_ZEROED so that the
purpose of the interface is 'clear'. ACPI_MEM_ALLOCATE and
ACPI_MEM_FREE are renamed to ACPI_ALLOCATE and ACPI_FREE.
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/tables/tbxfroot.c')
-rw-r--r-- | drivers/acpi/tables/tbxfroot.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/drivers/acpi/tables/tbxfroot.c b/drivers/acpi/tables/tbxfroot.c index 7f68b759f15a..1b6d8c510e95 100644 --- a/drivers/acpi/tables/tbxfroot.c +++ b/drivers/acpi/tables/tbxfroot.c | |||
@@ -41,8 +41,6 @@ | |||
41 | * POSSIBILITY OF SUCH DAMAGES. | 41 | * POSSIBILITY OF SUCH DAMAGES. |
42 | */ | 42 | */ |
43 | 43 | ||
44 | #include <linux/module.h> | ||
45 | |||
46 | #include <acpi/acpi.h> | 44 | #include <acpi/acpi.h> |
47 | #include <acpi/actables.h> | 45 | #include <acpi/actables.h> |
48 | 46 | ||
@@ -263,7 +261,7 @@ acpi_get_firmware_table(acpi_string signature, | |||
263 | 261 | ||
264 | /* Get and validate the RSDT */ | 262 | /* Get and validate the RSDT */ |
265 | 263 | ||
266 | rsdt_info = ACPI_MEM_CALLOCATE(sizeof(struct acpi_table_desc)); | 264 | rsdt_info = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_table_desc)); |
267 | if (!rsdt_info) { | 265 | if (!rsdt_info) { |
268 | return_ACPI_STATUS(AE_NO_MEMORY); | 266 | return_ACPI_STATUS(AE_NO_MEMORY); |
269 | } | 267 | } |
@@ -280,13 +278,13 @@ acpi_get_firmware_table(acpi_string signature, | |||
280 | 278 | ||
281 | /* Allocate a scratch table header and table descriptor */ | 279 | /* Allocate a scratch table header and table descriptor */ |
282 | 280 | ||
283 | header = ACPI_MEM_ALLOCATE(sizeof(struct acpi_table_header)); | 281 | header = ACPI_ALLOCATE(sizeof(struct acpi_table_header)); |
284 | if (!header) { | 282 | if (!header) { |
285 | status = AE_NO_MEMORY; | 283 | status = AE_NO_MEMORY; |
286 | goto cleanup; | 284 | goto cleanup; |
287 | } | 285 | } |
288 | 286 | ||
289 | table_info = ACPI_MEM_ALLOCATE(sizeof(struct acpi_table_desc)); | 287 | table_info = ACPI_ALLOCATE(sizeof(struct acpi_table_desc)); |
290 | if (!table_info) { | 288 | if (!table_info) { |
291 | status = AE_NO_MEMORY; | 289 | status = AE_NO_MEMORY; |
292 | goto cleanup; | 290 | goto cleanup; |
@@ -359,23 +357,21 @@ acpi_get_firmware_table(acpi_string signature, | |||
359 | acpi_os_unmap_memory(rsdt_info->pointer, | 357 | acpi_os_unmap_memory(rsdt_info->pointer, |
360 | (acpi_size) rsdt_info->pointer->length); | 358 | (acpi_size) rsdt_info->pointer->length); |
361 | } | 359 | } |
362 | ACPI_MEM_FREE(rsdt_info); | 360 | ACPI_FREE(rsdt_info); |
363 | 361 | ||
364 | if (header) { | 362 | if (header) { |
365 | ACPI_MEM_FREE(header); | 363 | ACPI_FREE(header); |
366 | } | 364 | } |
367 | if (table_info) { | 365 | if (table_info) { |
368 | ACPI_MEM_FREE(table_info); | 366 | ACPI_FREE(table_info); |
369 | } | 367 | } |
370 | return_ACPI_STATUS(status); | 368 | return_ACPI_STATUS(status); |
371 | } | 369 | } |
372 | 370 | ||
373 | EXPORT_SYMBOL(acpi_get_firmware_table); | 371 | ACPI_EXPORT_SYMBOL(acpi_get_firmware_table) |
374 | 372 | ||
375 | /* TBD: Move to a new file */ | 373 | /* TBD: Move to a new file */ |
376 | |||
377 | #if ACPI_MACHINE_WIDTH != 16 | 374 | #if ACPI_MACHINE_WIDTH != 16 |
378 | |||
379 | /******************************************************************************* | 375 | /******************************************************************************* |
380 | * | 376 | * |
381 | * FUNCTION: acpi_find_root_pointer | 377 | * FUNCTION: acpi_find_root_pointer |
@@ -388,7 +384,6 @@ EXPORT_SYMBOL(acpi_get_firmware_table); | |||
388 | * DESCRIPTION: Find the RSDP | 384 | * DESCRIPTION: Find the RSDP |
389 | * | 385 | * |
390 | ******************************************************************************/ | 386 | ******************************************************************************/ |
391 | |||
392 | acpi_status acpi_find_root_pointer(u32 flags, struct acpi_pointer *rsdp_address) | 387 | acpi_status acpi_find_root_pointer(u32 flags, struct acpi_pointer *rsdp_address) |
393 | { | 388 | { |
394 | struct acpi_table_desc table_info; | 389 | struct acpi_table_desc table_info; |
@@ -411,6 +406,8 @@ acpi_status acpi_find_root_pointer(u32 flags, struct acpi_pointer *rsdp_address) | |||
411 | return_ACPI_STATUS(AE_OK); | 406 | return_ACPI_STATUS(AE_OK); |
412 | } | 407 | } |
413 | 408 | ||
409 | ACPI_EXPORT_SYMBOL(acpi_find_root_pointer) | ||
410 | |||
414 | /******************************************************************************* | 411 | /******************************************************************************* |
415 | * | 412 | * |
416 | * FUNCTION: acpi_tb_scan_memory_for_rsdp | 413 | * FUNCTION: acpi_tb_scan_memory_for_rsdp |
@@ -423,7 +420,6 @@ acpi_status acpi_find_root_pointer(u32 flags, struct acpi_pointer *rsdp_address) | |||
423 | * DESCRIPTION: Search a block of memory for the RSDP signature | 420 | * DESCRIPTION: Search a block of memory for the RSDP signature |
424 | * | 421 | * |
425 | ******************************************************************************/ | 422 | ******************************************************************************/ |
426 | |||
427 | static u8 *acpi_tb_scan_memory_for_rsdp(u8 * start_address, u32 length) | 423 | static u8 *acpi_tb_scan_memory_for_rsdp(u8 * start_address, u32 length) |
428 | { | 424 | { |
429 | acpi_status status; | 425 | acpi_status status; |