diff options
Diffstat (limited to 'arch/sparc/mm')
-rw-r--r-- | arch/sparc/mm/init_64.c | 7 | ||||
-rw-r--r-- | arch/sparc/mm/iommu.c | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c index 696bb095e0fc..7a9b788c6ced 100644 --- a/arch/sparc/mm/init_64.c +++ b/arch/sparc/mm/init_64.c | |||
@@ -119,7 +119,8 @@ static void __init read_obp_memory(const char *property, | |||
119 | 119 | ||
120 | ret = prom_getproperty(node, property, (char *) regs, prop_size); | 120 | ret = prom_getproperty(node, property, (char *) regs, prop_size); |
121 | if (ret == -1) { | 121 | if (ret == -1) { |
122 | prom_printf("Couldn't get %s property from /memory.\n"); | 122 | prom_printf("Couldn't get %s property from /memory.\n", |
123 | property); | ||
123 | prom_halt(); | 124 | prom_halt(); |
124 | } | 125 | } |
125 | 126 | ||
@@ -497,7 +498,7 @@ static void __init read_obp_translations(void) | |||
497 | prom_halt(); | 498 | prom_halt(); |
498 | } | 499 | } |
499 | if (unlikely(n > sizeof(prom_trans))) { | 500 | if (unlikely(n > sizeof(prom_trans))) { |
500 | prom_printf("prom_mappings: Size %Zd is too big.\n", n); | 501 | prom_printf("prom_mappings: Size %d is too big.\n", n); |
501 | prom_halt(); | 502 | prom_halt(); |
502 | } | 503 | } |
503 | 504 | ||
@@ -559,7 +560,7 @@ static void __init hypervisor_tlb_lock(unsigned long vaddr, | |||
559 | unsigned long ret = sun4v_mmu_map_perm_addr(vaddr, 0, pte, mmu); | 560 | unsigned long ret = sun4v_mmu_map_perm_addr(vaddr, 0, pte, mmu); |
560 | 561 | ||
561 | if (ret != 0) { | 562 | if (ret != 0) { |
562 | prom_printf("hypervisor_tlb_lock[%lx:%lx:%lx:%lx]: " | 563 | prom_printf("hypervisor_tlb_lock[%lx:%x:%lx:%lx]: " |
563 | "errors with %lx\n", vaddr, 0, pte, mmu, ret); | 564 | "errors with %lx\n", vaddr, 0, pte, mmu, ret); |
564 | prom_halt(); | 565 | prom_halt(); |
565 | } | 566 | } |
diff --git a/arch/sparc/mm/iommu.c b/arch/sparc/mm/iommu.c index a8a58cad9d2b..0f4f7191fbba 100644 --- a/arch/sparc/mm/iommu.c +++ b/arch/sparc/mm/iommu.c | |||
@@ -90,8 +90,8 @@ static void __init sbus_iommu_init(struct platform_device *op) | |||
90 | it to us. */ | 90 | it to us. */ |
91 | tmp = __get_free_pages(GFP_KERNEL, IOMMU_ORDER); | 91 | tmp = __get_free_pages(GFP_KERNEL, IOMMU_ORDER); |
92 | if (!tmp) { | 92 | if (!tmp) { |
93 | prom_printf("Unable to allocate iommu table [0x%08x]\n", | 93 | prom_printf("Unable to allocate iommu table [0x%lx]\n", |
94 | IOMMU_NPTES*sizeof(iopte_t)); | 94 | IOMMU_NPTES * sizeof(iopte_t)); |
95 | prom_halt(); | 95 | prom_halt(); |
96 | } | 96 | } |
97 | iommu->page_table = (iopte_t *)tmp; | 97 | iommu->page_table = (iopte_t *)tmp; |