tty: fix need_resched ambiguity
authorAlan Cox <alan@linux.intel.com>
Tue, 30 Aug 2016 19:41:28 +0000 (20:41 +0100)
committerAlan Cox <alan@linux.intel.com>
Tue, 30 Aug 2016 19:41:28 +0000 (20:41 +0100)
Kernel/include/kernel.h
Kernel/tty.c

index d425c33..02e4878 100644 (file)
@@ -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 */
index ebe0d04..929144d 100644 (file)
@@ -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]);