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>
This commit is contained in:
@@ -41,8 +41,6 @@
|
||||
* POSSIBILITY OF SUCH DAMAGES.
|
||||
*/
|
||||
|
||||
#include <linux/module.h>
|
||||
|
||||
#include <acpi/acpi.h>
|
||||
#include <acpi/actables.h>
|
||||
|
||||
@@ -64,7 +62,7 @@ acpi_tb_convert_fadt2(struct fadt_descriptor_rev2 *local_fadt,
|
||||
struct fadt_descriptor_rev2 *original_fadt);
|
||||
|
||||
u8 acpi_fadt_is_v1;
|
||||
EXPORT_SYMBOL(acpi_fadt_is_v1);
|
||||
ACPI_EXPORT_SYMBOL(acpi_fadt_is_v1)
|
||||
|
||||
/*******************************************************************************
|
||||
*
|
||||
@@ -133,7 +131,7 @@ acpi_status acpi_tb_convert_to_xsdt(struct acpi_table_desc *table_info)
|
||||
|
||||
/* Allocate an XSDT */
|
||||
|
||||
new_table = ACPI_MEM_CALLOCATE(table_size);
|
||||
new_table = ACPI_ALLOCATE_ZEROED(table_size);
|
||||
if (!new_table) {
|
||||
return (AE_NO_MEMORY);
|
||||
}
|
||||
@@ -509,7 +507,7 @@ acpi_status acpi_tb_convert_table_fadt(void)
|
||||
|
||||
/* Allocate buffer for the ACPI 2.0(+) FADT */
|
||||
|
||||
local_fadt = ACPI_MEM_CALLOCATE(sizeof(struct fadt_descriptor_rev2));
|
||||
local_fadt = ACPI_ALLOCATE_ZEROED(sizeof(struct fadt_descriptor_rev2));
|
||||
if (!local_fadt) {
|
||||
return_ACPI_STATUS(AE_NO_MEMORY);
|
||||
}
|
||||
|
@@ -330,7 +330,7 @@ acpi_tb_get_this_table(struct acpi_pointer *address,
|
||||
|
||||
/* Pointer matches processor mode, copy the table to a new buffer */
|
||||
|
||||
full_table = ACPI_MEM_ALLOCATE(header->length);
|
||||
full_table = ACPI_ALLOCATE(header->length);
|
||||
if (!full_table) {
|
||||
ACPI_ERROR((AE_INFO,
|
||||
"Could not allocate table memory for [%4.4s] length %X",
|
||||
|
@@ -248,7 +248,7 @@ acpi_tb_init_table_descriptor(acpi_table_type table_type,
|
||||
|
||||
/* Allocate a descriptor for this table */
|
||||
|
||||
table_desc = ACPI_MEM_CALLOCATE(sizeof(struct acpi_table_desc));
|
||||
table_desc = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_table_desc));
|
||||
if (!table_desc) {
|
||||
return_ACPI_STATUS(AE_NO_MEMORY);
|
||||
}
|
||||
@@ -275,7 +275,7 @@ acpi_tb_init_table_descriptor(acpi_table_type table_type,
|
||||
* at this location, so return an error.
|
||||
*/
|
||||
if (list_head->next) {
|
||||
ACPI_MEM_FREE(table_desc);
|
||||
ACPI_FREE(table_desc);
|
||||
return_ACPI_STATUS(AE_ALREADY_EXISTS);
|
||||
}
|
||||
|
||||
@@ -472,7 +472,7 @@ void acpi_tb_delete_single_table(struct acpi_table_desc *table_desc)
|
||||
|
||||
case ACPI_MEM_ALLOCATED:
|
||||
|
||||
ACPI_MEM_FREE(table_desc->pointer);
|
||||
ACPI_FREE(table_desc->pointer);
|
||||
break;
|
||||
|
||||
case ACPI_MEM_MAPPED:
|
||||
@@ -531,7 +531,7 @@ struct acpi_table_desc *acpi_tb_uninstall_table(struct acpi_table_desc
|
||||
/* Free the table descriptor */
|
||||
|
||||
next_desc = table_desc->next;
|
||||
ACPI_MEM_FREE(table_desc);
|
||||
ACPI_FREE(table_desc);
|
||||
|
||||
/* Return pointer to the next descriptor */
|
||||
|
||||
|
@@ -42,8 +42,6 @@
|
||||
* POSSIBILITY OF SUCH DAMAGES.
|
||||
*/
|
||||
|
||||
#include <linux/module.h>
|
||||
|
||||
#include <acpi/acpi.h>
|
||||
#include <acpi/acnamesp.h>
|
||||
#include <acpi/actables.h>
|
||||
@@ -123,6 +121,8 @@ acpi_status acpi_load_tables(void)
|
||||
return_ACPI_STATUS(status);
|
||||
}
|
||||
|
||||
ACPI_EXPORT_SYMBOL(acpi_load_tables)
|
||||
|
||||
#ifdef ACPI_FUTURE_USAGE
|
||||
/*******************************************************************************
|
||||
*
|
||||
@@ -139,7 +139,6 @@ acpi_status acpi_load_tables(void)
|
||||
* is determined that the table is invalid, the call will fail.
|
||||
*
|
||||
******************************************************************************/
|
||||
|
||||
acpi_status acpi_load_table(struct acpi_table_header *table_ptr)
|
||||
{
|
||||
acpi_status status;
|
||||
@@ -218,6 +217,8 @@ acpi_status acpi_load_table(struct acpi_table_header *table_ptr)
|
||||
return_ACPI_STATUS(status);
|
||||
}
|
||||
|
||||
ACPI_EXPORT_SYMBOL(acpi_load_table)
|
||||
|
||||
/*******************************************************************************
|
||||
*
|
||||
* FUNCTION: acpi_unload_table
|
||||
@@ -229,7 +230,6 @@ acpi_status acpi_load_table(struct acpi_table_header *table_ptr)
|
||||
* DESCRIPTION: This routine is used to force the unload of a table
|
||||
*
|
||||
******************************************************************************/
|
||||
|
||||
acpi_status acpi_unload_table(acpi_table_type table_type)
|
||||
{
|
||||
struct acpi_table_desc *table_desc;
|
||||
@@ -263,6 +263,8 @@ acpi_status acpi_unload_table(acpi_table_type table_type)
|
||||
return_ACPI_STATUS(AE_OK);
|
||||
}
|
||||
|
||||
ACPI_EXPORT_SYMBOL(acpi_unload_table)
|
||||
|
||||
/*******************************************************************************
|
||||
*
|
||||
* FUNCTION: acpi_get_table_header
|
||||
@@ -283,7 +285,6 @@ acpi_status acpi_unload_table(acpi_table_type table_type)
|
||||
* have a standard header and is fixed length.
|
||||
*
|
||||
******************************************************************************/
|
||||
|
||||
acpi_status
|
||||
acpi_get_table_header(acpi_table_type table_type,
|
||||
u32 instance, struct acpi_table_header *out_table_header)
|
||||
@@ -327,6 +328,7 @@ acpi_get_table_header(acpi_table_type table_type,
|
||||
return_ACPI_STATUS(status);
|
||||
}
|
||||
|
||||
ACPI_EXPORT_SYMBOL(acpi_get_table_header)
|
||||
#endif /* ACPI_FUTURE_USAGE */
|
||||
|
||||
/*******************************************************************************
|
||||
@@ -351,7 +353,6 @@ acpi_get_table_header(acpi_table_type table_type,
|
||||
* a complete table including the header.
|
||||
*
|
||||
******************************************************************************/
|
||||
|
||||
acpi_status
|
||||
acpi_get_table(acpi_table_type table_type,
|
||||
u32 instance, struct acpi_buffer *ret_buffer)
|
||||
@@ -420,4 +421,4 @@ acpi_get_table(acpi_table_type table_type,
|
||||
return_ACPI_STATUS(AE_OK);
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL(acpi_get_table);
|
||||
ACPI_EXPORT_SYMBOL(acpi_get_table)
|
||||
|
@@ -41,8 +41,6 @@
|
||||
* POSSIBILITY OF SUCH DAMAGES.
|
||||
*/
|
||||
|
||||
#include <linux/module.h>
|
||||
|
||||
#include <acpi/acpi.h>
|
||||
#include <acpi/actables.h>
|
||||
|
||||
@@ -263,7 +261,7 @@ acpi_get_firmware_table(acpi_string signature,
|
||||
|
||||
/* Get and validate the RSDT */
|
||||
|
||||
rsdt_info = ACPI_MEM_CALLOCATE(sizeof(struct acpi_table_desc));
|
||||
rsdt_info = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_table_desc));
|
||||
if (!rsdt_info) {
|
||||
return_ACPI_STATUS(AE_NO_MEMORY);
|
||||
}
|
||||
@@ -280,13 +278,13 @@ acpi_get_firmware_table(acpi_string signature,
|
||||
|
||||
/* Allocate a scratch table header and table descriptor */
|
||||
|
||||
header = ACPI_MEM_ALLOCATE(sizeof(struct acpi_table_header));
|
||||
header = ACPI_ALLOCATE(sizeof(struct acpi_table_header));
|
||||
if (!header) {
|
||||
status = AE_NO_MEMORY;
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
table_info = ACPI_MEM_ALLOCATE(sizeof(struct acpi_table_desc));
|
||||
table_info = ACPI_ALLOCATE(sizeof(struct acpi_table_desc));
|
||||
if (!table_info) {
|
||||
status = AE_NO_MEMORY;
|
||||
goto cleanup;
|
||||
@@ -359,23 +357,21 @@ acpi_get_firmware_table(acpi_string signature,
|
||||
acpi_os_unmap_memory(rsdt_info->pointer,
|
||||
(acpi_size) rsdt_info->pointer->length);
|
||||
}
|
||||
ACPI_MEM_FREE(rsdt_info);
|
||||
ACPI_FREE(rsdt_info);
|
||||
|
||||
if (header) {
|
||||
ACPI_MEM_FREE(header);
|
||||
ACPI_FREE(header);
|
||||
}
|
||||
if (table_info) {
|
||||
ACPI_MEM_FREE(table_info);
|
||||
ACPI_FREE(table_info);
|
||||
}
|
||||
return_ACPI_STATUS(status);
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL(acpi_get_firmware_table);
|
||||
ACPI_EXPORT_SYMBOL(acpi_get_firmware_table)
|
||||
|
||||
/* TBD: Move to a new file */
|
||||
|
||||
#if ACPI_MACHINE_WIDTH != 16
|
||||
|
||||
/*******************************************************************************
|
||||
*
|
||||
* FUNCTION: acpi_find_root_pointer
|
||||
@@ -388,7 +384,6 @@ EXPORT_SYMBOL(acpi_get_firmware_table);
|
||||
* DESCRIPTION: Find the RSDP
|
||||
*
|
||||
******************************************************************************/
|
||||
|
||||
acpi_status acpi_find_root_pointer(u32 flags, struct acpi_pointer *rsdp_address)
|
||||
{
|
||||
struct acpi_table_desc table_info;
|
||||
@@ -411,6 +406,8 @@ acpi_status acpi_find_root_pointer(u32 flags, struct acpi_pointer *rsdp_address)
|
||||
return_ACPI_STATUS(AE_OK);
|
||||
}
|
||||
|
||||
ACPI_EXPORT_SYMBOL(acpi_find_root_pointer)
|
||||
|
||||
/*******************************************************************************
|
||||
*
|
||||
* FUNCTION: acpi_tb_scan_memory_for_rsdp
|
||||
@@ -423,7 +420,6 @@ acpi_status acpi_find_root_pointer(u32 flags, struct acpi_pointer *rsdp_address)
|
||||
* DESCRIPTION: Search a block of memory for the RSDP signature
|
||||
*
|
||||
******************************************************************************/
|
||||
|
||||
static u8 *acpi_tb_scan_memory_for_rsdp(u8 * start_address, u32 length)
|
||||
{
|
||||
acpi_status status;
|
||||
|
Reference in New Issue
Block a user