From owner-svn-src-stable@FreeBSD.ORG Fri Apr 13 21:47:15 2012 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 56EDB106566C; Fri, 13 Apr 2012 21:47:15 +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 281138FC1D; Fri, 13 Apr 2012 21:47:15 +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 q3DLlFNa098641; Fri, 13 Apr 2012 21:47:15 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3DLlElW098637; Fri, 13 Apr 2012 21:47:14 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201204132147.q3DLlElW098637@svn.freebsd.org> From: Dimitry Andric Date: Fri, 13 Apr 2012 21:47:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r234238 - in stable/9/sys: conf modules/mps X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Apr 2012 21:47:15 -0000 Author: dim Date: Fri Apr 13 21:47:14 2012 New Revision: 234238 URL: http://svn.freebsd.org/changeset/base/234238 Log: MFC r233354: 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. Modified: stable/9/sys/conf/files stable/9/sys/conf/kern.mk stable/9/sys/modules/mps/Makefile Directory Properties: stable/9/sys/ (props changed) stable/9/sys/conf/ (props changed) Modified: stable/9/sys/conf/files ============================================================================== --- stable/9/sys/conf/files Fri Apr 13 21:35:24 2012 (r234237) +++ stable/9/sys/conf/files Fri Apr 13 21:47:14 2012 (r234238) @@ -1464,7 +1464,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: stable/9/sys/conf/kern.mk ============================================================================== --- stable/9/sys/conf/kern.mk Fri Apr 13 21:35:24 2012 (r234237) +++ stable/9/sys/conf/kern.mk Fri Apr 13 21:47:14 2012 (r234238) @@ -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: stable/9/sys/modules/mps/Makefile ============================================================================== --- stable/9/sys/modules/mps/Makefile Fri Apr 13 21:35:24 2012 (r234237) +++ stable/9/sys/modules/mps/Makefile Fri Apr 13 21:47:14 2012 (r234238) @@ -12,3 +12,6 @@ SRCS+= device_if.h bus_if.h pci_if.h DEBUG_FLAGS += -g .include + +CWARNFLAGS.mps_sas.c= ${NO_WUNNEEDED_INTERNAL_DECL} +CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}}