summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-30 10:56:11 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-30 10:56:11 -0700
commit307cc7904841fd66a848ece16a179b49ae1a4ba4 (patch)
tree3a37d1b7d0a500de78999e956f6311575cf9c5b5 /arch
parentf52b69f86e27903d6896ed5fa7cd280fec8de532 (diff)
parent8befc9f23c695395de011ced289c611fada22f35 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull minor Sparc fixes from David Miller: "This just fixes build fallout due to recent changes that went int your tree." Sam Ravnborg says that sparc32 still needs some more tender loving. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc: sparc: Fix even more fallout from system.h split. sparc: fix fallout from system.h split
Diffstat (limited to 'arch')
-rw-r--r--arch/sparc/include/asm/ptrace.h1
-rw-r--r--arch/sparc/kernel/jump_label.c2
-rw-r--r--arch/sparc/kernel/kgdb_64.c1
3 files changed, 4 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/ptrace.h b/arch/sparc/include/asm/ptrace.h
index ef8c7c068f53..9835adc163fd 100644
--- a/arch/sparc/include/asm/ptrace.h
+++ b/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/arch/sparc/kernel/jump_label.c b/arch/sparc/kernel/jump_label.c
index 971fd435a281..48565c11e82a 100644
--- a/arch/sparc/kernel/jump_label.c
+++ b/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/arch/sparc/kernel/kgdb_64.c b/arch/sparc/kernel/kgdb_64.c
index 768290a6c028..c8759550799f 100644
--- a/arch/sparc/kernel/kgdb_64.c
+++ b/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>