diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-30 10:56:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-30 10:56:11 -0700 |
| commit | 307cc7904841fd66a848ece16a179b49ae1a4ba4 (patch) | |
| tree | 3a37d1b7d0a500de78999e956f6311575cf9c5b5 | |
| parent | f52b69f86e27903d6896ed5fa7cd280fec8de532 (diff) | |
| parent | 8befc9f23c695395de011ced289c611fada22f35 (diff) | |
| download | linux-3.10-307cc7904841fd66a848ece16a179b49ae1a4ba4.tar.gz linux-3.10-307cc7904841fd66a848ece16a179b49ae1a4ba4.tar.bz2 linux-3.10-307cc7904841fd66a848ece16a179b49ae1a4ba4.zip | |
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
| -rw-r--r-- | arch/sparc/include/asm/ptrace.h | 1 | ||||
| -rw-r--r-- | arch/sparc/kernel/jump_label.c | 2 | ||||
| -rw-r--r-- | arch/sparc/kernel/kgdb_64.c | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/ptrace.h b/arch/sparc/include/asm/ptrace.h index ef8c7c068f5..9835adc163f 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 971fd435a28..48565c11e82 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 768290a6c02..c8759550799 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> |