From: Gavin Shan <gshan@redhat.com>
To: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org, catalin.marinas@arm.com,
will@kernel.org, anshuman.khandual@arm.com, shan.gavin@gmail.com
Subject: [PATCH 2/2] arm64/mm: Use CONT_SHIFT to define CONT_PTE_SHIFT
Date: Tue, 8 Sep 2020 17:19:31 +1000 [thread overview]
Message-ID: <20200908071931.47767-2-gshan@redhat.com> (raw)
In-Reply-To: <20200908071931.47767-1-gshan@redhat.com>
The macro CONT_PTE_SHIFT actually depends on CONT_SHIFT, which has
been defined in page-def.h, based on CONFIG_ARM64_CONT_SHIFT. Lets
reflect the dependency.
Signed-off-by: Gavin Shan <gshan@redhat.com>
---
arch/arm64/include/asm/pgtable-hwdef.h | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/arch/arm64/include/asm/pgtable-hwdef.h b/arch/arm64/include/asm/pgtable-hwdef.h
index 8a399e666837..0bd9469f4323 100644
--- a/arch/arm64/include/asm/pgtable-hwdef.h
+++ b/arch/arm64/include/asm/pgtable-hwdef.h
@@ -81,14 +81,12 @@
/*
* Contiguous page definitions.
*/
+#define CONT_PTE_SHIFT (CONT_SHIFT + PAGE_SHIFT)
#ifdef CONFIG_ARM64_64K_PAGES
-#define CONT_PTE_SHIFT (5 + PAGE_SHIFT)
#define CONT_PMD_SHIFT (5 + PMD_SHIFT)
#elif defined(CONFIG_ARM64_16K_PAGES)
-#define CONT_PTE_SHIFT (7 + PAGE_SHIFT)
#define CONT_PMD_SHIFT (5 + PMD_SHIFT)
#else
-#define CONT_PTE_SHIFT (4 + PAGE_SHIFT)
#define CONT_PMD_SHIFT (4 + PMD_SHIFT)
#endif
--
2.23.0
next prev parent reply other threads:[~2020-09-08 7:20 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-08 7:19 [PATCH 1/2] arm64/mm: Remove CONT_RANGE_OFFSET Gavin Shan
2020-09-08 7:19 ` Gavin Shan [this message]
2020-09-10 6:17 ` [PATCH 2/2] arm64/mm: Use CONT_SHIFT to define CONT_PTE_SHIFT Anshuman Khandual
2020-09-10 8:31 ` Gavin Shan
2020-09-10 9:28 ` Anshuman Khandual
2020-09-10 9:56 ` Gavin Shan
2020-09-10 5:59 ` [PATCH 1/2] arm64/mm: Remove CONT_RANGE_OFFSET Anshuman Khandual
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=20200908071931.47767-2-gshan@redhat.com \
--to=gshan@redhat.com \
--cc=anshuman.khandual@arm.com \
--cc=catalin.marinas@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=shan.gavin@gmail.com \
--cc=will@kernel.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®