From 7924b8e40ff33bf4e6a2b6fa6ebfe15c006abffd Mon Sep 17 00:00:00 2001 From: Kylene Jo Hall Date: Wed, 1 Feb 2006 03:05:04 -0800 Subject: [PATCH] --- yaml --- r: 19340 b: refs/heads/master c: 10296cb0b2b0b0eb312f81032216504a64ee675a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/tpm/tpm_bios.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 926f043c0df5..8a407a0957c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7bcee5b86a8d9f8a0f2c1848fd9abd675e09e969 +refs/heads/master: 10296cb0b2b0b0eb312f81032216504a64ee675a diff --git a/trunk/drivers/char/tpm/tpm_bios.c b/trunk/drivers/char/tpm/tpm_bios.c index 22b645b93e02..047f213a480f 100644 --- a/trunk/drivers/char/tpm/tpm_bios.c +++ b/trunk/drivers/char/tpm/tpm_bios.c @@ -376,7 +376,7 @@ static int read_log(struct tpm_bios_log *log) { struct acpi_tcpa *buff; acpi_status status; - void *virt; + struct acpi_table_header *virt; if (log->bios_event_log != NULL) { printk(KERN_ERR @@ -413,7 +413,7 @@ static int read_log(struct tpm_bios_log *log) log->bios_event_log_end = log->bios_event_log + buff->log_max_len; - acpi_os_map_memory(buff->log_start_addr, buff->log_max_len, &virt); + acpi_os_map_memory(buff->log_start_addr, buff->log_max_len, (void *) &virt); memcpy(log->bios_event_log, virt, buff->log_max_len);