aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include/asm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/powerpc/include/asm')
-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
3 files changed, 6 insertions, 6 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)