diff options
author | Frans Kaashoek <[email protected]> | 2022-08-23 07:31:08 -0400 |
---|---|---|
committer | Frans Kaashoek <[email protected]> | 2022-08-23 07:31:08 -0400 |
commit | cd6207a972cf7692dceb837f460234eae9df5052 (patch) | |
tree | c2e1f8be9e5d030727ee4d5c4f033b8f2e5a3314 /kernel/console.c | |
parent | bc48c2be47ed4994d23327980737fef441fbbcc8 (diff) | |
parent | 4f716c8550b406c3e4b3e0c21b986ef99bc06c40 (diff) | |
download | xv6-labs-cd6207a972cf7692dceb837f460234eae9df5052.tar.gz xv6-labs-cd6207a972cf7692dceb837f460234eae9df5052.tar.bz2 xv6-labs-cd6207a972cf7692dceb837f460234eae9df5052.zip |
Merge branch 'riscv-killed' into riscv
Diffstat (limited to 'kernel/console.c')
-rw-r--r-- | kernel/console.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/console.c b/kernel/console.c index 39415d6..05dc526 100644 --- a/kernel/console.c +++ b/kernel/console.c @@ -89,7 +89,7 @@ consoleread(int user_dst, uint64 dst, int n) // wait until interrupt handler has put some // input into cons.buffer. while(cons.r == cons.w){ - if(myproc()->killed){ + if(killed(myproc())){ release(&cons.lock); return -1; } |