From: steve.capper@arm.com (Steve Capper)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH V2 4/7] arm64: mm: Replace fixed map BUILD_BUG_ON's with BUG_ON's
Date: Mon, 18 Dec 2017 21:47:33 +0000 [thread overview]
Message-ID: <20171218214736.13761-5-steve.capper@arm.com> (raw)
In-Reply-To: <20171218214736.13761-1-steve.capper@arm.com>
In order to prepare for a variable VA_BITS we need to account for a
variable size VMEMMAP which in turn means the position of the fixed map
is variable at compile time.
Thus, we need to replace the BUILD_BUG_ON's that check the fixed map
position with BUG_ON's.
Signed-off-by: Steve Capper <steve.capper@arm.com>
---
arch/arm64/mm/mmu.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
index 5a16e2b9b1a2..7c04479a809a 100644
--- a/arch/arm64/mm/mmu.c
+++ b/arch/arm64/mm/mmu.c
@@ -760,7 +760,7 @@ void __init early_fixmap_init(void)
* The boot-ioremap range spans multiple pmds, for which
* we are not prepared:
*/
- BUILD_BUG_ON((__fix_to_virt(FIX_BTMAP_BEGIN) >> PMD_SHIFT)
+ BUG_ON((__fix_to_virt(FIX_BTMAP_BEGIN) >> PMD_SHIFT)
!= (__fix_to_virt(FIX_BTMAP_END) >> PMD_SHIFT));
if ((pmd != fixmap_pmd(fix_to_virt(FIX_BTMAP_BEGIN)))
@@ -828,9 +828,9 @@ void *__init __fixmap_remap_fdt(phys_addr_t dt_phys, int *size, pgprot_t prot)
* On 4k pages, we'll use section mappings for the FDT so we only
* have to be in the same PUD.
*/
- BUILD_BUG_ON(dt_virt_base % SZ_2M);
+ BUG_ON(dt_virt_base % SZ_2M);
- BUILD_BUG_ON(__fix_to_virt(FIX_FDT_END) >> SWAPPER_TABLE_SHIFT !=
+ BUG_ON(__fix_to_virt(FIX_FDT_END) >> SWAPPER_TABLE_SHIFT !=
__fix_to_virt(FIX_BTMAP_BEGIN) >> SWAPPER_TABLE_SHIFT);
offset = dt_phys % SWAPPER_BLOCK_SIZE;
--
2.11.0
next prev parent reply other threads:[~2017-12-18 21:47 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-18 21:47 [PATCH V2 0/7] 52-bit kernel VAs for arm64 Steve Capper
2017-12-18 21:47 ` [PATCH V2 1/7] arm/arm64: KVM: Formalise end of direct linear map Steve Capper
2017-12-18 21:47 ` [PATCH V2 2/7] arm64: mm: Flip kernel VA space Steve Capper
2018-01-02 8:57 ` Steve Capper
2017-12-18 21:47 ` [PATCH V2 3/7] arm64: kasan: Switch to using KASAN_SHADOW_OFFSET Steve Capper
2017-12-18 21:47 ` Steve Capper [this message]
2017-12-18 21:47 ` [PATCH V2 5/7] arm64: dump: Make kernel page table dumper dynamic again Steve Capper
2017-12-18 21:47 ` [PATCH V2 6/7] arm64: mm: Make VA_BITS variable, introduce VA_BITS_MIN Steve Capper
2017-12-18 21:47 ` [PATCH V2 7/7] arm64: mm: Add 48/52-bit kernel VA support Steve Capper
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=20171218214736.13761-5-steve.capper@arm.com \
--to=steve.capper@arm.com \
--cc=linux-arm-kernel@lists.infradead.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;
as well as URLs for NNTP newsgroup(s).