@@ -118,7 +118,6 @@ struct pt_regs
118118#define USER_REDZONE_SIZE 512
119119#define KERNEL_REDZONE_SIZE 288
120120
121- #define STACK_FRAME_OVERHEAD 112 /* size of minimum stack frame */
122121#define STACK_FRAME_LR_SAVE 2 /* Location of LR in stack frame */
123122
124123#ifdef CONFIG_PPC64_ELF_ABI_V2
@@ -135,11 +134,11 @@ struct pt_regs
135134 * so the second from last one of those is used for the frame marker.
136135 */
137136#define STACK_FRAME_MIN_SIZE 112
138- #define STACK_USER_INT_FRAME_SIZE (sizeof(struct pt_regs) + STACK_FRAME_OVERHEAD )
139- #define STACK_INT_FRAME_REGS STACK_FRAME_OVERHEAD
140- #define STACK_INT_FRAME_MARKER (STACK_FRAME_OVERHEAD - 16)
141- #define STACK_SWITCH_FRAME_SIZE (sizeof(struct pt_regs) + STACK_FRAME_OVERHEAD )
142- #define STACK_SWITCH_FRAME_REGS STACK_FRAME_OVERHEAD
137+ #define STACK_USER_INT_FRAME_SIZE (sizeof(struct pt_regs) + STACK_FRAME_MIN_SIZE )
138+ #define STACK_INT_FRAME_REGS STACK_FRAME_MIN_SIZE
139+ #define STACK_INT_FRAME_MARKER (STACK_FRAME_MIN_SIZE - 16)
140+ #define STACK_SWITCH_FRAME_SIZE (sizeof(struct pt_regs) + STACK_FRAME_MIN_SIZE )
141+ #define STACK_SWITCH_FRAME_REGS STACK_FRAME_MIN_SIZE
143142#endif
144143
145144/* Size of dummy stack frame allocated when calling signal handler. */
@@ -150,14 +149,13 @@ struct pt_regs
150149
151150#define USER_REDZONE_SIZE 0
152151#define KERNEL_REDZONE_SIZE 0
153- #define STACK_FRAME_OVERHEAD 16 /* size of minimum stack frame */
152+ #define STACK_FRAME_MIN_SIZE 16
154153#define STACK_FRAME_LR_SAVE 1 /* Location of LR in stack frame */
155- #define STACK_USER_INT_FRAME_SIZE (sizeof(struct pt_regs) + STACK_FRAME_OVERHEAD)
156- #define STACK_INT_FRAME_REGS STACK_FRAME_OVERHEAD
157- #define STACK_INT_FRAME_MARKER (STACK_FRAME_OVERHEAD - 8)
158- #define STACK_FRAME_MIN_SIZE STACK_FRAME_OVERHEAD
159- #define STACK_SWITCH_FRAME_SIZE (sizeof(struct pt_regs) + STACK_FRAME_OVERHEAD)
160- #define STACK_SWITCH_FRAME_REGS STACK_FRAME_OVERHEAD
154+ #define STACK_USER_INT_FRAME_SIZE (sizeof(struct pt_regs) + STACK_FRAME_MIN_SIZE)
155+ #define STACK_INT_FRAME_REGS STACK_FRAME_MIN_SIZE
156+ #define STACK_INT_FRAME_MARKER (STACK_FRAME_MIN_SIZE - 8)
157+ #define STACK_SWITCH_FRAME_SIZE (sizeof(struct pt_regs) + STACK_FRAME_MIN_SIZE)
158+ #define STACK_SWITCH_FRAME_REGS STACK_FRAME_MIN_SIZE
161159
162160/* Size of stack frame allocated when calling signal handler. */
163161#define __SIGNAL_FRAMESIZE 64
0 commit comments