Date: Tue, 20 Sep 2005 18:08:06 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 83988 for review Message-ID: <200509201808.j8KI86UY083630@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=83988 Change 83988 by peter@peter_daintree on 2005/09/20 18:07:10 Integ -b i386_hammer Affected files ... .. //depot/projects/hammer/sys/amd64/acpica/OsdEnvironment.c#13 integrate .. //depot/projects/hammer/sys/amd64/acpica/acpi_machdep.c#23 integrate .. //depot/projects/hammer/sys/amd64/acpica/acpi_wakeup.c#16 integrate .. //depot/projects/hammer/sys/amd64/acpica/madt.c#42 integrate .. //depot/projects/hammer/sys/amd64/amd64/db_trace.c#33 integrate .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#56 integrate .. //depot/projects/hammer/sys/amd64/amd64/mptable_pci.c#10 integrate .. //depot/projects/hammer/sys/amd64/amd64/sys_machdep.c#25 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#74 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#79 integrate .. //depot/projects/hammer/sys/amd64/include/atomic.h#22 integrate .. //depot/projects/hammer/sys/amd64/include/legacyvar.h#12 integrate .. //depot/projects/hammer/sys/amd64/include/pcb_ext.h#6 integrate .. //depot/projects/hammer/sys/amd64/include/ucontext.h#14 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_bus.c#31 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/acpica/OsdEnvironment.c#13 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/acpica/acpi_machdep.c#23 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/acpica/acpi_wakeup.c#16 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/acpica/madt.c#42 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/db_trace.c#33 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#56 (text+ko) ==== @@ -322,7 +322,7 @@ lapic_timer_enable_intr(); } - /* XXX: Performance counter, error, and thermal LVTs */ + /* XXX: Error and thermal LVTs */ intr_restore(eflags); } @@ -927,8 +927,12 @@ } /* Wait for an earlier IPI to finish. */ - if (!lapic_ipi_wait(BEFORE_SPIN)) - panic("APIC: Previous IPI is stuck"); + if (!lapic_ipi_wait(BEFORE_SPIN)) { + if (panicstr != NULL) + return; + else + panic("APIC: Previous IPI is stuck"); + } lapic_ipi_raw(icrlo, destfield); ==== //depot/projects/hammer/sys/amd64/amd64/mptable_pci.c#10 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/sys_machdep.c#25 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#74 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#79 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/atomic.h#22 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/legacyvar.h#12 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/pcb_ext.h#6 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/ucontext.h#14 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/pci/pci_bus.c#31 (text+ko) ====
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200509201808.j8KI86UY083630>