kern/cbuf: update from upstream

1 files changed, 2 insertions, 2 deletions

diff --git a/kern/console.c b/kern/console.c
index 1f9a8a9c..ebbdb807 100644
--- a/kern/console.c
+++ b/kern/console.c
@@ -109,7 +109,7 @@ console_getc(struct console *console)
     console->waiter = thread_self();
 
     for (;;) {
-        error = cbuf_pop(&console->recvbuf, &c);
+        error = cbuf_popb(&console->recvbuf, &c);
 
         if (!error) {
             error = console_process_ctrl_char(console, c);
@@ -186,7 +186,7 @@ console_intr(struct console *console, const char *s)
             goto out;
         }
 
-        cbuf_push(&console->recvbuf, *s);
+        cbuf_pushb(&console->recvbuf, *s, false);
         s++;
     }