Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf23690b authored by Sam Ravnborg's avatar Sam Ravnborg Committed by Benjamin Herrenschmidt
Browse files

powerpc: Fix userspace build of ptrace.h 



Build of ptrace.h failed for assembly because it
pulls in stdint.h.
Use exportable types (__u32, __u64) to avoid the dependency
on stdint.h.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Cc: Andrey Volkov <avolkov@varma-el.com>
Cc: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: default avatarDave Kleikamp <shaggy@linux.vnet.ibm.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent c2be0548

arch/powerpc/include/asm/ptrace.h

+14 −18
Original line number Original line Diff line number Diff line
@@ -24,11 +24,7 @@ 
 * 2 of the License, or (at your option) any later version.

 * 2 of the License, or (at your option) any later version.

 */

 */





#ifdef __KERNEL__

#include <linux/types.h>

#include <linux/types.h>

#else

#include <stdint.h>

#endif





#ifndef __ASSEMBLY__

#ifndef __ASSEMBLY__
@@ -364,13 +360,13 @@ static inline unsigned long regs_get_kernel_stack_nth(struct pt_regs *regs, 
#ifndef __ASSEMBLY__

#ifndef __ASSEMBLY__





struct ppc_debug_info {

struct ppc_debug_info {

	uint32_t version;		/* Only version 1 exists to date */

	__u32 version;			/* Only version 1 exists to date */

	uint32_t num_instruction_bps;

	__u32 num_instruction_bps;

	uint32_t num_data_bps;

	__u32 num_data_bps;

	uint32_t num_condition_regs;

	__u32 num_condition_regs;

	uint32_t data_bp_alignment;

	__u32 data_bp_alignment;

	uint32_t sizeof_condition;	/* size of the DVC register */

	__u32 sizeof_condition;		/* size of the DVC register */

	uint64_t features;

	__u64 features;

};

};





#endif /* __ASSEMBLY__ */

#endif /* __ASSEMBLY__ */
@@ -386,13 +382,13 @@ struct ppc_debug_info { 
#ifndef __ASSEMBLY__

#ifndef __ASSEMBLY__





struct ppc_hw_breakpoint {

struct ppc_hw_breakpoint {

	uint32_t version;		/* currently, version must be 1 */

	__u32 version;		/* currently, version must be 1 */

	uint32_t trigger_type;		/* only some combinations allowed */

	__u32 trigger_type;	/* only some combinations allowed */

	uint32_t addr_mode;		/* address match mode */

	__u32 addr_mode;	/* address match mode */

	uint32_t condition_mode;	/* break/watchpoint condition flags */

	__u32 condition_mode;	/* break/watchpoint condition flags */

	uint64_t addr;			/* break/watchpoint address */

	__u64 addr;		/* break/watchpoint address */

	uint64_t addr2;			/* range end or mask */

	__u64 addr2;		/* range end or mask */

	uint64_t condition_value;	/* contents of the DVC register */

	__u64 condition_value;	/* contents of the DVC register */

};

};





#endif /* __ASSEMBLY__ */

#endif /* __ASSEMBLY__ */