From owner-p4-projects@FreeBSD.ORG  Mon Sep  8 20:29:24 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AFE171065673; Mon,  8 Sep 2008 20:29:24 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 73056106566B
	for <perforce@freebsd.org>; Mon,  8 Sep 2008 20:29:24 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 656708FC08
	for <perforce@freebsd.org>; Mon,  8 Sep 2008 20:29:24 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m88KTOXP005304
	for <perforce@freebsd.org>; Mon, 8 Sep 2008 20:29:24 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m88KTO5D005302
	for perforce@freebsd.org; Mon, 8 Sep 2008 20:29:24 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Mon, 8 Sep 2008 20:29:24 GMT
Message-Id: <200809082029.m88KTO5D005302@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter-gmail@wemm.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 149441 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Sep 2008 20:29:25 -0000

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

Change 149441 by peter@peter_overcee on 2008/09/08 20:28:31

	Fix mismerge

Affected files ...

.. //depot/projects/hammer/sys/amd64/include/pcpu.h#33 edit
.. //depot/projects/hammer/sys/i386/include/pcpu.h#19 edit

Differences ...

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

@@ -53,7 +53,6 @@
 
 #ifdef _KERNEL
 #define PCPU_MD_ALIGN	__aligned(64)	/* use unique cache line per entry */
-#endif
 
 #ifdef lint
 

==== //depot/projects/hammer/sys/i386/include/pcpu.h#19 (text+ko) ====

@@ -83,7 +83,6 @@
 
 #ifdef _KERNEL
 #define PCPU_MD_ALIGN	__aligned(64)	/* max cache line size */
-#endif
 
 #ifdef lint