ACPI: ACPICA 20060512

Replaced the acpi_os_queue_for_execution() with a new
interface named acpi_os_execute(). The major difference is
that the new interface does not have a Priority parameter,
this appeared to be useless and has been replaced by
a Type parameter. The Type tells the OS what type of
execution is being requested, such as global lock handler,
notify handler, GPE handler, etc. This allows the host
to queue and execute the request as appropriate for the
request type, possibly using different work queues and
different priorities for the various request types. This
enables fixes for multithreading deadlock problems such as
http://bugzilla.kernel.org/show_bug.cgi?id=5534
(Alexey Starikovskiy and Bob Moore)

Fixed a possible memory leak associated with the
support for the so-called "implicit return" ACPI
extension. Reported by FreeBSD  (Fiodor Suietov)
http://bugzilla.kernel.org/show_bug.cgi?id=6514

Fixed a problem with the Load() operator where a table
load from an operation region could overwrite an internal
table buffer by up to 7 bytes and cause alignment faults
on IPF systems. (With assistance from Luming Yu)

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

2 files changed, 10 insertions, 12 deletions

diff --git a/drivers/acpi/tables/tbrsdt.c b/drivers/acpi/tables/tbrsdt.c
index 9e226438a3f6..494965229fa2 100644
--- a/drivers/acpi/tables/tbrsdt.c
+++ b/drivers/acpi/tables/tbrsdt.c
@@ -196,10 +196,8 @@ acpi_status acpi_tb_validate_rsdt(struct acpi_table_header *table_ptr)
                 ACPI_DUMP_BUFFER(acpi_gbl_RSDP, 20);
 
                 ACPI_ERROR((AE_INFO,
-                            "RSDT/XSDT signature at %X (%p) is invalid",
-                            acpi_gbl_RSDP->rsdt_physical_address,
-                            (void *)(acpi_native_uint) acpi_gbl_RSDP->
-                            rsdt_physical_address));
+                            "RSDT/XSDT signature at %X is invalid",
+                            acpi_gbl_RSDP->rsdt_physical_address));
 
                 if (acpi_gbl_root_table_type == ACPI_TABLE_TYPE_RSDT) {
                         ACPI_ERROR((AE_INFO, "Looking for RSDT"));
diff --git a/drivers/acpi/tables/tbxfroot.c b/drivers/acpi/tables/tbxfroot.c
index 3107e741d510..da2648bbdbc0 100644
--- a/drivers/acpi/tables/tbxfroot.c
+++ b/drivers/acpi/tables/tbxfroot.c
@@ -472,10 +472,10 @@ static u8 *acpi_tb_scan_memory_for_rsdp(u8 * start_address, u32 length)
  *
  * RETURN:      Status, RSDP physical address
  *
- * DESCRIPTION: search lower 1_mbyte of memory for the root system descriptor
+ * DESCRIPTION: Search lower 1_mbyte of memory for the root system descriptor
  *              pointer structure.  If it is found, set *RSDP to point to it.
  *
- *              NOTE1: The RSDp must be either in the first 1_k of the Extended
+ *              NOTE1: The RSDP must be either in the first 1_k of the Extended
  *              BIOS Data Area or between E0000 and FFFFF (From ACPI Spec.)
  *              Only a 32-bit physical address is necessary.
  *
@@ -525,7 +525,7 @@ acpi_tb_find_rsdp(struct acpi_table_desc *table_info, u32 flags)
 
                 if (physical_address > 0x400) {
                         /*
-                         * 1b) Search EBDA paragraphs (EBDa is required to be a
+                         * 1b) Search EBDA paragraphs (EBDA is required to be a
                          *     minimum of 1_k length)
                          */
                         status = acpi_os_map_memory((acpi_physical_address)
@@ -550,7 +550,7 @@ acpi_tb_find_rsdp(struct acpi_table_desc *table_info, u32 flags)
                                 /* Return the physical address */
 
                                 physical_address +=
-                                    ACPI_PTR_DIFF(mem_rover, table_ptr);
+                                    (u32) ACPI_PTR_DIFF(mem_rover, table_ptr);
 
                                 table_info->physical_address =
                                     (acpi_physical_address) physical_address;
@@ -584,9 +584,9 @@ acpi_tb_find_rsdp(struct acpi_table_desc *table_info, u32 flags)
 
                         /* Return the physical address */
 
-                        physical_address =
-                            ACPI_HI_RSDP_WINDOW_BASE + ACPI_PTR_DIFF(mem_rover,
-                                                                     table_ptr);
+                        physical_address = (u32)
+                            (ACPI_HI_RSDP_WINDOW_BASE +
+                             ACPI_PTR_DIFF(mem_rover, table_ptr));
 
                         table_info->physical_address =
                             (acpi_physical_address) physical_address;
@@ -607,7 +607,7 @@ acpi_tb_find_rsdp(struct acpi_table_desc *table_info, u32 flags)
 
                 if (physical_address > 0x400) {
                         /*
-                         * 1b) Search EBDA paragraphs (EBDa is required to be a minimum of
+                         * 1b) Search EBDA paragraphs (EBDA is required to be a minimum of
                          *     1_k length)
                          */
                         mem_rover =