Date: Mon, 17 Nov 2003 00:25:46 -0800 (PST) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 42645 for review Message-ID: <200311170825.hAH8PkoK084254@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=42645 Change 42645 by peter@peter_overcee on 2003/11/17 00:24:53 step 1: cross fingers step 2: p4 resolve -ay step 3: hope the $FreeBSD$ conflicts aren't too painful to fix step 4: ... step 5: PROFIT!! Affected files ... .. //depot/projects/hammer/sys/amd64/acpica/madt.c#18 integrate .. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#8 integrate .. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#14 integrate .. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#20 integrate .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#23 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#39 integrate .. //depot/projects/hammer/sys/amd64/amd64/mpboot.S#6 integrate .. //depot/projects/hammer/sys/amd64/amd64/mptable.c#15 integrate .. //depot/projects/hammer/sys/amd64/amd64/mptable_pci.c#5 integrate .. //depot/projects/hammer/sys/amd64/include/apicreg.h#6 integrate .. //depot/projects/hammer/sys/amd64/include/apicvar.h#16 integrate .. //depot/projects/hammer/sys/amd64/include/intr_machdep.h#9 integrate .. //depot/projects/hammer/sys/amd64/include/mptable.h#6 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic.c#27 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic_vector.S#8 integrate .. //depot/projects/hammer/sys/amd64/isa/nmi.c#7 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/acpica/madt.c#18 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#8 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#14 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/io_apic.c#20 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#23 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#39 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/mpboot.S#6 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/mptable.c#15 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/mptable_pci.c#5 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/apicreg.h#6 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/apicvar.h#16 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/intr_machdep.h#9 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/mptable.h#6 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/atpic.c#27 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/atpic_vector.S#8 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/nmi.c#7 (text+ko) ====
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200311170825.hAH8PkoK084254>