From 7b921cc5ecbe1e94f26a1be5cf5de90d3a920fe1 Mon Sep 17 00:00:00 2001 From: Kent Yoder Date: Tue, 4 Sep 2012 11:18:21 -0500 Subject: [PATCH] --- yaml --- r: 329113 b: refs/heads/master c: a40695edad6a69561b299272028c172e2d981666 h: refs/heads/master i: 329111: fa507b0d45e94d97ae8bfaae7884b02f4b16a63a v: v3 --- [refs] | 2 +- trunk/drivers/char/tpm/tpm_acpi.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2839646fc0bc..bede8d38fa09 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ddf6aa8cbc07764c7fe33cfdb8644ca5e828252 +refs/heads/master: a40695edad6a69561b299272028c172e2d981666 diff --git a/trunk/drivers/char/tpm/tpm_acpi.c b/trunk/drivers/char/tpm/tpm_acpi.c index fe3fa9431dc9..56051d0c97a2 100644 --- a/trunk/drivers/char/tpm/tpm_acpi.c +++ b/trunk/drivers/char/tpm/tpm_acpi.c @@ -49,7 +49,7 @@ int read_log(struct tpm_bios_log *log) { struct acpi_tcpa *buff; acpi_status status; - struct acpi_table_header *virt; + void __iomem *virt; u64 len, start; if (log->bios_event_log != NULL) { @@ -102,7 +102,7 @@ int read_log(struct tpm_bios_log *log) return -EIO; } - memcpy(log->bios_event_log, virt, len); + memcpy_fromio(log->bios_event_log, virt, len); acpi_os_unmap_memory(virt, len); return 0;