diff options
Diffstat (limited to 'arch/x86/kernel/cpu/perf_event.c')
| -rw-r--r-- | arch/x86/kernel/cpu/perf_event.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index 04921017abe0..9d977a2ea693 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c | |||
| @@ -1267,7 +1267,6 @@ perf_event_nmi_handler(struct notifier_block *self, | |||
| 1267 | 1267 | ||
| 1268 | switch (cmd) { | 1268 | switch (cmd) { |
| 1269 | case DIE_NMI: | 1269 | case DIE_NMI: |
| 1270 | case DIE_NMI_IPI: | ||
| 1271 | break; | 1270 | break; |
| 1272 | case DIE_NMIUNKNOWN: | 1271 | case DIE_NMIUNKNOWN: |
| 1273 | this_nmi = percpu_read(irq_stat.__nmi_count); | 1272 | this_nmi = percpu_read(irq_stat.__nmi_count); |
| @@ -1317,7 +1316,7 @@ perf_event_nmi_handler(struct notifier_block *self, | |||
| 1317 | static __read_mostly struct notifier_block perf_event_nmi_notifier = { | 1316 | static __read_mostly struct notifier_block perf_event_nmi_notifier = { |
| 1318 | .notifier_call = perf_event_nmi_handler, | 1317 | .notifier_call = perf_event_nmi_handler, |
| 1319 | .next = NULL, | 1318 | .next = NULL, |
| 1320 | .priority = 1 | 1319 | .priority = NMI_LOCAL_LOW_PRIOR, |
| 1321 | }; | 1320 | }; |
| 1322 | 1321 | ||
| 1323 | static struct event_constraint unconstrained; | 1322 | static struct event_constraint unconstrained; |
