From owner-svn-src-all@FreeBSD.ORG Thu Jul 8 20:46:55 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E1DC4106566B; Thu, 8 Jul 2010 20:46:55 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B69E48FC08; Thu, 8 Jul 2010 20:46:55 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o68Kkt3b021911; Thu, 8 Jul 2010 20:46:55 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o68KktMu021907; Thu, 8 Jul 2010 20:46:55 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <201007082046.o68KktMu021907@svn.freebsd.org> From: Andriy Gapon Date: Thu, 8 Jul 2010 20:46:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r209828 - stable/8/sys/dev/sound/pcm X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Jul 2010 20:46:56 -0000 Author: avg Date: Thu Jul 8 20:46:55 2010 New Revision: 209828 URL: http://svn.freebsd.org/changeset/base/209828 Log: MFC r209193: sound/pcm: use non-const string with SYSCTL_STRING Modified: stable/8/sys/dev/sound/pcm/feeder_eq.c stable/8/sys/dev/sound/pcm/feeder_rate.c stable/8/sys/dev/sound/pcm/sound.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) Modified: stable/8/sys/dev/sound/pcm/feeder_eq.c ============================================================================== --- stable/8/sys/dev/sound/pcm/feeder_eq.c Thu Jul 8 20:43:20 2010 (r209827) +++ stable/8/sys/dev/sound/pcm/feeder_eq.c Thu Jul 8 20:46:55 2010 (r209828) @@ -93,7 +93,7 @@ SND_DECLARE_FILE("$FreeBSD$"); static int feeder_eq_exact_rate = 0; #ifdef _KERNEL -static const char feeder_eq_presets[] = FEEDER_EQ_PRESETS; +static char feeder_eq_presets[] = FEEDER_EQ_PRESETS; SYSCTL_STRING(_hw_snd, OID_AUTO, feeder_eq_presets, CTLFLAG_RD, &feeder_eq_presets, 0, "compile-time eq presets"); Modified: stable/8/sys/dev/sound/pcm/feeder_rate.c ============================================================================== --- stable/8/sys/dev/sound/pcm/feeder_rate.c Thu Jul 8 20:43:20 2010 (r209827) +++ stable/8/sys/dev/sound/pcm/feeder_rate.c Thu Jul 8 20:46:55 2010 (r209828) @@ -159,7 +159,7 @@ int feeder_rate_quality = Z_QUALITY_DEFA static int feeder_rate_polyphase_max = Z_POLYPHASE_MAX; #ifdef _KERNEL -static const char feeder_rate_presets[] = FEEDER_RATE_PRESETS; +static char feeder_rate_presets[] = FEEDER_RATE_PRESETS; SYSCTL_STRING(_hw_snd, OID_AUTO, feeder_rate_presets, CTLFLAG_RD, &feeder_rate_presets, 0, "compile-time rate presets"); Modified: stable/8/sys/dev/sound/pcm/sound.c ============================================================================== --- stable/8/sys/dev/sound/pcm/sound.c Thu Jul 8 20:43:20 2010 (r209827) +++ stable/8/sys/dev/sound/pcm/sound.c Thu Jul 8 20:46:55 2010 (r209828) @@ -68,7 +68,7 @@ SYSCTL_NODE(_hw, OID_AUTO, snd, CTLFLAG_ * XXX I've had enough with people not telling proper version/arch * while reporting problems, not after 387397913213th questions/requests. */ -static const char snd_driver_version[] = +static char snd_driver_version[] = __XSTRING(SND_DRV_VERSION)"/"MACHINE_ARCH; SYSCTL_STRING(_hw_snd, OID_AUTO, version, CTLFLAG_RD, &snd_driver_version, 0, "driver version/arch");