summaryrefslogtreecommitdiffstats
path: root/sys/kern/init_main.c
diff options
context:
space:
mode:
authordfr <dfr@FreeBSD.org>1998-06-07 17:13:14 +0000
committerdfr <dfr@FreeBSD.org>1998-06-07 17:13:14 +0000
commit1d5f38ac2264102518a09c66a7b285f57e81e67e (patch)
tree83ce2f0e2b8041d2c933d3beffc1f4465ea5b929 /sys/kern/init_main.c
parent83423d0e5a4ad035e44392f0427cb39232031e45 (diff)
downloadFreeBSD-src-1d5f38ac2264102518a09c66a7b285f57e81e67e.zip
FreeBSD-src-1d5f38ac2264102518a09c66a7b285f57e81e67e.tar.gz
This commit fixes various 64bit portability problems required for
FreeBSD/alpha. The most significant item is to change the command argument to ioctl functions from int to u_long. This change brings us inline with various other BSD versions. Driver writers may like to use (__FreeBSD_version == 300003) to detect this change. The prototype FreeBSD/alpha machdep will follow in a couple of days time.
Diffstat (limited to 'sys/kern/init_main.c')
-rw-r--r--sys/kern/init_main.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index ea599a7..ff5a0c5 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -39,7 +39,7 @@
* SUCH DAMAGE.
*
* @(#)init_main.c 8.9 (Berkeley) 1/21/94
- * $Id: init_main.c,v 1.92 1998/05/17 11:52:35 phk Exp $
+ * $Id: init_main.c,v 1.93 1998/05/28 09:30:15 phk Exp $
*/
#include "opt_devfs.h"
@@ -390,6 +390,7 @@ proc0_init(dummy)
vmspace0.vm_map.pmap = &vmspace0.vm_pmap;
p->p_addr = proc0paddr; /* XXX */
+#ifndef __alpha__ /* XXX what is this? */
#define INCOMPAT_LITES2
#ifdef INCOMPAT_LITES2
/*
@@ -397,6 +398,7 @@ proc0_init(dummy)
*/
cpu_set_init_frame(p, init_framep); /* XXX! */
#endif /* INCOMPAT_LITES2*/
+#endif
/*
* We continue to place resource usage info and signal
@@ -603,10 +605,10 @@ start_init(p)
/*
* Move out the arg pointers.
*/
- uap = (char **)((int)ucp & ~(NBPW-1));
+ uap = (char **)((long)ucp & ~(NBPW-1));
(void)suword((caddr_t)--uap, 0); /* terminator */
- (void)suword((caddr_t)--uap, (int)arg1);
- (void)suword((caddr_t)--uap, (int)arg0);
+ (void)suword((caddr_t)--uap, (long)arg1);
+ (void)suword((caddr_t)--uap, (long)arg0);
/*
* Point at the arguments.
OpenPOWER on IntegriCloud