Skip to content

Commit fff2d3d

Browse files
fix(compile): Temporary change to compile for armv8-r
1 parent 54c91dc commit fff2d3d

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

src/arch/armv8/armv8-r/mpu.c

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ static priv_t mpu_as_priv(struct addr_space *as)
182182

183183
bool mpu_map(struct addr_space* as, struct mp_region* mpr, bool locked)
184184
{
185+
UNUSED_ARG(locked);
185186
size_t size_left = mpr->size;
186187
bool failed = false;
187188
struct mp_region reg1 = *mpr;
@@ -562,3 +563,13 @@ void mpu_init(void)
562563
}
563564
}
564565
}
566+
567+
bool mpu_update(struct addr_space* as, struct mp_region* mpr)
568+
{
569+
UNUSED_ARG(as);
570+
UNUSED_ARG(mpr);
571+
return true;
572+
}
573+
574+
void mpu_enable(void)
575+
{}

src/core/mpu/mem.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ static mpid_t mem_vmpu_allocate_entry(struct addr_space* as)
115115
static mpid_t mem_vmpu_get_entry_by_addr(struct addr_space* as, vaddr_t addr)
116116
{
117117
mpid_t mpid = INVALID_MPID;
118-
struct mpe* mpe;
119118

120119
for (mpid_t i = 0; i < VMPU_NUM_ENTRIES; i++) {
121120
struct mpe* mpe = mem_vmpu_get_entry(as, i);
@@ -429,8 +428,9 @@ void mem_vmpu_coalesce_contiguous(struct addr_space* as, bool broadcast, bool lo
429428
prev_reg = mem_vmpu_get_entry(as, prev->mpid);
430429

431430
bool contiguous = prev_reg->region.base + prev_reg->region.size == cur_reg->region.base;
432-
bool perms_compatible =
433-
mpu_perms_compatible(prev_reg->region.mem_flags.raw, cur_reg->region.mem_flags.raw);
431+
bool perms_compatible = true;
432+
//LINE COMMENTED TO COMPILE BEFORE ARMV8-R REWORK
433+
//mpu_perms_compatible(prev_reg->region.mem_flags.raw, cur_reg->region.mem_flags.raw);
434434
bool lock_compatible = prev_reg->lock == cur_reg->lock;
435435
if (contiguous && perms_compatible && lock_compatible) {
436436
cur_mpid = cur->mpid;

0 commit comments

Comments
 (0)