From: Qian Cai <cai@lca.pw>
To: akpm@linux-foundation.org
Cc: James.Bottomley@HansenPartnership.com, deller@gmx.de,
linux@roeck-us.net, kirill.shutemov@linux.intel.com,
linux-parisc@vger.kernel.org, linux-kernel@vger.kernel.org,
Qian Cai <cai@lca.pw>
Subject: [PATCH] parisc: fix compilation errrors
Date: Thu, 15 Aug 2019 16:53:05 -0400
Message-ID: <20190815205305.1382-1-cai@lca.pw> (raw)
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)
next reply index
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-15 20:53 Qian Cai [this message]
2019-08-15 21:02 ` Guenter Roeck
2019-08-22 20:53 ` Helge Deller
2019-08-22 23:04 ` Guenter Roeck
2019-08-22 23:15 ` Andrew Morton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190815205305.1382-1-cai@lca.pw \
--to=cai@lca.pw \
--cc=James.Bottomley@HansenPartnership.com \
--cc=akpm@linux-foundation.org \
--cc=deller@gmx.de \
--cc=kirill.shutemov@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
--cc=linux@roeck-us.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Linux-parisc archive on lore.kernel.org
Archives are clonable:
git clone --mirror https://lore.kernel.org/linux-parisc/0 linux-parisc/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 linux-parisc linux-parisc/ https://lore.kernel.org/linux-parisc \
linux-parisc@vger.kernel.org
public-inbox-index linux-parisc
Example config snippet for mirrors
Newsgroup available over NNTP:
nntp://nntp.lore.kernel.org/org.kernel.vger.linux-parisc
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git