diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2014-10-03 23:15:56 +0200 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2014-10-03 23:15:56 +0200 |
| commit | 75b128573b275d5a5a7210b98c4b8cb3b39c12e7 (patch) | |
| tree | e607db32fd303246ee9b93af83a611fc7b93479a /arch/ia64 | |
| parent | Linux 3.17-rc7 (diff) | |
| parent | rtc: Disable EFI rtc for x86 (diff) | |
| download | linux-75b128573b275d5a5a7210b98c4b8cb3b39c12e7.tar.xz linux-75b128573b275d5a5a7210b98c4b8cb3b39c12e7.zip | |
Merge branch 'next' into efi-next-merge
Conflicts:
arch/x86/boot/compressed/eboot.c
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/kernel/efi.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c index 741b99c1a0b1..c52d7540dc05 100644 --- a/arch/ia64/kernel/efi.c +++ b/arch/ia64/kernel/efi.c @@ -568,6 +568,7 @@ efi_init (void) { const char *unit; unsigned long size; + char buf[64]; md = p; size = md->num_pages << EFI_PAGE_SHIFT; @@ -586,9 +587,10 @@ efi_init (void) unit = "KB"; } - printk("mem%02d: type=%2u, attr=0x%016lx, " + printk("mem%02d: %s " "range=[0x%016lx-0x%016lx) (%4lu%s)\n", - i, md->type, md->attribute, md->phys_addr, + i, efi_md_typeattr_format(buf, sizeof(buf), md), + md->phys_addr, md->phys_addr + efi_md_size(md), size, unit); } } |