From owner-svn-src-projects@freebsd.org  Sun Sep  4 18:00:15 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 81AF3B71B23
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Sun,  4 Sep 2016 18:00:15 +0000 (UTC) (envelope-from dim@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 mx1.freebsd.org (Postfix) with ESMTPS id 5CBF1F03;
 Sun,  4 Sep 2016 18:00:15 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u84I0E4r060368;
 Sun, 4 Sep 2016 18:00:14 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u84I0Eg2060364;
 Sun, 4 Sep 2016 18:00:14 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201609041800.u84I0Eg2060364@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sun, 4 Sep 2016 18:00:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r305394 - in projects/clang390-import/sys: arm64/arm64
 conf modules/bwn
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Sep 2016 18:00:15 -0000

Author: dim
Date: Sun Sep  4 18:00:14 2016
New Revision: 305394
URL: https://svnweb.freebsd.org/changeset/base/305394

Log:
  Merge ^/head r305390 through r305393.

Modified:
  projects/clang390-import/sys/arm64/arm64/pmap.c
  projects/clang390-import/sys/conf/files
  projects/clang390-import/sys/conf/kern.mk
  projects/clang390-import/sys/modules/bwn/Makefile
Directory Properties:
  projects/clang390-import/   (props changed)

Modified: projects/clang390-import/sys/arm64/arm64/pmap.c
==============================================================================
--- projects/clang390-import/sys/arm64/arm64/pmap.c	Sun Sep  4 17:56:55 2016	(r305393)
+++ projects/clang390-import/sys/arm64/arm64/pmap.c	Sun Sep  4 18:00:14 2016	(r305394)
@@ -242,7 +242,7 @@ extern pt_entry_t pagetable_dmap[];
 
 static SYSCTL_NODE(_vm, OID_AUTO, pmap, CTLFLAG_RD, 0, "VM/pmap parameters");
 
-static int superpages_enabled = 0;
+static int superpages_enabled = 1;
 SYSCTL_INT(_vm_pmap, OID_AUTO, superpages_enabled,
     CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &superpages_enabled, 0,
     "Are large page mappings enabled?");

Modified: projects/clang390-import/sys/conf/files
==============================================================================
--- projects/clang390-import/sys/conf/files	Sun Sep  4 17:56:55 2016	(r305393)
+++ projects/clang390-import/sys/conf/files	Sun Sep  4 18:00:14 2016	(r305394)
@@ -1211,13 +1211,13 @@ dev/bwi/bwiphy.c		optional bwi
 dev/bwi/bwirf.c			optional bwi
 dev/bwi/if_bwi.c		optional bwi
 dev/bwi/if_bwi_pci.c		optional bwi pci
-# XXX Work around clang warning, until maintainer approves fix.
+# XXX Work around clang warnings, until maintainer approves fix.
 dev/bwn/if_bwn.c		optional bwn siba_bwn \
 	compile-with "${NORMAL_C} ${NO_WSOMETIMES_UNINITIALIZED}"
 dev/bwn/if_bwn_pci.c		optional bwn pci bhnd
 dev/bwn/if_bwn_phy_common.c	optional bwn siba_bwn
 dev/bwn/if_bwn_phy_g.c		optional bwn siba_bwn \
-	compile-with "${NORMAL_C} ${NO_WSOMETIMES_UNINITIALIZED}"
+	compile-with "${NORMAL_C} ${NO_WSOMETIMES_UNINITIALIZED} ${NO_WCONSTANT_CONVERSION}"
 dev/bwn/if_bwn_phy_lp.c		optional bwn siba_bwn \
 	compile-with "${NORMAL_C} ${NO_WSOMETIMES_UNINITIALIZED}"
 dev/bwn/if_bwn_phy_n.c		optional bwn siba_bwn

Modified: projects/clang390-import/sys/conf/kern.mk
==============================================================================
--- projects/clang390-import/sys/conf/kern.mk	Sun Sep  4 17:56:55 2016	(r305393)
+++ projects/clang390-import/sys/conf/kern.mk	Sun Sep  4 18:00:14 2016	(r305394)
@@ -17,13 +17,13 @@ CWARNFLAGS?=	-Wall -Wredundant-decls -Wn
 # kernel where fixing them is more trouble than it is worth, or where there is
 # a false positive.
 .if ${COMPILER_TYPE} == "clang"
-NO_WCONSTANT_CONVERSION=	-Wno-constant-conversion
-NO_WSHIFT_COUNT_NEGATIVE=	-Wno-shift-count-negative
-NO_WSHIFT_COUNT_OVERFLOW=	-Wno-shift-count-overflow
-NO_WSELF_ASSIGN=		-Wno-self-assign
-NO_WUNNEEDED_INTERNAL_DECL=	-Wno-unneeded-internal-declaration
+NO_WCONSTANT_CONVERSION=	-Wno-error-constant-conversion
+NO_WSHIFT_COUNT_NEGATIVE=	-Wno-error-shift-count-negative
+NO_WSHIFT_COUNT_OVERFLOW=	-Wno-error-shift-count-overflow
+NO_WSELF_ASSIGN=		-Wno-error-self-assign
+NO_WUNNEEDED_INTERNAL_DECL=	-Wno-error-unneeded-internal-declaration
 NO_WSOMETIMES_UNINITIALIZED=	-Wno-error-sometimes-uninitialized
-NO_WCAST_QUAL=			-Wno-cast-qual
+NO_WCAST_QUAL=			-Wno-error-cast-qual
 # Several other warnings which might be useful in some cases, but not severe
 # enough to error out the whole kernel build.  Display them anyway, so there is
 # some incentive to fix them eventually.

Modified: projects/clang390-import/sys/modules/bwn/Makefile
==============================================================================
--- projects/clang390-import/sys/modules/bwn/Makefile	Sun Sep  4 17:56:55 2016	(r305393)
+++ projects/clang390-import/sys/modules/bwn/Makefile	Sun Sep  4 18:00:14 2016	(r305394)
@@ -28,7 +28,7 @@ SRCS+=	device_if.h bus_if.h pci_if.h opt
 
 .include <bsd.kmod.mk>
 
-# XXX Work around clang warning, until maintainer approves fix.
+# XXX Work around clang warnings, until maintainer approves fix.
 CWARNFLAGS.if_bwn.c=	${NO_WSOMETIMES_UNINITIALIZED}
-CWARNFLAGS.if_bwn_phy_g.c=	${NO_WSOMETIMES_UNINITIALIZED}
+CWARNFLAGS.if_bwn_phy_g.c=	${NO_WSOMETIMES_UNINITIALIZED} ${NO_WCONSTANT_CONVERSION}
 CWARNFLAGS.if_bwn_phy_lp.c=	${NO_WSOMETIMES_UNINITIALIZED}