Commit 46f52210 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Benjamin Herrenschmidt

powerpc: Remove second definition of STACK_FRAME_OVERHEAD

Since STACK_FRAME_OVERHEAD is defined in asm/ptrace.h and that
is ASSEMBER safe, we can just include that instead of going via
asm-offsets.h.
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 0b97fee0
...@@ -209,7 +209,6 @@ int main(void) ...@@ -209,7 +209,6 @@ int main(void)
DEFINE(RTASENTRY, offsetof(struct rtas_t, entry)); DEFINE(RTASENTRY, offsetof(struct rtas_t, entry));
/* Interrupt register frame */ /* Interrupt register frame */
DEFINE(STACK_FRAME_OVERHEAD, STACK_FRAME_OVERHEAD);
DEFINE(INT_FRAME_SIZE, STACK_INT_FRAME_SIZE); DEFINE(INT_FRAME_SIZE, STACK_INT_FRAME_SIZE);
DEFINE(SWITCH_FRAME_SIZE, STACK_FRAME_OVERHEAD + sizeof(struct pt_regs)); DEFINE(SWITCH_FRAME_SIZE, STACK_FRAME_OVERHEAD + sizeof(struct pt_regs));
#ifdef CONFIG_PPC64 #ifdef CONFIG_PPC64
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <asm/asm-offsets.h> #include <asm/asm-offsets.h>
#include <asm/unistd.h> #include <asm/unistd.h>
#include <asm/ftrace.h> #include <asm/ftrace.h>
#include <asm/ptrace.h>
#undef SHOW_SYSCALLS #undef SHOW_SYSCALLS
#undef SHOW_SYSCALLS_TASK #undef SHOW_SYSCALLS_TASK
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
*/ */
#include <asm/exception-64s.h> #include <asm/exception-64s.h>
#include <asm/ptrace.h>
/* /*
* We layout physical memory as follows: * We layout physical memory as follows:
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include <asm/thread_info.h> #include <asm/thread_info.h>
#include <asm/ppc_asm.h> #include <asm/ppc_asm.h>
#include <asm/asm-offsets.h> #include <asm/asm-offsets.h>
#include <asm/ptrace.h>
#ifdef CONFIG_VSX #ifdef CONFIG_VSX
#define REST_32FPVSRS(n,c,base) \ #define REST_32FPVSRS(n,c,base) \
......
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
#include <asm/thread_info.h> #include <asm/thread_info.h>
#include <asm/ppc_asm.h> #include <asm/ppc_asm.h>
#include <asm/asm-offsets.h> #include <asm/asm-offsets.h>
#include <asm/ptrace.h>
/* As with the other PowerPC ports, it is expected that when code /* As with the other PowerPC ports, it is expected that when code
* execution begins here, the following registers contain valid, yet * execution begins here, the following registers contain valid, yet
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include <asm/thread_info.h> #include <asm/thread_info.h>
#include <asm/ppc_asm.h> #include <asm/ppc_asm.h>
#include <asm/asm-offsets.h> #include <asm/asm-offsets.h>
#include <asm/ptrace.h>
#include <asm/synch.h> #include <asm/synch.h>
#include "head_booke.h" #include "head_booke.h"
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#include <asm/page_64.h> #include <asm/page_64.h>
#include <asm/irqflags.h> #include <asm/irqflags.h>
#include <asm/kvm_book3s_asm.h> #include <asm/kvm_book3s_asm.h>
#include <asm/ptrace.h>
/* The physical memory is layed out such that the secondary processor /* The physical memory is layed out such that the secondary processor
* spin code sits at 0x0000...0x00ff. On server, the vectors follow * spin code sits at 0x0000...0x00ff. On server, the vectors follow
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <asm/thread_info.h> #include <asm/thread_info.h>
#include <asm/ppc_asm.h> #include <asm/ppc_asm.h>
#include <asm/asm-offsets.h> #include <asm/asm-offsets.h>
#include <asm/ptrace.h>
/* Macro to make the code more readable. */ /* Macro to make the code more readable. */
#ifdef CONFIG_8xx_CPU6 #ifdef CONFIG_8xx_CPU6
......
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
#include <asm/ppc_asm.h> #include <asm/ppc_asm.h>
#include <asm/asm-offsets.h> #include <asm/asm-offsets.h>
#include <asm/cache.h> #include <asm/cache.h>
#include <asm/ptrace.h>
#include "head_booke.h" #include "head_booke.h"
/* As with the other PowerPC ports, it is expected that when code /* As with the other PowerPC ports, it is expected that when code
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/kexec.h> #include <asm/kexec.h>
#include <asm/bug.h> #include <asm/bug.h>
#include <asm/ptrace.h>
.text .text
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include <asm/cputable.h> #include <asm/cputable.h>
#include <asm/thread_info.h> #include <asm/thread_info.h>
#include <asm/kexec.h> #include <asm/kexec.h>
#include <asm/ptrace.h>
.text .text
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/ppc_asm.h> #include <asm/ppc_asm.h>
#include <asm/asm-offsets.h> #include <asm/asm-offsets.h>
#include <asm/ptrace.h>
/* /*
* Grab the register values as they are now. * Grab the register values as they are now.
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include <asm/cputable.h> #include <asm/cputable.h>
#include <asm/thread_info.h> #include <asm/thread_info.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/ptrace.h>
/* /*
* load_up_altivec(unused, unused, tsk) * load_up_altivec(unused, unused, tsk)
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/ppc_asm.h> #include <asm/ppc_asm.h>
#include <asm/asm-offsets.h> #include <asm/asm-offsets.h>
#include <asm/ptrace.h>
#define STK_PARM(i) (48 + ((i)-3)*8) #define STK_PARM(i) (48 + ((i)-3)*8)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment