Date: Thu, 11 Apr 2002 23:04:41 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 9602 for review Message-ID: <200204120604.g3C64fq51758@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9602 Change 9602 by peter@peter_thunder on 2002/04/11 23:03:49 Try and make 'options SKI' non-fatal for real hardware and make the detection work properly. Affected files ... ... //depot/projects/ia64/sys/conf/options.ia64#3 edit ... //depot/projects/ia64/sys/ia64/ia64/machdep.c#25 edit Differences ... ==== //depot/projects/ia64/sys/conf/options.ia64#3 (text+ko) ==== @@ -70,3 +70,4 @@ # Device options DEV_SPLASH opt_splash.h +DEV_ACPICA opt_acpi.h ==== //depot/projects/ia64/sys/ia64/ia64/machdep.c#25 (text+ko) ==== @@ -30,6 +30,11 @@ #include "opt_ddb.h" #include "opt_ski.h" #include "opt_msgbuf.h" +#include "opt_acpi.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/systm.h> @@ -222,12 +227,19 @@ bufinit(); vm_pager_bufferinit(); -#ifndef SKI +#ifdef DEV_ACPICA /* * Traverse the MADT to discover IOSAPIC and Local SAPIC * information. */ - ia64_probe_sapics(); + if (!ia64_running_in_simulator()) + 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 } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200204120604.g3C64fq51758>