Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1a25090 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

[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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d824e66a

drivers/char/tty_io.c

+16 −6
Original line number Diff line number Diff line
@@ -351,10 +351,10 @@ int tty_buffer_request_room(struct tty_struct *tty, size_t size) 
	spin_unlock_irqrestore(&tty->buf.lock, flags);

	return size;

}



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;

	do {
@@ -368,17 +368,16 @@ int tty_insert_flip_string(struct tty_struct *tty, const unsigned char *chars, s 
		tb->used += space;

		copied += space;

		chars += space;

/* 		printk("Flip insert %d.\n", space); */

	}

	/* There is a small chance that we need to split the data over

	   several buffers. If this is the case we must loop */

	while (unlikely(size > copied));

	return copied;

}



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;

	do {
@@ -399,9 +398,20 @@ int tty_insert_flip_string_flags(struct tty_struct *tty, const unsigned char *ch 
	while (unlikely(size > copied));

	return copied;

}



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

include/linux/tty_flip.h

+2 −23
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 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)
@@ -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 */