diff options
| author | marcel <marcel@FreeBSD.org> | 2002-04-30 02:29:00 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 2002-04-30 02:29:00 +0000 |
| commit | 8159406b95071f7ad52a287f52d55e1e8c7e5a7f (patch) | |
| tree | fff7ce8f7fadcf9f2eefe6755d3feeb1a7f6678b /sys | |
| parent | 6e645b20ef661ea95adf6bdbc4bb5ce26350b042 (diff) | |
| download | FreeBSD-src-8159406b95071f7ad52a287f52d55e1e8c7e5a7f.zip FreeBSD-src-8159406b95071f7ad52a287f52d55e1e8c7e5a7f.tar.gz | |
Make this work for ski again. Don't call ia64_mca_init() when we're
in the simulator.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/ia64/ia64/machdep.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/sys/ia64/ia64/machdep.c b/sys/ia64/ia64/machdep.c index 7d7d53f..c79abe5 100644 --- a/sys/ia64/ia64/machdep.c +++ b/sys/ia64/ia64/machdep.c @@ -227,22 +227,21 @@ cpu_startup(dummy) bufinit(); vm_pager_bufferinit(); + if (!ia64_running_in_simulator()) { #ifdef DEV_ACPICA - /* - * Traverse the MADT to discover IOSAPIC and Local SAPIC - * information. - */ - if (!ia64_running_in_simulator()) + /* + * Traverse the MADT to discover IOSAPIC and Local SAPIC + * information. + */ ia64_probe_sapics(); + ia64_mca_init(); #else - /* - * It is an error to boot a SKI-only kernel on hardware. - */ - if (!ia64_running_in_simulator()) + /* + * It is an error to boot a SKI-only kernel on hardware. + */ panic("Mandatory 'device acpica' is missing"); #endif - - ia64_mca_init(); + } } void |
