Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] make tty_insert_flip_string_flags() a non gpl export

Browse source 
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>
This commit is contained in:
Andrew Morton 2006-04-10 22:54:05 -07:00 committed by Linus Torvalds
parent d824e66a9a
commit e1a2509023
2 changed files with 18 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/char/tty_io.c
View file

@ -351,10 +351,10 @@ int tty_buffer_request_room(struct tty_struct *tty, size_t size)
spin_unlock_irqrestore(&tty->buf.lock, flags); spin_unlock_irqrestore(&tty->buf.lock, flags);
return size; return size;
} }
EXPORT_SYMBOL_GPL(tty_buffer_request_room); EXPORT_SYMBOL_GPL(tty_buffer_request_room);
int tty_insert_flip_string(struct tty_struct *tty, const unsigned char *chars, size_t size) int tty_insert_flip_string(struct tty_struct *tty, const unsigned char *chars,
size_t size)
{ {
int copied = 0; int copied = 0;
do { do {
@ -368,17 +368,16 @@ int tty_insert_flip_string(struct tty_struct *tty, const unsigned char *chars, s
tb->used += space; tb->used += space;
copied += space; copied += space;
chars += space; chars += space;
/* printk("Flip insert %d.\n", space); */
} }
/* There is a small chance that we need to split the data over /* There is a small chance that we need to split the data over
several buffers. If this is the case we must loop */ several buffers. If this is the case we must loop */
while (unlikely(size > copied)); while (unlikely(size > copied));
return copied; return copied;
} }
EXPORT_SYMBOL(tty_insert_flip_string); EXPORT_SYMBOL(tty_insert_flip_string);
int tty_insert_flip_string_flags(struct tty_struct *tty, const unsigned char *chars, const char *flags, size_t size) int tty_insert_flip_string_flags(struct tty_struct *tty,
const unsigned char *chars, const char *flags, size_t size)
{ {
int copied = 0; int copied = 0;
do { do {
@ -399,9 +398,20 @@ int tty_insert_flip_string_flags(struct tty_struct *tty, const unsigned char *ch
while (unlikely(size > copied)); while (unlikely(size > copied));
return copied; return copied;
} }
EXPORT_SYMBOL_GPL(tty_insert_flip_string_flags); EXPORT_SYMBOL_GPL(tty_insert_flip_string_flags);
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);
}
EXPORT_SYMBOL(tty_schedule_flip);
/* /*
* Prepare a block of space in the buffer for data. Returns the length * Prepare a block of space in the buffer for data. Returns the length

25
include/linux/tty_flip.h
View file

@ -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_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(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); 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, 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; struct tty_buffer *tb = tty->buf.tail;
if (tb && tb->active && tb->used < tb->size) { 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); 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 */ #endif /* _LINUX_TTY_FLIP_H */