From a84185c99545c9614894a36f2d135ffd271d76ff Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Tue, 30 Aug 2016 20:41:28 +0100 Subject: [PATCH] tty: fix need_resched ambiguity --- Kernel/include/kernel.h | 2 +- Kernel/tty.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Kernel/include/kernel.h b/Kernel/include/kernel.h index d425c33c..02e4878c 100644 --- a/Kernel/include/kernel.h +++ b/Kernel/include/kernel.h @@ -834,7 +834,7 @@ extern void timer_interrupt(void); extern void doexit (uint16_t val); extern void panic(char *deathcry); extern void exec_or_die(void); -#define need_resched() (nready != 1 && runticks >= udata.u_ptab->p_priority) +#define need_reschedule() (nready != 1 && runticks >= udata.u_ptab->p_priority) /* select.c */ diff --git a/Kernel/tty.c b/Kernel/tty.c index ebe0d040..929144d4 100644 --- a/Kernel/tty.c +++ b/Kernel/tty.c @@ -432,7 +432,7 @@ void tty_putc_wait(uint8_t minor, unsigned char c) -1 (TTY_READY_LATER) -- blocked, don't spin (eg flow controlled) */ if (!udata.u_ininterrupt) { while ((t = tty_writeready(minor)) != TTY_READY_NOW) - if (t != TTY_READY_SOON || need_resched()){ + if (t != TTY_READY_SOON || need_reschedule()){ irqflags_t irq = di(); tty_sleeping(minor); psleep(&ttydata[minor]); -- 2.34.1