Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751809AbWEPMch (ORCPT ); Tue, 16 May 2006 08:32:37 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751811AbWEPMch (ORCPT ); Tue, 16 May 2006 08:32:37 -0400 Received: from mailout.stusta.mhn.de ([141.84.69.5]:772 "HELO mailout.stusta.mhn.de") by vger.kernel.org with SMTP id S1751808AbWEPMcg (ORCPT ); Tue, 16 May 2006 08:32:36 -0400 Date: Tue, 16 May 2006 14:32:34 +0200 From: Adrian Bunk To: Andrew Morton , hpa@zytor.com Cc: linux-kernel@vger.kernel.org, mingo@redhat.com, neilb@cse.unsw.edu.au, linux-raid@vger.kernel.org Subject: [-mm patch] make variables static after klibc merge Message-ID: <20060516123234.GR6931@stusta.de> References: <20060515005637.00b54560.akpm@osdl.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060515005637.00b54560.akpm@osdl.org> User-Agent: Mutt/1.5.11+cvs20060403 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1771 Lines: 55 On Mon, May 15, 2006 at 12:56:37AM -0700, Andrew Morton wrote: > > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.17-rc4/2.6.17-rc4-mm1/ > > - This tree contains a large number of new bugs^H^H^H^Hpatches. > > - klibc (Kernel libc), as git-klibc.patch (Peter Anvin) >... > Changes since 2.6.17-rc3-mm1: >... > git-klibc.patch >... > git trees >... We can now make the following variables static: - drivers/md/md.c: mdp_major - init/main.c: envp_init[] Signed-off-by: Adrian Bunk --- drivers/md/md.c | 2 +- init/main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- linux-2.6.17-rc4-mm1-full/drivers/md/md.c.old 2006-05-16 12:49:59.000000000 +0200 +++ linux-2.6.17-rc4-mm1-full/drivers/md/md.c 2006-05-16 12:50:17.000000000 +0200 @@ -2563,7 +2563,7 @@ .default_attrs = md_default_attrs, }; -int mdp_major = 0; +static int mdp_major = 0; static struct kobject *md_probe(dev_t dev, int *part, void *data) { --- linux-2.6.17-rc4-mm1-full/init/main.c.old 2006-05-16 13:20:22.000000000 +0200 +++ linux-2.6.17-rc4-mm1-full/init/main.c 2006-05-16 13:20:43.000000000 +0200 @@ -161,7 +161,7 @@ __setup("maxcpus=", maxcpus); static char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, }; -char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, }; +static char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, }; static const char *panic_later, *panic_param; extern struct obs_kernel_param __setup_start[], __setup_end[]; - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/