From: Andrew Morton <akpm@linux-foundation.org>

Cc: Andi Kleen <ak@muc.de>
Cc: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/i386/kernel/marker.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

diff -puN arch/i386/kernel/marker.c~linux-kernel-markers-i386-optimization-fix arch/i386/kernel/marker.c
--- a/arch/i386/kernel/marker.c~linux-kernel-markers-i386-optimization-fix
+++ a/arch/i386/kernel/marker.c
@@ -16,8 +16,9 @@
 #include <linux/notifier.h>
 #include <linux/module.h>
 #include <linux/marker.h>
+#include <linux/kdebug.h>
+
 #include <asm/cacheflush.h>
-#include <asm/kdebug.h>
 
 #define BREAKPOINT_INSTRUCTION  0xcc
 #define BREAKPOINT_INS_LEN 1
_