d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cosmetics: define FREEBSD32_MINUSER and AOUT32_MINUSER for struct

Browse Source 
sysentvec .sv_minuser. Also improve style.

Submitted by:	Oliver Pinter <oliver.pinter@gmail.com>
MFC after:	1 week
This commit is contained in:
kib 2012-07-22 13:41:45 +00:00
parent 85d13cee2c
commit 6253150288
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/compat/ia32/ia32_sysvec.c
View File

@ -117,7 +117,7 @@ struct sysentvec ia32_freebsd_sysvec = {
.sv_imgact_try = NULL,
.sv_minsigstksz = MINSIGSTKSZ,
.sv_pagesize = IA32_PAGE_SIZE,
.sv_minuser = 0,
.sv_minuser = FREEBSD32_MINUSER,
.sv_maxuser = FREEBSD32_MAXUSER,
.sv_usrstack = FREEBSD32_USRSTACK,
.sv_psstrings = FREEBSD32_PS_STRINGS,

17
sys/compat/ia32/ia32_util.h
View File

@ -35,29 +35,30 @@
#include <vm/vm_param.h>
#include <vm/pmap.h>
#include <sys/exec.h>
#include <sys/sysent.h>
#include <sys/cdefs.h>
#ifdef __ia64__
#define FREEBSD32_MAXUSER ((1ul << 32) - IA32_PAGE_SIZE * 2)
#define FREEBSD32_MAXUSER ((1ul << 32) - IA32_PAGE_SIZE * 2)
#define FREEBSD32_MINUSER 0
#define FREEBSD32_SHAREDPAGE 0
#define FREEBSD32_USRSTACK FREEBSD32_MAXUSER
#else
#define FREEBSD32_USRSTACK FREEBSD32_MAXUSER
#else /* __ia64__ */
#define FREEBSD32_MAXUSER ((1ul << 32) - IA32_PAGE_SIZE)
#define FREEBSD32_MINUSER 0
#define FREEBSD32_SHAREDPAGE (FREEBSD32_MAXUSER - IA32_PAGE_SIZE)
#define FREEBSD32_USRSTACK FREEBSD32_SHAREDPAGE
#endif
#define FREEBSD32_USRSTACK FREEBSD32_SHAREDPAGE
#endif /* __ia64 */
#define IA32_PAGE_SIZE 4096
#define IA32_MAXDSIZ (512*1024*1024) /* 512MB */
#define IA32_MAXSSIZ (64*1024*1024) /* 64MB */
#define IA32_MAXVMEM 0 /* Unlimited */
#define IA32_MAXVMEM 0 /* Unlimited */
struct syscall_args;
int ia32_fetch_syscall_args(struct thread *td, struct syscall_args *sa);
void ia32_set_syscall_retval(struct thread *, int);
void ia32_fixlimit(struct rlimit *rl, int which);
#endif
#endif /* _COMPAT_IA32_IA32_UTIL_H */

3
sys/kern/imgact_aout.c
View File

@ -106,6 +106,7 @@ struct sysentvec aout_sysvec = {
#define AOUT32_USRSTACK 0xbfc00000
#define AOUT32_PS_STRINGS \
(AOUT32_USRSTACK - sizeof(struct freebsd32_ps_strings))
#define AOUT32_MINUSER FREEBSD32_MINUSER
extern const char *freebsd32_syscallnames[];
extern u_long ia32_maxssiz;
@ -129,7 +130,7 @@ struct sysentvec aout_sysvec = {
.sv_imgact_try = NULL,
.sv_minsigstksz = MINSIGSTKSZ,
.sv_pagesize = IA32_PAGE_SIZE,
.sv_minuser = 0,
.sv_minuser = AOUT32_MINUSER,
.sv_maxuser = AOUT32_USRSTACK,
.sv_usrstack = AOUT32_USRSTACK,
.sv_psstrings = AOUT32_PS_STRINGS,