Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/ia64/ia64 Call main() in locore.S. like other arch.
details: https://anonhg.NetBSD.org/src/rev/e1704e0dc68e
branches: trunk
changeset: 783737:e1704e0dc68e
user: kiyohara <kiyohara%NetBSD.org@localhost>
date: Sun Jan 06 11:29:35 2013 +0000
description:
Call main() in locore.S. like other arch.
diffstat:
sys/arch/ia64/ia64/locore.S | 4 +++-
sys/arch/ia64/ia64/machdep.c | 8 +-------
2 files changed, 4 insertions(+), 8 deletions(-)
diffs (47 lines):
diff -r cdecb06f8c4b -r e1704e0dc68e sys/arch/ia64/ia64/locore.S
--- a/sys/arch/ia64/ia64/locore.S Sun Jan 06 11:25:13 2013 +0000
+++ b/sys/arch/ia64/ia64/locore.S Sun Jan 06 11:29:35 2013 +0000
@@ -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 @@
;;
br.call.sptk.many rp=ia64_init
;;
+ br.call.sptk.many rp=main
+ ;;
/* NOTREACHED */
1: br.cond.sptk.few 1b
END(start)
diff -r cdecb06f8c4b -r e1704e0dc68e sys/arch/ia64/ia64/machdep.c
--- a/sys/arch/ia64/ia64/machdep.c Sun Jan 06 11:25:13 2013 +0000
+++ b/sys/arch/ia64/ia64/machdep.c Sun Jan 06 11:29:35 2013 +0000
@@ -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 @@
* information.
*/
ia64_probe_sapics();
- /*XXX: ia64_mca_init();*/
}
void
@@ -664,11 +663,6 @@
if (boothowto & RB_KDB)
Debugger();
#endif
-
- extern void main(void);
- main();
-
- panic("Wheeee!!! main() returned!!! \n");
}
uint64_t
Home |
Main Index |
Thread Index |
Old Index