Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 7d452c326c2ac879aced884411a0fe3ba75d9c87

Authored by Arnd Bergmann
Committed by Paul Mackerras
1 parent 2954da897c
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[POWERPC] powerpc: fix building gdb against asm/ptrace.h 

Ulrich Weigand found a bug with the current version of the
asm-powerpc/ptrace.h that prevents building at least the
SPU target version of gdb, since some ptrace opcodes are
not defined.

The problem seems to have originated in the merging of 32 and
64 bit versions of that file, the problem is that some opcodes
are only valid on 64 bit kernels, but are also used by 32 bit
programs, so they can't depends on the __powerpc64__ symbol.

Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

Showing 1 changed file with 0 additions and 4 deletions Side-by-side Diff

include/asm-powerpc/ptrace.h
Diff comments   View file @ 7d452c3
... ... @@ -215,12 +215,10 @@
215 215 #define PTRACE_GETVRREGS 18
216 216 #define PTRACE_SETVRREGS 19
217 217  
218   -#ifndef __powerpc64__
219 218 /* Get/set all the upper 32-bits of the SPE registers, accumulator, and
220 219 * spefscr, in one go */
221 220 #define PTRACE_GETEVRREGS 20
222 221 #define PTRACE_SETEVRREGS 21
223   -#endif /* __powerpc64__ */
224 222  
225 223 /*
226 224 * Get or set a debug register. The first 16 are DABR registers and the
... ... @@ -235,7 +233,6 @@
235 233 #define PPC_PTRACE_GETFPREGS 0x97 /* Get FPRs 0 - 31 */
236 234 #define PPC_PTRACE_SETFPREGS 0x96 /* Set FPRs 0 - 31 */
237 235  
238   -#ifdef __powerpc64__
239 236 /* Calls to trace a 64bit program from a 32bit program */
240 237 #define PPC_PTRACE_PEEKTEXT_3264 0x95
241 238 #define PPC_PTRACE_PEEKDATA_3264 0x94
... ... @@ -243,7 +240,6 @@
243 240 #define PPC_PTRACE_POKEDATA_3264 0x92
244 241 #define PPC_PTRACE_PEEKUSR_3264 0x91
245 242 #define PPC_PTRACE_POKEUSR_3264 0x90
246   -#endif /* __powerpc64__ */
247 243  
248 244 #endif /* _ASM_POWERPC_PTRACE_H */