From owner-svn-src-head@FreeBSD.ORG Fri Mar 23 11:35:02 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C54991065670; Fri, 23 Mar 2012 11:35:02 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 96BD98FC1D; Fri, 23 Mar 2012 11:35:02 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2NBZ27g073580; Fri, 23 Mar 2012 11:35:02 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2NBZ2EF073576; Fri, 23 Mar 2012 11:35:02 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201203231135.q2NBZ2EF073576@svn.freebsd.org> From: Dimitry Andric Date: Fri, 23 Mar 2012 11:35:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233354 - in head/sys: conf modules/mps X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Mar 2012 11:35:02 -0000 Author: dim Date: Fri Mar 23 11:35:01 2012 New Revision: 233354 URL: http://svn.freebsd.org/changeset/base/233354 Log: Work around the following clang warning in mps(4): sys/dev/mps/mps_sas.c:861:1: error: function 'mpssas_discovery_timeout' is not needed and will not be emitted [-Werror,-Wunneeded-internal-declaration] mpssas_discovery_timeout(void *data) ^ Because the driver is obtained from upstream, we don't want to modify it; just silence the warning instead, it is harmless. MFC after: 3 days Modified: head/sys/conf/files head/sys/conf/kern.mk head/sys/modules/mps/Makefile Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Fri Mar 23 11:26:54 2012 (r233353) +++ head/sys/conf/files Fri Mar 23 11:35:01 2012 (r233354) @@ -1480,7 +1480,8 @@ dev/mps/mps.c optional mps dev/mps/mps_config.c optional mps dev/mps/mps_mapping.c optional mps dev/mps/mps_pci.c optional mps pci -dev/mps/mps_sas.c optional mps +dev/mps/mps_sas.c optional mps \ + compile-with "${NORMAL_C} ${NO_WUNNEEDED_INTERNAL_DECL}" dev/mps/mps_sas_lsi.c optional mps dev/mps/mps_table.c optional mps dev/mps/mps_user.c optional mps Modified: head/sys/conf/kern.mk ============================================================================== --- head/sys/conf/kern.mk Fri Mar 23 11:26:54 2012 (r233353) +++ head/sys/conf/kern.mk Fri Mar 23 11:35:01 2012 (r233354) @@ -23,6 +23,7 @@ NO_WSHIFT_COUNT_OVERFLOW= -Wno-shift-cou NO_WUNUSED_VALUE= -Wno-unused-value NO_WSELF_ASSIGN= -Wno-self-assign NO_WFORMAT_SECURITY= -Wno-format-security +NO_WUNNEEDED_INTERNAL_DECL= -Wno-unneeded-internal-declaration # 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: head/sys/modules/mps/Makefile ============================================================================== --- head/sys/modules/mps/Makefile Fri Mar 23 11:26:54 2012 (r233353) +++ head/sys/modules/mps/Makefile Fri Mar 23 11:35:01 2012 (r233354) @@ -11,3 +11,6 @@ SRCS+= device_if.h bus_if.h pci_if.h #CFLAGS += -DMPS_DEBUG .include + +CWARNFLAGS.mps_sas.c= ${NO_WUNNEEDED_INTERNAL_DECL} +CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}}