Commit dfecd06b authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman
Browse files

powerpc: remove STACK_FRAME_OVERHEAD 



This is equal to STACK_FRAME_MIN_SIZE on 32-bit and 64-bit ELFv1, and no
longer used in 64-bit ELFv2, so replace STACK_FRAME_OVERHEAD occurrences
with STACK_FRAME_MIN_SIZE.

Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20221127124942.1665522-18-npiggin@gmail.com
parent cd52414d

arch/powerpc/include/asm/ptrace.h

+11 −13
Original line number Diff line number Diff line
@@ -118,7 +118,6 @@ struct pt_regs 
#define USER_REDZONE_SIZE	512

#define KERNEL_REDZONE_SIZE	288



#define STACK_FRAME_OVERHEAD	112	/* size of minimum stack frame */

#define STACK_FRAME_LR_SAVE	2	/* Location of LR in stack frame */



#ifdef CONFIG_PPC64_ELF_ABI_V2
@@ -135,11 +134,11 @@ struct pt_regs 
 * so the second from last one of those is used for the frame marker.

 */

#define STACK_FRAME_MIN_SIZE	112

#define STACK_USER_INT_FRAME_SIZE	(sizeof(struct pt_regs) + STACK_FRAME_OVERHEAD)

#define STACK_INT_FRAME_REGS	STACK_FRAME_OVERHEAD

#define STACK_INT_FRAME_MARKER	(STACK_FRAME_OVERHEAD - 16)

#define STACK_SWITCH_FRAME_SIZE	(sizeof(struct pt_regs) + STACK_FRAME_OVERHEAD)

#define STACK_SWITCH_FRAME_REGS	STACK_FRAME_OVERHEAD

#define STACK_USER_INT_FRAME_SIZE	(sizeof(struct pt_regs) + STACK_FRAME_MIN_SIZE)

#define STACK_INT_FRAME_REGS	STACK_FRAME_MIN_SIZE

#define STACK_INT_FRAME_MARKER	(STACK_FRAME_MIN_SIZE - 16)

#define STACK_SWITCH_FRAME_SIZE	(sizeof(struct pt_regs) + STACK_FRAME_MIN_SIZE)

#define STACK_SWITCH_FRAME_REGS	STACK_FRAME_MIN_SIZE

#endif



/* Size of dummy stack frame allocated when calling signal handler. */
@@ -150,14 +149,13 @@ struct pt_regs 


#define USER_REDZONE_SIZE	0

#define KERNEL_REDZONE_SIZE	0

#define STACK_FRAME_OVERHEAD	16	/* size of minimum stack frame */

#define STACK_FRAME_MIN_SIZE	16

#define STACK_FRAME_LR_SAVE	1	/* Location of LR in stack frame */

#define STACK_USER_INT_FRAME_SIZE	(sizeof(struct pt_regs) + STACK_FRAME_OVERHEAD)

#define STACK_INT_FRAME_REGS	STACK_FRAME_OVERHEAD

#define STACK_INT_FRAME_MARKER	(STACK_FRAME_OVERHEAD - 8)

#define STACK_FRAME_MIN_SIZE	STACK_FRAME_OVERHEAD

#define STACK_SWITCH_FRAME_SIZE	(sizeof(struct pt_regs) + STACK_FRAME_OVERHEAD)

#define STACK_SWITCH_FRAME_REGS	STACK_FRAME_OVERHEAD

#define STACK_USER_INT_FRAME_SIZE	(sizeof(struct pt_regs) + STACK_FRAME_MIN_SIZE)

#define STACK_INT_FRAME_REGS	STACK_FRAME_MIN_SIZE

#define STACK_INT_FRAME_MARKER	(STACK_FRAME_MIN_SIZE - 8)

#define STACK_SWITCH_FRAME_SIZE	(sizeof(struct pt_regs) + STACK_FRAME_MIN_SIZE)

#define STACK_SWITCH_FRAME_REGS	STACK_FRAME_MIN_SIZE



/* Size of stack frame allocated when calling signal handler. */

#define __SIGNAL_FRAMESIZE	64