Make struct syscall_args visible to userspace compilation environment

from machine/proc.h, consistently on all architectures.

Reviewed by:	jhb
Sponsored by:	The FreeBSD Foundation
MFC after:	3 weeks
X-Differential revision:	https://reviews.freebsd.org/D11080
This commit is contained in:
kib 2017-06-12 20:53:44 +00:00
parent 3a25a026d3
commit 7b6fe97487
7 changed files with 28 additions and 38 deletions

View File

@ -70,6 +70,13 @@ struct mdproc {
#define KINFO_PROC_SIZE 1088 #define KINFO_PROC_SIZE 1088
#define KINFO_PROC32_SIZE 768 #define KINFO_PROC32_SIZE 768
struct syscall_args {
u_int code;
struct sysent *callp;
register_t args[8];
int narg;
};
#ifdef _KERNEL #ifdef _KERNEL
/* Get the current kernel thread stack usage. */ /* Get the current kernel thread stack usage. */
@ -92,13 +99,6 @@ int amd64_set_ldt_data(struct thread *td, int start, int num,
extern struct mtx dt_lock; extern struct mtx dt_lock;
extern int max_ldt_segment; extern int max_ldt_segment;
struct syscall_args {
u_int code;
struct sysent *callp;
register_t args[8];
int narg;
};
#endif /* _KERNEL */ #endif /* _KERNEL */
#endif /* !_MACHINE_PROC_H_ */ #endif /* !_MACHINE_PROC_H_ */

View File

@ -45,8 +45,6 @@ struct mdproc {
#define KINFO_PROC_SIZE 1088 #define KINFO_PROC_SIZE 1088
#ifdef _KERNEL
#define MAXARGS 8 #define MAXARGS 8
struct syscall_args { struct syscall_args {
u_int code; u_int code;
@ -55,6 +53,4 @@ struct syscall_args {
int narg; int narg;
}; };
#endif
#endif /* !_MACHINE_PROC_H_ */ #endif /* !_MACHINE_PROC_H_ */

View File

@ -60,6 +60,13 @@ struct mdproc {
#define KINFO_PROC_SIZE 768 #define KINFO_PROC_SIZE 768
struct syscall_args {
u_int code;
struct sysent *callp;
register_t args[8];
int narg;
};
#ifdef _KERNEL #ifdef _KERNEL
/* Get the current kernel thread stack usage. */ /* Get the current kernel thread stack usage. */
@ -77,13 +84,6 @@ void user_ldt_free(struct thread *);
void user_ldt_deref(struct proc_ldt *pldt); void user_ldt_deref(struct proc_ldt *pldt);
extern struct mtx dt_lock; extern struct mtx dt_lock;
struct syscall_args {
u_int code;
struct sysent *callp;
register_t args[8];
int narg;
};
#endif /* _KERNEL */ #endif /* _KERNEL */
#endif /* !_MACHINE_PROC_H_ */ #endif /* !_MACHINE_PROC_H_ */

View File

@ -80,7 +80,6 @@ struct mdproc {
/* empty */ /* empty */
}; };
#ifdef _KERNEL
struct syscall_args { struct syscall_args {
u_int code; u_int code;
struct sysent *callp; struct sysent *callp;
@ -88,7 +87,6 @@ struct syscall_args {
int narg; int narg;
struct trapframe *trapframe; struct trapframe *trapframe;
}; };
#endif
#ifdef __mips_n64 #ifdef __mips_n64
#define KINFO_PROC_SIZE 1088 #define KINFO_PROC_SIZE 1088

View File

@ -53,6 +53,13 @@ struct mdproc {
#define KINFO_PROC_SIZE 768 #define KINFO_PROC_SIZE 768
#endif #endif
struct syscall_args {
u_int code;
struct sysent *callp;
register_t args[10];
int narg;
};
#ifdef _KERNEL #ifdef _KERNEL
#include <machine/pcb.h> #include <machine/pcb.h>
@ -65,13 +72,6 @@ struct mdproc {
td->td_kstack_pages * PAGE_SIZE - \ td->td_kstack_pages * PAGE_SIZE - \
(char *)&td; \ (char *)&td; \
} while (0) } while (0)
struct syscall_args {
u_int code;
struct sysent *callp;
register_t args[10];
int narg;
};
#endif #endif
#endif /* !_MACHINE_PROC_H_ */ #endif /* !_MACHINE_PROC_H_ */

View File

@ -45,8 +45,6 @@ struct mdproc {
#define KINFO_PROC_SIZE 1088 #define KINFO_PROC_SIZE 1088
#ifdef _KERNEL
#define MAXARGS 8 #define MAXARGS 8
struct syscall_args { struct syscall_args {
u_int code; u_int code;
@ -55,6 +53,4 @@ struct syscall_args {
int narg; int narg;
}; };
#endif
#endif /* !_MACHINE_PROC_H_ */ #endif /* !_MACHINE_PROC_H_ */

View File

@ -53,6 +53,13 @@ struct mdproc {
#define KINFO_PROC_SIZE 1088 #define KINFO_PROC_SIZE 1088
struct syscall_args {
u_int code;
struct sysent *callp;
register_t args[8];
int narg;
};
#ifdef _KERNEL #ifdef _KERNEL
#include <machine/pcb.h> #include <machine/pcb.h>
@ -66,13 +73,6 @@ struct mdproc {
(char *)&td; \ (char *)&td; \
} while (0) } while (0)
struct syscall_args {
u_int code;
struct sysent *callp;
register_t args[8];
int narg;
};
#endif #endif
#endif /* !_MACHINE_PROC_H_ */ #endif /* !_MACHINE_PROC_H_ */