Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 3 Nov 2003 16:55:37 -0800 (PST)
From:      Peter Wemm <peter@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 41294 for review
Message-ID:  <200311040055.hA40tbZf042486@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help

http://perforce.freebsd.org/chv.cgi?CH=41294

Change 41294 by peter@peter_daintree on 2003/11/03 16:54:37

	re-target source of smp_hammer branch

Affected files ...

.. //depot/projects/hammer/sys/amd64/include/apicreg.h#4 integrate
.. //depot/projects/hammer/sys/amd64/isa/nmi.c#4 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/include/apicreg.h#4 (text+ko) ====

@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/i386/include/apic.h,v 1.24 2003/09/10 01:11:58 jhb Exp $
+ * $FreeBSD: src/sys/i386/include/apicreg.h,v 1.25 2003/11/03 21:53:38 jhb Exp $
  */
 
 #ifndef _MACHINE_APICREG_H_

==== //depot/projects/hammer/sys/amd64/isa/nmi.c#4 (text+ko) ====

@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/isa/intr_machdep.c,v 1.76 2003/06/02 16:32:54 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/isa/nmi.c,v 1.77 2003/11/03 21:10:17 jhb Exp $");
 
 #include "opt_mca.h"
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200311040055.hA40tbZf042486>