Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7696b36 authored by Anton Blanchard's avatar Anton Blanchard Committed by Michael Ellerman
Browse files

powerpc: Add printk levels to powerpc code 



Add printk levels to some places in the powerpc port.

Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 9a4f5cd0

arch/powerpc/include/asm/pgtable-ppc32.h

+2 −2
Original line number Diff line number Diff line
@@ -48,10 +48,10 @@ extern int icache_44x_need_flush; 
#define FIRST_USER_ADDRESS	0



#define pte_ERROR(e) \

	printk("%s:%d: bad pte %llx.\n", __FILE__, __LINE__, \

	pr_err("%s:%d: bad pte %llx.\n", __FILE__, __LINE__, \

		(unsigned long long)pte_val(e))

#define pgd_ERROR(e) \

	printk("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e))

	pr_err("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e))



/*

 * This is the bottom of the PKMAP area with HIGHMEM or an arbitrary

arch/powerpc/include/asm/pgtable-ppc64-4k.h

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
    (((addr) >> PUD_SHIFT) & (PTRS_PER_PUD - 1)))



#define pud_ERROR(e) \

	printk("%s:%d: bad pud %08lx.\n", __FILE__, __LINE__, pud_val(e))

	pr_err("%s:%d: bad pud %08lx.\n", __FILE__, __LINE__, pud_val(e))



/*

 * On all 4K setups, remap_4k_pfn() equates to remap_pfn_range() */

arch/powerpc/include/asm/pgtable-ppc64.h

+3 −3
Original line number Diff line number Diff line
@@ -328,11 +328,11 @@ static inline void __ptep_set_access_flags(pte_t *ptep, pte_t entry) 
#define pte_same(A,B)	(((pte_val(A) ^ pte_val(B)) & ~_PAGE_HPTEFLAGS) == 0)



#define pte_ERROR(e) \

	printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e))

	pr_err("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e))

#define pmd_ERROR(e) \

	printk("%s:%d: bad pmd %08lx.\n", __FILE__, __LINE__, pmd_val(e))

	pr_err("%s:%d: bad pmd %08lx.\n", __FILE__, __LINE__, pmd_val(e))

#define pgd_ERROR(e) \

	printk("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e))

	pr_err("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e))



/* Encode and de-code a swap entry */

#define __swp_type(entry)	(((entry).val >> 1) & 0x3f)

arch/powerpc/kernel/irq.c

+3 −3
Original line number Diff line number Diff line
@@ -444,13 +444,13 @@ void migrate_irqs(void) 


		cpumask_and(mask, data->affinity, map);

		if (cpumask_any(mask) >= nr_cpu_ids) {

			printk("Breaking affinity for irq %i\n", irq);

			pr_warn("Breaking affinity for irq %i\n", irq);

			cpumask_copy(mask, map);

		}

		if (chip->irq_set_affinity)

			chip->irq_set_affinity(data, mask, true);

		else if (desc->action && !(warned++))

			printk("Cannot set affinity for irq %i\n", irq);

			pr_err("Cannot set affinity for irq %i\n", irq);

	}



	free_cpumask_var(mask);
@@ -470,7 +470,7 @@ static inline void check_stack_overflow(void) 


	/* check for stack overflow: is there less than 2KB free? */

	if (unlikely(sp < (sizeof(struct thread_info) + 2048))) {

		printk("do_IRQ: stack overflow: %ld\n",

		pr_err("do_IRQ: stack overflow: %ld\n",

			sp - sizeof(struct thread_info));

		dump_stack();

	}

arch/powerpc/kernel/setup-common.c

+1 −1
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ void __init check_for_initrd(void) 
		initrd_start = initrd_end = 0;



	if (initrd_start)

		printk("Found initrd at 0x%lx:0x%lx\n", initrd_start, initrd_end);

		pr_info("Found initrd at 0x%lx:0x%lx\n", initrd_start, initrd_end);



	DBG(" <- check_for_initrd()\n");

#endif /* CONFIG_BLK_DEV_INITRD */