Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core

Fixes and improvements for perf/core:

. Overhaul the tools/ makefiles, gluing them to the top level Makefile, from
  Borislav Petkov.

. Move the UI files from tools/perf/util/ui/ to tools/perf/ui/. Also move
  the GTK+ browser to tools/perf/ui/gtk/, from Namhyung Kim.

. Only fallback to sw cycles counter on ENOENT for the hw cycles, from
  Robert Richter

. Trivial fixes from Robert Richter

. Handle the autogenerated bison/flex files better, from Namhyung and Jiri Olsa.

. Navigate jump instructions in the annotate browser, just press enter or ->,
  still needs support for a jump navigation history, i.e. to go back.

. Search string in the annotate browser: same keys as vim:
     / forward
     n next backward/forward
     ? backward

. Clarify number of events/samples in the report header, from Ashay Rane

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 2 insertions, 7 deletions

diff --git a/drivers/tty/nozomi.c b/drivers/tty/nozomi.c
index fd347ff34d07..e7592f9037da 100644
--- a/drivers/tty/nozomi.c
+++ b/drivers/tty/nozomi.c
@@ -1602,13 +1602,9 @@ static int ntty_install(struct tty_driver *driver, struct tty_struct *tty)
         int ret;
         if (!port || !dc || dc->state != NOZOMI_STATE_READY)
                 return -ENODEV;
-        ret = tty_init_termios(tty);
-        if (ret == 0) {
-                tty_driver_kref_get(driver);
-                tty->count++;
+        ret = tty_standard_install(driver, tty);
+        if (ret == 0)
                 tty->driver_data = port;
-                driver->ttys[tty->index] = tty;
-        }
         return ret;
 }
 
@@ -1920,7 +1916,6 @@ static __init int nozomi_init(void)
         if (!ntty_driver)
                 return -ENOMEM;
 
-        ntty_driver->owner = THIS_MODULE;
         ntty_driver->driver_name = NOZOMI_NAME_TTY;
         ntty_driver->name = "noz";
         ntty_driver->major = 0;