system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-21 17:25:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow a kernel to be compiled with both SKI and acpica and still

Browse source 
work on real hardware.  (SKI used to break the sapic probes)
This commit is contained in:
Peter Wemm 2002-04-14 04:33:41 +00:00
parent 75a778e9f8
commit 421f855923
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=94639
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sys/conf/options.ia64
View file

@ -70,3 +70,4 @@ SSC_NSECT opt_ski.h
# Device options # Device options
DEV_SPLASH opt_splash.h DEV_SPLASH opt_splash.h
DEV_ACPICA opt_acpica.h

14
sys/ia64/ia64/machdep.c
View file

@ -30,6 +30,11 @@
#include "opt_ddb.h" #include "opt_ddb.h"
#include "opt_ski.h" #include "opt_ski.h"
#include "opt_msgbuf.h" #include "opt_msgbuf.h"
#include "opt_acpica.h"
#if !defined(SKI) && !defined(DEV_ACPICA)
#error "You need the SKI option and/or the acpica device"
#endif
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -223,12 +228,19 @@ cpu_startup(dummy)
bufinit(); bufinit();
vm_pager_bufferinit(); vm_pager_bufferinit();
#ifndef SKI #ifdef DEV_ACPICA
/* /*
* Traverse the MADT to discover IOSAPIC and Local SAPIC * Traverse the MADT to discover IOSAPIC and Local SAPIC
* information. * information.
*/ */
if (!ia64_running_in_simulator())
ia64_probe_sapics(); ia64_probe_sapics();
#else
/*
* It is an error to boot a SKI-only kernel on hardware.
*/
if (!ia64_running_in_simulator())
panic("Mandatory 'device acpica' is missing");
#endif #endif
} }