Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[sfrench/cifs-2.6.git] / drivers / acpi / acpica / tbutils.c

diff --git a/drivers/acpi/acpica/tbutils.c b/drivers/acpi/acpica/tbutils.c
index e285bedbb989e5051706195a71a263f87bdd9112..ef7d2c2d8f0b0067fabf069e547a456afde52fc9 100644 (file)
--- a/drivers/acpi/acpica/tbutils.c
+++ b/drivers/acpi/acpica/tbutils.c
@@ -177,19 +177,23 @@ acpi_tb_print_table_header(acpi_physical_address address,
                           struct acpi_table_header *header)
 {
 
+       /*
+        * The reason that the Address is cast to a void pointer is so that we
+        * can use %p which will work properly on both 32-bit and 64-bit hosts.
+        */
        if (ACPI_COMPARE_NAME(header->signature, ACPI_SIG_FACS)) {
 
-               /* FACS only has signature and length fields of common table header */
+               /* FACS only has signature and length fields */
 
-               ACPI_INFO((AE_INFO, "%4.4s %08lX, %04X",
-                          header->signature, (unsigned long)address,
+               ACPI_INFO((AE_INFO, "%4.4s %p %05X",
+                          header->signature, ACPI_CAST_PTR(void, address),
                           header->length));
        } else if (ACPI_COMPARE_NAME(header->signature, ACPI_SIG_RSDP)) {
 
                /* RSDP has no common fields */
 
-               ACPI_INFO((AE_INFO, "RSDP %08lX, %04X (r%d %6.6s)",
-                          (unsigned long)address,
+               ACPI_INFO((AE_INFO, "RSDP %p %05X (v%.2d %6.6s)",
+                          ACPI_CAST_PTR (void, address),
                           (ACPI_CAST_PTR(struct acpi_table_rsdp, header)->
                            revision >
                            0) ? ACPI_CAST_PTR(struct acpi_table_rsdp,
@@ -202,8 +206,8 @@ acpi_tb_print_table_header(acpi_physical_address address,
                /* Standard ACPI table with full common header */
 
                ACPI_INFO((AE_INFO,
-                          "%4.4s %08lX, %04X (r%d %6.6s %8.8s %8X %4.4s %8X)",
-                          header->signature, (unsigned long)address,
+                          "%4.4s %p %05X (v%.2d %6.6s %8.8s %08X %4.4s %08X)",
+                          header->signature, ACPI_CAST_PTR (void, address),
                           header->length, header->revision, header->oem_id,
                           header->oem_table_id, header->oem_revision,
                           header->asl_compiler_id,
@@ -280,7 +284,6 @@ u8 acpi_tb_checksum(u8 *buffer, u32 length)
  * FUNCTION:    acpi_tb_install_table
  *
  * PARAMETERS:  Address                 - Physical address of DSDT or FACS
- *              Flags                   - Flags
  *              Signature               - Table signature, NULL if no need to
  *                                        match
  *              table_index             - Index into root table array
@@ -296,8 +299,9 @@ u8 acpi_tb_checksum(u8 *buffer, u32 length)
 
 void
 acpi_tb_install_table(acpi_physical_address address,
-                     u8 flags, char *signature, u32 table_index)
+                     char *signature, u32 table_index)
 {
+       u8 flags;
        acpi_status status;
        struct acpi_table_header *table_to_install;
        struct acpi_table_header *mapped_table;
@@ -344,12 +348,13 @@ acpi_tb_install_table(acpi_physical_address address,
 
                acpi_gbl_root_table_list.tables[table_index].pointer =
                    override_table;
-               flags = ACPI_TABLE_ORIGIN_OVERRIDE;
                address = ACPI_PTR_TO_PHYSADDR(override_table);
 
                table_to_install = override_table;
+               flags = ACPI_TABLE_ORIGIN_OVERRIDE;
        } else {
                table_to_install = mapped_table;
+               flags = ACPI_TABLE_ORIGIN_MAPPED;
        }
 
        /* Initialize the table entry */
@@ -412,7 +417,8 @@ acpi_tb_get_root_table_entry(u8 *table_entry, u32 table_entry_size)
        } else {
                /*
                 * 32-bit platform, XSDT: Truncate 64-bit to 32-bit and return
-                * 64-bit platform, XSDT: Move (unaligned) 64-bit to local, return 64-bit
+                * 64-bit platform, XSDT: Move (unaligned) 64-bit to local,
+                *  return 64-bit
                 */
                ACPI_MOVE_64_TO_64(&address64, table_entry);
 
@@ -422,7 +428,8 @@ acpi_tb_get_root_table_entry(u8 *table_entry, u32 table_entry_size)
                        /* Will truncate 64-bit address to 32 bits, issue warning */
 
                        ACPI_WARNING((AE_INFO,
-                                     "64-bit Physical Address in XSDT is too large (%8.8X%8.8X), truncating",
+                                     "64-bit Physical Address in XSDT is too large (%8.8X%8.8X),"
+                                     " truncating",
                                      ACPI_FORMAT_UINT64(address64)));
                }
 #endif
@@ -435,7 +442,6 @@ acpi_tb_get_root_table_entry(u8 *table_entry, u32 table_entry_size)
  * FUNCTION:    acpi_tb_parse_root_table
  *
  * PARAMETERS:  Rsdp                    - Pointer to the RSDP
- *              Flags                   - Flags
  *
  * RETURN:      Status
  *
@@ -449,7 +455,7 @@ acpi_tb_get_root_table_entry(u8 *table_entry, u32 table_entry_size)
  ******************************************************************************/
 
 acpi_status __init
-acpi_tb_parse_root_table(acpi_physical_address rsdp_address, u8 flags)
+acpi_tb_parse_root_table(acpi_physical_address rsdp_address)
 {
        struct acpi_table_rsdp *rsdp;
        u32 table_entry_size;
@@ -546,13 +552,12 @@ acpi_tb_parse_root_table(acpi_physical_address rsdp_address, u8 flags)
 
        /* Calculate the number of tables described in the root table */
 
-       table_count =
-           (u32) ((table->length -
-                   sizeof(struct acpi_table_header)) / table_entry_size);
-
+       table_count = (u32)((table->length - sizeof(struct acpi_table_header)) /
+                           table_entry_size);
        /*
-        * First two entries in the table array are reserved for the DSDT and FACS,
-        * which are not actually present in the RSDT/XSDT - they come from the FADT
+        * First two entries in the table array are reserved for the DSDT
+        * and FACS, which are not actually present in the RSDT/XSDT - they
+        * come from the FADT
         */
        table_entry =
            ACPI_CAST_PTR(u8, table) + sizeof(struct acpi_table_header);
@@ -600,14 +605,14 @@ acpi_tb_parse_root_table(acpi_physical_address rsdp_address, u8 flags)
         */
        for (i = 2; i < acpi_gbl_root_table_list.count; i++) {
                acpi_tb_install_table(acpi_gbl_root_table_list.tables[i].
-                                     address, flags, NULL, i);
+                                     address, NULL, i);
 
                /* Special case for FADT - get the DSDT and FACS */
 
                if (ACPI_COMPARE_NAME
                    (&acpi_gbl_root_table_list.tables[i].signature,
                     ACPI_SIG_FADT)) {
-                       acpi_tb_parse_fadt(i, flags);
+                       acpi_tb_parse_fadt(i);
                }
        }