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

Commit 8f657933 authored by David Daney's avatar David Daney Committed by Ralf Baechle
Browse files

MIPS: Quit exposing Kconfig symbols in uapi headers. 



The kernel's struct pt_regs has many fields conditional on various
Kconfig variables, we cannot be exporting this garbage to user-space.

Move the kernel's definition to asm/ptrace.h, and put a uapi only
version in uapi/asm/ptrace.h gated by #ifndef __KERNEL__

Signed-off-by: default avatarDavid Daney <david.daney@cavium.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/5305/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent be8a6d45

arch/mips/include/asm/ptrace.h

+32 −0
Original line number Diff line number Diff line
@@ -16,6 +16,38 @@ 
#include <asm/isadep.h>

#include <uapi/asm/ptrace.h>



/*

 * This struct defines the way the registers are stored on the stack during a

 * system call/exception. As usual the registers k0/k1 aren't being saved.

 */

struct pt_regs {

#ifdef CONFIG_32BIT

	/* Pad bytes for argument save space on the stack. */

	unsigned long pad0[6];

#endif



	/* Saved main processor registers. */

	unsigned long regs[32];



	/* Saved special registers. */

	unsigned long cp0_status;

	unsigned long hi;

	unsigned long lo;

#ifdef CONFIG_CPU_HAS_SMARTMIPS

	unsigned long acx;

#endif

	unsigned long cp0_badvaddr;

	unsigned long cp0_cause;

	unsigned long cp0_epc;

#ifdef CONFIG_MIPS_MT_SMTC

	unsigned long cp0_tcstatus;

#endif /* CONFIG_MIPS_MT_SMTC */

#ifdef CONFIG_CPU_CAVIUM_OCTEON

	unsigned long long mpl[3];	  /* MTM{0,1,2} */

	unsigned long long mtp[3];	  /* MTP{0,1,2} */

#endif

} __aligned(8);



struct task_struct;



extern int ptrace_getregs(struct task_struct *child, __s64 __user *data);

arch/mips/include/uapi/asm/ptrace.h

+2 −15
Original line number Diff line number Diff line
@@ -22,16 +22,12 @@ 
#define DSP_CONTROL	77

#define ACX		78



#ifndef __KERNEL__

/*

 * This struct defines the way the registers are stored on the stack during a

 * system call/exception. As usual the registers k0/k1 aren't being saved.

 */

struct pt_regs {

#ifdef CONFIG_32BIT

	/* Pad bytes for argument save space on the stack. */

	unsigned long pad0[6];

#endif



	/* Saved main processor registers. */

	unsigned long regs[32];
@@ -39,20 +35,11 @@ struct pt_regs { 
	unsigned long cp0_status;

	unsigned long hi;

	unsigned long lo;

#ifdef CONFIG_CPU_HAS_SMARTMIPS

	unsigned long acx;

#endif

	unsigned long cp0_badvaddr;

	unsigned long cp0_cause;

	unsigned long cp0_epc;

#ifdef CONFIG_MIPS_MT_SMTC

	unsigned long cp0_tcstatus;

#endif /* CONFIG_MIPS_MT_SMTC */

#ifdef CONFIG_CPU_CAVIUM_OCTEON

	unsigned long long mpl[3];	  /* MTM{0,1,2} */

	unsigned long long mtp[3];	  /* MTP{0,1,2} */

#endif

} __attribute__ ((aligned (8)));

#endif /* __KERNEL__ */



/* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */

#define PTRACE_GETREGS		12