The patch titled
ldisc n_tty: export all N_TTY ldisc methods
has been removed from the -mm tree. Its filename was
ldisc-n_tty-export-all-n_tty-ldisc-methods.patch
This patch was dropped because an updated version will be merged
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: ldisc n_tty: export all N_TTY ldisc methods
From: Rodolfo Giometti <giometti@xxxxxxxx>
Signed-off-by: Rodolfo Giometti <giometti@xxxxxxxx>
Cc: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
Cc: Dave Jones <davej@xxxxxxxxxx>
Cc: Sam Ravnborg <sam@xxxxxxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Cc: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Cc: Kay Sievers <kay.sievers@xxxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Michael Kerrisk <mtk.manpages@xxxxxxxxxxxxxx>
Cc: Roman Zippel <zippel@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/char/n_tty.c | 32 +++++++++++++++++++++-----------
include/linux/tty.h | 16 ++++++++++++++++
2 files changed, 37 insertions(+), 11 deletions(-)
diff -puN drivers/char/n_tty.c~ldisc-n_tty-export-all-n_tty-ldisc-methods drivers/char/n_tty.c
--- a/drivers/char/n_tty.c~ldisc-n_tty-export-all-n_tty-ldisc-methods
+++ a/drivers/char/n_tty.c
@@ -43,10 +43,10 @@
#include <linux/mm.h>
#include <linux/string.h>
#include <linux/slab.h>
-#include <linux/poll.h>
#include <linux/bitops.h>
#include <linux/audit.h>
#include <linux/file.h>
+#include <linux/module.h>
#include <asm/uaccess.h>
#include <asm/system.h>
@@ -194,7 +194,7 @@ static void reset_buffer_flags(struct tt
* Locking: ctrl_lock, read_lock.
*/
-static void n_tty_flush_buffer(struct tty_struct *tty)
+void n_tty_flush_buffer(struct tty_struct *tty)
{
unsigned long flags;
/* clear everything and unthrottle the driver */
@@ -210,6 +210,7 @@ static void n_tty_flush_buffer(struct tt
}
spin_unlock_irqrestore(&tty->ctrl_lock, flags);
}
+EXPORT_SYMBOL_GPL(n_tty_flush_buffer);
/**
* n_tty_chars_in_buffer - report available bytes
@@ -221,7 +222,7 @@ static void n_tty_flush_buffer(struct tt
* Locking: read_lock
*/
-static ssize_t n_tty_chars_in_buffer(struct tty_struct *tty)
+ssize_t n_tty_chars_in_buffer(struct tty_struct *tty)
{
unsigned long flags;
ssize_t n = 0;
@@ -237,6 +238,7 @@ static ssize_t n_tty_chars_in_buffer(str
spin_unlock_irqrestore(&tty->read_lock, flags);
return n;
}
+EXPORT_SYMBOL_GPL(n_tty_chars_in_buffer);
/**
* is_utf8_continuation - utf8 multibyte check
@@ -921,13 +923,14 @@ handle_newline:
* IO must be woken up
*/
-static void n_tty_write_wakeup(struct tty_struct *tty)
+void n_tty_write_wakeup(struct tty_struct *tty)
{
if (tty->fasync) {
set_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
kill_fasync(&tty->fasync, SIGIO, POLL_OUT);
}
}
+EXPORT_SYMBOL_GPL(n_tty_write_wakeup);
/**
* n_tty_receive_buf - data receive
@@ -942,7 +945,7 @@ static void n_tty_write_wakeup(struct tt
* calls one at a time and in order (or using flush_to_ldisc)
*/
-static void n_tty_receive_buf(struct tty_struct *tty, const unsigned char *cp,
+void n_tty_receive_buf(struct tty_struct *tty, const unsigned char *cp,
char *fp, int count)
{
const unsigned char *p;
@@ -1016,6 +1019,7 @@ static void n_tty_receive_buf(struct tty
if (tty->receive_room < TTY_THRESHOLD_THROTTLE)
tty_throttle(tty);
}
+EXPORT_SYMBOL_GPL(n_tty_receive_buf);
int is_ignored(int sig)
{
@@ -1037,7 +1041,7 @@ int is_ignored(int sig)
* Locking: Caller holds tty->termios_mutex
*/
-static void n_tty_set_termios(struct tty_struct *tty, struct ktermios *old)
+void n_tty_set_termios(struct tty_struct *tty, struct ktermios *old)
{
int canon_change = 1;
BUG_ON(!tty);
@@ -1116,6 +1120,7 @@ static void n_tty_set_termios(struct tty
wake_up_interruptible(&tty->write_wait);
wake_up_interruptible(&tty->read_wait);
}
+EXPORT_SYMBOL_GPL(n_tty_set_termios);
/**
* n_tty_close - close the ldisc for this tty
@@ -1127,7 +1132,7 @@ static void n_tty_set_termios(struct tty
* ldisc methods are in progress.
*/
-static void n_tty_close(struct tty_struct *tty)
+void n_tty_close(struct tty_struct *tty)
{
n_tty_flush_buffer(tty);
if (tty->read_buf) {
@@ -1135,6 +1140,7 @@ static void n_tty_close(struct tty_struc
tty->read_buf = NULL;
}
}
+EXPORT_SYMBOL_GPL(n_tty_close);
/**
* n_tty_open - open an ldisc
@@ -1146,7 +1152,7 @@ static void n_tty_close(struct tty_struc
* until a close.
*/
-static int n_tty_open(struct tty_struct *tty)
+int n_tty_open(struct tty_struct *tty)
{
if (!tty)
return -EINVAL;
@@ -1165,6 +1171,7 @@ static int n_tty_open(struct tty_struct
tty->closing = 0;
return 0;
}
+EXPORT_SYMBOL_GPL(n_tty_open);
static inline int input_available_p(struct tty_struct *tty, int amt)
{
@@ -1279,7 +1286,7 @@ static int job_control(struct tty_struct
* This code must be sure never to sleep through a hangup.
*/
-static ssize_t n_tty_read(struct tty_struct *tty, struct file *file,
+ssize_t n_tty_read(struct tty_struct *tty, struct file *file,
unsigned char __user *buf, size_t nr)
{
unsigned char __user *b = buf;
@@ -1479,6 +1486,7 @@ do_it_again:
n_tty_set_room(tty);
return retval;
}
+EXPORT_SYMBOL_GPL(n_tty_read);
/**
* n_tty_write - write function for tty
@@ -1495,7 +1503,7 @@ do_it_again:
* This code must be sure never to sleep through a hangup.
*/
-static ssize_t n_tty_write(struct tty_struct *tty, struct file *file,
+ssize_t n_tty_write(struct tty_struct *tty, struct file *file,
const unsigned char *buf, size_t nr)
{
const unsigned char *b = buf;
@@ -1567,6 +1575,7 @@ break_out:
remove_wait_queue(&tty->write_wait, &wait);
return (b - buf) ? b - buf : retval;
}
+EXPORT_SYMBOL_GPL(n_tty_write);
/**
* n_tty_poll - poll method for N_TTY
@@ -1582,7 +1591,7 @@ break_out:
* Called without the kernel lock held - fine
*/
-static unsigned int n_tty_poll(struct tty_struct *tty, struct file *file,
+unsigned int n_tty_poll(struct tty_struct *tty, struct file *file,
poll_table *wait)
{
unsigned int mask = 0;
@@ -1609,6 +1618,7 @@ static unsigned int n_tty_poll(struct tt
mask |= POLLOUT | POLLWRNORM;
return mask;
}
+EXPORT_SYMBOL_GPL(n_tty_poll);
static unsigned long inq_canon(struct tty_struct *tty)
{
diff -puN include/linux/tty.h~ldisc-n_tty-export-all-n_tty-ldisc-methods include/linux/tty.h
--- a/include/linux/tty.h~ldisc-n_tty-export-all-n_tty-ldisc-methods
+++ a/include/linux/tty.h
@@ -13,6 +13,7 @@
#include <linux/tty_driver.h>
#include <linux/tty_ldisc.h>
#include <linux/mutex.h>
+#include <linux/poll.h>
#include <asm/system.h>
@@ -432,6 +433,21 @@ extern void tty_ldisc_begin(void);
/* This last one is just for the tty layer internals and shouldn't be used elsewhere */
extern void tty_ldisc_enable(struct tty_struct *tty);
+extern void n_tty_flush_buffer(struct tty_struct *tty);
+extern ssize_t n_tty_chars_in_buffer(struct tty_struct *tty);
+extern void n_tty_write_wakeup(struct tty_struct *tty);
+extern void n_tty_receive_buf(struct tty_struct *tty, const unsigned char *cp,
+ char *fp, int count);
+extern void n_tty_set_termios(struct tty_struct *tty, struct ktermios *old);
+extern void n_tty_close(struct tty_struct *tty);
+extern int n_tty_open(struct tty_struct *tty);
+extern ssize_t n_tty_read(struct tty_struct *tty, struct file *file,
+ unsigned char __user *buf, size_t nr);
+extern ssize_t n_tty_write(struct tty_struct *tty, struct file *file,
+ const unsigned char *buf, size_t nr);
+extern unsigned int n_tty_poll(struct tty_struct *tty, struct file *file,
+ poll_table *wait);
+
/* n_tty.c */
extern struct tty_ldisc_ops tty_ldisc_N_TTY;
_
Patches currently in -mm which might be from giometti@xxxxxxxx are
linux-next.patch
ldisc-n_tty-export-all-n_tty-ldisc-methods.patch
pps-serial-clients-support.patch
pps-parallel-port-clients-support.patch
pps-low-level-irq-timestamps-recording.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
