summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/proc.c4
-rw-r--r--kernel/trap.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/kernel/proc.c b/kernel/proc.c
index 24680b6..b4f8a80 100644
--- a/kernel/proc.c
+++ b/kernel/proc.c
@@ -588,7 +588,7 @@ kill(int pid)
for(p = proc; p < &proc[NPROC]; p++){
acquire(&p->lock);
if(p->pid == pid){
- __sync_bool_compare_and_swap(&p->killed, 0, 1);
+ __atomic_store_n(&p->killed, 1, __ATOMIC_SEQ_CST);
if(p->state == SLEEPING){
// Wake process from sleep().
p->state = RUNNABLE;
@@ -604,7 +604,7 @@ kill(int pid)
int
killed(struct proc *p)
{
- return __sync_add_and_fetch(&p->killed, 0);
+ return __atomic_load_n(&p->killed, __ATOMIC_SEQ_CST);
}
// Copy to either a user address, or kernel address,
diff --git a/kernel/trap.c b/kernel/trap.c
index f895aea..1039911 100644
--- a/kernel/trap.c
+++ b/kernel/trap.c
@@ -70,7 +70,7 @@ usertrap(void)
} else {
printf("usertrap(): unexpected scause %p pid=%d\n", r_scause(), p->pid);
printf(" sepc=%p stval=%p\n", r_sepc(), r_stval());
- __sync_bool_compare_and_swap(&p->killed, 0, 1);
+ __atomic_store_n(&p->killed, 1, __ATOMIC_SEQ_CST);
}
if(killed(p))