From patchwork Fri Mar 20 15:44:27 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 24755 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 9DEA6DDE06 for ; Sat, 21 Mar 2009 02:46:00 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755705AbZCTPpz (ORCPT ); Fri, 20 Mar 2009 11:45:55 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755603AbZCTPpz (ORCPT ); Fri, 20 Mar 2009 11:45:55 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:39537 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755447AbZCTPpz (ORCPT ); Fri, 20 Mar 2009 11:45:55 -0400 Received: from nehalam (pool-71-117-208-104.ptldor.fios.verizon.net [71.117.208.104]) (authenticated bits=0) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id n2KFib1A006569 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Fri, 20 Mar 2009 08:45:11 -0700 Date: Fri, 20 Mar 2009 08:44:27 -0700 From: Stephen Hemminger To: David Miller , Arnaldo Carvalho de Melo Cc: netdev@vger.kernel.org Subject: [PATCH 2/2] ipx: use constant for strings and desciptor Message-ID: <20090320084427.5b09049d@nehalam> In-Reply-To: <20090320084314.5761b1d9@nehalam> References: <20090320084314.5761b1d9@nehalam> Organization: Linux Foundation X-Mailer: Claws Mail 3.6.1 (GTK+ 2.16.0; x86_64-pc-linux-gnu) Mime-Version: 1.0 X-Spam-Status: No, hits=-4.239 required=5 tests=AWL, BAYES_00, FH_HOST_EQ_VERIZON_P, OSDL_HEADER_SUBJECT_BRACKETED, RDNS_DYNAMIC X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.13 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix compiler warning about non-const format string. Signed-off-by: Stephen Hemminger --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- a/net/ipx/af_ipx.c 2009-03-19 23:37:56.671964109 -0700 +++ b/net/ipx/af_ipx.c 2009-03-19 23:46:55.613777665 -0700 @@ -1975,15 +1975,15 @@ static struct notifier_block ipx_dev_not extern struct datalink_proto *make_EII_client(void); extern void destroy_EII_client(struct datalink_proto *); -static unsigned char ipx_8022_type = 0xE0; -static unsigned char ipx_snap_id[5] = { 0x0, 0x0, 0x0, 0x81, 0x37 }; -static char ipx_EII_err_msg[] __initdata = +static const unsigned char ipx_8022_type = 0xE0; +static const unsigned char ipx_snap_id[5] = { 0x0, 0x0, 0x0, 0x81, 0x37 }; +static const char ipx_EII_err_msg[] __initconst = KERN_CRIT "IPX: Unable to register with Ethernet II\n"; -static char ipx_8023_err_msg[] __initdata = +static const char ipx_8023_err_msg[] __initconst = KERN_CRIT "IPX: Unable to register with 802.3\n"; -static char ipx_llc_err_msg[] __initdata = +static const char ipx_llc_err_msg[] __initconst = KERN_CRIT "IPX: Unable to register with 802.2\n"; -static char ipx_snap_err_msg[] __initdata = +static const char ipx_snap_err_msg[] __initconst = KERN_CRIT "IPX: Unable to register with SNAP\n"; static int __init ipx_init(void)