On Tuesday, December 24, 2013 12:21:01 PM Roger Pau Monne wrote: > Xen PV guests doesn't have a lapic, so disable the lapic call in mca > initialization.
I think this is fine, but I wonder if it wouldn't be cleaner to have lapic_enable_cmc() do the check instead. Where else do you check lapic_disabled? > --- > sys/x86/x86/mca.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/sys/x86/x86/mca.c b/sys/x86/x86/mca.c > index f1369cd..e9d2c1d 100644 > --- a/sys/x86/x86/mca.c > +++ b/sys/x86/x86/mca.c > @@ -897,7 +897,7 @@ _mca_init(int boot) > } > > #ifdef DEV_APIC > - if (PCPU_GET(cmci_mask) != 0 && boot) > + if (PCPU_GET(cmci_mask) != 0 && boot && !lapic_disabled) > lapic_enable_cmc(); > #endif > } -- John Baldwin _______________________________________________ freebsd-current@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
