parisc: fix compilation errrors
Subsystems (2)
[email protected]
maintainerPATCH 3/11 parisc: fix compilation errrors
From: Qian Cai <[email protected]>
Subject: parisc: fix compilation errrors
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")
Signed-off-by Qian Cai <[email protected]>
Reported-by Guenter Roeck <[email protected]>
Tested-by Guenter Roeck <[email protected]>
Cc Stephen Rothwell <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
arch/parisc/include/asm/pgtable.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/parisc/include/asm/pgtable.h renamed from arch/parisc/include/asm/pgtable.h~parisc-fix-compilation-errrors +1 -2
@@ -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(str#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) \
_