Messages in this thread Patch in this message | | | From | Qian Cai <> | Subject | [PATCH] parisc: fix compilation errrors | Date | Thu, 15 Aug 2019 16:53:05 -0400 |
| |
The commit 0cfaee2af3a0 ("include/asm-generic/5level-fixup.h: fix variable 'p4d' set but not used") converted a few functions from macros to static inline, which causes parisc to complain,
In file included from ./include/asm-generic/4level-fixup.h:38:0, from ./arch/parisc/include/asm/pgtable.h:5, from ./arch/parisc/include/asm/io.h:6, from ./include/linux/io.h:13, from sound/core/memory.c:9: ./include/asm-generic/5level-fixup.h:14:18: error: unknown type name 'pgd_t'; did you mean 'pid_t'? #define p4d_t pgd_t ^ ./include/asm-generic/5level-fixup.h:24:28: note: in expansion of macro 'p4d_t' static inline int p4d_none(p4d_t p4d) ^~~~~
It is because "4level-fixup.h" is included before "asm/page.h" where "pgd_t" is defined.
Fixes: 0cfaee2af3a0 ("include/asm-generic/5level-fixup.h: fix variable 'p4d' set but not used") Reported-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Qian Cai <cai@lca.pw> --- arch/parisc/include/asm/pgtable.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h index a39b079e73f2..6d58c1739b42 100644 --- a/arch/parisc/include/asm/pgtable.h +++ b/arch/parisc/include/asm/pgtable.h @@ -2,6 +2,7 @@ #ifndef _PARISC_PGTABLE_H #define _PARISC_PGTABLE_H +#include <asm/page.h> #include <asm-generic/4level-fixup.h> #include <asm/fixmap.h> @@ -98,8 +99,6 @@ static inline void purge_tlb_entries(struct mm_struct *mm, unsigned long addr) #endif /* !__ASSEMBLY__ */ -#include <asm/page.h> - #define pte_ERROR(e) \ printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e)) #define pmd_ERROR(e) \ -- 2.20.1 (Apple Git-117)
| |