Commit 4c2ef53d authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

TTY: vt, remove con_schedule_flip 



This is identical to tty_schedule_flip. So let us use that instead.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d03702a2

drivers/tty/vt/keyboard.c

+3 −3
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ static void put_queue(struct vc_data *vc, int ch) 


	if (tty) {

		tty_insert_flip_char(tty, ch, 0);

		con_schedule_flip(tty);

		tty_schedule_flip(tty);

	}

}
@@ -325,7 +325,7 @@ static void puts_queue(struct vc_data *vc, char *cp) 
		tty_insert_flip_char(tty, *cp, 0);

		cp++;

	}

	con_schedule_flip(tty);

	tty_schedule_flip(tty);

}



static void applkey(struct vc_data *vc, int key, char mode)
@@ -586,7 +586,7 @@ static void fn_send_intr(struct vc_data *vc) 
	if (!tty)

		return;

	tty_insert_flip_char(tty, 0, TTY_BREAK);

	con_schedule_flip(tty);

	tty_schedule_flip(tty);

}



static void fn_scroll_forw(struct vc_data *vc)

drivers/tty/vt/vt.c

+1 −1
Original line number Diff line number Diff line
@@ -1380,7 +1380,7 @@ static void respond_string(const char *p, struct tty_struct *tty) 
		tty_insert_flip_char(tty, *p, 0);

		p++;

	}

	con_schedule_flip(tty);

	tty_schedule_flip(tty);

}



static void cursor_report(struct vc_data *vc, struct tty_struct *tty)

include/linux/kbd_kern.h

+0 −12
Original line number Diff line number Diff line
@@ -145,16 +145,4 @@ void compute_shiftstate(void); 


extern unsigned int keymap_count;



/* console.c */



static inline void con_schedule_flip(struct tty_struct *t)

{

	unsigned long flags;

	spin_lock_irqsave(&t->buf.lock, flags);

	if (t->buf.tail != NULL)

		t->buf.tail->commit = t->buf.tail->used;

	spin_unlock_irqrestore(&t->buf.lock, flags);

	schedule_work(&t->buf.work);

}



#endif