Commit 69529c0e authored by Russell King's avatar Russell King
Browse files

ARM: pgtable: directly pass pgd/pmd/pte to their error functions 



Rather than passing the pte value to __pte_error, pass the raw pte_t
cookie instead.  Do the same for pmd and pgd functions.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent b510b049

arch/arm/include/asm/pgtable.h

+6 −6
Original line number Diff line number Diff line
@@ -112,13 +112,13 @@ 
#define LIBRARY_TEXT_START	0x0c000000



#ifndef __ASSEMBLY__

extern void __pte_error(const char *file, int line, unsigned long val);

extern void __pmd_error(const char *file, int line, unsigned long val);

extern void __pgd_error(const char *file, int line, unsigned long val);

extern void __pte_error(const char *file, int line, pte_t);

extern void __pmd_error(const char *file, int line, pmd_t);

extern void __pgd_error(const char *file, int line, pgd_t);



#define pte_ERROR(pte)		__pte_error(__FILE__, __LINE__, pte_val(pte))

#define pmd_ERROR(pmd)		__pmd_error(__FILE__, __LINE__, pmd_val(pmd))

#define pgd_ERROR(pgd)		__pgd_error(__FILE__, __LINE__, pgd_val(pgd))

#define pte_ERROR(pte)		__pte_error(__FILE__, __LINE__, pte)

#define pmd_ERROR(pmd)		__pmd_error(__FILE__, __LINE__, pmd)

#define pgd_ERROR(pgd)		__pgd_error(__FILE__, __LINE__, pgd)

#endif /* !__ASSEMBLY__ */



#define PMD_SIZE		(1UL << PMD_SHIFT)

arch/arm/kernel/traps.c

+6 −6
Original line number Diff line number Diff line
@@ -708,19 +708,19 @@ void __readwrite_bug(const char *fn) 
}

EXPORT_SYMBOL(__readwrite_bug);



void __pte_error(const char *file, int line, unsigned long val)

void __pte_error(const char *file, int line, pte_t pte)

{

	printk("%s:%d: bad pte %08lx.\n", file, line, val);

	printk("%s:%d: bad pte %08lx.\n", file, line, pte_val(pte));

}



void __pmd_error(const char *file, int line, unsigned long val)

void __pmd_error(const char *file, int line, pmd_t pmd)

{

	printk("%s:%d: bad pmd %08lx.\n", file, line, val);

	printk("%s:%d: bad pmd %08lx.\n", file, line, pmd_val(pmd));

}



void __pgd_error(const char *file, int line, unsigned long val)

void __pgd_error(const char *file, int line, pgd_t pgd)

{

	printk("%s:%d: bad pgd %08lx.\n", file, line, val);

	printk("%s:%d: bad pgd %08lx.\n", file, line, pgd_val(pgd));

}



asmlinkage void __div0(void)