diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-30 18:40:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-30 18:40:33 -0700 |
| commit | fa2a4519cb6ad94224eb56a1341fff570fd44ea1 (patch) | |
| tree | 02f7d676a805bd1961dfb3c86a7ea40965207365 | |
| parent | 923f79743c76583ed4684e2c80c8da51a7268af3 (diff) | |
| parent | bde4d8b205bc3ccdf7f5a841bfbfa9896b44b1ce (diff) | |
| download | blackbird-op-linux-fa2a4519cb6ad94224eb56a1341fff570fd44ea1.tar.gz blackbird-op-linux-fa2a4519cb6ad94224eb56a1341fff570fd44ea1.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull Sam Ravnborg's sparc32 build fixes from David Miller.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc32: fix fallout from system.h removal
| -rw-r--r-- | arch/sparc/include/asm/ptrace.h | 1 | ||||
| -rw-r--r-- | arch/sparc/kernel/sun4d_smp.c | 1 | ||||
| -rw-r--r-- | arch/sparc/kernel/sun4m_smp.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/ptrace.h b/arch/sparc/include/asm/ptrace.h index 9835adc163fd..fd9c3f21cbf0 100644 --- a/arch/sparc/include/asm/ptrace.h +++ b/arch/sparc/include/asm/ptrace.h @@ -241,6 +241,7 @@ extern unsigned long profile_pc(struct pt_regs *); #ifndef __ASSEMBLY__ #ifdef __KERNEL__ +#include <asm/switch_to.h> static inline bool pt_regs_is_syscall(struct pt_regs *regs) { diff --git a/arch/sparc/kernel/sun4d_smp.c b/arch/sparc/kernel/sun4d_smp.c index 133387980b56..540b2fec09f0 100644 --- a/arch/sparc/kernel/sun4d_smp.c +++ b/arch/sparc/kernel/sun4d_smp.c @@ -14,6 +14,7 @@ #include <asm/sbi.h> #include <asm/mmu.h> #include <asm/tlbflush.h> +#include <asm/switch_to.h> #include <asm/cacheflush.h> #include "kernel.h" diff --git a/arch/sparc/kernel/sun4m_smp.c b/arch/sparc/kernel/sun4m_smp.c index 594768686525..02db9a0412ce 100644 --- a/arch/sparc/kernel/sun4m_smp.c +++ b/arch/sparc/kernel/sun4m_smp.c @@ -10,6 +10,7 @@ #include <linux/cpu.h> #include <asm/cacheflush.h> +#include <asm/switch_to.h> #include <asm/tlbflush.h> #include "irq.h" |
