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

Commit f4743673 authored by Joe Perches's avatar Joe Perches Committed by Chris Metcalf
Browse files

tile: Use the more common pr_warn instead of pr_warning 



And other message logging neatening.

Other miscellanea:

o coalesce formats
o realign arguments
o standardize a couple of macros
o use __func__ instead of embedding the function name

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarChris Metcalf <cmetcalf@tilera.com>
parent ebd25caf

arch/tile/include/asm/io.h

+2 −3
Original line number Diff line number Diff line
@@ -392,8 +392,7 @@ extern void ioport_unmap(void __iomem *addr); 
static inline long ioport_panic(void)

{

#ifdef __tilegx__

	panic("PCI IO space support is disabled. Configure the kernel with"

	      " CONFIG_TILE_PCI_IO to enable it");

	panic("PCI IO space support is disabled. Configure the kernel with CONFIG_TILE_PCI_IO to enable it");

#else

	panic("inb/outb and friends do not exist on tile");

#endif
@@ -402,7 +401,7 @@ static inline long ioport_panic(void) 


static inline void __iomem *ioport_map(unsigned long port, unsigned int len)

{

	pr_info("ioport_map: mapping IO resources is unsupported on tile.\n");

	pr_info("ioport_map: mapping IO resources is unsupported on tile\n");

	return NULL;

}

arch/tile/include/asm/pgtable.h

+2 −2
Original line number Diff line number Diff line
@@ -235,9 +235,9 @@ static inline void __pte_clear(pte_t *ptep) 
#define pte_donemigrate(x) hv_pte_set_present(hv_pte_clear_migrating(x))



#define pte_ERROR(e) \

	pr_err("%s:%d: bad pte 0x%016llx.\n", __FILE__, __LINE__, pte_val(e))

	pr_err("%s:%d: bad pte 0x%016llx\n", __FILE__, __LINE__, pte_val(e))

#define pgd_ERROR(e) \

	pr_err("%s:%d: bad pgd 0x%016llx.\n", __FILE__, __LINE__, pgd_val(e))

	pr_err("%s:%d: bad pgd 0x%016llx\n", __FILE__, __LINE__, pgd_val(e))



/* Return PA and protection info for a given kernel VA. */

int va_to_cpa_and_pte(void *va, phys_addr_t *cpa, pte_t *pte);

arch/tile/include/asm/pgtable_64.h

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static inline int pud_huge_page(pud_t pud) 
}



#define pmd_ERROR(e) \

	pr_err("%s:%d: bad pmd 0x%016llx.\n", __FILE__, __LINE__, pmd_val(e))

	pr_err("%s:%d: bad pmd 0x%016llx\n", __FILE__, __LINE__, pmd_val(e))



static inline void pud_clear(pud_t *pudp)

{

arch/tile/kernel/hardwall.c

+2 −4
Original line number Diff line number Diff line
@@ -365,8 +365,7 @@ void __kprobes do_hardwall_trap(struct pt_regs* regs, int fault_num) 
	 * to quiesce.

	 */

	if (rect->teardown_in_progress) {

		pr_notice("cpu %d: detected %s hardwall violation %#lx"

		       " while teardown already in progress\n",

		pr_notice("cpu %d: detected %s hardwall violation %#lx while teardown already in progress\n",

			  cpu, hwt->name,

			  (long)mfspr_XDN(hwt, DIRECTION_PROTECT));

		goto done;
@@ -630,8 +629,7 @@ static void _hardwall_deactivate(struct hardwall_type *hwt, 
	struct thread_struct *ts = &task->thread;



	if (cpumask_weight(&task->cpus_allowed) != 1) {

		pr_err("pid %d (%s) releasing %s hardwall with"

		       " an affinity mask containing %d cpus!\n",

		pr_err("pid %d (%s) releasing %s hardwall with an affinity mask containing %d cpus!\n",

		       task->pid, task->comm, hwt->name,

		       cpumask_weight(&task->cpus_allowed));

		BUG();

arch/tile/kernel/irq.c

+2 −3
Original line number Diff line number Diff line
@@ -107,9 +107,8 @@ void tile_dev_intr(struct pt_regs *regs, int intnum) 
	{

		long sp = stack_pointer - (long) current_thread_info();

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

			pr_emerg("tile_dev_intr: "

			       "stack overflow: %ld\n",

			       sp - sizeof(struct thread_info));

			pr_emerg("%s: stack overflow: %ld\n",

				 __func__, sp - sizeof(struct thread_info));

			dump_stack();

		}

	}