Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 307cc790 authored by Linus Torvalds's avatar Linus Torvalds
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
parents f52b69f8 8befc9f2

arch/sparc/include/asm/ptrace.h

+1 −0
Original line number Diff line number Diff line
@@ -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)

{

arch/sparc/kernel/jump_label.c

+2 −0
Original line number Diff line number Diff line
@@ -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,

arch/sparc/kernel/kgdb_64.c

+1 −0
Original line number Diff line number Diff line
@@ -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>