From dff6e58edc9873cad0c3ffe53718c9a5c8fe740f Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Thu, 29 Mar 2012 22:40:52 -0700
Subject: [PATCH] --- yaml --- r: 297827 b: refs/heads/master c:
 8befc9f23c695395de011ced289c611fada22f35 h: refs/heads/master i:   297825:
 0c35d51b80d60b050d3285f32d7d6b9f41b3bd38   297823:
 bd600883f8518fe2ea48ebe2524d8a2e9320ad97 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/sparc/kernel/jump_label.c | 2 ++
 trunk/arch/sparc/kernel/kgdb_64.c    | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9b71647a77c2..8d1ab102abc0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f55ba9c4ca9e365637e8ddee1884aea47cb20c6
+refs/heads/master: 8befc9f23c695395de011ced289c611fada22f35
diff --git a/trunk/arch/sparc/kernel/jump_label.c b/trunk/arch/sparc/kernel/jump_label.c
index 971fd435a281..48565c11e82a 100644
--- a/trunk/arch/sparc/kernel/jump_label.c
+++ b/trunk/arch/sparc/kernel/jump_label.c
@@ -6,6 +6,8 @@
 #include <linux/jump_label.h>
 #include <linux/memory.h>
 
+#include <asm/cacheflush.h>
+
 #ifdef HAVE_JUMP_LABEL
 
 void arch_jump_label_transform(struct jump_entry *entry,
diff --git a/trunk/arch/sparc/kernel/kgdb_64.c b/trunk/arch/sparc/kernel/kgdb_64.c
index 768290a6c028..c8759550799f 100644
--- a/trunk/arch/sparc/kernel/kgdb_64.c
+++ b/trunk/arch/sparc/kernel/kgdb_64.c
@@ -7,6 +7,7 @@
 #include <linux/kdebug.h>
 #include <linux/ftrace.h>
 
+#include <asm/cacheflush.h>
 #include <asm/kdebug.h>
 #include <asm/ptrace.h>
 #include <asm/irq.h>