Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

torvalds · torvalds · commit fa2a4519cb6a · 2012-03-30T18:40:33.000-07:00
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
diff --git 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
@@ -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
@@ -10,6 +10,7 @@
 #include <linux/cpu.h>
 
 #include <asm/cacheflush.h>
+#include <asm/switch_to.h>
 #include <asm/tlbflush.h>
 
 #include "irq.h"

Original file line number	Diff line number	Diff line change
`@@ -241,6 +241,7 @@ extern unsigned long profile_pc(struct pt_regs *);`
`241`	`241`	`#ifndef __ASSEMBLY__`
`242`	`242`
`243`	`243`	`#ifdef __KERNEL__`
	`244`	`+#include <asm/switch_to.h>`
`244`	`245`
`245`	`246`	`static inline bool pt_regs_is_syscall(struct pt_regs *regs)`
`246`	`247`	`{`