diff options
| author | Len Brown <len.brown@intel.com> | 2007-02-03 01:08:52 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-02-03 01:08:52 -0500 |
| commit | e8bdc5a9c56c140c732246a298922c3cf3777460 (patch) | |
| tree | dfdbf3a5597dfc5b29324a4dcb303839504cd88e /drivers/char/tpm/tpm_bios.c | |
| parent | c6f4bc211122c86de85a6c93f139319957fd1f8a (diff) | |
| parent | b0b7eaaf0c7aefd118d3ff8640fbed75a9fad9a1 (diff) | |
Pull acpica into test branch
Diffstat (limited to 'drivers/char/tpm/tpm_bios.c')
| -rw-r--r-- | drivers/char/tpm/tpm_bios.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/char/tpm/tpm_bios.c b/drivers/char/tpm/tpm_bios.c index a611972024e..7fca5f470be 100644 --- a/drivers/char/tpm/tpm_bios.c +++ b/drivers/char/tpm/tpm_bios.c @@ -372,10 +372,8 @@ static int read_log(struct tpm_bios_log *log) } /* Find TCPA entry in RSDT (ACPI_LOGICAL_ADDRESSING) */ - status = acpi_get_firmware_table(ACPI_TCPA_SIG, 1, - ACPI_LOGICAL_ADDRESSING, - (struct acpi_table_header **) - &buff); + status = acpi_get_table(ACPI_SIG_TCPA, 1, + (struct acpi_table_header **)&buff); if (ACPI_FAILURE(status)) { printk(KERN_ERR "%s: ERROR - Could not get TCPA table\n", @@ -409,7 +407,7 @@ static int read_log(struct tpm_bios_log *log) log->bios_event_log_end = log->bios_event_log + len; - acpi_os_map_memory(start, len, (void *) &virt); + virt = acpi_os_map_memory(start, len); memcpy(log->bios_event_log, virt, len); |