Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (121 commits)
  perf symbols: Increase symbol KSYM_NAME_LEN size
  perf hists browser: Refuse 'a' hotkey on non symbolic views
  perf ui browser: Use libslang to read keys
  perf tools: Fix tracing info recording
  perf hists browser: Elide DSO column when it is set to just one DSO, ditto for threads
  perf hists: Don't consider filtered entries when calculating column widths
  perf hists: Don't decay total_period for filtered entries
  perf hists browser: Honour symbol_conf.show_{nr_samples,total_period}
  perf hists browser: Do not exit on tab key with single event
  perf annotate browser: Don't change selection line when returning from callq
  perf tools: handle endianness of feature bitmap
  perf tools: Add prelink suggestion to dso update message
  perf script: Fix unknown feature comment
  perf hists browser: Apply the dso and thread filters when merging new batches
  perf hists: Move the dso and thread filters from hist_browser
  perf ui browser: Honour the xterm colors
  perf top tui: Give color hints just on the percentage, like on --stdio
  perf ui browser: Make the colors configurable and change the defaults
  perf tui: Remove unneeded call to newtCls on startup
  perf hists: Don't format the percentage on hist_entry__snprintf
  ...

Fix up conflicts in arch/x86/kernel/kprobes.c manually.

Ingo's tree did the insane "add volatile to const array", which just
doesn't make sense ("volatile const"?).  But we could remove the const
*and* make the array volatile to make doubly sure that gcc doesn't
optimize it away..

Also fix up kernel/trace/ring_buffer.c non-data-conflicts manually: the
reader_lock has been turned into a raw lock by the core locking merge,
and there was a new user of it introduced in this perf core merge.  Make
sure that new use also uses the raw accessor functions.

1 files changed, 11 insertions, 22 deletions

diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c
index 3302586655c..c2917ffad2c 100644
--- a/drivers/char/ipmi/ipmi_watchdog.c
+++ b/drivers/char/ipmi/ipmi_watchdog.c
@@ -65,6 +65,7 @@
  * mechanism for it at that time.
  */
 #include <asm/kdebug.h>
+#include <asm/nmi.h>
 #define HAVE_DIE_NMI
 #endif
 
@@ -1077,17 +1078,8 @@ static void ipmi_unregister_watchdog(int ipmi_intf)
 
 #ifdef HAVE_DIE_NMI
 static int
-ipmi_nmi(struct notifier_block *self, unsigned long val, void *data)
+ipmi_nmi(unsigned int val, struct pt_regs *regs)
 {
-        struct die_args *args = data;
-
-        if (val != DIE_NMIUNKNOWN)
-                return NOTIFY_OK;
-
-        /* Hack, if it's a memory or I/O error, ignore it. */
-        if (args->err & 0xc0)
-                return NOTIFY_OK;
-
         /*
          * If we get here, it's an NMI that's not a memory or I/O
          * error.  We can't truly tell if it's from IPMI or not
@@ -1097,15 +1089,15 @@ ipmi_nmi(struct notifier_block *self, unsigned long val, void *data)
 
         if (testing_nmi) {
                 testing_nmi = 2;
-                return NOTIFY_STOP;
+                return NMI_HANDLED;
         }
 
         /* If we are not expecting a timeout, ignore it. */
         if (ipmi_watchdog_state == WDOG_TIMEOUT_NONE)
-                return NOTIFY_OK;
+                return NMI_DONE;
 
         if (preaction_val != WDOG_PRETIMEOUT_NMI)
-                return NOTIFY_OK;
+                return NMI_DONE;
 
         /*
          * If no one else handled the NMI, we assume it was the IPMI
@@ -1120,12 +1112,8 @@ ipmi_nmi(struct notifier_block *self, unsigned long val, void *data)
                         panic(PFX "pre-timeout");
         }
 
-        return NOTIFY_STOP;
+        return NMI_HANDLED;
 }
-
-static struct notifier_block ipmi_nmi_handler = {
-        .notifier_call = ipmi_nmi
-};
 #endif
 
 static int wdog_reboot_handler(struct notifier_block *this,
@@ -1290,7 +1278,8 @@ static void check_parms(void)
                 }
         }
         if (do_nmi && !nmi_handler_registered) {
-                rv = register_die_notifier(&ipmi_nmi_handler);
+                rv = register_nmi_handler(NMI_UNKNOWN, ipmi_nmi, 0,
+                                                "ipmi");
                 if (rv) {
                         printk(KERN_WARNING PFX
                                "Can't register nmi handler\n");
@@ -1298,7 +1287,7 @@ static void check_parms(void)
                 } else
                         nmi_handler_registered = 1;
         } else if (!do_nmi && nmi_handler_registered) {
-                unregister_die_notifier(&ipmi_nmi_handler);
+                unregister_nmi_handler(NMI_UNKNOWN, "ipmi");
                 nmi_handler_registered = 0;
         }
 #endif
@@ -1336,7 +1325,7 @@ static int __init ipmi_wdog_init(void)
         if (rv) {
 #ifdef HAVE_DIE_NMI
                 if (nmi_handler_registered)
-                        unregister_die_notifier(&ipmi_nmi_handler);
+                        unregister_nmi_handler(NMI_UNKNOWN, "ipmi");
 #endif
                 atomic_notifier_chain_unregister(&panic_notifier_list,
                                                  &wdog_panic_notifier);
@@ -1357,7 +1346,7 @@ static void __exit ipmi_wdog_exit(void)
 
 #ifdef HAVE_DIE_NMI
         if (nmi_handler_registered)
-                unregister_die_notifier(&ipmi_nmi_handler);
+                unregister_nmi_handler(NMI_UNKNOWN, "ipmi");
 #endif
 
         atomic_notifier_chain_unregister(&panic_notifier_list,