Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-kgdb

* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-kgdb:
  kgdb: always use icache flush for sw breakpoints
  kgdb: fix SMP NMI kgdb_handle_exception exit race
  kgdb: documentation fixes
  kgdb: allow static kgdbts boot configuration
  kgdb: add documentation
  kgdb: Kconfig fix
  kgdb: add kgdb internal test suite
  kgdb: fix several kgdb regressions
  kgdb: kgdboc pl011 I/O module
  kgdb: fix optional arch functions and probe_kernel_*
  kgdb: add x86 HW breakpoints
  kgdb: print breakpoint removed on exception
  kgdb: clocksource watchdog
  kgdb: fix NMI hangs
  kgdb: fix kgdboc dynamic module configuration
  kgdb: document parameters
  x86: kgdb support
  consoles: polling support, kgdboc
  kgdb: core
  uaccess: add probe_kernel_write()

1 files changed, 47 insertions, 0 deletions

diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 613ec816ce60..4d3c7018f0c3 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -1155,6 +1155,48 @@ static struct tty_driver *get_tty_driver(dev_t device, int *index)
         return NULL;
 }
 
+#ifdef CONFIG_CONSOLE_POLL
+
+/**
+ *      tty_find_polling_driver -       find device of a polled tty
+ *      @name: name string to match
+ *      @line: pointer to resulting tty line nr
+ *
+ *      This routine returns a tty driver structure, given a name
+ *      and the condition that the tty driver is capable of polled
+ *      operation.
+ */
+struct tty_driver *tty_find_polling_driver(char *name, int *line)
+{
+        struct tty_driver *p, *res = NULL;
+        int tty_line = 0;
+        char *str;
+
+        mutex_lock(&tty_mutex);
+        /* Search through the tty devices to look for a match */
+        list_for_each_entry(p, &tty_drivers, tty_drivers) {
+                str = name + strlen(p->name);
+                tty_line = simple_strtoul(str, &str, 10);
+                if (*str == ',')
+                        str++;
+                if (*str == '\0')
+                        str = 0;
+
+                if (tty_line >= 0 && tty_line <= p->num && p->poll_init &&
+                                !p->poll_init(p, tty_line, str)) {
+
+                        res = p;
+                        *line = tty_line;
+                        break;
+                }
+        }
+        mutex_unlock(&tty_mutex);
+
+        return res;
+}
+EXPORT_SYMBOL_GPL(tty_find_polling_driver);
+#endif
+
 /**
  *      tty_check_change        -       check for POSIX terminal changes
  *      @tty: tty to check
@@ -3850,6 +3892,11 @@ void tty_set_operations(struct tty_driver *driver,
         driver->write_proc = op->write_proc;
         driver->tiocmget = op->tiocmget;
         driver->tiocmset = op->tiocmset;
+#ifdef CONFIG_CONSOLE_POLL
+        driver->poll_init = op->poll_init;
+        driver->poll_get_char = op->poll_get_char;
+        driver->poll_put_char = op->poll_put_char;
+#endif
 }