cvs commit: src/sys/i386/acpica madt.c src/sys/i386/i386 local_apic.c mptable.c

[John Baldwin]

On 04-Dec-2003 Nate Lawson wrote:
> On Wed, 3 Dec 2003, John Baldwin wrote:
>>   - Allow the apic device to be disabled via 'hint.apic.0.disabled' from the
>>     loader.  Note that since this is done in the local APIC code, it works
>>     for both the ACPI and non-ACPI cases.
>>
>>   Approved by:    re (scott / blanket)
>>
>>   Revision  Changes    Path
>>   1.8       +2 -3      src/sys/i386/acpica/madt.c
>>   1.4       +16 -24    src/sys/i386/i386/local_apic.c
>>   1.228     +2 -2      src/sys/i386/i386/mptable.c
>>
>>  static void
>>  apic_init(void *dummy __unused)
>>  {
>>      struct apic_enumerator *enumerator;
>> +    uint64_t apic_base;
>>      int retval, best;
>>
>>      /* We only support built in local APICs. */
>>      if (!(cpu_feature & CPUID_APIC))
>>              return;
>>
>> +    /* Don't probe if APIC mode is disabled. */
>> +    if (resource_disabled("apic", 0))
>> +            return;
>> +
> 
> Isn't the code that Peter just committed to amd64 redundant with this?

His code only works for the ACPI case and doesn't handle the MP Table
case.

-- 

John Baldwin <jhb at FreeBSD.org>  <><  http://www.FreeBSD.org/~jhb/
"Power Users Use the Power to Serve!"  -  http://www.FreeBSD.org/