From owner-svn-src-all@freebsd.org  Thu Jun  7 19:57:56 2018
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1DB92FE9FA3;
 Thu,  7 Jun 2018 19:57:56 +0000 (UTC) (envelope-from rrs@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id C2A577C3CC;
 Thu,  7 Jun 2018 19:57:55 +0000 (UTC) (envelope-from rrs@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A3A4E24BA0;
 Thu,  7 Jun 2018 19:57:55 +0000 (UTC) (envelope-from rrs@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w57JvtbC031547;
 Thu, 7 Jun 2018 19:57:55 GMT (envelope-from rrs@FreeBSD.org)
Received: (from rrs@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w57Jvt6w031546;
 Thu, 7 Jun 2018 19:57:55 GMT (envelope-from rrs@FreeBSD.org)
Message-Id: <201806071957.w57Jvt6w031546@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rrs set sender to rrs@FreeBSD.org
 using -f
From: Randall Stewart <rrs@FreeBSD.org>
Date: Thu, 7 Jun 2018 19:57:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r334813 - head/sys/sys
X-SVN-Group: head
X-SVN-Commit-Author: rrs
X-SVN-Commit-Paths: head/sys/sys
X-SVN-Commit-Revision: 334813
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.26
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Jun 2018 19:57:56 -0000

Author: rrs
Date: Thu Jun  7 19:57:55 2018
New Revision: 334813
URL: https://svnweb.freebsd.org/changeset/base/334813

Log:
  Fix build issue with const and volatile and the
  myriad ways that the various compliers treat this. The
  only safe prefetch appears to be for AMD. The other
  compilers either are not volatile or are not const :(
  
  Reported by:	Michael Tuexen

Modified:
  head/sys/sys/kern_prefetch.h

Modified: head/sys/sys/kern_prefetch.h
==============================================================================
--- head/sys/sys/kern_prefetch.h	Thu Jun  7 19:48:49 2018	(r334812)
+++ head/sys/sys/kern_prefetch.h	Thu Jun  7 19:57:55 2018	(r334813)
@@ -34,7 +34,7 @@ kern_prefetch(const volatile void *addr, void* before)
 #if defined(__amd64__)
 	__asm __volatile("prefetcht1 (%1)":"=rm"(*((int32_t *)before)):"r"(addr):);
 #else
-	__builtin_prefetch(addr);
+/*	__builtin_prefetch(addr);*/
 #endif
 }