From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 13 Mar 2012 15:32:54 +0000 (+0100)
Subject: Merge branch 'x86/cleanups' into perf/uprobes
X-Git-Tag: firefly_0821_release~3680^2~2780^2~11
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ef15eda98217f5183f457e7a2de8b79555ef908b;p=firefly-linux-kernel-4.4.55.git

Merge branch 'x86/cleanups' into perf/uprobes

Merge reason: We want to merge a dependent patch.

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

ef15eda98217f5183f457e7a2de8b79555ef908b
diff --cc arch/x86/kernel/cpu/perf_event.c
index 3c44b712380c,63c0e058a405..1c52bdbb9b8b
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@@ -29,10 -28,8 +29,9 @@@
  #include <asm/apic.h>
  #include <asm/stacktrace.h>
  #include <asm/nmi.h>
- #include <asm/compat.h>
  #include <asm/smp.h>
  #include <asm/alternative.h>
 +#include <asm/timer.h>
  
  #include "perf_event.h"