Permalink
Browse files

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
  • Loading branch information...
2 parents f52b69f + 8befc9f commit 307cc7904841fd66a848ece16a179b49ae1a4ba4 @torvalds committed Mar 30, 2012
Showing with 4 additions and 0 deletions.
  1. +1 −0 arch/sparc/include/asm/ptrace.h
  2. +2 −0 arch/sparc/kernel/jump_label.c
  3. +1 −0 arch/sparc/kernel/kgdb_64.c
@@ -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)
{
@@ -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,
@@ -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>

0 comments on commit 307cc79

Please sign in to comment.