From 3318e8940f02cb4159bbd65cefc1bb137073b367 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 30 Mar 2012 10:57:40 -0700
Subject: [PATCH] --- yaml --- r: 297830 b: refs/heads/master c:
 59f2fe326666002f8387fb434a871815d3535f40 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index a51ad9a883ba..6a7eb736b00d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e3cab2f2fbca25289094698fd1280ecfad7a8d4
+refs/heads/master: 59f2fe326666002f8387fb434a871815d3535f40
diff --git a/trunk/arch/sparc/include/asm/ptrace.h b/trunk/arch/sparc/include/asm/ptrace.h
index ef8c7c068f53..9835adc163fd 100644
--- a/trunk/arch/sparc/include/asm/ptrace.h
+++ b/trunk/arch/sparc/include/asm/ptrace.h
@@ -165,6 +165,7 @@ struct sparc_stackf {
 #ifdef __KERNEL__
 
 #include <linux/threads.h>
+#include <asm/switch_to.h>
 
 static inline int pt_regs_trap_type(struct pt_regs *regs)
 {
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>