Skip to content

Commit 46aeeb0

Browse files
fix(addr_space): Change functions to use the correct address space
1 parent 84df9e0 commit 46aeeb0

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

src/core/mpu/mem.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,7 @@ static void mem_vmpu_set_entry(struct addr_space* as, mpid_t mpid, struct mp_reg
7272
mpe->mpid = mpid;
7373
mpe->lock = locked;
7474

75-
list_insert_ordered(&cpu()->as.vmpu.ordered_list, (node_t*)&cpu()->as.vmpu.node[mpid],
76-
vmpu_node_cmp);
75+
list_insert_ordered(&as->vmpu.ordered_list, (node_t*)&as->vmpu.node[mpid], vmpu_node_cmp);
7776
}
7877

7978
static void mem_vmpu_clear_entry(struct addr_space* as, mpid_t mpid)
@@ -94,7 +93,7 @@ static void mem_vmpu_free_entry(struct addr_space* as, mpid_t mpid)
9493
struct mpe* mpe = mem_vmpu_get_entry(as, mpid);
9594
mpe->state = MPE_S_FREE;
9695

97-
list_rm(&cpu()->as.vmpu.ordered_list, (node_t*)&cpu()->as.vmpu.node[mpid]);
96+
list_rm(&as->vmpu.ordered_list, (node_t*)&as->vmpu.node[mpid]);
9897
}
9998

10099
static mpid_t mem_vmpu_allocate_entry(struct addr_space* as)
@@ -239,7 +238,7 @@ void as_init(struct addr_space* as, enum AS_TYPE type, asid_t id, cpumap_t cpus,
239238
mem_vmpu_free_entry(as, i);
240239
}
241240

242-
list_init(&cpu()->as.vmpu.ordered_list);
241+
list_init(&(as->vmpu.ordered_list));
243242
as_arch_init(as);
244243
}
245244

@@ -432,7 +431,7 @@ void mem_vmpu_coalesce_contiguous(struct addr_space* as, bool broadcast, bool lo
432431
mpid_t prev_mpid = INVALID_MPID;
433432
struct mpe* prev_reg;
434433
struct mpe* cur_reg;
435-
list_foreach_tail(cpu()->as.vmpu.ordered_list, struct mpe, cur, prev)
434+
list_foreach_tail(as->vmpu.ordered_list, struct mpe, cur, prev)
436435
{
437436
if (prev == NULL) {
438437
continue;

0 commit comments

Comments
 (0)