aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/include/asm/pgtable-ppc32.h4
-rw-r--r--arch/powerpc/include/asm/pgtable-ppc64-4k.h2
-rw-r--r--arch/powerpc/include/asm/pgtable-ppc64.h6
-rw-r--r--arch/powerpc/kernel/irq.c6
-rw-r--r--arch/powerpc/kernel/setup-common.c2
5 files changed, 10 insertions, 10 deletions
diff --git a/arch/powerpc/include/asm/pgtable-ppc32.h b/arch/powerpc/include/asm/pgtable-ppc32.h
index 622672fef309..945e47adf7db 100644
--- a/arch/powerpc/include/asm/pgtable-ppc32.h
+++ b/arch/powerpc/include/asm/pgtable-ppc32.h
@@ -48,10 +48,10 @@ extern int icache_44x_need_flush;
48#define FIRST_USER_ADDRESS 0 48#define FIRST_USER_ADDRESS 0
49 49
50#define pte_ERROR(e) \ 50#define pte_ERROR(e) \
51 printk("%s:%d: bad pte %llx.\n", __FILE__, __LINE__, \ 51 pr_err("%s:%d: bad pte %llx.\n", __FILE__, __LINE__, \
52 (unsigned long long)pte_val(e)) 52 (unsigned long long)pte_val(e))
53#define pgd_ERROR(e) \ 53#define pgd_ERROR(e) \
54 printk("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e)) 54 pr_err("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e))
55 55
56/* 56/*
57 * This is the bottom of the PKMAP area with HIGHMEM or an arbitrary 57 * This is the bottom of the PKMAP area with HIGHMEM or an arbitrary
diff --git a/arch/powerpc/include/asm/pgtable-ppc64-4k.h b/arch/powerpc/include/asm/pgtable-ppc64-4k.h
index 12798c9d4b4b..7b935683f268 100644
--- a/arch/powerpc/include/asm/pgtable-ppc64-4k.h
+++ b/arch/powerpc/include/asm/pgtable-ppc64-4k.h
@@ -64,7 +64,7 @@
64 (((addr) >> PUD_SHIFT) & (PTRS_PER_PUD - 1))) 64 (((addr) >> PUD_SHIFT) & (PTRS_PER_PUD - 1)))
65 65
66#define pud_ERROR(e) \ 66#define pud_ERROR(e) \
67 printk("%s:%d: bad pud %08lx.\n", __FILE__, __LINE__, pud_val(e)) 67 pr_err("%s:%d: bad pud %08lx.\n", __FILE__, __LINE__, pud_val(e))
68 68
69/* 69/*
70 * On all 4K setups, remap_4k_pfn() equates to remap_pfn_range() */ 70 * On all 4K setups, remap_4k_pfn() equates to remap_pfn_range() */
diff --git a/arch/powerpc/include/asm/pgtable-ppc64.h b/arch/powerpc/include/asm/pgtable-ppc64.h
index 7b3d54fae46f..ae153c40ab7c 100644
--- a/arch/powerpc/include/asm/pgtable-ppc64.h
+++ b/arch/powerpc/include/asm/pgtable-ppc64.h
@@ -328,11 +328,11 @@ static inline void __ptep_set_access_flags(pte_t *ptep, pte_t entry)
328#define pte_same(A,B) (((pte_val(A) ^ pte_val(B)) & ~_PAGE_HPTEFLAGS) == 0) 328#define pte_same(A,B) (((pte_val(A) ^ pte_val(B)) & ~_PAGE_HPTEFLAGS) == 0)
329 329
330#define pte_ERROR(e) \ 330#define pte_ERROR(e) \
331 printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e)) 331 pr_err("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e))
332#define pmd_ERROR(e) \ 332#define pmd_ERROR(e) \
333 printk("%s:%d: bad pmd %08lx.\n", __FILE__, __LINE__, pmd_val(e)) 333 pr_err("%s:%d: bad pmd %08lx.\n", __FILE__, __LINE__, pmd_val(e))
334#define pgd_ERROR(e) \ 334#define pgd_ERROR(e) \
335 printk("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e)) 335 pr_err("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e))
336 336
337/* Encode and de-code a swap entry */ 337/* Encode and de-code a swap entry */
338#define __swp_type(entry) (((entry).val >> 1) & 0x3f) 338#define __swp_type(entry) (((entry).val >> 1) & 0x3f)
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 4c5891de162e..8eb857f216c1 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -444,13 +444,13 @@ void migrate_irqs(void)
444 444
445 cpumask_and(mask, data->affinity, map); 445 cpumask_and(mask, data->affinity, map);
446 if (cpumask_any(mask) >= nr_cpu_ids) { 446 if (cpumask_any(mask) >= nr_cpu_ids) {
447 printk("Breaking affinity for irq %i\n", irq); 447 pr_warn("Breaking affinity for irq %i\n", irq);
448 cpumask_copy(mask, map); 448 cpumask_copy(mask, map);
449 } 449 }
450 if (chip->irq_set_affinity) 450 if (chip->irq_set_affinity)
451 chip->irq_set_affinity(data, mask, true); 451 chip->irq_set_affinity(data, mask, true);
452 else if (desc->action && !(warned++)) 452 else if (desc->action && !(warned++))
453 printk("Cannot set affinity for irq %i\n", irq); 453 pr_err("Cannot set affinity for irq %i\n", irq);
454 } 454 }
455 455
456 free_cpumask_var(mask); 456 free_cpumask_var(mask);
@@ -470,7 +470,7 @@ static inline void check_stack_overflow(void)
470 470
471 /* check for stack overflow: is there less than 2KB free? */ 471 /* check for stack overflow: is there less than 2KB free? */
472 if (unlikely(sp < (sizeof(struct thread_info) + 2048))) { 472 if (unlikely(sp < (sizeof(struct thread_info) + 2048))) {
473 printk("do_IRQ: stack overflow: %ld\n", 473 pr_err("do_IRQ: stack overflow: %ld\n",
474 sp - sizeof(struct thread_info)); 474 sp - sizeof(struct thread_info));
475 dump_stack(); 475 dump_stack();
476 } 476 }
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index 0df37f5e2d54..1362cd62b3fa 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -383,7 +383,7 @@ void __init check_for_initrd(void)
383 initrd_start = initrd_end = 0; 383 initrd_start = initrd_end = 0;
384 384
385 if (initrd_start) 385 if (initrd_start)
386 printk("Found initrd at 0x%lx:0x%lx\n", initrd_start, initrd_end); 386 pr_info("Found initrd at 0x%lx:0x%lx\n", initrd_start, initrd_end);
387 387
388 DBG(" <- check_for_initrd()\n"); 388 DBG(" <- check_for_initrd()\n");
389#endif /* CONFIG_BLK_DEV_INITRD */ 389#endif /* CONFIG_BLK_DEV_INITRD */