Patchwork sparc32: fix fallout from system.h removal

login
register
mail settings
Submitter Sam Ravnborg
Date March 30, 2012, 2:13 p.m.
Message ID <20120330141324.GA7195@merkur.ravnborg.org>
Download mbox | patch
Permalink /patch/149660/
State Accepted
Delegated to: David Miller
Headers show

Comments

Sam Ravnborg - March 30, 2012, 2:13 p.m.
From 26f7506bc6b2184c925534ed3e006dd0937b8147 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Fri, 30 Mar 2012 15:53:50 +0200
Subject: [PATCH] sparc32: fix fallout from system.h removal

Build failures for the typical configs I use

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
 arch/sparc/include/asm/ptrace.h |    1 +
 arch/sparc/kernel/sun4d_smp.c   |    1 +
 arch/sparc/kernel/sun4m_smp.c   |    1 +
 3 files changed, 3 insertions(+), 0 deletions(-)
David Miller - March 31, 2012, 1:18 a.m.
From: Sam Ravnborg <sam@ravnborg.org>
Date: Fri, 30 Mar 2012 16:13:24 +0200

> Subject: [PATCH] sparc32: fix fallout from system.h removal
> 
> Build failures for the typical configs I use
> 
> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

Applied, thanks Sam.
--
To unsubscribe from this list: send the line "unsubscribe sparclinux" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/arch/sparc/include/asm/ptrace.h b/arch/sparc/include/asm/ptrace.h
index 9835adc..fd9c3f2 100644
--- 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
index 1333879..540b2fe 100644
--- 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
index 5947686..02db9a0 100644
--- 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"