Date: Mon, 8 Jun 2009 07:42:20 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r193692 - in user/kmacy/releng_7_2_fcs/sys: amd64/include dev/cxgb dev/mxge Message-ID: <200906080742.n587gKDk019881@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906080742.n587gKDk019881>