diff options
Diffstat (limited to 'arch/ia64/kernel/efi.c')
| -rw-r--r-- | arch/ia64/kernel/efi.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c index 7ef80e8161ce..c745d0aeb6e0 100644 --- a/arch/ia64/kernel/efi.c +++ b/arch/ia64/kernel/efi.c | |||
| @@ -46,7 +46,7 @@ extern efi_status_t efi_call_phys (void *, ...); | |||
| 46 | struct efi efi; | 46 | struct efi efi; |
| 47 | EXPORT_SYMBOL(efi); | 47 | EXPORT_SYMBOL(efi); |
| 48 | static efi_runtime_services_t *runtime; | 48 | static efi_runtime_services_t *runtime; |
| 49 | static unsigned long mem_limit = ~0UL, max_addr = ~0UL, min_addr = 0UL; | 49 | static u64 mem_limit = ~0UL, max_addr = ~0UL, min_addr = 0UL; |
| 50 | 50 | ||
| 51 | #define efi_call_virt(f, args...) (*(f))(args) | 51 | #define efi_call_virt(f, args...) (*(f))(args) |
| 52 | 52 | ||
| @@ -356,7 +356,7 @@ efi_get_pal_addr (void) | |||
| 356 | 356 | ||
| 357 | if (++pal_code_count > 1) { | 357 | if (++pal_code_count > 1) { |
| 358 | printk(KERN_ERR "Too many EFI Pal Code memory ranges, " | 358 | printk(KERN_ERR "Too many EFI Pal Code memory ranges, " |
| 359 | "dropped @ %lx\n", md->phys_addr); | 359 | "dropped @ %llx\n", md->phys_addr); |
| 360 | continue; | 360 | continue; |
| 361 | } | 361 | } |
| 362 | /* | 362 | /* |
| @@ -490,10 +490,10 @@ efi_init (void) | |||
| 490 | } | 490 | } |
| 491 | } | 491 | } |
| 492 | if (min_addr != 0UL) | 492 | if (min_addr != 0UL) |
| 493 | printk(KERN_INFO "Ignoring memory below %luMB\n", | 493 | printk(KERN_INFO "Ignoring memory below %lluMB\n", |
| 494 | min_addr >> 20); | 494 | min_addr >> 20); |
| 495 | if (max_addr != ~0UL) | 495 | if (max_addr != ~0UL) |
| 496 | printk(KERN_INFO "Ignoring memory above %luMB\n", | 496 | printk(KERN_INFO "Ignoring memory above %lluMB\n", |
| 497 | max_addr >> 20); | 497 | max_addr >> 20); |
| 498 | 498 | ||
| 499 | efi.systab = __va(ia64_boot_param->efi_systab); | 499 | efi.systab = __va(ia64_boot_param->efi_systab); |
| @@ -1066,7 +1066,7 @@ find_memmap_space (void) | |||
| 1066 | * parts exist, and are WB. | 1066 | * parts exist, and are WB. |
| 1067 | */ | 1067 | */ |
| 1068 | unsigned long | 1068 | unsigned long |
| 1069 | efi_memmap_init(unsigned long *s, unsigned long *e) | 1069 | efi_memmap_init(u64 *s, u64 *e) |
| 1070 | { | 1070 | { |
| 1071 | struct kern_memdesc *k, *prev = NULL; | 1071 | struct kern_memdesc *k, *prev = NULL; |
| 1072 | u64 contig_low=0, contig_high=0; | 1072 | u64 contig_low=0, contig_high=0; |
