From owner-svn-src-user@FreeBSD.ORG Mon Jun 8 07:42:20 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A9881106564A; Mon, 8 Jun 2009 07:42:20 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7D5EE8FC08; Mon, 8 Jun 2009 07:42:20 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n587gK2j019884; Mon, 8 Jun 2009 07:42:20 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n587gKDk019881; Mon, 8 Jun 2009 07:42:20 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200906080742.n587gKDk019881@svn.freebsd.org> From: Kip Macy Date: Mon, 8 Jun 2009 07:42:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193692 - in user/kmacy/releng_7_2_fcs/sys: amd64/include dev/cxgb dev/mxge X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Jun 2009 07:42:20 -0000 Author: kmacy Date: Mon Jun 8 07:42:19 2009 New Revision: 193692 URL: http://svn.freebsd.org/changeset/base/193692 Log: move prefetch in to machine/cpufunc.h for amd64 Modified: user/kmacy/releng_7_2_fcs/sys/amd64/include/cpufunc.h user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_osdep.h user/kmacy/releng_7_2_fcs/sys/dev/mxge/if_mxge.c Modified: user/kmacy/releng_7_2_fcs/sys/amd64/include/cpufunc.h ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/amd64/include/cpufunc.h Mon Jun 8 06:13:34 2009 (r193691) +++ user/kmacy/releng_7_2_fcs/sys/amd64/include/cpufunc.h Mon Jun 8 07:42:19 2009 (r193692) @@ -343,6 +343,12 @@ ia32_pause(void) __asm __volatile("pause"); } +static __inline +void prefetch(void *x) +{ + __asm volatile("prefetcht0 %0" :: "m" (*(unsigned long *)x)); +} + static __inline u_long read_rflags(void) { Modified: user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_osdep.h ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_osdep.h Mon Jun 8 06:13:34 2009 (r193691) +++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_osdep.h Mon Jun 8 07:42:19 2009 (r193692) @@ -184,16 +184,10 @@ struct t3_mbuf_hdr { */ -#if defined(__i386__) || defined(__amd64__) +#if defined(__i386__) #define smp_mb() mb() #define L1_CACHE_BYTES 128 -static __inline -void prefetch(void *x) -{ - __asm volatile("prefetcht0 %0" :: "m" (*(unsigned long *)x)); -} - extern void kdb_backtrace(void); #define WARN_ON(condition) do { \ Modified: user/kmacy/releng_7_2_fcs/sys/dev/mxge/if_mxge.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/dev/mxge/if_mxge.c Mon Jun 8 06:13:34 2009 (r193691) +++ user/kmacy/releng_7_2_fcs/sys/dev/mxge/if_mxge.c Mon Jun 8 07:42:19 2009 (r193692) @@ -146,13 +146,13 @@ static int mxge_close(mxge_softc_t *sc); static int mxge_open(mxge_softc_t *sc); static void mxge_tick(void *arg); -#if defined(__i386__) || defined(__amd64__) +#if defined(__i386__) static __inline void prefetch(void *x) { __asm volatile("prefetcht0 %0" :: "m" (*(unsigned long *)x)); } -#else +#elif !defined(__amd64__) #define prefetch(x) #endif