23 files changed, 1006 insertions, 89 deletions

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 43b35d0369d6..8783457b93d3 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -124,7 +124,7 @@ config COMPUTONE
           which give you many serial ports. You would need something like this
           to connect more than two modems to your Linux box, for instance in
           order to become a dial-in server. If you have a card like that, say
-          Y here and read <file:Documentation/computone.txt>.
+          Y here and read <file:Documentation/serial/computone.txt>.
 
           To compile this driver as module, choose M here: the
           module will be called ip2.
@@ -136,7 +136,7 @@ config ROCKETPORT
           This driver supports Comtrol RocketPort and RocketModem PCI boards.   
           These boards provide 2, 4, 8, 16, or 32 high-speed serial ports or
           modems.  For information about the RocketPort/RocketModem  boards
-          and this driver read <file:Documentation/rocket.txt>.
+          and this driver read <file:Documentation/serial/rocket.txt>.
 
           To compile this driver as a module, choose M here: the
           module will be called rocket.
@@ -154,7 +154,7 @@ config CYCLADES
           your Linux box, for instance in order to become a dial-in server.
 
           For information about the Cyclades-Z card, read
-          <file:Documentation/README.cycladesZ>.
+          <file:Documentation/serial/README.cycladesZ>.
 
           To compile this driver as a module, choose M here: the
           module will be called cyclades.
@@ -183,7 +183,7 @@ config DIGIEPCA
           box, for instance in order to become a dial-in server. This driver
           supports the original PC (ISA) boards as well as PCI, and EISA. If
           you have a card like this, say Y here and read the file
-          <file:Documentation/digiepca.txt>.
+          <file:Documentation/serial/digiepca.txt>.
 
           To compile this driver as a module, choose M here: the
           module will be called epca.
@@ -289,7 +289,7 @@ config RISCOM8
           which gives you many serial ports. You would need something like
           this to connect more than two modems to your Linux box, for instance
           in order to become a dial-in server. If you have a card like that,
-          say Y here and read the file <file:Documentation/riscom8.txt>.
+          say Y here and read the file <file:Documentation/serial/riscom8.txt>.
 
           Also it's possible to say M here and compile this driver as kernel
           loadable module; the module will be called riscom8.
@@ -304,8 +304,8 @@ config SPECIALIX
           your Linux box, for instance in order to become a dial-in server.
 
           If you have a card like that, say Y here and read the file
-          <file:Documentation/specialix.txt>. Also it's possible to say M here
-          and compile this driver as kernel loadable module which will be
+          <file:Documentation/serial/specialix.txt>. Also it's possible to say
+          M here and compile this driver as kernel loadable module which will be
           called specialix.
 
 config SX
@@ -313,7 +313,7 @@ config SX
         depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA)
         help
           This is a driver for the SX and SI multiport serial cards.
-          Please read the file <file:Documentation/sx.txt> for details.
+          Please read the file <file:Documentation/serial/sx.txt> for details.
 
           This driver can only be built as a module ( = code which can be
           inserted in and removed from the running kernel whenever you want).
@@ -344,8 +344,8 @@ config STALDRV
           like this to connect more than two modems to your Linux box, for
           instance in order to become a dial-in server.  If you say Y here,
           you will be asked for your specific card model in the next
-          questions.  Make sure to read <file:Documentation/stallion.txt> in
-          this case.  If you have never heard about all this, it's safe to
+          questions.  Make sure to read <file:Documentation/serial/stallion.txt>
+          in this case.  If you have never heard about all this, it's safe to
           say N.
 
 config STALLION
@@ -354,7 +354,7 @@ config STALLION
         help
           If you have an EasyIO or EasyConnection 8/32 multiport Stallion
           card, then this is for you; say Y.  Make sure to read
-          <file:Documentation/stallion.txt>.
+          <file:Documentation/serial/stallion.txt>.
 
           To compile this driver as a module, choose M here: the
           module will be called stallion.
@@ -365,7 +365,7 @@ config ISTALLION
         help
           If you have an EasyConnection 8/64, ONboard, Brumby or Stallion
           serial multiport card, say Y here. Make sure to read
-          <file:Documentation/stallion.txt>.
+          <file:Documentation/serial/stallion.txt>.
 
           To compile this driver as a module, choose M here: the
           module will be called istallion.
@@ -622,6 +622,16 @@ config HVC_BEAT
         help
           Toshiba's Cell Reference Set Beat Console device driver
 
+config HVC_IUCV
+        bool "z/VM IUCV Hypervisor console support (VM only)"
+        depends on S390
+        select HVC_DRIVER
+        select IUCV
+        default y
+        help
+          This driver provides a Hypervisor console (HVC) back-end to access
+          a Linux (console) terminal via a z/VM IUCV communication path.
+
 config HVC_XEN
         bool "Xen Hypervisor Console support"
         depends on XEN
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 438f71317c5c..36151bae0d72 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -50,6 +50,7 @@ obj-$(CONFIG_HVC_BEAT)		+= hvc_beat.o
 obj-$(CONFIG_HVC_DRIVER)        += hvc_console.o
 obj-$(CONFIG_HVC_IRQ)           += hvc_irq.o
 obj-$(CONFIG_HVC_XEN)           += hvc_xen.o
+obj-$(CONFIG_HVC_IUCV)          += hvc_iucv.o
 obj-$(CONFIG_VIRTIO_CONSOLE)    += virtio_console.o
 obj-$(CONFIG_RAW_DRIVER)        += raw.o
 obj-$(CONFIG_SGI_SNSC)          += snsc.o snsc_event.o
diff --git a/drivers/char/agp/uninorth-agp.c b/drivers/char/agp/uninorth-agp.c
index 0f004b65ec03..03f95ec08f59 100644
--- a/drivers/char/agp/uninorth-agp.c
+++ b/drivers/char/agp/uninorth-agp.c
@@ -27,7 +27,7 @@
 static int uninorth_rev;
 static int is_u3;
 
-static char __devinitdata *aperture = NULL;
+static char *aperture = NULL;
 
 static int uninorth_fetch_size(void)
 {
diff --git a/drivers/char/cp437.uni b/drivers/char/cp437.uni
index 1f06889a96b9..bc6163484f62 100644
--- a/drivers/char/cp437.uni
+++ b/drivers/char/cp437.uni
@@ -27,7 +27,7 @@
 0x0c    U+2640
 0x0d    U+266a
 0x0e    U+266b
-0x0f    U+263c
+0x0f    U+263c U+00a4
 0x10    U+25b6 U+25ba
 0x11    U+25c0 U+25c4
 0x12    U+2195
@@ -55,7 +55,7 @@
 0x24    U+0024
 0x25    U+0025
 0x26    U+0026
-0x27    U+0027
+0x27    U+0027 U+00b4
 0x28    U+0028
 0x29    U+0029
 0x2a    U+002a
@@ -84,7 +84,7 @@
 0x41    U+0041 U+00c0 U+00c1 U+00c2 U+00c3
 0x42    U+0042
 0x43    U+0043 U+00a9
-0x44    U+0044
+0x44    U+0044 U+00d0
 0x45    U+0045 U+00c8 U+00ca U+00cb
 0x46    U+0046
 0x47    U+0047
@@ -140,7 +140,7 @@
 0x79    U+0079 U+00fd
 0x7a    U+007a
 0x7b    U+007b
-0x7c    U+007c U+00a5
+0x7c    U+007c U+00a6
 0x7d    U+007d
 0x7e    U+007e
 #
@@ -263,10 +263,10 @@
 0xe8    U+03a6 U+00d8
 0xe9    U+0398
 0xea    U+03a9 U+2126
-0xeb    U+03b4
+0xeb    U+03b4 U+00f0
 0xec    U+221e
 0xed    U+03c6 U+00f8
-0xee    U+03b5
+0xee    U+03b5 U+2208
 0xef    U+2229
 0xf0    U+2261
 0xf1    U+00b1
diff --git a/drivers/char/hvc_iucv.c b/drivers/char/hvc_iucv.c
new file mode 100644
index 000000000000..5ea7d7713fca
--- /dev/null
+++ b/drivers/char/hvc_iucv.c
@@ -0,0 +1,850 @@
+/*
+ * hvc_iucv.c - z/VM IUCV back-end for the Hypervisor Console (HVC)
+ *
+ * This back-end for HVC provides terminal access via
+ * z/VM IUCV communication paths.
+ *
+ * Copyright IBM Corp. 2008.
+ *
+ * Author(s):   Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
+ */
+#define KMSG_COMPONENT          "hvc_iucv"
+
+#include <linux/types.h>
+#include <asm/ebcdic.h>
+#include <linux/mempool.h>
+#include <linux/module.h>
+#include <linux/tty.h>
+#include <net/iucv/iucv.h>
+
+#include "hvc_console.h"
+
+
+/* HVC backend for z/VM IUCV */
+#define HVC_IUCV_MAGIC          0xc9e4c3e5
+#define MAX_HVC_IUCV_LINES      HVC_ALLOC_TTY_ADAPTERS
+#define MEMPOOL_MIN_NR          (PAGE_SIZE / sizeof(struct iucv_tty_buffer)/4)
+
+/* IUCV TTY message  */
+#define MSG_VERSION             0x02    /* Message version */
+#define MSG_TYPE_ERROR          0x01    /* Error message */
+#define MSG_TYPE_TERMENV        0x02    /* Terminal environment variable */
+#define MSG_TYPE_TERMIOS        0x04    /* Terminal IO struct update */
+#define MSG_TYPE_WINSIZE        0x08    /* Terminal window size update */
+#define MSG_TYPE_DATA           0x10    /* Terminal data */
+
+#define MSG_SIZE(s)             ((s) + offsetof(struct iucv_tty_msg, data))
+struct iucv_tty_msg {
+        u8      version;                /* Message version */
+        u8      type;                   /* Message type */
+#define MSG_MAX_DATALEN         (~(u16)0)
+        u16     datalen;                /* Payload length */
+        u8      data[];                 /* Payload buffer */
+} __attribute__((packed));
+
+enum iucv_state_t {
+        IUCV_DISCONN    = 0,
+        IUCV_CONNECTED  = 1,
+        IUCV_SEVERED    = 2,
+};
+
+enum tty_state_t {
+        TTY_CLOSED      = 0,
+        TTY_OPENED      = 1,
+};
+
+struct hvc_iucv_private {
+        struct hvc_struct       *hvc; /* HVC console struct reference */
+        u8                      srv_name[8];    /* IUCV service name (ebcdic) */
+        enum iucv_state_t       iucv_state;     /* IUCV connection status */
+        enum tty_state_t        tty_state;      /* TTY status */
+        struct iucv_path        *path;          /* IUCV path pointer */
+        spinlock_t              lock;           /* hvc_iucv_private lock */
+        struct list_head        tty_outqueue;   /* outgoing IUCV messages */
+        struct list_head        tty_inqueue;    /* incoming IUCV messages */
+};
+
+struct iucv_tty_buffer {
+        struct list_head        list;   /* list pointer */
+        struct iucv_message     msg;    /* store an incoming IUCV message */
+        size_t                  offset; /* data buffer offset */
+        struct iucv_tty_msg     *mbuf;  /* buffer to store input/output data */
+};
+
+/* IUCV callback handler */
+static  int hvc_iucv_path_pending(struct iucv_path *, u8[8], u8[16]);
+static void hvc_iucv_path_severed(struct iucv_path *, u8[16]);
+static void hvc_iucv_msg_pending(struct iucv_path *, struct iucv_message *);
+static void hvc_iucv_msg_complete(struct iucv_path *, struct iucv_message *);
+
+
+/* Kernel module parameters */
+static unsigned long hvc_iucv_devices;
+
+/* Array of allocated hvc iucv tty lines... */
+static struct hvc_iucv_private *hvc_iucv_table[MAX_HVC_IUCV_LINES];
+
+/* Kmem cache and mempool for iucv_tty_buffer elements */
+static struct kmem_cache *hvc_iucv_buffer_cache;
+static mempool_t *hvc_iucv_mempool;
+
+/* IUCV handler callback functions */
+static struct iucv_handler hvc_iucv_handler = {
+        .path_pending  = hvc_iucv_path_pending,
+        .path_severed  = hvc_iucv_path_severed,
+        .message_complete = hvc_iucv_msg_complete,
+        .message_pending  = hvc_iucv_msg_pending,
+};
+
+
+/**
+ * hvc_iucv_get_private() - Return a struct hvc_iucv_private instance.
+ * @num:        The HVC virtual terminal number (vtermno)
+ *
+ * This function returns the struct hvc_iucv_private instance that corresponds
+ * to the HVC virtual terminal number specified as parameter @num.
+ */
+struct hvc_iucv_private *hvc_iucv_get_private(uint32_t num)
+{
+        if ((num < HVC_IUCV_MAGIC) || (num - HVC_IUCV_MAGIC > hvc_iucv_devices))
+                return NULL;
+        return hvc_iucv_table[num - HVC_IUCV_MAGIC];
+}
+
+/**
+ * alloc_tty_buffer() - Returns a new struct iucv_tty_buffer element.
+ * @size:       Size of the internal buffer used to store data.
+ * @flags:      Memory allocation flags passed to mempool.
+ *
+ * This function allocates a new struct iucv_tty_buffer element and, optionally,
+ * allocates an internal data buffer with the specified size @size.
+ * Note: The total message size arises from the internal buffer size and the
+ *       members of the iucv_tty_msg structure.
+ *
+ * The function returns NULL if memory allocation has failed.
+ */
+static struct iucv_tty_buffer *alloc_tty_buffer(size_t size, gfp_t flags)
+{
+        struct iucv_tty_buffer *bufp;
+
+        bufp = mempool_alloc(hvc_iucv_mempool, flags);
+        if (!bufp)
+                return NULL;
+        memset(bufp, 0, sizeof(struct iucv_tty_buffer));
+
+        if (size > 0) {
+                bufp->msg.length = MSG_SIZE(size);
+                bufp->mbuf = kmalloc(bufp->msg.length, flags);
+                if (!bufp->mbuf) {
+                        mempool_free(bufp, hvc_iucv_mempool);
+                        return NULL;
+                }
+                bufp->mbuf->version = MSG_VERSION;
+                bufp->mbuf->type    = MSG_TYPE_DATA;
+                bufp->mbuf->datalen = (u16) size;
+        }
+        return bufp;
+}
+
+/**
+ * destroy_tty_buffer() - destroy struct iucv_tty_buffer element.
+ * @bufp:       Pointer to a struct iucv_tty_buffer element, SHALL NOT be NULL.
+ *
+ * The destroy_tty_buffer() function frees the internal data buffer and returns
+ * the struct iucv_tty_buffer element back to the mempool for freeing.
+ */
+static void destroy_tty_buffer(struct iucv_tty_buffer *bufp)
+{
+        kfree(bufp->mbuf);
+        mempool_free(bufp, hvc_iucv_mempool);
+}
+
+/**
+ * destroy_tty_buffer_list() - call destroy_tty_buffer() for each list element.
+ * @list:       List head pointer to a list containing struct iucv_tty_buffer
+ *              elements.
+ *
+ * Calls destroy_tty_buffer() for each struct iucv_tty_buffer element in the
+ * list @list.
+ */
+static void destroy_tty_buffer_list(struct list_head *list)
+{
+        struct iucv_tty_buffer *ent, *next;
+
+        list_for_each_entry_safe(ent, next, list, list) {
+                list_del(&ent->list);
+                destroy_tty_buffer(ent);
+        }
+}
+
+/**
+ * hvc_iucv_write() - Receive IUCV message write data to HVC console buffer.
+ * @priv:               Pointer to hvc_iucv_private structure.
+ * @buf:                HVC console buffer for writing received terminal data.
+ * @count:              HVC console buffer size.
+ * @has_more_data:      Pointer to an int variable.
+ *
+ * The function picks up pending messages from the input queue and receives
+ * the message data that is then written to the specified buffer @buf.
+ * If the buffer size @count is less than the data message size, then the
+ * message is kept on the input queue and @has_more_data is set to 1.
+ * If the message data has been entirely written, the message is removed from
+ * the input queue.
+ *
+ * The function returns the number of bytes written to the terminal, zero if
+ * there are no pending data messages available or if there is no established
+ * IUCV path.
+ * If the IUCV path has been severed, then -EPIPE is returned to cause a
+ * hang up (that is issued by the HVC console layer).
+ */
+static int hvc_iucv_write(struct hvc_iucv_private *priv,
+                          char *buf, int count, int *has_more_data)
+{
+        struct iucv_tty_buffer *rb;
+        int written;
+        int rc;
+
+        /* Immediately return if there is no IUCV connection */
+        if (priv->iucv_state == IUCV_DISCONN)
+                return 0;
+
+        /* If the IUCV path has been severed, return -EPIPE to inform the
+         * hvc console layer to hang up the tty device. */
+        if (priv->iucv_state == IUCV_SEVERED)
+                return -EPIPE;
+
+        /* check if there are pending messages */
+        if (list_empty(&priv->tty_inqueue))
+                return 0;
+
+        /* receive a iucv message and flip data to the tty (ldisc) */
+        rb = list_first_entry(&priv->tty_inqueue, struct iucv_tty_buffer, list);
+
+        written = 0;
+        if (!rb->mbuf) { /* message not yet received ... */
+                /* allocate mem to store msg data; if no memory is available
+                 * then leave the buffer on the list and re-try later */
+                rb->mbuf = kmalloc(rb->msg.length, GFP_ATOMIC);
+                if (!rb->mbuf)
+                        return -ENOMEM;
+
+                rc = __iucv_message_receive(priv->path, &rb->msg, 0,
+                                            rb->mbuf, rb->msg.length, NULL);
+                switch (rc) {
+                case 0: /* Successful       */
+                        break;
+                case 2: /* No message found */
+                case 9: /* Message purged   */
+                        break;
+                default:
+                        written = -EIO;
+                }
+                /* remove buffer if an error has occured or received data
+                 * is not correct */
+                if (rc || (rb->mbuf->version != MSG_VERSION) ||
+                          (rb->msg.length    != MSG_SIZE(rb->mbuf->datalen)))
+                        goto out_remove_buffer;
+        }
+
+        switch (rb->mbuf->type) {
+        case MSG_TYPE_DATA:
+                written = min_t(int, rb->mbuf->datalen - rb->offset, count);
+                memcpy(buf, rb->mbuf->data + rb->offset, written);
+                if (written < (rb->mbuf->datalen - rb->offset)) {
+                        rb->offset += written;
+                        *has_more_data = 1;
+                        goto out_written;
+                }
+                break;
+
+        case MSG_TYPE_WINSIZE:
+                if (rb->mbuf->datalen != sizeof(struct winsize))
+                        break;
+                hvc_resize(priv->hvc, *((struct winsize *)rb->mbuf->data));
+                break;
+
+        case MSG_TYPE_ERROR:    /* ignored ... */
+        case MSG_TYPE_TERMENV:  /* ignored ... */
+        case MSG_TYPE_TERMIOS:  /* ignored ... */
+                break;
+        }
+
+out_remove_buffer:
+        list_del(&rb->list);
+        destroy_tty_buffer(rb);
+        *has_more_data = !list_empty(&priv->tty_inqueue);
+
+out_written:
+        return written;
+}
+
+/**
+ * hvc_iucv_get_chars() - HVC get_chars operation.
+ * @vtermno:    HVC virtual terminal number.
+ * @buf:        Pointer to a buffer to store data
+ * @count:      Size of buffer available for writing
+ *
+ * The hvc_console thread calls this method to read characters from
+ * the terminal backend. If an IUCV communication path has been established,
+ * pending IUCV messages are received and data is copied into buffer @buf
+ * up to @count bytes.
+ *
+ * Locking:     The routine gets called under an irqsave() spinlock; and
+ *              the routine locks the struct hvc_iucv_private->lock to call
+ *              helper functions.
+ */
+static int hvc_iucv_get_chars(uint32_t vtermno, char *buf, int count)
+{
+        struct hvc_iucv_private *priv = hvc_iucv_get_private(vtermno);
+        int written;
+        int has_more_data;
+
+        if (count <= 0)
+                return 0;
+
+        if (!priv)
+                return -ENODEV;
+
+        spin_lock(&priv->lock);
+        has_more_data = 0;
+        written = hvc_iucv_write(priv, buf, count, &has_more_data);
+        spin_unlock(&priv->lock);
+
+        /* if there are still messages on the queue... schedule another run */
+        if (has_more_data)
+                hvc_kick();
+
+        return written;
+}
+
+/**
+ * hvc_iucv_send() - Send an IUCV message containing terminal data.
+ * @priv:       Pointer to struct hvc_iucv_private instance.
+ * @buf:        Buffer containing data to send.
+ * @size:       Size of buffer and amount of data to send.
+ *
+ * If an IUCV communication path is established, the function copies the buffer
+ * data to a newly allocated struct iucv_tty_buffer element, sends the data and
+ * puts the element to the outqueue.
+ *
+ * If there is no IUCV communication path established, the function returns 0.
+ * If an existing IUCV communicaton path has been severed, the function returns
+ * -EPIPE (can be passed to HVC layer to cause a tty hangup).
+ */
+static int hvc_iucv_send(struct hvc_iucv_private *priv, const char *buf,
+                         int count)
+{
+        struct iucv_tty_buffer *sb;
+        int rc;
+        u16 len;
+
+        if (priv->iucv_state == IUCV_SEVERED)
+                return -EPIPE;
+
+        if (priv->iucv_state == IUCV_DISCONN)
+                return 0;
+
+        len = min_t(u16, MSG_MAX_DATALEN, count);
+
+        /* allocate internal buffer to store msg data and also compute total
+         * message length */
+        sb = alloc_tty_buffer(len, GFP_ATOMIC);
+        if (!sb)
+                return -ENOMEM;
+
+        sb->mbuf->datalen = len;
+        memcpy(sb->mbuf->data, buf, len);
+
+        list_add_tail(&sb->list, &priv->tty_outqueue);
+
+        rc = __iucv_message_send(priv->path, &sb->msg, 0, 0,
+                                 (void *) sb->mbuf, sb->msg.length);
+        if (rc) {
+                list_del(&sb->list);
+                destroy_tty_buffer(sb);
+                len = 0;
+        }
+
+        return len;
+}
+
+/**
+ * hvc_iucv_put_chars() - HVC put_chars operation.
+ * @vtermno:    HVC virtual terminal number.
+ * @buf:        Pointer to an buffer to read data from
+ * @count:      Size of buffer available for reading
+ *
+ * The hvc_console thread calls this method to write characters from
+ * to the terminal backend.
+ * The function calls hvc_iucv_send() under the lock of the
+ * struct hvc_iucv_private instance that corresponds to the tty @vtermno.
+ *
+ * Locking:     The method gets called under an irqsave() spinlock; and
+ *              locks struct hvc_iucv_private->lock.
+ */
+static int hvc_iucv_put_chars(uint32_t vtermno, const char *buf, int count)
+{
+        struct hvc_iucv_private *priv = hvc_iucv_get_private(vtermno);
+        int sent;
+
+        if (count <= 0)
+                return 0;
+
+        if (!priv)
+                return -ENODEV;
+
+        spin_lock(&priv->lock);
+        sent = hvc_iucv_send(priv, buf, count);
+        spin_unlock(&priv->lock);
+
+        return sent;
+}
+
+/**
+ * hvc_iucv_notifier_add() - HVC notifier for opening a TTY for the first time.
+ * @hp: Pointer to the HVC device (struct hvc_struct)
+ * @id: Additional data (originally passed to hvc_alloc): the index of an struct
+ *      hvc_iucv_private instance.
+ *
+ * The function sets the tty state to TTY_OPEN for the struct hvc_iucv_private
+ * instance that is derived from @id. Always returns 0.
+ *
+ * Locking:     struct hvc_iucv_private->lock, spin_lock_bh
+ */
+static int hvc_iucv_notifier_add(struct hvc_struct *hp, int id)
+{
+        struct hvc_iucv_private *priv;
+
+        priv = hvc_iucv_get_private(id);
+        if (!priv)
+                return 0;
+
+        spin_lock_bh(&priv->lock);
+        priv->tty_state = TTY_OPENED;
+        spin_unlock_bh(&priv->lock);
+
+        return 0;
+}
+
+/**
+ * hvc_iucv_cleanup() - Clean up function if the tty portion is finally closed.
+ * @priv:       Pointer to the struct hvc_iucv_private instance.
+ *
+ * The functions severs the established IUCV communication path (if any), and
+ * destroy struct iucv_tty_buffer elements from the in- and outqueue. Finally,
+ * the functions resets the states to TTY_CLOSED and IUCV_DISCONN.
+ */
+static void hvc_iucv_cleanup(struct hvc_iucv_private *priv)
+{
+        destroy_tty_buffer_list(&priv->tty_outqueue);
+        destroy_tty_buffer_list(&priv->tty_inqueue);
+
+        priv->tty_state = TTY_CLOSED;
+        priv->iucv_state = IUCV_DISCONN;
+}
+
+/**
+ * hvc_iucv_notifier_hangup() - HVC notifier for tty hangups.
+ * @hp: Pointer to the HVC device (struct hvc_struct)
+ * @id: Additional data (originally passed to hvc_alloc): the index of an struct
+ *      hvc_iucv_private instance.
+ *
+ * This routine notifies the HVC backend that a tty hangup (carrier loss,
+ * virtual or otherwise) has occured.
+ *
+ * The HVC backend for z/VM IUCV ignores virtual hangups (vhangup()), to keep
+ * an existing IUCV communication path established.
+ * (Background: vhangup() is called from user space (by getty or login) to
+ *              disable writing to the tty by other applications).
+ *
+ * If the tty has been opened (e.g. getty) and an established IUCV path has been
+ * severed (we caused the tty hangup in that case), then the functions invokes
+ * hvc_iucv_cleanup() to clean up.
+ *
+ * Locking:     struct hvc_iucv_private->lock
+ */
+static void hvc_iucv_notifier_hangup(struct hvc_struct *hp, int id)
+{
+        struct hvc_iucv_private *priv;
+
+        priv = hvc_iucv_get_private(id);
+        if (!priv)
+                return;
+
+        spin_lock_bh(&priv->lock);
+        /* NOTE: If the hangup was scheduled by ourself (from the iucv
+         *       path_servered callback [IUCV_SEVERED]), then we have to
+         *       finally clean up the tty backend structure and set state to
+         *       TTY_CLOSED.
+         *
+         *       If the tty was hung up otherwise (e.g. vhangup()), then we
+         *       ignore this hangup and keep an established IUCV path open...
+         *       (...the reason is that we are not able to connect back to the
+         *       client if we disconnect on hang up) */
+        priv->tty_state = TTY_CLOSED;
+
+        if (priv->iucv_state == IUCV_SEVERED)
+                hvc_iucv_cleanup(priv);
+        spin_unlock_bh(&priv->lock);
+}
+
+/**
+ * hvc_iucv_notifier_del() - HVC notifier for closing a TTY for the last time.
+ * @hp:         Pointer to the HVC device (struct hvc_struct)
+ * @id:         Additional data (originally passed to hvc_alloc):
+ *              the index of an struct hvc_iucv_private instance.
+ *
+ * This routine notifies the HVC backend that the last tty device file
+ * descriptor has been closed.
+ * The function calls hvc_iucv_cleanup() to clean up the struct hvc_iucv_private
+ * instance.
+ *
+ * Locking:     struct hvc_iucv_private->lock
+ */
+static void hvc_iucv_notifier_del(struct hvc_struct *hp, int id)
+{
+        struct hvc_iucv_private *priv;
+        struct iucv_path        *path;
+
+        priv = hvc_iucv_get_private(id);
+        if (!priv)
+                return;
+
+        spin_lock_bh(&priv->lock);
+        path = priv->path;              /* save reference to IUCV path */
+        priv->path = NULL;
+        hvc_iucv_cleanup(priv);
+        spin_unlock_bh(&priv->lock);
+
+        /* sever IUCV path outside of priv->lock due to lock ordering of:
+         * priv->lock <--> iucv_table_lock */
+        if (path) {
+                iucv_path_sever(path, NULL);
+                iucv_path_free(path);
+        }
+}
+
+/**
+ * hvc_iucv_path_pending() - IUCV handler to process a connection request.
+ * @path:       Pending path (struct iucv_path)
+ * @ipvmid:     Originator z/VM system identifier
+ * @ipuser:     User specified data for this path
+ *              (AF_IUCV: port/service name and originator port)
+ *
+ * The function uses the @ipuser data to check to determine if the pending
+ * path belongs to a terminal managed by this HVC backend.
+ * If the check is successful, then an additional check is done to ensure
+ * that a terminal cannot be accessed multiple times (only one connection
+ * to a terminal is allowed). In that particular case, the pending path is
+ * severed. If it is the first connection, the pending path is accepted and
+ * associated to the struct hvc_iucv_private. The iucv state is updated to
+ * reflect that a communication path has been established.
+ *
+ * Returns 0 if the path belongs to a terminal managed by the this HVC backend;
+ * otherwise returns -ENODEV in order to dispatch this path to other handlers.
+ *
+ * Locking:     struct hvc_iucv_private->lock
+ */
+static  int hvc_iucv_path_pending(struct iucv_path *path,
+                                  u8 ipvmid[8], u8 ipuser[16])
+{
+        struct hvc_iucv_private *priv;
+        u8 nuser_data[16];
+        int i, rc;
+
+        priv = NULL;
+        for (i = 0; i < hvc_iucv_devices; i++)
+                if (hvc_iucv_table[i] &&
+                    (0 == memcmp(hvc_iucv_table[i]->srv_name, ipuser, 8))) {
+                        priv = hvc_iucv_table[i];
+                        break;
+                }
+
+        if (!priv)
+                return -ENODEV;
+
+        spin_lock(&priv->lock);
+
+        /* If the terminal is already connected or being severed, then sever
+         * this path to enforce that there is only ONE established communication
+         * path per terminal. */
+        if (priv->iucv_state != IUCV_DISCONN) {
+                iucv_path_sever(path, ipuser);
+                iucv_path_free(path);
+                goto out_path_handled;
+        }
+
+        /* accept path */
+        memcpy(nuser_data, ipuser + 8, 8);  /* remote service (for af_iucv) */
+        memcpy(nuser_data + 8, ipuser, 8);  /* local service  (for af_iucv) */
+        path->msglim = 0xffff;              /* IUCV MSGLIMIT */
+        path->flags &= ~IUCV_IPRMDATA;      /* TODO: use IUCV_IPRMDATA */
+        rc = iucv_path_accept(path, &hvc_iucv_handler, nuser_data, priv);
+        if (rc) {
+                iucv_path_sever(path, ipuser);
+                iucv_path_free(path);
+                goto out_path_handled;
+        }
+        priv->path = path;
+        priv->iucv_state = IUCV_CONNECTED;
+
+out_path_handled:
+        spin_unlock(&priv->lock);
+        return 0;
+}
+
+/**
+ * hvc_iucv_path_severed() - IUCV handler to process a path sever.
+ * @path:       Pending path (struct iucv_path)
+ * @ipuser:     User specified data for this path
+ *              (AF_IUCV: port/service name and originator port)
+ *
+ * The function also severs the path (as required by the IUCV protocol) and
+ * sets the iucv state to IUCV_SEVERED for the associated struct
+ * hvc_iucv_private instance. Later, the IUCV_SEVERED state triggers a tty
+ * hangup (hvc_iucv_get_chars() / hvc_iucv_write()).
+ *
+ * If tty portion of the HVC is closed then clean up the outqueue in addition.
+ *
+ * Locking:     struct hvc_iucv_private->lock
+ */
+static void hvc_iucv_path_severed(struct iucv_path *path, u8 ipuser[16])
+{
+        struct hvc_iucv_private *priv = path->private;
+
+        spin_lock(&priv->lock);
+        priv->iucv_state = IUCV_SEVERED;
+
+        /* NOTE: If the tty has not yet been opened by a getty program
+         *       (e.g. to see console messages), then cleanup the
+         *       hvc_iucv_private structure to allow re-connects.
+         *
+         *       If the tty has been opened, the get_chars() callback returns
+         *       -EPIPE to signal the hvc console layer to hang up the tty. */
+        priv->path = NULL;
+        if (priv->tty_state == TTY_CLOSED)
+                hvc_iucv_cleanup(priv);
+        spin_unlock(&priv->lock);
+
+        /* finally sever path (outside of priv->lock due to lock ordering) */
+        iucv_path_sever(path, ipuser);
+        iucv_path_free(path);
+}
+
+/**
+ * hvc_iucv_msg_pending() - IUCV handler to process an incoming IUCV message.
+ * @path:       Pending path (struct iucv_path)
+ * @msg:        Pointer to the IUCV message
+ *
+ * The function stores an incoming message on the input queue for later
+ * processing (by hvc_iucv_get_chars() / hvc_iucv_write()).
+ * However, if the tty has not yet been opened, the message is rejected.
+ *
+ * Locking:     struct hvc_iucv_private->lock
+ */
+static void hvc_iucv_msg_pending(struct iucv_path *path,
+                                 struct iucv_message *msg)
+{
+        struct hvc_iucv_private *priv = path->private;
+        struct iucv_tty_buffer *rb;
+
+        spin_lock(&priv->lock);
+
+        /* reject messages if tty has not yet been opened */
+        if (priv->tty_state == TTY_CLOSED) {
+                iucv_message_reject(path, msg);
+                goto unlock_return;
+        }
+
+        /* allocate buffer an empty buffer element */
+        rb = alloc_tty_buffer(0, GFP_ATOMIC);
+        if (!rb) {
+                iucv_message_reject(path, msg);
+                goto unlock_return;     /* -ENOMEM */
+        }
+        rb->msg = *msg;
+
+        list_add_tail(&rb->list, &priv->tty_inqueue);
+
+        hvc_kick();     /* wakup hvc console thread */
+
+unlock_return:
+        spin_unlock(&priv->lock);
+}
+
+/**
+ * hvc_iucv_msg_complete() - IUCV handler to process message completion
+ * @path:       Pending path (struct iucv_path)
+ * @msg:        Pointer to the IUCV message
+ *
+ * The function is called upon completion of message delivery and the
+ * message is removed from the outqueue. Additional delivery information
+ * can be found in msg->audit: rejected messages (0x040000 (IPADRJCT)) and
+ * purged messages (0x010000 (IPADPGNR)).
+ *
+ * Locking:     struct hvc_iucv_private->lock
+ */
+static void hvc_iucv_msg_complete(struct iucv_path *path,
+                                  struct iucv_message *msg)
+{
+        struct hvc_iucv_private *priv = path->private;
+        struct iucv_tty_buffer  *ent, *next;
+        LIST_HEAD(list_remove);
+
+        spin_lock(&priv->lock);
+        list_for_each_entry_safe(ent, next, &priv->tty_outqueue, list)
+                if (ent->msg.id == msg->id) {
+                        list_move(&ent->list, &list_remove);
+                        break;
+                }
+        spin_unlock(&priv->lock);
+        destroy_tty_buffer_list(&list_remove);
+}
+
+
+/* HVC operations */
+static struct hv_ops hvc_iucv_ops = {
+        .get_chars = hvc_iucv_get_chars,
+        .put_chars = hvc_iucv_put_chars,
+        .notifier_add = hvc_iucv_notifier_add,
+        .notifier_del = hvc_iucv_notifier_del,
+        .notifier_hangup = hvc_iucv_notifier_hangup,
+};
+
+/**
+ * hvc_iucv_alloc() - Allocates a new struct hvc_iucv_private instance
+ * @id: hvc_iucv_table index
+ *
+ * This function allocates a new hvc_iucv_private struct and put the
+ * instance into hvc_iucv_table at index @id.
+ * Returns 0 on success; otherwise non-zero.
+ */
+static int __init hvc_iucv_alloc(int id)
+{
+        struct hvc_iucv_private *priv;
+        char name[9];
+        int rc;
+
+        priv = kzalloc(sizeof(struct hvc_iucv_private), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+
+        spin_lock_init(&priv->lock);
+        INIT_LIST_HEAD(&priv->tty_outqueue);
+        INIT_LIST_HEAD(&priv->tty_inqueue);
+
+        /* Finally allocate hvc */
+        priv->hvc = hvc_alloc(HVC_IUCV_MAGIC + id,
+                              HVC_IUCV_MAGIC + id, &hvc_iucv_ops, PAGE_SIZE);
+        if (IS_ERR(priv->hvc)) {
+                rc = PTR_ERR(priv->hvc);
+                kfree(priv);
+                return rc;
+        }
+
+        /* setup iucv related information */
+        snprintf(name, 9, "ihvc%-4d", id);
+        memcpy(priv->srv_name, name, 8);
+        ASCEBC(priv->srv_name, 8);
+
+        hvc_iucv_table[id] = priv;
+        return 0;
+}
+
+/**
+ * hvc_iucv_init() - Initialization of HVC backend for z/VM IUCV
+ */
+static int __init hvc_iucv_init(void)
+{
+        int rc, i;
+
+        if (!MACHINE_IS_VM) {
+                pr_warning("The z/VM IUCV Hypervisor console cannot be "
+                           "used without z/VM.\n");
+                return -ENODEV;
+        }
+
+        if (!hvc_iucv_devices)
+                return -ENODEV;
+
+        if (hvc_iucv_devices > MAX_HVC_IUCV_LINES)
+                return -EINVAL;
+
+        hvc_iucv_buffer_cache = kmem_cache_create(KMSG_COMPONENT,
+                                           sizeof(struct iucv_tty_buffer),
+                                           0, 0, NULL);
+        if (!hvc_iucv_buffer_cache) {
+                pr_err("Not enough memory for driver initialization "
+                        "(rs=%d).\n", 1);
+                return -ENOMEM;
+        }
+
+        hvc_iucv_mempool = mempool_create_slab_pool(MEMPOOL_MIN_NR,
+                                                    hvc_iucv_buffer_cache);
+        if (!hvc_iucv_mempool) {
+                pr_err("Not enough memory for driver initialization "
+                        "(rs=%d).\n", 2);
+                kmem_cache_destroy(hvc_iucv_buffer_cache);
+                return -ENOMEM;
+        }
+
+        /* allocate hvc_iucv_private structs */
+        for (i = 0; i < hvc_iucv_devices; i++) {
+                rc = hvc_iucv_alloc(i);
+                if (rc) {
+                        pr_err("Could not create new z/VM IUCV HVC backend "
+                                "rc=%d.\n", rc);
+                        goto out_error_hvc;
+                }
+        }
+
+        /* register IUCV callback handler */
+        rc = iucv_register(&hvc_iucv_handler, 0);
+        if (rc) {
+                pr_err("Could not register iucv handler (rc=%d).\n", rc);
+                goto out_error_iucv;
+        }
+
+        return 0;
+
+out_error_iucv:
+        iucv_unregister(&hvc_iucv_handler, 0);
+out_error_hvc:
+        for (i = 0; i < hvc_iucv_devices; i++)
+                if (hvc_iucv_table[i]) {
+                        if (hvc_iucv_table[i]->hvc)
+                                hvc_remove(hvc_iucv_table[i]->hvc);
+                        kfree(hvc_iucv_table[i]);
+                }
+        mempool_destroy(hvc_iucv_mempool);
+        kmem_cache_destroy(hvc_iucv_buffer_cache);
+        return rc;
+}
+
+/**
+ * hvc_iucv_console_init() - Early console initialization
+ */
+static  int __init hvc_iucv_console_init(void)
+{
+        if (!MACHINE_IS_VM || !hvc_iucv_devices)
+                return -ENODEV;
+        return hvc_instantiate(HVC_IUCV_MAGIC, 0, &hvc_iucv_ops);
+}
+
+/**
+ * hvc_iucv_config() - Parsing of hvc_iucv=  kernel command line parameter
+ * @val:        Parameter value (numeric)
+ */
+static  int __init hvc_iucv_config(char *val)
+{
+         return strict_strtoul(val, 10, &hvc_iucv_devices);
+}
+
+
+module_init(hvc_iucv_init);
+console_initcall(hvc_iucv_console_init);
+__setup("hvc_iucv=", hvc_iucv_config);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("HVC back-end for z/VM IUCV.");
+MODULE_AUTHOR("Hendrik Brueckner <brueckner@linux.vnet.ibm.com>");
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
index 8a59aaa21be5..7a88dfd4427b 100644
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -422,9 +422,11 @@ struct ipmi_smi {
 /**
  * The driver model view of the IPMI messaging driver.
  */
-static struct device_driver ipmidriver = {
-        .name = "ipmi",
-        .bus = &platform_bus_type
+static struct platform_driver ipmidriver = {
+        .driver = {
+                .name = "ipmi",
+                .bus = &platform_bus_type
+        }
 };
 static DEFINE_MUTEX(ipmidriver_mutex);
 
@@ -2384,9 +2386,9 @@ static int ipmi_bmc_register(ipmi_smi_t intf, int ifnum,
          * representing the interfaced BMC already
          */
         if (bmc->guid_set)
-                old_bmc = ipmi_find_bmc_guid(&ipmidriver, bmc->guid);
+                old_bmc = ipmi_find_bmc_guid(&ipmidriver.driver, bmc->guid);
         else
-                old_bmc = ipmi_find_bmc_prod_dev_id(&ipmidriver,
+                old_bmc = ipmi_find_bmc_prod_dev_id(&ipmidriver.driver,
                                                     bmc->id.product_id,
                                                     bmc->id.device_id);
 
@@ -2416,7 +2418,7 @@ static int ipmi_bmc_register(ipmi_smi_t intf, int ifnum,
                 snprintf(name, sizeof(name),
                          "ipmi_bmc.%4.4x", bmc->id.product_id);
 
-                while (ipmi_find_bmc_prod_dev_id(&ipmidriver,
+                while (ipmi_find_bmc_prod_dev_id(&ipmidriver.driver,
                                                  bmc->id.product_id,
                                                  bmc->id.device_id)) {
                         if (!warn_printed) {
@@ -2446,7 +2448,7 @@ static int ipmi_bmc_register(ipmi_smi_t intf, int ifnum,
                                " Unable to allocate platform device\n");
                         return -ENOMEM;
                 }
-                bmc->dev->dev.driver = &ipmidriver;
+                bmc->dev->dev.driver = &ipmidriver.driver;
                 dev_set_drvdata(&bmc->dev->dev, bmc);
                 kref_init(&bmc->refcount);
 
@@ -4247,7 +4249,7 @@ static int ipmi_init_msghandler(void)
         if (initialized)
                 return 0;
 
-        rv = driver_register(&ipmidriver);
+        rv = driver_register(&ipmidriver.driver);
         if (rv) {
                 printk(KERN_ERR PFX "Could not register IPMI driver\n");
                 return rv;
@@ -4308,7 +4310,7 @@ static __exit void cleanup_ipmi(void)
         remove_proc_entry(proc_ipmi_root->name, NULL);
 #endif /* CONFIG_PROC_FS */
 
-        driver_unregister(&ipmidriver);
+        driver_unregister(&ipmidriver.driver);
 
         initialized = 0;
 
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 3123bf57ad91..3000135f2ead 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -114,9 +114,11 @@ static char *si_to_str[] = { "kcs", "smic", "bt" };
 
 #define DEVICE_NAME "ipmi_si"
 
-static struct device_driver ipmi_driver = {
-        .name = DEVICE_NAME,
-        .bus = &platform_bus_type
+static struct platform_driver ipmi_driver = {
+        .driver = {
+                .name = DEVICE_NAME,
+                .bus = &platform_bus_type
+        }
 };
 
 
@@ -2868,7 +2870,7 @@ static int try_smi_init(struct smi_info *new_smi)
                         goto out_err;
                 }
                 new_smi->dev = &new_smi->pdev->dev;
-                new_smi->dev->driver = &ipmi_driver;
+                new_smi->dev->driver = &ipmi_driver.driver;
 
                 rv = platform_device_add(new_smi->pdev);
                 if (rv) {
@@ -2983,7 +2985,7 @@ static __devinit int init_ipmi_si(void)
         initialized = 1;
 
         /* Register the device drivers. */
-        rv = driver_register(&ipmi_driver);
+        rv = driver_register(&ipmi_driver.driver);
         if (rv) {
                 printk(KERN_ERR
                        "init_ipmi_si: Unable to register driver: %d\n",
@@ -3052,7 +3054,7 @@ static __devinit int init_ipmi_si(void)
 #ifdef CONFIG_PPC_OF
                 of_unregister_platform_driver(&ipmi_of_platform_driver);
 #endif
-                driver_unregister(&ipmi_driver);
+                driver_unregister(&ipmi_driver.driver);
                 printk(KERN_WARNING
                        "ipmi_si: Unable to find any System Interface(s)\n");
                 return -ENODEV;
@@ -3151,7 +3153,7 @@ static __exit void cleanup_ipmi_si(void)
                 cleanup_one_si(e);
         mutex_unlock(&smi_infos_lock);
 
-        driver_unregister(&ipmi_driver);
+        driver_unregister(&ipmi_driver.driver);
 }
 module_exit(cleanup_ipmi_si);
 
diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c
index 7d30ee1d3fca..04e4549299ba 100644
--- a/drivers/char/isicom.c
+++ b/drivers/char/isicom.c
@@ -7,12 +7,14 @@
  *      Original driver code supplied by Multi-Tech
  *
  *      Changes
- *      1/9/98  alan@redhat.com         Merge to 2.0.x kernel tree
+ *      1/9/98  alan@lxorguk.ukuu.org.uk
+ *                                      Merge to 2.0.x kernel tree
  *                                      Obtain and use official major/minors
  *                                      Loader switched to a misc device
  *                                      (fixed range check bug as a side effect)
  *                                      Printk clean up
- *      9/12/98 alan@redhat.com         Rough port to 2.1.x
+ *      9/12/98 alan@lxorguk.ukuu.org.uk
+ *                                      Rough port to 2.1.x
  *
  *      10/6/99 sameer                  Merged the ISA and PCI drivers to
  *                                      a new unified driver.
diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
index 44e5d60f517e..4b10770fa937 100644
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
@@ -3739,7 +3739,7 @@ static int stli_getbrdnr(void)
  *      do is go probing around in the usual places hoping we can find it.
  */
 
-static int stli_findeisabrds(void)
+static int __init stli_findeisabrds(void)
 {
         struct stlibrd *brdp;
         unsigned int iobase, eid, i;
@@ -3935,7 +3935,7 @@ static struct stlibrd *stli_allocbrd(void)
  *      can find.
  */
 
-static int stli_initbrds(void)
+static int __init stli_initbrds(void)
 {
         struct stlibrd *brdp, *nxtbrdp;
         struct stlconf conf;
diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c
index 8beef50f95a0..047766915411 100644
--- a/drivers/char/mxser.c
+++ b/drivers/char/mxser.c
@@ -14,7 +14,8 @@
  *      (at your option) any later version.
  *
  *      Fed through a cleanup, indent and remove of non 2.6 code by Alan Cox
- *      <alan@redhat.com>. The original 1.8 code is available on www.moxa.com.
+ *      <alan@lxorguk.ukuu.org.uk>. The original 1.8 code is available on
+ *      www.moxa.com.
  *      - Fixed x86_64 cleanness
  */
 
diff --git a/drivers/char/serial167.c b/drivers/char/serial167.c
index 3b23270eaa65..a8f15e6be594 100644
--- a/drivers/char/serial167.c
+++ b/drivers/char/serial167.c
@@ -418,7 +418,7 @@ static irqreturn_t cd2401_rxerr_interrupt(int irq, void *dev_id)
                                                              TTY_OVERRUN);
                                         /*
                                            If the flip buffer itself is
-                                           overflowing, we still loose
+                                           overflowing, we still lose
                                            the next incoming character.
                                          */
                                         if (tty_buffer_request_room(tty, 1) !=
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index 2457b07dabd6..f4374437a033 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -523,7 +523,7 @@ static int acpi_driver_registered;
 
 static int sonypi_ec_write(u8 addr, u8 value)
 {
-#ifdef CONFIG_ACPI_EC
+#ifdef CONFIG_ACPI
         if (SONYPI_ACPI_ACTIVE)
                 return ec_write(addr, value);
 #endif
@@ -539,7 +539,7 @@ static int sonypi_ec_write(u8 addr, u8 value)
 
 static int sonypi_ec_read(u8 addr, u8 *value)
 {
-#ifdef CONFIG_ACPI_EC
+#ifdef CONFIG_ACPI
         if (SONYPI_ACPI_ACTIVE)
                 return ec_read(addr, value);
 #endif
diff --git a/drivers/char/specialix.c b/drivers/char/specialix.c
index 242fd46fda22..a16b94f12eb2 100644
--- a/drivers/char/specialix.c
+++ b/drivers/char/specialix.c
@@ -72,7 +72,7 @@
 /*
  * There is a bunch of documentation about the card, jumpers, config
  * settings, restrictions, cables, device names and numbers in
- * Documentation/specialix.txt
+ * Documentation/serial/specialix.txt
  */
 
 #include <linux/module.h>
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c
index ce0d9da52a8a..94966edfb44d 100644
--- a/drivers/char/sysrq.c
+++ b/drivers/char/sysrq.c
@@ -274,6 +274,22 @@ static struct sysrq_key_op sysrq_showstate_blocked_op = {
         .enable_mask    = SYSRQ_ENABLE_DUMP,
 };
 
+#ifdef CONFIG_TRACING
+#include <linux/ftrace.h>
+
+static void sysrq_ftrace_dump(int key, struct tty_struct *tty)
+{
+        ftrace_dump();
+}
+static struct sysrq_key_op sysrq_ftrace_dump_op = {
+        .handler        = sysrq_ftrace_dump,
+        .help_msg       = "dumpZ-ftrace-buffer",
+        .action_msg     = "Dump ftrace buffer",
+        .enable_mask    = SYSRQ_ENABLE_DUMP,
+};
+#else
+#define sysrq_ftrace_dump_op (*(struct sysrq_key_op *)0)
+#endif
 
 static void sysrq_handle_showmem(int key, struct tty_struct *tty)
 {
@@ -406,7 +422,7 @@ static struct sysrq_key_op *sysrq_key_table[36] = {
         NULL,                           /* x */
         /* y: May be registered on sparc64 for global register dump */
         NULL,                           /* y */
-        NULL                            /* z */
+        &sysrq_ftrace_dump_op,          /* z */
 };
 
 /* key2index calculation, -1 on invalid index */
diff --git a/drivers/char/tty_audit.c b/drivers/char/tty_audit.c
index 5787249934c8..34ab6d798f81 100644
--- a/drivers/char/tty_audit.c
+++ b/drivers/char/tty_audit.c
@@ -67,6 +67,29 @@ static void tty_audit_buf_put(struct tty_audit_buf *buf)
                 tty_audit_buf_free(buf);
 }
 
+static void tty_audit_log(const char *description, struct task_struct *tsk,
+                          uid_t loginuid, unsigned sessionid, int major,
+                          int minor, unsigned char *data, size_t size)
+{
+        struct audit_buffer *ab;
+
+        ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_TTY);
+        if (ab) {
+                char name[sizeof(tsk->comm)];
+                uid_t uid = task_uid(tsk);
+
+                audit_log_format(ab, "%s pid=%u uid=%u auid=%u ses=%u "
+                                 "major=%d minor=%d comm=", description,
+                                 tsk->pid, uid, loginuid, sessionid,
+                                 major, minor);
+                get_task_comm(name, tsk);
+                audit_log_untrustedstring(ab, name);
+                audit_log_format(ab, " data=");
+                audit_log_n_hex(ab, data, size);
+                audit_log_end(ab);
+        }
+}
+
 /**
  *      tty_audit_buf_push      -       Push buffered data out
  *
@@ -77,25 +100,12 @@ static void tty_audit_buf_push(struct task_struct *tsk, uid_t loginuid,
                                unsigned int sessionid,
                                struct tty_audit_buf *buf)
 {
-        struct audit_buffer *ab;
-
         if (buf->valid == 0)
                 return;
         if (audit_enabled == 0)
                 return;
-        ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_TTY);
-        if (ab) {
-                char name[sizeof(tsk->comm)];
-
-                audit_log_format(ab, "tty pid=%u uid=%u auid=%u ses=%u "
-                                 "major=%d minor=%d comm=", tsk->pid, tsk->uid,
-                                 loginuid, sessionid, buf->major, buf->minor);
-                get_task_comm(name, tsk);
-                audit_log_untrustedstring(ab, name);
-                audit_log_format(ab, " data=");
-                audit_log_n_hex(ab, buf->data, buf->valid);
-                audit_log_end(ab);
-        }
+        tty_audit_log("tty", tsk, loginuid, sessionid, buf->major, buf->minor,
+                      buf->data, buf->valid);
         buf->valid = 0;
 }
 
@@ -150,6 +160,42 @@ void tty_audit_fork(struct signal_struct *sig)
 }
 
 /**
+ *      tty_audit_tiocsti       -       Log TIOCSTI
+ */
+void tty_audit_tiocsti(struct tty_struct *tty, char ch)
+{
+        struct tty_audit_buf *buf;
+        int major, minor, should_audit;
+
+        spin_lock_irq(&current->sighand->siglock);
+        should_audit = current->signal->audit_tty;
+        buf = current->signal->tty_audit_buf;
+        if (buf)
+                atomic_inc(&buf->count);
+        spin_unlock_irq(&current->sighand->siglock);
+
+        major = tty->driver->major;
+        minor = tty->driver->minor_start + tty->index;
+        if (buf) {
+                mutex_lock(&buf->mutex);
+                if (buf->major == major && buf->minor == minor)
+                        tty_audit_buf_push_current(buf);
+                mutex_unlock(&buf->mutex);
+                tty_audit_buf_put(buf);
+        }
+
+        if (should_audit && audit_enabled) {
+                uid_t auid;
+                unsigned int sessionid;
+
+                auid = audit_get_loginuid(current);
+                sessionid = audit_get_sessionid(current);
+                tty_audit_log("ioctl=TIOCSTI", current, auid, sessionid, major,
+                              minor, &ch, 1);
+        }
+}
+
+/**
  *      tty_audit_push_task     -       Flush task's pending audit data
  */
 void tty_audit_push_task(struct task_struct *tsk, uid_t loginuid, u32 sessionid)
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 59f472143f08..db15f9ba7c0b 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -1795,12 +1795,15 @@ retry_open:
         }
 #endif
         if (device == MKDEV(TTYAUX_MAJOR, 1)) {
-                driver = tty_driver_kref_get(console_device(&index));
-                if (driver) {
-                        /* Don't let /dev/console block */
-                        filp->f_flags |= O_NONBLOCK;
-                        noctty = 1;
-                        goto got_driver;
+                struct tty_driver *console_driver = console_device(&index);
+                if (console_driver) {
+                        driver = tty_driver_kref_get(console_driver);
+                        if (driver) {
+                                /* Don't let /dev/console block */
+                                filp->f_flags |= O_NONBLOCK;
+                                noctty = 1;
+                                goto got_driver;
+                        }
                 }
                 mutex_unlock(&tty_mutex);
                 return -ENODEV;
@@ -2015,6 +2018,7 @@ static int tiocsti(struct tty_struct *tty, char __user *p)
                 return -EPERM;
         if (get_user(ch, p))
                 return -EFAULT;
+        tty_audit_tiocsti(tty, ch);
         ld = tty_ldisc_ref_wait(tty);
         ld->ops->receive_buf(tty, &ch, &mbz, 1);
         tty_ldisc_deref(ld);
diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index a5af6072e2b3..008176edbd64 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -2274,7 +2274,7 @@ rescan_last_byte:
                                     continue; /* nothing to display */
                                 }
                                 /* Glyph not found */
-                                if ((!(vc->vc_utf && !vc->vc_disp_ctrl) || c < 128) && !(c & ~charmask)) {
+                                if ((!(vc->vc_utf && !vc->vc_disp_ctrl) && c < 128) && !(c & ~charmask)) {
                                     /* In legacy mode use the glyph we get by a 1:1 mapping.
                                        This would make absolutely no sense with Unicode in mind,
                                        but do this for ASCII characters since a font may lack
diff --git a/drivers/char/xilinx_hwicap/buffer_icap.c b/drivers/char/xilinx_hwicap/buffer_icap.c
index aa7f7962a9a0..05d897764f02 100644
--- a/drivers/char/xilinx_hwicap/buffer_icap.c
+++ b/drivers/char/xilinx_hwicap/buffer_icap.c
@@ -21,9 +21,6 @@
  *     INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
  *     FOR A PARTICULAR PURPOSE.
  *
- *     Xilinx products are not intended for use in life support appliances,
- *     devices, or systems. Use in such applications is expressly prohibited.
- *
  *     (c) Copyright 2003-2008 Xilinx Inc.
  *     All rights reserved.
  *
diff --git a/drivers/char/xilinx_hwicap/buffer_icap.h b/drivers/char/xilinx_hwicap/buffer_icap.h
index 8b0252bf06e2..d4f419ee87ab 100644
--- a/drivers/char/xilinx_hwicap/buffer_icap.h
+++ b/drivers/char/xilinx_hwicap/buffer_icap.h
@@ -21,9 +21,6 @@
  *     INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
  *     FOR A PARTICULAR PURPOSE.
  *
- *     Xilinx products are not intended for use in life support appliances,
- *     devices, or systems. Use in such applications is expressly prohibited.
- *
  *     (c) Copyright 2003-2008 Xilinx Inc.
  *     All rights reserved.
  *
diff --git a/drivers/char/xilinx_hwicap/fifo_icap.c b/drivers/char/xilinx_hwicap/fifo_icap.c
index 776b50528478..02225eb19cf6 100644
--- a/drivers/char/xilinx_hwicap/fifo_icap.c
+++ b/drivers/char/xilinx_hwicap/fifo_icap.c
@@ -21,9 +21,6 @@
  *     INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
  *     FOR A PARTICULAR PURPOSE.
  *
- *     Xilinx products are not intended for use in life support appliances,
- *     devices, or systems. Use in such applications is expressly prohibited.
- *
  *     (c) Copyright 2007-2008 Xilinx Inc.
  *     All rights reserved.
  *
diff --git a/drivers/char/xilinx_hwicap/fifo_icap.h b/drivers/char/xilinx_hwicap/fifo_icap.h
index 62bda453c90b..4c9dd9a3b62a 100644
--- a/drivers/char/xilinx_hwicap/fifo_icap.h
+++ b/drivers/char/xilinx_hwicap/fifo_icap.h
@@ -21,9 +21,6 @@
  *     INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
  *     FOR A PARTICULAR PURPOSE.
  *
- *     Xilinx products are not intended for use in life support appliances,
- *     devices, or systems. Use in such applications is expressly prohibited.
- *
  *     (c) Copyright 2007-2008 Xilinx Inc.
  *     All rights reserved.
  *
diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
index ed132fe55d3d..f40ab699860f 100644
--- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c
+++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
@@ -21,9 +21,6 @@
  *     INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
  *     FOR A PARTICULAR PURPOSE.
  *
- *     Xilinx products are not intended for use in life support appliances,
- *     devices, or systems. Use in such applications is expressly prohibited.
- *
  *     (c) Copyright 2002 Xilinx Inc., Systems Engineering Group
  *     (c) Copyright 2004 Xilinx Inc., Systems Engineering Group
  *     (c) Copyright 2007-2008 Xilinx Inc.
@@ -626,7 +623,7 @@ static int __devinit hwicap_setup(struct device *dev, int id,
         if (!request_mem_region(drvdata->mem_start,
                                         drvdata->mem_size, DRIVER_NAME)) {
                 dev_err(dev, "Couldn't lock memory region at %Lx\n",
-                        regs_res->start);
+                        (unsigned long long) regs_res->start);
                 retval = -EBUSY;
                 goto failed1;
         }
@@ -645,9 +642,10 @@ static int __devinit hwicap_setup(struct device *dev, int id,
         mutex_init(&drvdata->sem);
         drvdata->is_open = 0;
 
-        dev_info(dev, "ioremap %lx to %p with size %Lx\n",
-                 (unsigned long int)drvdata->mem_start,
-                        drvdata->base_address, drvdata->mem_size);
+        dev_info(dev, "ioremap %llx to %p with size %llx\n",
+                 (unsigned long long) drvdata->mem_start,
+                 drvdata->base_address,
+                 (unsigned long long) drvdata->mem_size);
 
         cdev_init(&drvdata->cdev, &hwicap_fops);
         drvdata->cdev.owner = THIS_MODULE;
diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.h b/drivers/char/xilinx_hwicap/xilinx_hwicap.h
index 24d0d9b938fb..8cca11981c5f 100644
--- a/drivers/char/xilinx_hwicap/xilinx_hwicap.h
+++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.h
@@ -21,9 +21,6 @@
  *     INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
  *     FOR A PARTICULAR PURPOSE.
  *
- *     Xilinx products are not intended for use in life support appliances,
- *     devices, or systems. Use in such applications is expressly prohibited.
- *
  *     (c) Copyright 2003-2007 Xilinx Inc.
  *     All rights reserved.
  *