From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp1.linux-foundation.org (smtp1.linux-foundation.org [140.211.169.13]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "smtp.linux-foundation.org", Issuer "CA Cert Signing Authority" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id 33D14DE567 for ; Fri, 18 Apr 2008 17:07:22 +1000 (EST) Date: Fri, 18 Apr 2008 00:07:17 -0700 From: Andrew Morton To: Benjamin Herrenschmidt Subject: Re: [PATCH 3/3] Use __weak macro for smp_setup_processor_id Message-Id: <20080418000717.5a9c9758.akpm@linux-foundation.org> In-Reply-To: <20080418065728.31AF4DE255@ozlabs.org> References: <20080418065728.31AF4DE255@ozlabs.org> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Cc: Linux-Arch , linuxppc-dev@ozlabs.org, Paul Mackerras , linux-kernel@vger.kernel.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Fri, 18 Apr 2008 16:56:18 +1000 Benjamin Herrenschmidt wrote: > Use the __weak macro instead of the longer __attribute__ ((weak)) form > > Signed-off-by: Benjamin Herrenschmidt > -- > > init/main.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > --- linux-work.orig/init/main.c 2008-04-18 16:44:32.000000000 +1000 > +++ linux-work/init/main.c 2008-04-18 16:44:37.000000000 +1000 > @@ -500,7 +500,7 @@ static void __init boot_cpu_init(void) > cpu_set(cpu, cpu_possible_map); > } > > -void __init __attribute__((weak)) smp_setup_processor_id(void) > +void __init __weak smp_setup_processor_id(void) > { > } ack on all three. Please fold #3 into #1 and add both to git-powerpc.