aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/pgtable.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-11-15 19:19:55 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-11-26 15:45:45 -0500
commit69529c0eb76469168f1dd5851f363dbab17ce8fd (patch)
treec37e90dc48384e372536e72a4101c768a5ede014 /arch/arm/include/asm/pgtable.h
parentb510b049b549500816280f7ceaa087cfefdec581 (diff)
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: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/include/asm/pgtable.h')
-rw-r--r--arch/arm/include/asm/pgtable.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
index 0ebe1165ba0a..d00ef7ecee64 100644
--- a/arch/arm/include/asm/pgtable.h
+++ b/arch/arm/include/asm/pgtable.h
@@ -112,13 +112,13 @@
112#define LIBRARY_TEXT_START 0x0c000000 112#define LIBRARY_TEXT_START 0x0c000000
113 113
114#ifndef __ASSEMBLY__ 114#ifndef __ASSEMBLY__
115extern void __pte_error(const char *file, int line, unsigned long val); 115extern void __pte_error(const char *file, int line, pte_t);
116extern void __pmd_error(const char *file, int line, unsigned long val); 116extern void __pmd_error(const char *file, int line, pmd_t);
117extern void __pgd_error(const char *file, int line, unsigned long val); 117extern void __pgd_error(const char *file, int line, pgd_t);
118 118
119#define pte_ERROR(pte) __pte_error(__FILE__, __LINE__, pte_val(pte)) 119#define pte_ERROR(pte) __pte_error(__FILE__, __LINE__, pte)
120#define pmd_ERROR(pmd) __pmd_error(__FILE__, __LINE__, pmd_val(pmd)) 120#define pmd_ERROR(pmd) __pmd_error(__FILE__, __LINE__, pmd)
121#define pgd_ERROR(pgd) __pgd_error(__FILE__, __LINE__, pgd_val(pgd)) 121#define pgd_ERROR(pgd) __pgd_error(__FILE__, __LINE__, pgd)
122#endif /* !__ASSEMBLY__ */ 122#endif /* !__ASSEMBLY__ */
123 123
124#define PMD_SIZE (1UL << PMD_SHIFT) 124#define PMD_SIZE (1UL << PMD_SHIFT)