diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-06-04 14:39:36 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-06-04 14:39:36 -0700 |
| commit | 1a621b34f2a4bf8495bf801cd0024f063d561472 (patch) | |
| tree | 89578d425f3c5f538bebaceec4257339430b8a93 /drivers/acpi/acpica/tbxfload.c | |
| parent | 131b3aa7c04250554e4d303bc90f798bf21423dd (diff) | |
| parent | 361e3f0276d666faa6a785f610ffc8b7c541d478 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-rt
* linux-linaro-lsk-v3.14: (218 commits)
configs: linaro-base: enable ZRAM features
arm64: errata: add workaround for cortex-a53 erratum #845719
Linux 3.14.43
kvm: arm64: vgic: fix hyp panic with 64k pages on juno platform
arm64: kvm: use inner-shareable barriers for inner-shareable maintenance
KVM: ARM: vgic: Fix the overlap check action about setting the GICD & GICC base address.
KVM: arm/arm64: vgic: fix GICD_ICFGR register accesses
ARM: KVM: trap VM system registers until MMU and caches are ON
ARM: KVM: add world-switch for AMAIR{0,1}
ARM: KVM: introduce per-vcpu HYP Configuration Register
ARM: KVM: fix ordering of 64bit coprocessor accesses
ARM: KVM: fix handling of trapped 64bit coprocessor accesses
ARM: KVM: force cache clean on page fault when caches are off
arm64: KVM: flush VM pages before letting the guest enable caches
ARM: KVM: introduce kvm_p*d_addr_end
arm64: KVM: trap VM system registers until MMU and caches are ON
arm64: KVM: allows discrimination of AArch32 sysreg access
arm64: KVM: force cache clean on page fault when caches are off
deal with deadlock in d_walk()
ACPICA: Utilities: Cleanup to remove useless ACPI_PRINTF/FORMAT_xxx helpers.
...
Conflicts:
kernel/softirq.c
Diffstat (limited to 'drivers/acpi/acpica/tbxfload.c')
| -rw-r--r-- | drivers/acpi/acpica/tbxfload.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/acpi/acpica/tbxfload.c b/drivers/acpi/acpica/tbxfload.c index 60b5a871833c..daad59d76e67 100644 --- a/drivers/acpi/acpica/tbxfload.c +++ b/drivers/acpi/acpica/tbxfload.c @@ -184,11 +184,10 @@ static acpi_status acpi_tb_load_namespace(void) * be useful for debugging ACPI problems on some machines. */ if (acpi_gbl_disable_ssdt_table_load) { - ACPI_INFO((AE_INFO, "Ignoring %4.4s at %p", + ACPI_INFO((AE_INFO, "Ignoring %4.4s at %8.8X%8.8X", acpi_gbl_root_table_list.tables[i].signature. - ascii, ACPI_CAST_PTR(void, - acpi_gbl_root_table_list. - tables[i].address))); + ascii, ACPI_FORMAT_UINT64(acpi_gbl_root_table_list. + tables[i].address))); continue; } |