summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAndrey Smirnov <andrew.smirnov@gmail.com>2018-06-07 06:01:00 -0700
committerSascha Hauer <s.hauer@pengutronix.de>2018-06-08 08:36:31 +0200
commit66eabf3f00bdb32597dd282aa7689fa01069111b (patch)
treec2782f0b0619910ac44eca1180a353fad50c25bf /arch
parent379e8d3861c56a2c5f4894b6b1f03bf4937ab22d (diff)
downloadbarebox-66eabf3f00bdb32597dd282aa7689fa01069111b.tar.gz
barebox-66eabf3f00bdb32597dd282aa7689fa01069111b.tar.xz
ARM: mmu64: Trivial code simplification
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/cpu/mmu_64.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/cpu/mmu_64.c b/arch/arm/cpu/mmu_64.c
index d5a3d22238..80cf240d30 100644
--- a/arch/arm/cpu/mmu_64.c
+++ b/arch/arm/cpu/mmu_64.c
@@ -126,6 +126,7 @@ static void map_region(uint64_t virt, uint64_t phys, uint64_t size, uint64_t att
uint64_t idx;
uint64_t addr;
uint64_t *table;
+ uint64_t type;
int level;
if (!ttb)
@@ -145,11 +146,9 @@ static void map_region(uint64_t virt, uint64_t phys, uint64_t size, uint64_t att
pte = table + idx;
if (size >= block_size && IS_ALIGNED(addr, block_size)) {
- if (level == 3)
- *pte = phys | attr | PTE_TYPE_PAGE;
- else
- *pte = phys | attr | PTE_TYPE_BLOCK;
-
+ type = (level == 3) ?
+ PTE_TYPE_PAGE : PTE_TYPE_BLOCK;
+ *pte = phys | attr | type;
addr += block_size;
phys += block_size;
size -= block_size;