Merge branch 'tracing/urgent' into tracing/core

Merge reason: Pick up tracing/filters fix from the urgent queue,
              we will queue up dependent patches.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/m32r/kernel/traps.c b/arch/m32r/kernel/traps.c
index 03b14e55cd89..fbd109031df3 100644
--- a/arch/m32r/kernel/traps.c
+++ b/arch/m32r/kernel/traps.c
@@ -104,8 +104,8 @@ static void set_eit_vector_entries(void)
         eit_vector[186] = (unsigned long)smp_call_function_interrupt;
         eit_vector[187] = (unsigned long)smp_ipi_timer_interrupt;
         eit_vector[188] = (unsigned long)smp_flush_cache_all_interrupt;
-        eit_vector[189] = (unsigned long)smp_call_function_single_interrupt;
-        eit_vector[190] = 0;
+        eit_vector[189] = 0;    /* CPU_BOOT_IPI */
+        eit_vector[190] = (unsigned long)smp_call_function_single_interrupt;
         eit_vector[191] = 0;
 #endif
         _flush_cache_copyback_all();