summaryrefslogtreecommitdiffstats
path: root/include/linux/tty_flip.h
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-04-10 22:54:05 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-11 06:18:41 -0700
commite1a2509023785bd3199ac068ab80155aeba01265 (patch)
tree2d1f4541893a39537e67a921a2d5999c38310c28 /include/linux/tty_flip.h
parentd824e66a9a427faf69c58f98dd7e1c3d1bb51c61 (diff)
downloadop-kernel-dev-e1a2509023785bd3199ac068ab80155aeba01265.zip
op-kernel-dev-e1a2509023785bd3199ac068ab80155aeba01265.tar.gz
[PATCH] make tty_insert_flip_string_flags() a non gpl export
We changed the wrong symbol. It's tty_insert_flip_string_flags() which is called from the previously-non-GPL'ed now-inlined tty_insert_flip_char(). Fix that up, and uninline tty_schedule_flip() while we're there. Cc: Tobias Powalowski <t.powa@gmx.de> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/tty_flip.h')
-rw-r--r--include/linux/tty_flip.h25
1 files changed, 2 insertions, 23 deletions
diff --git a/include/linux/tty_flip.h b/include/linux/tty_flip.h
index 0976a16..3154830 100644
--- a/include/linux/tty_flip.h
+++ b/include/linux/tty_flip.h
@@ -6,9 +6,10 @@ extern int tty_insert_flip_string(struct tty_struct *tty, const unsigned char *c
extern int tty_insert_flip_string_flags(struct tty_struct *tty, const unsigned char *chars, const char *flags, size_t size);
extern int tty_prepare_flip_string(struct tty_struct *tty, unsigned char **chars, size_t size);
extern int tty_prepare_flip_string_flags(struct tty_struct *tty, unsigned char **chars, char **flags, size_t size);
+void tty_schedule_flip(struct tty_struct *tty);
static inline int tty_insert_flip_char(struct tty_struct *tty,
- unsigned char ch, char flag)
+ unsigned char ch, char flag)
{
struct tty_buffer *tb = tty->buf.tail;
if (tb && tb->active && tb->used < tb->size) {
@@ -19,26 +20,4 @@ static inline int tty_insert_flip_char(struct tty_struct *tty,
return tty_insert_flip_string_flags(tty, &ch, &flag, 1);
}
-static inline void tty_schedule_flip(struct tty_struct *tty)
-{
- unsigned long flags;
- spin_lock_irqsave(&tty->buf.lock, flags);
- if (tty->buf.tail != NULL) {
- tty->buf.tail->active = 0;
- tty->buf.tail->commit = tty->buf.tail->used;
- }
- spin_unlock_irqrestore(&tty->buf.lock, flags);
- schedule_delayed_work(&tty->buf.work, 1);
-}
-
-#undef _INLINE_
-
-
#endif /* _LINUX_TTY_FLIP_H */
-
-
-
-
-
-
-
OpenPOWER on IntegriCloud