[Midnightbsd-cvs] src [7950] trunk/sys: Cosmetics: define FREEBSD32_MINUSER and AUOT32_MINUSER for struct sysentvec
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Sep 14 18:17:53 EDT 2016
Revision: 7950
http://svnweb.midnightbsd.org/src/?rev=7950
Author: laffer1
Date: 2016-09-14 18:17:52 -0400 (Wed, 14 Sep 2016)
Log Message:
-----------
Cosmetics: define FREEBSD32_MINUSER and AUOT32_MINUSER for struct sysentvec
Modified Paths:
--------------
trunk/sys/compat/ia32/ia32_sysvec.c
trunk/sys/compat/ia32/ia32_util.h
trunk/sys/kern/imgact_aout.c
Modified: trunk/sys/compat/ia32/ia32_sysvec.c
===================================================================
--- trunk/sys/compat/ia32/ia32_sysvec.c 2016-09-14 22:14:56 UTC (rev 7949)
+++ trunk/sys/compat/ia32/ia32_sysvec.c 2016-09-14 22:17:52 UTC (rev 7950)
@@ -126,7 +126,7 @@
.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,
Modified: trunk/sys/compat/ia32/ia32_util.h
===================================================================
--- trunk/sys/compat/ia32/ia32_util.h 2016-09-14 22:14:56 UTC (rev 7949)
+++ trunk/sys/compat/ia32/ia32_util.h 2016-09-14 22:17:52 UTC (rev 7950)
@@ -35,25 +35,26 @@
#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);
@@ -60,4 +61,4 @@
void ia32_set_syscall_retval(struct thread *, int);
void ia32_fixlimit(struct rlimit *rl, int which);
-#endif
+#endif /* _COMPAT_IA32_IA32_UTIL_H */
Modified: trunk/sys/kern/imgact_aout.c
===================================================================
--- trunk/sys/kern/imgact_aout.c 2016-09-14 22:14:56 UTC (rev 7949)
+++ trunk/sys/kern/imgact_aout.c 2016-09-14 22:17:52 UTC (rev 7950)
@@ -106,6 +106,7 @@
#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 @@
.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,
More information about the Midnightbsd-cvs
mailing list