Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Mar 2012 17:57:40 +0000 (10:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Mar 2012 17:57:40 +0000 (10:57 -0700)
Pull s390 build fixes from Martin Schwidefsky.

More small fixes for the system.h disintegration.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  [S390] Fix build errors (fallout from system.h disintegration)

arch/sparc/include/asm/ptrace.h
arch/sparc/kernel/jump_label.c
arch/sparc/kernel/kgdb_64.c

index ef8c7c068f53a3b3dfbaef79bcf9a5fa089b60f6..9835adc163fd79011ced5128696c2b9bf2be6744 100644 (file)
@@ -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)
 {
index 971fd435a281767d80bd75db250afad41b847745..48565c11e82ae2fcc4ef3627abe67ba38ca811b2 100644 (file)
@@ -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,
index 768290a6c028a65d61bd5e356ba58549f8fdde4f..c8759550799f0beb13b9108d60de83b19c2fab04 100644 (file)
@@ -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>