From owner-svn-src-user@FreeBSD.ORG  Sat Dec 22 14:35:46 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id EFD6F430;
 Sat, 22 Dec 2012 14:35:46 +0000 (UTC)
 (envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D3CBE8FC0C;
 Sat, 22 Dec 2012 14:35:46 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBMEZk2m094628;
 Sat, 22 Dec 2012 14:35:46 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBMEZkNo094627;
 Sat, 22 Dec 2012 14:35:46 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201212221435.qBMEZkNo094627@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Sat, 22 Dec 2012 14:35:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r244589 - user/attilio/membarclean/dev/bxe
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Dec 2012 14:35:47 -0000

Author: attilio
Date: Sat Dec 22 14:35:46 2012
New Revision: 244589
URL: http://svnweb.freebsd.org/changeset/base/244589

Log:
  There is no relation between prefetcht instruction and the mentioned
  __FreeBSD_version, so fix this up by making prefetcht always available.

Modified:
  user/attilio/membarclean/dev/bxe/if_bxe.h

Modified: user/attilio/membarclean/dev/bxe/if_bxe.h
==============================================================================
--- user/attilio/membarclean/dev/bxe/if_bxe.h	Sat Dec 22 14:26:58 2012	(r244588)
+++ user/attilio/membarclean/dev/bxe/if_bxe.h	Sat Dec 22 14:35:46 2012	(r244589)
@@ -1806,19 +1806,19 @@ struct bxe_softc {
 #define	mb()		__asm volatile("mfence" ::: "memory")
 #define	wmb()		__asm volatile("sfence" ::: "memory")
 #define	rmb()		__asm volatile("lfence" ::: "memory")
-static __inline void
-prefetch(void *x)
-{
-	__asm volatile("prefetcht0 %0" :: "m" (*(unsigned long *)x));
-}
 #else
 #define	mb()
 #define	rmb()
 #define	wmb()
-#define	prefetch()
 #endif
 #endif
 
+static __inline void
+prefetch(void *x)
+{
+	__asm volatile("prefetcht0 %0" :: "m" (*(unsigned long *)x));
+}
+
 #define	BXE_RX_ALIGN		(1 << BXE_RX_ALIGN_SHIFT)
 
 #define	PAGE_ALIGN(addr)	(((addr) + PAGE_SIZE - 1) & (~PAGE_MASK))