CVS commit: src/sys/arch/ia64/stand/ia64/efi

2020-07-02 Thread Luke Mewburn 
Module Name:src
Committed By:   lukem
Date:   Thu Jul  2 09:07:25 UTC 2020

Modified Files:
src/sys/arch/ia64/stand/ia64/efi: Makefile

Log Message:
loader.efi doesn't have source

(Untested fix)


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ia64/stand/ia64/efi/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/ia64/stand/ia64/efi/Makefile
diff -u src/sys/arch/ia64/stand/ia64/efi/Makefile:1.6 src/sys/arch/ia64/stand/ia64/efi/Makefile:1.7
--- src/sys/arch/ia64/stand/ia64/efi/Makefile:1.6	Sun Apr  9 22:50:02 2017
+++ src/sys/arch/ia64/stand/ia64/efi/Makefile	Thu Jul  2 09:07:24 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2017/04/09 22:50:02 christos Exp $	
+#	$NetBSD: Makefile,v 1.7 2020/07/02 09:07:24 lukem Exp $	
 
 S=	${.CURDIR}/../../../../..
 
@@ -9,6 +9,8 @@ PROGS=		loader.sym loader.efi
 MAN.loader.sym=		# no man
 MAN.loader.efi=		# no man
 
+SRCS.loader.efi=	# no SRCS
+
 CPPFLAGS+=	-I${IA64_STAND_DIR}/efi/libefi/
 CPPFLAGS+=	-I${IA64_STAND_DIR}/common/
 CPPFLAGS+=	-I${S}

CVS commit: src/sys/arch/ia64/stand/efi/libefi

2020-01-26 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Sun Jan 26 10:12:29 UTC 2020

Modified Files:
src/sys/arch/ia64/stand/efi/libefi: efiboot.h

Log Message:
Trailing whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/stand/efi/libefi/efiboot.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/ia64/stand/efi/libefi/efiboot.h
diff -u src/sys/arch/ia64/stand/efi/libefi/efiboot.h:1.3 src/sys/arch/ia64/stand/efi/libefi/efiboot.h:1.4
--- src/sys/arch/ia64/stand/efi/libefi/efiboot.h:1.3	Thu Aug  4 16:22:40 2016
+++ src/sys/arch/ia64/stand/efi/libefi/efiboot.h	Sun Jan 26 10:12:29 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: efiboot.h,v 1.3 2016/08/04 16:22:40 scole Exp $	*/
+/*	$NetBSD: efiboot.h,v 1.4 2020/01/26 10:12:29 skrll Exp $	*/
 
 /*-
  * Copyright (c) 1996
@@ -65,7 +65,7 @@ typedef unsigned long physaddr_t;
 
 /* exported devices XXX rename? */
 extern struct devsw devsw[];
-extern struct netif_driver efi_net; 
+extern struct netif_driver efi_net;
 
 /* Find EFI network resources */
 extern void efinet_init_driver(void);

CVS commit: src/sys/arch/ia64/stand/ia64/ski

2020-01-14 Thread Sean Cole 
Module Name:src
Committed By:   scole
Date:   Tue Jan 14 16:23:08 UTC 2020

Modified Files:
src/sys/arch/ia64/stand/ia64/ski: ssc.c

Log Message:
add noinline attribute


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/stand/ia64/ski/ssc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/ia64/stand/ia64/ski/ssc.c
diff -u src/sys/arch/ia64/stand/ia64/ski/ssc.c:1.3 src/sys/arch/ia64/stand/ia64/ski/ssc.c:1.4
--- src/sys/arch/ia64/stand/ia64/ski/ssc.c:1.3	Mon Jul 20 04:59:04 2009
+++ src/sys/arch/ia64/stand/ia64/ski/ssc.c	Tue Jan 14 16:23:07 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: ssc.c,v 1.3 2009/07/20 04:59:04 kiyohara Exp $	*/
+/*	$NetBSD: ssc.c,v 1.4 2020/01/14 16:23:07 scole Exp $	*/
 
 /*-
  * Copyright (c) 2001 Doug Rabson
@@ -41,6 +41,8 @@
  * PSR.dt across the SSC call. We do this by saving and restoring psr.l
  * completely.
  */
+
+__attribute__((__noinline__))
 u_int64_t
 ssc(u_int64_t in0, u_int64_t in1, u_int64_t in2, u_int64_t in3, int which)
 {

CVS commit: src/sys/arch/ia64/stand/efi/libefi

2019-05-06 Thread Sean Cole 
Module Name:src
Committed By:   scole
Date:   Tue May  7 02:05:17 UTC 2019

Modified Files:
src/sys/arch/ia64/stand/efi/libefi: exec.c

Log Message:
Avoid some RAW dependency compilation warnings


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/ia64/stand/efi/libefi/exec.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/ia64/stand/efi/libefi/exec.c
diff -u src/sys/arch/ia64/stand/efi/libefi/exec.c:1.7 src/sys/arch/ia64/stand/efi/libefi/exec.c:1.8
--- src/sys/arch/ia64/stand/efi/libefi/exec.c:1.7	Thu Aug  4 18:07:43 2016
+++ src/sys/arch/ia64/stand/efi/libefi/exec.c	Tue May  7 02:05:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: exec.c,v 1.7 2016/08/04 18:07:43 scole Exp $ */
+/* $NetBSD: exec.c,v 1.8 2019/05/07 02:05:17 scole Exp $ */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -192,13 +192,17 @@ elf64_exec(struct preloaded_file *fp)
 
 	__asm __volatile("mov cr.ifa=%0" :: "r"(IA64_RR_BASE(7)));
 	__asm __volatile("mov cr.itir=%0" :: "r"(28 << 2));
-	__asm __volatile("ptr.i %0,%1" :: "r"(IA64_RR_BASE(7)), "r"(28<<2));
+	__asm __volatile("srlz.d;;");
+	
 	__asm __volatile("ptr.d %0,%1" :: "r"(IA64_RR_BASE(7)), "r"(28<<2));
+	__asm __volatile("srlz.d;;");
+	__asm __volatile("itr.d dtr[%0]=%1;;" :: "r"(0), "r"(pte));
+	__asm __volatile("srlz.d;;");
+	
+	__asm __volatile("ptr.i %0,%1;;" :: "r"(IA64_RR_BASE(7)), "r"(28<<2));
 	__asm __volatile("srlz.i;;");
 	__asm __volatile("itr.i itr[%0]=%1;;" :: "r"(0), "r"(pte));
 	__asm __volatile("srlz.i;;");
-	__asm __volatile("itr.d dtr[%0]=%1;;" :: "r"(0), "r"(pte));
-	__asm __volatile("srlz.i;;");
 
 	enter_kernel(fp->marks[MARK_ENTRY], bi);

CVS commit: src/sys/arch/ia64/stand/efi/libefi

2018-08-18 Thread Robert Elz 
Module Name:src
Committed By:   kre
Date:   Sat Aug 18 15:55:19 UTC 2018

Modified Files:
src/sys/arch/ia64/stand/efi/libefi: efinet.c

Log Message:
More fallout from new gnu-efi ... EFI_SIMPLE_NETWORK_PROTOCOL
is now EFI_SIMPLE_NETWORK_PROTOCOL_GUID


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/ia64/stand/efi/libefi/efinet.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/ia64/stand/efi/libefi/efinet.c
diff -u src/sys/arch/ia64/stand/efi/libefi/efinet.c:1.7 src/sys/arch/ia64/stand/efi/libefi/efinet.c:1.8
--- src/sys/arch/ia64/stand/efi/libefi/efinet.c:1.7	Thu Aug  4 16:22:40 2016
+++ src/sys/arch/ia64/stand/efi/libefi/efinet.c	Sat Aug 18 15:55:19 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: efinet.c,v 1.7 2016/08/04 16:22:40 scole Exp $	*/
+/*	$NetBSD: efinet.c,v 1.8 2018/08/18 15:55:19 kre Exp $	*/
 
 /*-
  * Copyright (c) 2001 Doug Rabson
@@ -231,7 +231,7 @@ efinet_init_driver(void)
 {
 	EFI_STATUS	status;
 	UINTN		sz;
-	static EFI_GUID netid = EFI_SIMPLE_NETWORK_PROTOCOL;
+	static EFI_GUID netid = EFI_SIMPLE_NETWORK_PROTOCOL_GUID;
 	EFI_HANDLE	*handles;
 	int		nifs, i;
 #define MAX_INTERFACES	4

CVS commit: src/sys/arch/ia64/stand/ia64/efi

2018-08-18 Thread Robert Elz 
Module Name:src
Committed By:   kre
Date:   Sat Aug 18 06:52:57 UTC 2018

Modified Files:
src/sys/arch/ia64/stand/ia64/efi: main.c

Log Message:
More gnu-efi update fallout ... the symbol EFI_SIMPLE_NETWORK_PROTOCOL
has been replaced with EFI_SIMPLE_NETWORK_PROTOCOL_GUID and the old
one (EFI_SIMPLE_NETWORK_PROTOCOL) is now something completely different.

Adapt...   (should help the ia64 build)


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/ia64/stand/ia64/efi/main.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/ia64/stand/ia64/efi/main.c
diff -u src/sys/arch/ia64/stand/ia64/efi/main.c:1.11 src/sys/arch/ia64/stand/ia64/efi/main.c:1.12
--- src/sys/arch/ia64/stand/ia64/efi/main.c:1.11	Thu Aug  4 18:07:43 2016
+++ src/sys/arch/ia64/stand/ia64/efi/main.c	Sat Aug 18 06:52:57 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.11 2016/08/04 18:07:43 scole Exp $	*/
+/*	$NetBSD: main.c,v 1.12 2018/08/18 06:52:57 kre Exp $	*/
 
 /*-
  * Copyright (c) 1998 Michael Smith 
@@ -63,7 +63,7 @@ EFI_GUID devid = DEVICE_PATH_PROTOCOL;
 EFI_GUID hcdp = HCDP_TABLE_GUID;
 EFI_GUID imgid = LOADED_IMAGE_PROTOCOL;
 EFI_GUID mps = MPS_TABLE_GUID;
-EFI_GUID netid = EFI_SIMPLE_NETWORK_PROTOCOL;
+EFI_GUID netid = EFI_SIMPLE_NETWORK_PROTOCOL_GUID;
 EFI_GUID sal = SAL_SYSTEM_TABLE_GUID;
 EFI_GUID smbios = SMBIOS_TABLE_GUID;

CVS commit: src/sys/arch/ia64/stand/efi/libefi

2018-06-13 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Jun 13 16:04:55 UTC 2018

Modified Files:
src/sys/arch/ia64/stand/efi/libefi: Makefile.inc

Log Message:
revert previous MAKEOBJDIRPREFIX massaging


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ia64/stand/efi/libefi/Makefile.inc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/ia64/stand/efi/libefi/Makefile.inc
diff -u src/sys/arch/ia64/stand/efi/libefi/Makefile.inc:1.6 src/sys/arch/ia64/stand/efi/libefi/Makefile.inc:1.7
--- src/sys/arch/ia64/stand/efi/libefi/Makefile.inc:1.6	Mon Jun 11 17:38:27 2018
+++ src/sys/arch/ia64/stand/efi/libefi/Makefile.inc	Wed Jun 13 12:04:55 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.6 2018/06/11 21:38:27 christos Exp $
+#	$NetBSD: Makefile.inc,v 1.7 2018/06/13 16:04:55 christos Exp $
 #
 #	Configuration variables (default values are below):
 #
@@ -22,7 +22,7 @@ EFILIB=			${EFIDST}/libefi.a
 EFIMAKE= \
 	cd ${EFIDIR} && MAKEOBJDIRPREFIX= && unset MAKEOBJDIRPREFIX && \
 	MAKEOBJDIR=${EFIDST} ${MAKE} \
-	CC=${CC:q} CFLAGS=${CFLAGS:S/MAKEOBJDIRPREFIX/MAKEOBJDIR/:q} \
+	CC=${CC:q} CFLAGS=${CFLAGS:q} \
 	AS=${AS:q} AFLAGS=${AFLAGS:q} \
 	LD=${LD:q} STRIP=${STRIP:q} \
 	MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH:q} \

CVS commit: src/sys/arch/ia64/stand/efi/libefi

2018-06-11 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Mon Jun 11 21:38:27 UTC 2018

Modified Files:
src/sys/arch/ia64/stand/efi/libefi: Makefile.inc

Log Message:
switch from MAKEOBJDIRPREFIX to MAKEOBJDIR.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/stand/efi/libefi/Makefile.inc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/ia64/stand/efi/libefi/Makefile.inc
diff -u src/sys/arch/ia64/stand/efi/libefi/Makefile.inc:1.5 src/sys/arch/ia64/stand/efi/libefi/Makefile.inc:1.6
--- src/sys/arch/ia64/stand/efi/libefi/Makefile.inc:1.5	Sat May 26 21:14:50 2018
+++ src/sys/arch/ia64/stand/efi/libefi/Makefile.inc	Mon Jun 11 17:38:27 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.5 2018/05/27 01:14:50 christos Exp $
+#	$NetBSD: Makefile.inc,v 1.6 2018/06/11 21:38:27 christos Exp $
 #
 #	Configuration variables (default values are below):
 #
@@ -22,7 +22,7 @@ EFILIB=			${EFIDST}/libefi.a
 EFIMAKE= \
 	cd ${EFIDIR} && MAKEOBJDIRPREFIX= && unset MAKEOBJDIRPREFIX && \
 	MAKEOBJDIR=${EFIDST} ${MAKE} \
-	CC=${CC:q} CFLAGS=${CFLAGS:q} \
+	CC=${CC:q} CFLAGS=${CFLAGS:S/MAKEOBJDIRPREFIX/MAKEOBJDIR/:q} \
 	AS=${AS:q} AFLAGS=${AFLAGS:q} \
 	LD=${LD:q} STRIP=${STRIP:q} \
 	MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH:q} \

CVS commit: src/sys/arch/ia64/stand/common

2017-12-09 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sun Dec 10 02:32:03 UTC 2017

Modified Files:
src/sys/arch/ia64/stand/common: bootstrap.h misc.c

Log Message:
comment out unused hexdump


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/ia64/stand/common/bootstrap.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/ia64/stand/common/misc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/ia64/stand/common/bootstrap.h
diff -u src/sys/arch/ia64/stand/common/bootstrap.h:1.9 src/sys/arch/ia64/stand/common/bootstrap.h:1.10
--- src/sys/arch/ia64/stand/common/bootstrap.h:1.9	Tue Mar 25 14:35:32 2014
+++ src/sys/arch/ia64/stand/common/bootstrap.h	Sat Dec  9 21:32:03 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: bootstrap.h,v 1.9 2014/03/25 18:35:32 christos Exp $	*/
+/*	$NetBSD: bootstrap.h,v 1.10 2017/12/10 02:32:03 christos Exp $	*/
 
 /*-
  * Copyright (c) 1998 Michael Smith 
@@ -79,7 +79,9 @@ int	getrootmount(char *rootdev);
 
 /* misc.c */
 char	*unargv(int argc, char *argv[]);
+#if 0
 void	hexdump(void *region, size_t len);
+#endif
 size_t	strlenout(vaddr_t str);
 char	*strdupout(vaddr_t str);
 void	kern_bzero(vaddr_t dest, size_t len);

Index: src/sys/arch/ia64/stand/common/misc.c
diff -u src/sys/arch/ia64/stand/common/misc.c:1.7 src/sys/arch/ia64/stand/common/misc.c:1.8
--- src/sys/arch/ia64/stand/common/misc.c:1.7	Tue Mar 25 14:35:32 2014
+++ src/sys/arch/ia64/stand/common/misc.c	Sat Dec  9 21:32:03 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: misc.c,v 1.7 2014/03/25 18:35:32 christos Exp $	*/
+/*	$NetBSD: misc.c,v 1.8 2017/12/10 02:32:03 christos Exp $	*/
 
 /*-
  * Copyright (c) 1998 Michael Smith 
@@ -166,6 +166,7 @@ alloc_pread(int fd, off_t off, size_t le
 	return (buf);
 }
 
+#if 0
 /*
  * Display a region in traditional hexdump format.
  */
@@ -205,6 +206,7 @@ hexdump(void *region, size_t len)
 }
 pager_close();
 }
+#endif
 
 void
 dev_cleanup(void)

CVS commit: src/sys/arch/ia64/stand/common

2017-10-14 Thread Maya Rashish 
Module Name:src
Committed By:   maya
Date:   Sun Oct 15 01:28:32 UTC 2017

Modified Files:
src/sys/arch/ia64/stand/common: load_elf64.c

Log Message:
reorder to avoid null deref before null test


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/stand/common/load_elf64.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/ia64/stand/common/load_elf64.c
diff -u src/sys/arch/ia64/stand/common/load_elf64.c:1.3 src/sys/arch/ia64/stand/common/load_elf64.c:1.4
--- src/sys/arch/ia64/stand/common/load_elf64.c:1.3	Mon Aug 15 08:24:05 2016
+++ src/sys/arch/ia64/stand/common/load_elf64.c	Sun Oct 15 01:28:32 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: load_elf64.c,v 1.3 2016/08/15 08:24:05 maxv Exp $	*/
+/*	$NetBSD: load_elf64.c,v 1.4 2017/10/15 01:28:32 maya Exp $	*/
 
 /*-
  * Copyright (c) 1998 Michael Smith 
@@ -62,7 +62,6 @@ elf64_loadfile(char *filename, u_int64_t
 	return(EFTYPE);
 
 fp = file_alloc();
-marks = fp->marks;
 
 if (fp == NULL) {
 	printf("elf64_loadfile: cannot allocate module info\n");
@@ -70,6 +69,7 @@ elf64_loadfile(char *filename, u_int64_t
 	goto out;
 }
 
+marks = fp->marks;
 fp->f_name = strdup(filename);
 fp->f_type = strdup(ELF64_KERNELTYPE);

CVS commit: src/sys/arch/ia64/stand/ia64/ski

2017-06-25 Thread Maxime Villard 
Module Name:src
Committed By:   maxv
Date:   Sun Jun 25 12:04:37 UTC 2017

Modified Files:
src/sys/arch/ia64/stand/ia64/ski: devicename.c

Log Message:
uninitialized variable, found by Mootja


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/ia64/stand/ia64/ski/devicename.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/ia64/stand/ia64/ski/devicename.c
diff -u src/sys/arch/ia64/stand/ia64/ski/devicename.c:1.8 src/sys/arch/ia64/stand/ia64/ski/devicename.c:1.9
--- src/sys/arch/ia64/stand/ia64/ski/devicename.c:1.8	Mon Aug 15 09:06:39 2016
+++ src/sys/arch/ia64/stand/ia64/ski/devicename.c	Sun Jun 25 12:04:37 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: devicename.c,v 1.8 2016/08/15 09:06:39 maxv Exp $	*/
+/*	$NetBSD: devicename.c,v 1.9 2017/06/25 12:04:37 maxv Exp $	*/
 
 /*-
  * Copyright (c) 1998 Michael Smith 
@@ -236,8 +236,7 @@ ski_fmtdev(void *vdev)
 		break;
 
 	case DEVT_NET:
-		/* XXX XXX XXX: Yay, 'len' is not initialized here */
-		snprintf(buf, buflen - len, "%s%d:", dev->d_dev->dv_name, dev->d_kind.netif.unit);
+		snprintf(buf, buflen, "%s%d:", dev->d_dev->dv_name, dev->d_kind.netif.unit);
 		break;
 	}
 	return(buf);

CVS commit: src/sys/arch/ia64/stand/ia64/efi

2017-04-09 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sun Apr  9 22:50:02 UTC 2017

Modified Files:
src/sys/arch/ia64/stand/ia64/efi: Makefile

Log Message:
move vers.c evaluation before we use ${SRCS}


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/stand/ia64/efi/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/ia64/stand/ia64/efi/Makefile
diff -u src/sys/arch/ia64/stand/ia64/efi/Makefile:1.5 src/sys/arch/ia64/stand/ia64/efi/Makefile:1.6
--- src/sys/arch/ia64/stand/ia64/efi/Makefile:1.5	Sat Apr  8 15:53:21 2017
+++ src/sys/arch/ia64/stand/ia64/efi/Makefile	Sun Apr  9 18:50:02 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2017/04/08 19:53:21 christos Exp $	
+#	$NetBSD: Makefile,v 1.6 2017/04/09 22:50:02 christos Exp $	
 
 S=	${.CURDIR}/../../../../..
 
@@ -18,6 +18,8 @@ CPPFLAGS+=	-DLOADER -DLIBKERN_OPTIMISE_S
 .PATH: ${.CURDIR}/../../common
 .include "${.CURDIR}/../../common/Makefile.inc"
 
+.include "${S}/conf/newvers_stand.mk"
+
 # need to do this after common stuff pulled in
 SRCS.loader.sym:=	start.S conf.c efimd.c main.c ${SRCS}
 
@@ -54,6 +56,5 @@ DPADD=		${LIBEFI} ${LIBLIST}
 # Cross dependencies between LIBEFI and LIB(SA|KERN). Need to elaborate below.
 LDADD=		${LIBEFI} ${LIBLIST} ${LIBEFI} ${LIBLIST}
 
-.include "${S}/conf/newvers_stand.mk"
 
 .include

CVS commit: src/sys/arch/ia64/stand/ia64/ski

2016-12-17 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sat Dec 17 18:41:13 UTC 2016

Modified Files:
src/sys/arch/ia64/stand/ia64/ski: Makefile

Log Message:
XXX: Can't do PIE yet because of gp relocation in start.S


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/stand/ia64/ski/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/ia64/stand/ia64/ski/Makefile
diff -u src/sys/arch/ia64/stand/ia64/ski/Makefile:1.5 src/sys/arch/ia64/stand/ia64/ski/Makefile:1.6
--- src/sys/arch/ia64/stand/ia64/ski/Makefile:1.5	Fri Aug  5 13:08:10 2016
+++ src/sys/arch/ia64/stand/ia64/ski/Makefile	Sat Dec 17 13:41:13 2016
@@ -4,6 +4,7 @@ VERSIONFILE= ${.CURDIR}/version
 
 .include "../Makefile.booters"
 
+NOPIE=		yes
 PROG=		skiload
 MAN=#
 BINDIR?=	/usr/mdec

CVS commit: src/sys/arch/ia64/stand/ia64/ski

2016-08-15 Thread Maxime Villard 
Module Name:src
Committed By:   maxv
Date:   Mon Aug 15 09:06:40 UTC 2016

Modified Files:
src/sys/arch/ia64/stand/ia64/ski: devicename.c

Log Message:
Two uninitialized vars, found by brainy. The former is similar to the one
I fixed in ia64/stand/efi/libefi/devicename.c. I don't know how to fix the
latter, so just add a comment. I will probably file a PR for this one.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/ia64/stand/ia64/ski/devicename.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/ia64/stand/ia64/ski/devicename.c
diff -u src/sys/arch/ia64/stand/ia64/ski/devicename.c:1.7 src/sys/arch/ia64/stand/ia64/ski/devicename.c:1.8
--- src/sys/arch/ia64/stand/ia64/ski/devicename.c:1.7	Tue Apr  8 21:51:06 2014
+++ src/sys/arch/ia64/stand/ia64/ski/devicename.c	Mon Aug 15 09:06:39 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: devicename.c,v 1.7 2014/04/08 21:51:06 martin Exp $	*/
+/*	$NetBSD: devicename.c,v 1.8 2016/08/15 09:06:39 maxv Exp $	*/
 
 /*-
  * Copyright (c) 1998 Michael Smith 
@@ -91,7 +91,7 @@ ski_parsedev(struct ski_devdesc **dev, c
 	struct devsw	*dv;
 	int dv_type;
 	int		i, unit, slice, partition, err;
-	char		*cp;
+	char		*cp = NULL;
 	const char	*np;
 
 	/* minimum length check */
@@ -146,6 +146,10 @@ ski_parsedev(struct ski_devdesc **dev, c
 cp++;
 			}
 		}
+		if (cp == NULL) {
+			err = EINVAL;
+			goto fail;
+		}
 		if (*cp && (*cp != ':')) {
 			err = EINVAL;
 			goto fail;
@@ -169,6 +173,10 @@ ski_parsedev(struct ski_devdesc **dev, c
 goto fail;
 			}
 		}
+		if (cp == NULL) {
+			err = EINVAL;
+			goto fail;
+		}
 		if (*cp && (*cp != ':')) {
 			err = EINVAL;
 			goto fail;
@@ -228,6 +236,7 @@ ski_fmtdev(void *vdev)
 		break;
 
 	case DEVT_NET:
+		/* XXX XXX XXX: Yay, 'len' is not initialized here */
 		snprintf(buf, buflen - len, "%s%d:", dev->d_dev->dv_name, dev->d_kind.netif.unit);
 		break;
 	}

CVS commit: src/sys/arch/ia64/stand/efi/libefi

2016-08-15 Thread Maxime Villard 
Module Name:src
Committed By:   maxv
Date:   Mon Aug 15 09:00:52 UTC 2016

Modified Files:
src/sys/arch/ia64/stand/efi/libefi: devicename.c

Log Message:
Uninitialized var, found by brainy. I haven't tested this change, and it
may not be the perfect way to fix it. But it seems correct enough.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/ia64/stand/efi/libefi/devicename.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/ia64/stand/efi/libefi/devicename.c
diff -u src/sys/arch/ia64/stand/efi/libefi/devicename.c:1.8 src/sys/arch/ia64/stand/efi/libefi/devicename.c:1.9
--- src/sys/arch/ia64/stand/efi/libefi/devicename.c:1.8	Tue Apr  8 21:51:06 2014
+++ src/sys/arch/ia64/stand/efi/libefi/devicename.c	Mon Aug 15 09:00:52 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: devicename.c,v 1.8 2014/04/08 21:51:06 martin Exp $	*/
+/*	$NetBSD: devicename.c,v 1.9 2016/08/15 09:00:52 maxv Exp $	*/
 
 /*-
  * Copyright (c) 1998 Michael Smith 
@@ -95,7 +95,7 @@ efi_parsedev(struct efi_devdesc **dev, c
 	struct devsw	*dv;
 	int dv_type;
 	int		i, unit, slice, partition, err;
-	char		*cp;
+	char		*cp = NULL;
 	const char	*np;
 
 	/* minimum length check */
@@ -151,6 +151,10 @@ efi_parsedev(struct efi_devdesc **dev, c
 cp++;
 			}
 		}
+		if (cp == NULL) {
+			err = EINVAL;
+			goto fail;
+		}
 		if (*cp && (*cp != ':')) {
 			err = EINVAL;
 			goto fail;
@@ -174,6 +178,10 @@ efi_parsedev(struct efi_devdesc **dev, c
 goto fail;
 			}
 		}
+		if (cp == NULL) {
+			err = EINVAL;
+			goto fail;
+		}
 		if (*cp && (*cp != ':')) {
 			err = EINVAL;
 			goto fail;

CVS commit: src/sys/arch/ia64/stand/common

2016-08-15 Thread Maxime Villard 
Module Name:src
Committed By:   maxv
Date:   Mon Aug 15 08:24:05 UTC 2016

Modified Files:
src/sys/arch/ia64/stand/common: load_elf64.c

Log Message:
Uninitialized var, found by brainy; not tested, but obvious enough


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/stand/common/load_elf64.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/ia64/stand/common/load_elf64.c
diff -u src/sys/arch/ia64/stand/common/load_elf64.c:1.2 src/sys/arch/ia64/stand/common/load_elf64.c:1.3
--- src/sys/arch/ia64/stand/common/load_elf64.c:1.2	Sat Apr 22 07:58:53 2006
+++ src/sys/arch/ia64/stand/common/load_elf64.c	Mon Aug 15 08:24:05 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: load_elf64.c,v 1.2 2006/04/22 07:58:53 cherry Exp $	*/
+/*	$NetBSD: load_elf64.c,v 1.3 2016/08/15 08:24:05 maxv Exp $	*/
 
 /*-
  * Copyright (c) 1998 Michael Smith 
@@ -75,8 +75,10 @@ elf64_loadfile(char *filename, u_int64_t
 
 marks[MARK_START] = dest;
 
-if ((fd = loadfile(filename, marks, LOAD_KERNEL)) == -1)
+if ((fd = loadfile(filename, marks, LOAD_KERNEL)) == -1) {
+	err = EPERM;
 	goto oerr;
+}
 close(fd);
 
 dest = marks[MARK_ENTRY];

CVS commit: src/sys/arch/ia64/stand/ia64

2016-08-05 Thread Sean Cole 
Module Name:src
Committed By:   scole
Date:   Fri Aug  5 17:08:10 UTC 2016

Modified Files:
src/sys/arch/ia64/stand/ia64/efi: Makefile
src/sys/arch/ia64/stand/ia64/ski: Makefile

Log Message:
PR port-ia64/51261

Put skiload loader.efi loader.sym in /usr/mdec


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/stand/ia64/efi/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ia64/stand/ia64/ski/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/ia64/stand/ia64/efi/Makefile
diff -u src/sys/arch/ia64/stand/ia64/efi/Makefile:1.3 src/sys/arch/ia64/stand/ia64/efi/Makefile:1.4
--- src/sys/arch/ia64/stand/ia64/efi/Makefile:1.3	Sat Jan 22 19:19:19 2011
+++ src/sys/arch/ia64/stand/ia64/efi/Makefile	Fri Aug  5 17:08:10 2016
@@ -1,48 +1,37 @@
+#	$NetBSD: Makefile,v 1.4 2016/08/05 17:08:10 scole Exp $	
+
 S=	${.CURDIR}/../../../../..
 
 VERSIONFILE= ${.CURDIR}/version
 
 .include "../Makefile.booters"
 
-PROG=		loader.sym
-
-MAN=#		Tell bsd.prog.mk that loader.sym is not a man page.
-
-INTERNALPROG=
+PROGS=		loader.sym loader.efi
 
+MAN.loader.sym=		# no man
+MAN.loader.efi=		# no man
 
-SRCS=		start.S conf.c efimd.c vers.c main.c
-
-CPPFLAGS+=	-I${IA64_STAND_DIR}/efi/include
-CPPFLAGS+=	-I${IA64_STAND_DIR}/efi/include/${MACHINE_ARCH}
 CPPFLAGS+=	-I${IA64_STAND_DIR}/efi/libefi/
-CPPFLAGS+=	-I${IA64_STAND_DIR}/efi/libshell/
 CPPFLAGS+=	-I${IA64_STAND_DIR}/common/
 CPPFLAGS+=	-I${S}
-
-CPPFLAGS+=	-DLOADER
-
-CPPFLAGS+= 	-DLIBKERN_OPTIMISE_SPACE \
-		-DHEAP_VARIABLE
-
-
-# Pick up FreeBSD glue
-#CPPFLAGS+= -I${.CURDIR}/../../
+CPPFLAGS+=	-DLOADER -DLIBKERN_OPTIMISE_SPACE -DHEAP_VARIABLE
 
 # Always add MI sources
 .PATH: ${.CURDIR}/../../common
 .include "${.CURDIR}/../../common/Makefile.inc"
 
+# need to do this after common stuff pulled in
+SRCS.loader.sym:=	start.S conf.c efimd.c vers.c main.c ${SRCS}
 
-FILES=		loader.efi
-
+# XXX verify
+BINDIR?=	/usr/mdec
 
 LDSCRIPT=	${.CURDIR}/ldscript.${MACHINE_ARCH}
 LDFLAGS=	-Wl,-T${LDSCRIPT} -shared -symbolic -nostdlib
 
-${PROG}: ${LDSCRIPT}
+loader.sym: ${LDSCRIPT}
 
-CLEANFILES+=	vers.c loader.efi ${OBJS}
+CLEANFILES+=	vers.c ${OBJS}
 
 NEWVERSWHAT=	"EFI boot" ${MACHINE_ARCH}
 
@@ -50,14 +39,14 @@ vers.c: ${VERSIONFILE} ${SOURCES}
 	${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
 	${.ALLSRC} ${MACHINE} ${NEWVERSWHAT}
 
-loader.efi: ${PROG}
-	if [ `${OBJDUMP} -t ${.ALLSRC} | fgrep '*UND*' | wc -l` != 0 ]; then \
-		${OBJDUMP} -t ${.ALLSRC} | fgrep '*UND*'; \
+loader.efi: loader.sym
+	if [ `${OBJDUMP} -t loader.sym | fgrep '*UND*' | wc -l` != 0 ]; then \
+		${OBJDUMP} -t loader.sym | fgrep '*UND*'; \
 		exit 1; \
 	fi
 	${OBJCOPY} -j .data -j .dynamic -j .dynstr -j .dynsym -j .hash \
 	-j .rela.dyn -j .reloc -j .sdata -j .text \
-	--target=efi-app-${MACHINE_ARCH} ${.ALLSRC} ${.TARGET}
+	--target=efi-app-${MACHINE_ARCH} loader.sym ${.TARGET}
 	@echo link finished.
 
 all: loader.efi

Index: src/sys/arch/ia64/stand/ia64/ski/Makefile
diff -u src/sys/arch/ia64/stand/ia64/ski/Makefile:1.4 src/sys/arch/ia64/stand/ia64/ski/Makefile:1.5
--- src/sys/arch/ia64/stand/ia64/ski/Makefile:1.4	Sat Jan 22 19:19:19 2011
+++ src/sys/arch/ia64/stand/ia64/ski/Makefile	Fri Aug  5 17:08:10 2016
@@ -6,6 +6,7 @@ VERSIONFILE= ${.CURDIR}/version
 
 PROG=		skiload
 MAN=#
+BINDIR?=	/usr/mdec
 
 STRIP=		# We must not strip skiload at install time.
 
@@ -16,8 +17,6 @@ SRCS=		conf.c copy.c delay.c devicename.
 CPPFLAGS+=	-DLOADER -DSKIFS
 CPPFLAGS+=	-I${S}
 CPPFLAGS+=	-I${IA64_STAND_DIR}/common
-CPPFLAGS+=	-I${IA64_STAND_DIR}/efi/include
-CPPFLAGS+=	-I${IA64_STAND_DIR}/efi/include/${MACHINE_ARCH}
 
 CPPFLAGS+= 	-DLIBKERN_OPTIMISE_SPACE \
 		-DHEAP_VARIABLE

CVS commit: src/sys/arch/ia64/stand

2016-08-04 Thread Sean Cole 
Module Name:src
Committed By:   scole
Date:   Thu Aug  4 16:22:40 UTC 2016

Modified Files:
src/sys/arch/ia64/stand/common: Makefile.inc dev_net.c dev_net.h
src/sys/arch/ia64/stand/efi/libefi: Makefile efiboot.h efinet.c
src/sys/arch/ia64/stand/ia64: Makefile.booters
src/sys/arch/ia64/stand/ia64/efi: conf.c main.c
src/sys/arch/ia64/stand/ia64/ski: conf.c time.c

Log Message:
PR port-ia64/49717

Minimal changes needed to add nfs netboot support


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/stand/common/Makefile.inc \
src/sys/arch/ia64/stand/common/dev_net.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/ia64/stand/common/dev_net.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/stand/efi/libefi/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/stand/efi/libefi/efiboot.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ia64/stand/efi/libefi/efinet.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ia64/stand/ia64/Makefile.booters
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/stand/ia64/efi/conf.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/ia64/stand/ia64/efi/main.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/stand/ia64/ski/conf.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/stand/ia64/ski/time.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/ia64/stand/common/Makefile.inc
diff -u src/sys/arch/ia64/stand/common/Makefile.inc:1.2 src/sys/arch/ia64/stand/common/Makefile.inc:1.3
--- src/sys/arch/ia64/stand/common/Makefile.inc:1.2	Sun Jul  2 17:28:11 2006
+++ src/sys/arch/ia64/stand/common/Makefile.inc	Thu Aug  4 16:22:40 2016
@@ -1,6 +1,6 @@
-# $FreeBSD$
+#	$NetBSD: Makefile.inc,v 1.3 2016/08/04 16:22:40 scole Exp $
 
-SRCS+=	commands.c console.c devopen.c interp.c boot.c #XXX: Remove bcache.c 
+SRCS+=	commands.c console.c devopen.c interp.c boot.c dev_net.c
 SRCS+=	interp_backslash.c interp_parse.c ls.c misc.c 
 SRCS+=	panic.c calloc.c readdir.c pager.c environment.c fileload.c 
 SRCS+=  getopt.c gets.c strdup.c strtol.c strspn.c
@@ -9,7 +9,8 @@ SRCS+=  getopt.c gets.c strdup.c strtol.
 SRCS+=	load_elf64.c 
 .endif
 
-.if defined(LOADER_NET_SUPPORT)
+# XXX might need this for different loaders later
+#.if defined(LOADER_NET_SUPPORT)
 #SRCS+=	dev_net.c
-.endif
+#.endif
 
Index: src/sys/arch/ia64/stand/common/dev_net.h
diff -u src/sys/arch/ia64/stand/common/dev_net.h:1.2 src/sys/arch/ia64/stand/common/dev_net.h:1.3
--- src/sys/arch/ia64/stand/common/dev_net.h:1.2	Sat Apr 22 07:58:53 2006
+++ src/sys/arch/ia64/stand/common/dev_net.h	Thu Aug  4 16:22:40 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: dev_net.h,v 1.2 2006/04/22 07:58:53 cherry Exp $	*/
+/*	$NetBSD: dev_net.h,v 1.3 2016/08/04 16:22:40 scole Exp $	*/
 
 /*-
  * Copyright (c) 1998 Doug Rabson 
@@ -28,5 +28,7 @@
  * $FreeBSD: src/sys/boot/common/dev_net.h,v 1.2 1999/08/28 00:39:46 peter Exp $
  */
 
-extern struct devsw netdev;
-
+int	net_open(struct open_file *, ...);
+int	net_close(struct open_file *);
+int	net_ioctl(struct open_file *, u_long, void *);
+int	net_strategy(void *, int , daddr_t , size_t, void *, size_t *);

Index: src/sys/arch/ia64/stand/common/dev_net.c
diff -u src/sys/arch/ia64/stand/common/dev_net.c:1.10 src/sys/arch/ia64/stand/common/dev_net.c:1.11
--- src/sys/arch/ia64/stand/common/dev_net.c:1.10	Mon Feb  1 17:38:31 2016
+++ src/sys/arch/ia64/stand/common/dev_net.c	Thu Aug  4 16:22:40 2016
@@ -1,5 +1,5 @@
 /*	
- * $NetBSD: dev_net.c,v 1.10 2016/02/01 17:38:31 christos Exp $
+ * $NetBSD: dev_net.c,v 1.11 2016/08/04 16:22:40 scole Exp $
  */
 
 /*-
@@ -53,17 +53,15 @@
  */
 
 #include 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "dev_net.h"
 #include "bootstrap.h"
@@ -73,31 +71,8 @@ int debug = 0;
 static int netdev_sock = -1;
 static int netdev_opens;
 
-static int	net_init(void);
-static int	net_open(struct open_file *, ...);
-static int	net_close(struct open_file *);
-static int	net_strategy();
-static void	net_print(int);
-
 static int net_getparams(int sock);
 
-struct devsw netdev = {
-"net", 
-DEVT_NET, 
-net_init,
-net_strategy, 
-net_open, 
-net_close, 
-noioctl,
-net_print
-};
-
-int
-net_init(void)
-{
-return 0;
-}
-
 /*
  * Called by devopen after it sets f->f_dev to our devsw entry.
  * This opens the low-level device and sets f->f_devdata.
@@ -136,6 +111,23 @@ net_open(struct open_file *f, ...)
 		return (error);
 	}
 	}
+	if (debug)
+	printf("net_open: got rootip %s\n", inet_ntoa(rootip));
+
+	/*
+	 * Get the NFS file handle (mount).
+	 */
+	error = nfs_mount(netdev_sock, rootip, rootpath);
+	if (error) {
+	netif_close(netdev_sock);
+	netdev_sock = -1;
+	printf("net_open: error with nfs mount 0x%x\n", error);
+	return error;
+	}
+
+	if

CVS commit: src/sys/arch/ia64/stand/common

2016-02-01 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Mon Feb  1 17:38:31 UTC 2016

Modified Files:
src/sys/arch/ia64/stand/common: dev_net.c

Log Message:
PR/50736: David Binderman: Check bounds before dereferencing.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/ia64/stand/common/dev_net.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/ia64/stand/common/dev_net.c
diff -u src/sys/arch/ia64/stand/common/dev_net.c:1.9 src/sys/arch/ia64/stand/common/dev_net.c:1.10
--- src/sys/arch/ia64/stand/common/dev_net.c:1.9	Tue Mar 25 14:35:32 2014
+++ src/sys/arch/ia64/stand/common/dev_net.c	Mon Feb  1 12:38:31 2016
@@ -1,5 +1,5 @@
 /*	
- * $NetBSD: dev_net.c,v 1.9 2014/03/25 18:35:32 christos Exp $
+ * $NetBSD: dev_net.c,v 1.10 2016/02/01 17:38:31 christos Exp $
  */
 
 /*-
@@ -265,7 +265,7 @@ net_getparams(int sock)
  * before passing it along.  This allows us to be compatible with
  * the kernel's diskless (BOOTP_NFSROOT) booting conventions
  */
-for (i = 0; rootpath[i] != '\0' && i < FNAME_SIZE; i++)
+for (i = 0; i < FNAME_SIZE && rootpath[i] != '\0'; i++)
 	if (rootpath[i] == ':')
 		break;
 if (i && i != FNAME_SIZE && rootpath[i] == ':') {

CVS commit: src/sys/arch/ia64/stand

2014-04-08 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Tue Apr  8 21:51:06 UTC 2014

Modified Files:
src/sys/arch/ia64/stand/common: boot.c commands.c
src/sys/arch/ia64/stand/efi/libefi: devicename.c
src/sys/arch/ia64/stand/ia64/ski: devicename.c

Log Message:
Make it compile again - partly from PR 48727 by Henning Petersen.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ia64/stand/common/boot.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ia64/stand/common/commands.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/ia64/stand/efi/libefi/devicename.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ia64/stand/ia64/ski/devicename.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/ia64/stand/common/boot.c
diff -u src/sys/arch/ia64/stand/common/boot.c:1.6 src/sys/arch/ia64/stand/common/boot.c:1.7
--- src/sys/arch/ia64/stand/common/boot.c:1.6	Tue Mar 25 18:35:32 2014
+++ src/sys/arch/ia64/stand/common/boot.c	Tue Apr  8 21:51:06 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.6 2014/03/25 18:35:32 christos Exp $	*/
+/*	$NetBSD: boot.c,v 1.7 2014/04/08 21:51:06 martin Exp $	*/
 
 /*-
  * Copyright (c) 1998 Michael Smith msm...@freebsd.org
@@ -108,7 +108,7 @@ command_boot(int argc, char *argv[])
 	return(CMD_ERROR);
 
 /* Call the exec handler from the loader matching the kernel */
-command_seterr(%s, strerror(file_formats[fp-f_loader]-l_exec(fp));
+command_seterr(%s, strerror(file_formats[fp-f_loader]-l_exec(fp)));
 return(CMD_ERROR);
 }
 

Index: src/sys/arch/ia64/stand/common/commands.c
diff -u src/sys/arch/ia64/stand/common/commands.c:1.4 src/sys/arch/ia64/stand/common/commands.c:1.5
--- src/sys/arch/ia64/stand/common/commands.c:1.4	Tue Mar 25 18:35:32 2014
+++ src/sys/arch/ia64/stand/common/commands.c	Tue Apr  8 21:51:06 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: commands.c,v 1.4 2014/03/25 18:35:32 christos Exp $	*/
+/*	$NetBSD: commands.c,v 1.5 2014/04/08 21:51:06 martin Exp $	*/
 
 /*-
  * Copyright (c) 1998 Michael Smith msm...@freebsd.org
@@ -42,7 +42,7 @@ command_seterr(const char *fmt, ...)
 {
 	int len;
 	va_list ap;
-	va_start(fmt, ap);
+	va_start(ap, fmt);
 	len = vsnprintf(command_errbuf, sizeof(command_errbuf), fmt, ap);
 	va_end(ap);
 	return len;

Index: src/sys/arch/ia64/stand/efi/libefi/devicename.c
diff -u src/sys/arch/ia64/stand/efi/libefi/devicename.c:1.7 src/sys/arch/ia64/stand/efi/libefi/devicename.c:1.8
--- src/sys/arch/ia64/stand/efi/libefi/devicename.c:1.7	Thu Mar 27 18:22:56 2014
+++ src/sys/arch/ia64/stand/efi/libefi/devicename.c	Tue Apr  8 21:51:06 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: devicename.c,v 1.7 2014/03/27 18:22:56 christos Exp $	*/
+/*	$NetBSD: devicename.c,v 1.8 2014/04/08 21:51:06 martin Exp $	*/
 
 /*-
  * Copyright (c) 1998 Michael Smith msm...@freebsd.org
@@ -227,8 +227,8 @@ efi_fmtdev(void *vdev)
 		if (dev-d_kind.efidisk.partition = 0) {
 			len += snprintf(buf + len, buflen - len, %c, dev-d_kind.efidisk.partition + 'a');
 			if (len  buflen)
-		}
 len = buflen;
+		}
 		strlcat(buf, :, sizeof(buf) - len);
 		break;
 

Index: src/sys/arch/ia64/stand/ia64/ski/devicename.c
diff -u src/sys/arch/ia64/stand/ia64/ski/devicename.c:1.6 src/sys/arch/ia64/stand/ia64/ski/devicename.c:1.7
--- src/sys/arch/ia64/stand/ia64/ski/devicename.c:1.6	Thu Mar 27 18:22:56 2014
+++ src/sys/arch/ia64/stand/ia64/ski/devicename.c	Tue Apr  8 21:51:06 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: devicename.c,v 1.6 2014/03/27 18:22:56 christos Exp $	*/
+/*	$NetBSD: devicename.c,v 1.7 2014/04/08 21:51:06 martin Exp $	*/
 
 /*-
  * Copyright (c) 1998 Michael Smith msm...@freebsd.org
@@ -224,7 +224,7 @@ ski_fmtdev(void *vdev)
 			if (len  buflen)
 len = buflen;
 		}
-		strlcat(cp, :, buflen - len);
+		strlcat(buf, :, buflen - len);
 		break;
 
 	case DEVT_NET:

CVS commit: src/sys/arch/ia64/stand/ia64

2013-08-21 Thread Matt Thomas 
Module Name:src
Committed By:   matt
Date:   Wed Aug 21 07:17:08 UTC 2013

Modified Files:
src/sys/arch/ia64/stand/ia64: Makefile.booters

Log Message:
Use bsd.klinks.mk


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ia64/stand/ia64/Makefile.booters

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/ia64/stand/ia64/Makefile.booters
diff -u src/sys/arch/ia64/stand/ia64/Makefile.booters:1.4 src/sys/arch/ia64/stand/ia64/Makefile.booters:1.5
--- src/sys/arch/ia64/stand/ia64/Makefile.booters:1.4	Thu May 27 06:58:14 2010
+++ src/sys/arch/ia64/stand/ia64/Makefile.booters	Wed Aug 21 07:17:08 2013
@@ -1,6 +1,7 @@
-#	$NetBSD: Makefile.booters,v 1.4 2010/05/27 06:58:14 dholland Exp $
+#	$NetBSD: Makefile.booters,v 1.5 2013/08/21 07:17:08 matt Exp $
 
 .include bsd.own.mk
+.include bsd.klinks.mk
 
 STRIPFLAG=
 BINMODE=444
@@ -23,29 +24,6 @@ CFLAGS+=	-ffreestanding -fshort-wchar -W
 LDFLAGS+=	#-nostdlib
 CPPFLAGS+=	-D_STANDALONE
 
-.if !make(obj)  !make(clean)  !make(cleandir)
-.BEGIN: machine
-.NOPATH: machine
-.endif
-
-realdepend realall: machine lib
-CLEANFILES= machine
-
-machine:
-	-rm -f $@
-	ln -s $S/arch/${MACHINE_ARCH}/include $@
-
-${OBJS}: machine lib
-
-lib:
-.ifdef LIBOBJ
-	-rm -f $@
-	ln -s ${LIBOBJ}/lib .
-	[ -d ${LIBOBJ}/lib ] || mkdir ${LIBOBJ}/lib
-.else
-	mkdir lib
-.endif
-
 ### find out what to use for libkern
 KERN_AS=	library
 .include ${S}/lib/libkern/Makefile.inc

CVS commit: src/sys/arch/ia64/stand/common

2013-06-27 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Thu Jun 27 21:22:16 UTC 2013

Modified Files:
src/sys/arch/ia64/stand/common: fileload.c

Log Message:
fix uninitialized variable
http://M00nBSD.net/ae123a9bae03f7dde5c6d654412daf5a.html


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/stand/common/fileload.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/ia64/stand/common/fileload.c
diff -u src/sys/arch/ia64/stand/common/fileload.c:1.3 src/sys/arch/ia64/stand/common/fileload.c:1.4
--- src/sys/arch/ia64/stand/common/fileload.c:1.3	Thu Dec 27 15:21:51 2012
+++ src/sys/arch/ia64/stand/common/fileload.c	Thu Jun 27 17:22:16 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: fileload.c,v 1.3 2012/12/27 20:21:51 martin Exp $	*/
+/*	$NetBSD: fileload.c,v 1.4 2013/06/27 21:22:16 christos Exp $	*/
 
 /*-
  * Copyright (c) 1998 Michael Smith msm...@freebsd.org
@@ -61,7 +61,7 @@ int
 command_load(int argc, char *argv[])
 {
 char	*typestr;
-int		dofile, dokld, ch, error;
+int		dofile, dokld, ch;
 
 dokld = dofile = 0;
 optind = 1;
@@ -89,11 +89,12 @@ command_load(int argc, char *argv[])
  * Do we have explicit KLD load ?
  */
 if (dokld || file_havepath(argv[1])) {
-	error = file_loadkernel(argv[1], argc - 2, argv + 2);
+	int error = file_loadkernel(argv[1], argc - 2, argv + 2);
 	if (error == EEXIST)
 	sprintf(command_errbuf, warning: KLD '%s' already loaded, argv[1]);
+	return error == 0 ? CMD_OK : CMD_ERROR;
 }
-return (error == 0 ? CMD_OK : CMD_ERROR);
+return CMD_OK;
 }

CVS commit: src/sys/arch/ia64/stand

2012-12-27 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Thu Dec 27 20:21:51 UTC 2012

Modified Files:
src/sys/arch/ia64/stand/common: bootstrap.h fileload.c interp.c misc.c
readdir.c
src/sys/arch/ia64/stand/efi/libefi: bootinfo.c devicename.c efi.c
efifsdev.h exec.c
src/sys/arch/ia64/stand/ia64/efi: main.c
src/sys/arch/ia64/stand/ia64/ski: acpi_stub.c bootinfo.c devicename.c
efi_stub.c exec.c libski.h main.c sal_stub.c

Log Message:
Make it all compile


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/ia64/stand/common/bootstrap.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/stand/common/fileload.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ia64/stand/common/interp.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/stand/common/misc.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/stand/common/readdir.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/stand/efi/libefi/bootinfo.c \
src/sys/arch/ia64/stand/efi/libefi/efi.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ia64/stand/efi/libefi/devicename.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/ia64/stand/efi/libefi/efifsdev.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/stand/efi/libefi/exec.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/ia64/stand/ia64/efi/main.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ia64/stand/ia64/ski/acpi_stub.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/stand/ia64/ski/bootinfo.c \
src/sys/arch/ia64/stand/ia64/ski/devicename.c \
src/sys/arch/ia64/stand/ia64/ski/efi_stub.c \
src/sys/arch/ia64/stand/ia64/ski/main.c \
src/sys/arch/ia64/stand/ia64/ski/sal_stub.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/stand/ia64/ski/exec.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/stand/ia64/ski/libski.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/ia64/stand/common/bootstrap.h
diff -u src/sys/arch/ia64/stand/common/bootstrap.h:1.7 src/sys/arch/ia64/stand/common/bootstrap.h:1.8
--- src/sys/arch/ia64/stand/common/bootstrap.h:1.7	Thu Jun 30 20:09:31 2011
+++ src/sys/arch/ia64/stand/common/bootstrap.h	Thu Dec 27 20:21:50 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: bootstrap.h,v 1.7 2011/06/30 20:09:31 wiz Exp $	*/
+/*	$NetBSD: bootstrap.h,v 1.8 2012/12/27 20:21:50 martin Exp $	*/
 
 /*-
  * Copyright (c) 1998 Michael Smith msm...@freebsd.org
@@ -57,6 +57,7 @@ extern char	command_errbuf[];	/* XXX bla
 #define CMD_OK		0
 #define CMD_ERROR	1
 
+
 /* interp.c */
 void	interact(void);
 int	include(const char *filename);
@@ -124,6 +125,7 @@ struct console 
 };
 extern struct console	*consoles[];
 void		cons_probe(void);
+int		ischar(void);
 
 /*
  * Plug-and-play enumerator/configurator interface.
@@ -211,6 +213,7 @@ int			mod_loadkld(const char *name, int 
 struct preloaded_file *file_alloc(void);
 struct preloaded_file *file_findfile(char *name, char *type);
 
+int file_loadkernel(char *filename, int argc, char *argv[]);
 void file_discard(struct preloaded_file *fp);
 
 int	elf64_loadfile(char *filename, u_int64_t dest, struct preloaded_file **result);
@@ -330,6 +333,12 @@ time_t	time(time_t *tloc);
 /* calloc.c */
 void*calloc(unsigned int, unsigned int);
 
+/* various string functions */
+size_t	strspn(const char *s1, const char *s2);
+size_t	strlen(const char *s);
+char *strcpy(char * restrict dst, const char * restrict src);
+char *strcat(char * restrict s, const char * restrict append);
+
 /* pager.c */
 extern void	pager_open(void);
 extern void	pager_close(void);

Index: src/sys/arch/ia64/stand/common/fileload.c
diff -u src/sys/arch/ia64/stand/common/fileload.c:1.2 src/sys/arch/ia64/stand/common/fileload.c:1.3
--- src/sys/arch/ia64/stand/common/fileload.c:1.2	Wed Mar 18 16:00:12 2009
+++ src/sys/arch/ia64/stand/common/fileload.c	Thu Dec 27 20:21:51 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: fileload.c,v 1.2 2009/03/18 16:00:12 cegger Exp $	*/
+/*	$NetBSD: fileload.c,v 1.3 2012/12/27 20:21:51 martin Exp $	*/
 
 /*-
  * Copyright (c) 1998 Michael Smith msm...@freebsd.org
@@ -33,8 +33,9 @@
  */
 
 #include lib/libsa/stand.h
+#include lib/libsa/loadfile.h
+#include lib/libkern/libkern.h
 #include sys/param.h
-#include sys/lkm.h
 #include sys/queue.h
 
 #include bootstrap.h
@@ -266,10 +267,11 @@ file_alloc(void)
 
 if ((fp = alloc(sizeof(struct preloaded_file))) != NULL) {
 	memset(fp, 0, sizeof(struct preloaded_file));
-
+/*
 	if (fp-marks = alloc(sizeof(u_long))) {
 		memset(fp-marks, 0, sizeof(u_long));
 	}
+*/
 }
 return (fp);
 }

Index: src/sys/arch/ia64/stand/common/interp.c
diff -u src/sys/arch/ia64/stand/common/interp.c:1.4 src/sys/arch/ia64/stand/common/interp.c:1.5
--- src/sys/arch/ia64/stand/common/interp.c:1.4	Mon Jul 20 04:59:03 2009
+++ src/sys/arch/ia64/stand/common/interp.c	Thu Dec 27 20:21:51 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: interp.c,v 1.4 2009/07/20 04:59:03 kiyohara Exp $	*/
+/*	$NetBSD: interp.c,v 1.5 2012/12/27 20:21:51 martin Exp $	*/
 
 /*-
  * Copyright (c)

CVS commit: src/sys/arch/ia64/stand/ia64/ski

2009-11-10 Thread KIYOHARA Takashi 
Module Name:src
Committed By:   kiyohara
Date:   Wed Nov 11 05:19:35 UTC 2009

Modified Files:
src/sys/arch/ia64/stand/ia64/ski: acpi_stub.c

Log Message:
Include dev/acpi/acpica.h instead of external/intel-public/acpica/ ... .
  Thanks cegger@


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/stand/ia64/ski/acpi_stub.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/ia64/stand/ia64/ski/acpi_stub.c
diff -u src/sys/arch/ia64/stand/ia64/ski/acpi_stub.c:1.5 src/sys/arch/ia64/stand/ia64/ski/acpi_stub.c:1.6
--- src/sys/arch/ia64/stand/ia64/ski/acpi_stub.c:1.5	Tue Nov 10 11:14:48 2009
+++ src/sys/arch/ia64/stand/ia64/ski/acpi_stub.c	Wed Nov 11 05:19:34 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi_stub.c,v 1.5 2009/11/10 11:14:48 kiyohara Exp $	*/
+/*	$NetBSD: acpi_stub.c,v 1.6 2009/11/11 05:19:34 kiyohara Exp $	*/
 
 /*-
  * Copyright (c) 2003 Marcel Moolenaar
@@ -34,7 +34,7 @@
 
 #include sys/types.h
 #include sys/lock.h
-#include external/intel-public/acpica/dist/include/acpi.h
+#include dev/acpi/acpica.h
 
 #define APIC_IO_SAPIC   6
 #define APIC_LOCAL_SAPIC7

CVS commit: src/sys/arch/ia64/stand

2009-07-19 Thread KIYOHARA Takashi 
Module Name:src
Committed By:   kiyohara
Date:   Mon Jul 20 04:59:04 UTC 2009

Modified Files:
src/sys/arch/ia64/stand/common: boot.c bootstrap.h commands.c console.c
devopen.c environment.c gets.c interp.c interp_backslash.c
interp_parse.c ls.c misc.c pager.c readdir.c strdup.c strtol.c
src/sys/arch/ia64/stand/efi/libefi: Makefile Makefile.inc devicename.c
efi_console.c efifpswa.c efifs.c
src/sys/arch/ia64/stand/ia64: Makefile.booters
src/sys/arch/ia64/stand/ia64/efi: Makefile conf.c main.c
src/sys/arch/ia64/stand/ia64/ski: Makefile bootinfo.c conf.c
devicename.c efi_stub.c exit.c main.c sal_stub.c skiconsole.c
skifs.c ssc.c time.c

Log Message:
Fix little bit, and add a few files.
  current status is to see following thread.
http://mail-index.netbsd.org/port-ia64/2009/06/18/msg000102.html


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ia64/stand/common/boot.c \
src/sys/arch/ia64/stand/common/misc.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/stand/common/bootstrap.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/stand/common/commands.c \
src/sys/arch/ia64/stand/common/console.c \
src/sys/arch/ia64/stand/common/devopen.c \
src/sys/arch/ia64/stand/common/interp_backslash.c \
src/sys/arch/ia64/stand/common/ls.c \
src/sys/arch/ia64/stand/common/readdir.c \
src/sys/arch/ia64/stand/common/strdup.c \
src/sys/arch/ia64/stand/common/strtol.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/ia64/stand/common/environment.c \
src/sys/arch/ia64/stand/common/gets.c \
src/sys/arch/ia64/stand/common/pager.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/stand/common/interp.c \
src/sys/arch/ia64/stand/common/interp_parse.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/ia64/stand/efi/libefi/Makefile \
src/sys/arch/ia64/stand/efi/libefi/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/stand/efi/libefi/devicename.c \
src/sys/arch/ia64/stand/efi/libefi/efi_console.c \
src/sys/arch/ia64/stand/efi/libefi/efifs.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/stand/efi/libefi/efifpswa.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/stand/ia64/Makefile.booters
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/ia64/stand/ia64/efi/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/stand/ia64/efi/conf.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/stand/ia64/efi/main.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/stand/ia64/ski/Makefile \
src/sys/arch/ia64/stand/ia64/ski/bootinfo.c \
src/sys/arch/ia64/stand/ia64/ski/devicename.c \
src/sys/arch/ia64/stand/ia64/ski/efi_stub.c \
src/sys/arch/ia64/stand/ia64/ski/exit.c \
src/sys/arch/ia64/stand/ia64/ski/sal_stub.c \
src/sys/arch/ia64/stand/ia64/ski/ssc.c \
src/sys/arch/ia64/stand/ia64/ski/time.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/ia64/stand/ia64/ski/conf.c \
src/sys/arch/ia64/stand/ia64/ski/main.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/stand/ia64/ski/skiconsole.c \
src/sys/arch/ia64/stand/ia64/ski/skifs.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/ia64/stand/common/boot.c
diff -u src/sys/arch/ia64/stand/common/boot.c:1.4 src/sys/arch/ia64/stand/common/boot.c:1.5
--- src/sys/arch/ia64/stand/common/boot.c:1.4	Wed Mar 18 10:22:31 2009
+++ src/sys/arch/ia64/stand/common/boot.c	Mon Jul 20 04:59:03 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.4 2009/03/18 10:22:31 cegger Exp $	*/
+/*	$NetBSD: boot.c,v 1.5 2009/07/20 04:59:03 kiyohara Exp $	*/
 
 /*-
  * Copyright (c) 1998 Michael Smith msm...@freebsd.org
@@ -35,6 +35,7 @@
  */
 
 #include lib/libsa/stand.h
+#include lib/libsa/loadfile.h
 #include lib/libkern/libkern.h
 
 #include bootstrap.h
@@ -106,7 +107,6 @@
 	return(CMD_ERROR);
 
 /* Call the exec handler from the loader matching the kernel */
-file_formats[fp-f_loader]-l_exec(fp);
 command_errmsg = strerror(file_formats[fp-f_loader]-l_exec(fp));
 return(CMD_ERROR);
 }
Index: src/sys/arch/ia64/stand/common/misc.c
diff -u src/sys/arch/ia64/stand/common/misc.c:1.4 src/sys/arch/ia64/stand/common/misc.c:1.5
--- src/sys/arch/ia64/stand/common/misc.c:1.4	Wed Mar 18 16:00:12 2009
+++ src/sys/arch/ia64/stand/common/misc.c	Mon Jul 20 04:59:03 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: misc.c,v 1.4 2009/03/18 16:00:12 cegger Exp $	*/
+/*	$NetBSD: misc.c,v 1.5 2009/07/20 04:59:03 kiyohara Exp $	*/
 
 /*-
  * Copyright (c) 1998 Michael Smith msm...@freebsd.org
@@ -30,6 +30,7 @@
 /* __FBSDID($FreeBSD: src/sys/boot/common/misc.c,v 1.8.4.1 2004/09/03 19:25:40 iedowse Exp $); */
 
 #include lib/libsa/stand.h
+#include lib/libsa/loadfile.h
 #include bootstrap.h
 
 /*

Index: src/sys/arch/ia64/stand/common/bootstrap.h
diff -u src/sys/arch/ia64/stand/common/bootstrap.h:1.5 src/sys/arch/ia64/stand/common/bootstrap.h:1.6
--- src/sys/arch/ia64/stand/common/bootstrap.h:1.5	Sun Mar  4 06:00:03 2007
+++