From owner-cvs-src-old@FreeBSD.ORG  Fri Nov  6 19:17:12 2009
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6D730106568D
	for <cvs-src-old@freebsd.org>; Fri,  6 Nov 2009 19:17:12 +0000 (UTC)
	(envelope-from ambrisko@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 41C018FC15
	for <cvs-src-old@freebsd.org>; Fri,  6 Nov 2009 19:17:12 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nA6JHChr057746
	for <cvs-src-old@freebsd.org>; Fri, 6 Nov 2009 19:17:12 GMT
	(envelope-from ambrisko@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nA6JHCiF057745
	for cvs-src-old@freebsd.org; Fri, 6 Nov 2009 19:17:12 GMT
	(envelope-from ambrisko@repoman.freebsd.org)
Message-Id: <200911061917.nA6JHCiF057745@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	ambrisko@repoman.freebsd.org using -f
From: Doug Ambrisko <ambrisko@FreeBSD.org>
Date: Fri, 6 Nov 2009 19:16:33 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: RELENG_6
Subject: cvs commit: src/sys/amd64/amd64 mp_machdep.c src/sys/i386/i386
 mp_machdep.c
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Nov 2009 19:17:12 -0000

ambrisko    2009-11-06 19:16:33 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/amd64/amd64      mp_machdep.c 
    sys/i386/i386        mp_machdep.c 
  Log:
  SVN rev 198998 on 2009-11-06 19:16:33Z by ambrisko
  
  Fix botched merge.  This was in an old repo. that I thought was current.
  Check in the real working code.
  
  Pointy hat to:  ambrisko
  
  Revision    Changes    Path
  1.260.2.16  +19 -14    src/sys/amd64/amd64/mp_machdep.c
  1.252.2.16  +17 -13    src/sys/i386/i386/mp_machdep.c