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

Commit fa2a4519 authored Mar 30, 2012 by Linus Torvalds

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

parents 923f7974 bde4d8b2

arch/sparc/include/asm/ptrace.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -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)
		{

arch/sparc/kernel/sun4d_smp.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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"

arch/sparc/kernel/sun4m_smp.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@
		#include <linux/cpu.h>

		#include <asm/cacheflush.h>
		#include <asm/switch_to.h>
		#include <asm/tlbflush.h>

		#include "irq.h"