From: Paul Cercueil <paul@crapouillou.net>
To: Ralf Baechle <ralf@linux-mips.org>,
Paul Burton <paul.burton@mips.com>,
James Hogan <jhogan@kernel.org>
Cc: od@zcrc.me, linux-mips@vger.kernel.org,
linux-kernel@vger.kernel.org, Daniel Silsby <dansilsby@gmail.com>,
Paul Cercueil <paul@crapouillou.net>
Subject: [PATCH 5/5] MIPS: Undefine PMD_ORDER for 32-bit builds
Date: Mon, 15 Jul 2019 17:40:03 -0400 [thread overview]
Message-ID: <20190715214003.9714-5-paul@crapouillou.net> (raw)
In-Reply-To: <20190715214003.9714-1-paul@crapouillou.net>
From: Daniel Silsby <dansilsby@gmail.com>
During an update long ago to conform to 4-level page code, PMD_ORDER was
changed from 0 to 1, despite the fact that a PMD table is not used at
all in a 32-bit MIPS build. PMD_ORDER does not seem to be used in these
builds. Now, it matches PUD_ORDER, a nonsense #define to give a build
failure with informative error.
The older commit that had redefined PMD_ORDER was
commit c6e8b587718c ("Update MIPS to use the 4-level pagetable code
thereby getting rid of the compacrapability headers.")
Signed-off-by: Daniel Silsby <dansilsby@gmail.com>
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---
arch/mips/include/asm/pgtable-32.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/mips/include/asm/pgtable-32.h b/arch/mips/include/asm/pgtable-32.h
index b0a78c9b6434..e600570789f4 100644
--- a/arch/mips/include/asm/pgtable-32.h
+++ b/arch/mips/include/asm/pgtable-32.h
@@ -83,7 +83,7 @@ extern int add_temporary_entry(unsigned long entrylo0, unsigned long entrylo1,
#define PGD_ORDER (__PGD_ORDER >= 0 ? __PGD_ORDER : 0)
#define PUD_ORDER aieeee_attempt_to_allocate_pud
-#define PMD_ORDER 1
+#define PMD_ORDER aieeee_attempt_to_allocate_pmd
#define PTE_ORDER 0
#define PTRS_PER_PGD (USER_PTRS_PER_PGD * 2)
--
2.21.0.593.g511ec345e18
next prev parent reply other threads:[~2019-07-15 21:40 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-15 21:39 [PATCH 1/5] MIPS: Disallow CPU_SUPPORTS_HUGEPAGES for XPA,EVA Paul Cercueil
2019-07-15 21:40 ` [PATCH 2/5] MIPS: Add partial 32-bit huge page support Paul Cercueil
2019-07-22 21:20 ` Paul Burton
2019-07-15 21:40 ` [PATCH 3/5] MIPS: Decouple CPU_SUPPORTS_HUGEPAGES from 64BIT Paul Cercueil
2019-07-22 21:21 ` Paul Burton
2019-07-15 21:40 ` [PATCH 4/5] MIPS: ingenic: Add support for huge pages Paul Cercueil
2019-07-22 21:21 ` Paul Burton
2019-07-15 21:40 ` Paul Cercueil [this message]
2019-07-22 21:21 ` [PATCH 5/5] MIPS: Undefine PMD_ORDER for 32-bit builds Paul Burton
2019-07-22 21:15 ` [PATCH 1/5] MIPS: Disallow CPU_SUPPORTS_HUGEPAGES for XPA,EVA Paul Burton
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=20190715214003.9714-5-paul@crapouillou.net \
--to=paul@crapouillou.net \
--cc=dansilsby@gmail.com \
--cc=jhogan@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=od@zcrc.me \
--cc=paul.burton@mips.com \
--cc=ralf@linux-mips.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®