diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2008-06-02 11:46:20 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2008-06-02 11:46:20 +0000 |
| commit | f3036d5c36b6578cbf2d4a781413249e03db24c3 (patch) | |
| tree | 85b0e5e5e7c6100a1f1005ecbc2f9d236c558e0c /sys/arch | |
| parent | e7168f78a6aa8135eef01c0d2f0112c38b895601 (diff) | |
Move interrupt setup to before ddb setup not after.
Makes early ddb (boot -d/ddb from ukc) work on amd64.
Similiar to the change made in NetBSD by Andrew Doran.
ok kettenis@ fgsch@
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/amd64/amd64/machdep.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c index ba1925d4e3c..71905848f35 100644 --- a/sys/arch/amd64/amd64/machdep.c +++ b/sys/arch/amd64/amd64/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.75 2008/05/23 15:39:43 jasper Exp $ */ +/* $OpenBSD: machdep.c,v 1.76 2008/06/02 11:46:19 jsg Exp $ */ /* $NetBSD: machdep.c,v 1.3 2003/05/07 22:58:18 fvdl Exp $ */ /*- @@ -1561,6 +1561,12 @@ init_x86_64(paddr_t first_avail) cpu_init_idt(); + intr_default_setup(); + + softintr_init(); + splraise(IPL_IPI); + enable_intr(); + #ifdef DDB db_machine_init(); ddb_init(); @@ -1575,12 +1581,6 @@ init_x86_64(paddr_t first_avail) } #endif - intr_default_setup(); - - softintr_init(); - splraise(IPL_IPI); - enable_intr(); - /* Make sure maxproc is sane */ if (maxproc > cpu_maxproc()) maxproc = cpu_maxproc(); |