aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/char/tty_io.c25
-rw-r--r--kernel/printk.c16
2 files changed, 25 insertions, 16 deletions
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 4c0e4ed31a48..913b50258f90 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -1081,6 +1081,31 @@ out:
1081 return ret; 1081 return ret;
1082} 1082}
1083 1083
1084/**
1085 * tty_write_message - write a message to a certain tty, not just the console.
1086 * @tty: the destination tty_struct
1087 * @msg: the message to write
1088 *
1089 * This is used for messages that need to be redirected to a specific tty.
1090 * We don't put it into the syslog queue right now maybe in the future if
1091 * really needed.
1092 *
1093 * We must still hold the BKL and test the CLOSING flag for the moment.
1094 */
1095
1096void tty_write_message(struct tty_struct *tty, char *msg)
1097{
1098 lock_kernel();
1099 if (tty) {
1100 mutex_lock(&tty->atomic_write_lock);
1101 if (tty->ops->write && !test_bit(TTY_CLOSING, &tty->flags))
1102 tty->ops->write(tty, msg, strlen(msg));
1103 tty_write_unlock(tty);
1104 }
1105 unlock_kernel();
1106 return;
1107}
1108
1084 1109
1085/** 1110/**
1086 * tty_write - write method for tty device file 1111 * tty_write - write method for tty device file
diff --git a/kernel/printk.c b/kernel/printk.c
index b51b1567bb55..a430fd04008b 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -1291,22 +1291,6 @@ static int __init disable_boot_consoles(void)
1291} 1291}
1292late_initcall(disable_boot_consoles); 1292late_initcall(disable_boot_consoles);
1293 1293
1294/**
1295 * tty_write_message - write a message to a certain tty, not just the console.
1296 * @tty: the destination tty_struct
1297 * @msg: the message to write
1298 *
1299 * This is used for messages that need to be redirected to a specific tty.
1300 * We don't put it into the syslog queue right now maybe in the future if
1301 * really needed.
1302 */
1303void tty_write_message(struct tty_struct *tty, char *msg)
1304{
1305 if (tty && tty->ops->write)
1306 tty->ops->write(tty, msg, strlen(msg));
1307 return;
1308}
1309
1310#if defined CONFIG_PRINTK 1294#if defined CONFIG_PRINTK
1311 1295
1312/* 1296/*