Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / arch / um / drivers / ssl.c

diff --git a/arch/um/drivers/ssl.c b/arch/um/drivers/ssl.c
index c5839c3..a4d6415 100644 (file)
--- a/arch/um/drivers/ssl.c
+++ b/arch/um/drivers/ssl.c
@@ -22,7 +22,6 @@
 #include "init.h"
 #include "irq_user.h"
 #include "mconsole_kern.h"
-#include "2_5compat.h"
 
 static int ssl_version = 1;
 
@@ -34,7 +33,7 @@ static struct tty_driver *ssl_driver;
 
 #define NR_PORTS 64
 
-void ssl_announce(char *dev_name, int dev)
+static void ssl_announce(char *dev_name, int dev)
 {
        printk(KERN_INFO "Serial line %d assigned device '%s'\n", dev,
               dev_name);
@@ -50,7 +49,7 @@ static struct chan_opts opts = {
 
 static int ssl_config(char *str);
 static int ssl_get_config(char *dev, char *str, int size, char **error_out);
-static int ssl_remove(char *str);
+static int ssl_remove(int n);
 
 static struct line_driver driver = {
        .name                   = "UML serial line",
@@ -70,6 +69,7 @@ static struct line_driver driver = {
                .name           = "ssl",
                .config         = ssl_config,
                .get_config     = ssl_get_config,
+               .id             = line_id,
                .remove         = ssl_remove,
        },
 };
@@ -84,49 +84,31 @@ static struct lines lines = LINES_INIT(NR_PORTS);
 
 static int ssl_config(char *str)
 {
-       return(line_config(serial_lines, 
-                          sizeof(serial_lines)/sizeof(serial_lines[0]), str));
+       return line_config(serial_lines, ARRAY_SIZE(serial_lines), str, &opts);
 }
 
 static int ssl_get_config(char *dev, char *str, int size, char **error_out)
 {
-       return(line_get_config(dev, serial_lines, 
-                              sizeof(serial_lines)/sizeof(serial_lines[0]), 
-                              str, size, error_out));
+       return line_get_config(dev, serial_lines, ARRAY_SIZE(serial_lines), str,
+                              size, error_out);
 }
 
-static int ssl_remove(char *str)
+static int ssl_remove(int n)
 {
-       return(line_remove(serial_lines, 
-                          sizeof(serial_lines)/sizeof(serial_lines[0]), str));
+       return line_remove(serial_lines, ARRAY_SIZE(serial_lines), n);
 }
 
-int ssl_open(struct tty_struct *tty, struct file *filp)
+static int ssl_open(struct tty_struct *tty, struct file *filp)
 {
-       return line_open(serial_lines, tty, &opts);
+       return line_open(serial_lines, tty);
 }
 
 #if 0
-static int ssl_chars_in_buffer(struct tty_struct *tty)
-{
-       return(0);
-}
-
 static void ssl_flush_buffer(struct tty_struct *tty)
 {
        return;
 }
 
-static void ssl_throttle(struct tty_struct * tty)
-{
-       printk(KERN_ERR "Someone should implement ssl_throttle\n");
-}
-
-static void ssl_unthrottle(struct tty_struct * tty)
-{
-       printk(KERN_ERR "Someone should implement ssl_unthrottle\n");
-}
-
 static void ssl_stop(struct tty_struct *tty)
 {
        printk(KERN_ERR "Someone should implement ssl_stop\n");
@@ -149,13 +131,13 @@ static struct tty_operations ssl_ops = {
        .put_char               = line_put_char,
        .write_room             = line_write_room,
        .chars_in_buffer        = line_chars_in_buffer,
+       .flush_buffer           = line_flush_buffer,
+       .flush_chars            = line_flush_chars,
        .set_termios            = line_set_termios,
        .ioctl                  = line_ioctl,
+       .throttle               = line_throttle,
+       .unthrottle             = line_unthrottle,
 #if 0
-       .flush_chars            = ssl_flush_chars,
-       .flush_buffer           = ssl_flush_buffer,
-       .throttle               = ssl_throttle,
-       .unthrottle             = ssl_unthrottle,
        .stop                   = ssl_stop,
        .start                  = ssl_start,
        .hangup                 = ssl_hangup,
@@ -171,10 +153,11 @@ static void ssl_console_write(struct console *c, const char *string,
                              unsigned len)
 {
        struct line *line = &serial_lines[c->index];
+       unsigned long flags;
 
-       down(&line->sem);
+       spin_lock_irqsave(&line->lock, flags);
        console_write_chan(&line->chan_list, string, len);
-       up(&line->sem);
+       spin_unlock_irqrestore(&line->lock, flags);
 }
 
 static struct tty_driver *ssl_console_device(struct console *c, int *index)
@@ -187,7 +170,7 @@ static int ssl_console_setup(struct console *co, char *options)
 {
        struct line *line = &serial_lines[co->index];
 
-       return console_open_chan(line,co,&opts);
+       return console_open_chan(line, co, &opts);
 }
 
 static struct console ssl_cons = {
@@ -199,16 +182,17 @@ static struct console ssl_cons = {
        .index          = -1,
 };
 
-int ssl_init(void)
+static int ssl_init(void)
 {
        char *new_title;
 
-       printk(KERN_INFO "Initializing software serial port version %d\n", 
+       printk(KERN_INFO "Initializing software serial port version %d\n",
               ssl_version);
        ssl_driver = line_register_devfs(&lines, &driver, &ssl_ops,
-                                        serial_lines, ARRAY_SIZE(serial_lines));
+                                        serial_lines,
+                                        ARRAY_SIZE(serial_lines));
 
-       lines_init(serial_lines, sizeof(serial_lines)/sizeof(serial_lines[0]));
+       lines_init(serial_lines, ARRAY_SIZE(serial_lines), &opts);
 
        new_title = add_xterm_umid(opts.xterm_title);
        if (new_title != NULL)
@@ -216,7 +200,7 @@ int ssl_init(void)
 
        ssl_init_done = 1;
        register_console(&ssl_cons);
-       return(0);
+       return 0;
 }
 late_initcall(ssl_init);
 
@@ -224,28 +208,14 @@ static void ssl_exit(void)
 {
        if (!ssl_init_done)
                return;
-       close_lines(serial_lines,
-                   sizeof(serial_lines)/sizeof(serial_lines[0]));
+       close_lines(serial_lines, ARRAY_SIZE(serial_lines));
 }
 __uml_exitcall(ssl_exit);
 
 static int ssl_chan_setup(char *str)
 {
-       return(line_setup(serial_lines,
-                         sizeof(serial_lines)/sizeof(serial_lines[0]),
-                         str, 1));
+       return line_setup(serial_lines, ARRAY_SIZE(serial_lines), str);
 }
 
 __setup("ssl", ssl_chan_setup);
 __channel_help(ssl_chan_setup, "ssl");
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */