Module Name: src
Committed By: kiyohara
Date: Sun Jan 6 11:29:35 UTC 2013
Modified Files:
src/sys/arch/ia64/ia64: locore.S machdep.c
Log Message:
Call main() in locore.S. like other arch.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ia64/ia64/locore.S
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/ia64/ia64/machdep.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/ia64/locore.S
diff -u src/sys/arch/ia64/ia64/locore.S:1.4 src/sys/arch/ia64/ia64/locore.S:1.5
--- src/sys/arch/ia64/ia64/locore.S:1.4 Sat Oct 1 15:59:28 2011
+++ src/sys/arch/ia64/ia64/locore.S Sun Jan 6 11:29:35 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.4 2011/10/01 15:59:28 chs Exp $ */
+/* $NetBSD: locore.S,v 1.5 2013/01/06 11:29:35 kiyohara Exp $ */
/*-
* Copyright (c) 1998 Doug Rabson
@@ -96,6 +96,8 @@ ENTRY_NOPROFILE(start, 1)
;;
br.call.sptk.many rp=ia64_init
;;
+ br.call.sptk.many rp=main
+ ;;
/* NOTREACHED */
1: br.cond.sptk.few 1b
END(start)
Index: src/sys/arch/ia64/ia64/machdep.c
diff -u src/sys/arch/ia64/ia64/machdep.c:1.33 src/sys/arch/ia64/ia64/machdep.c:1.34
--- src/sys/arch/ia64/ia64/machdep.c:1.33 Mon Nov 5 15:13:04 2012
+++ src/sys/arch/ia64/ia64/machdep.c Sun Jan 6 11:29:35 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.33 2012/11/05 15:13:04 chs Exp $ */
+/* $NetBSD: machdep.c,v 1.34 2013/01/06 11:29:35 kiyohara Exp $ */
/*-
* Copyright (c) 2003,2004 Marcel Moolenaar
@@ -221,7 +221,6 @@ cpu_startup(void)
* information.
*/
ia64_probe_sapics();
- /*XXX: ia64_mca_init();*/
}
void
@@ -664,11 +663,6 @@ ia64_init(void)
if (boothowto & RB_KDB)
Debugger();
#endif
-
- extern void main(void);
- main();
-
- panic("Wheeee!!! main() returned!!! \n");
}
uint64_t
