From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758261AbYDRHHf (ORCPT ); Fri, 18 Apr 2008 03:07:35 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752943AbYDRHH0 (ORCPT ); Fri, 18 Apr 2008 03:07:26 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:57739 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752868AbYDRHHY (ORCPT ); Fri, 18 Apr 2008 03:07:24 -0400 Date: Fri, 18 Apr 2008 00:07:17 -0700 From: Andrew Morton To: Benjamin Herrenschmidt Cc: Paul Mackerras , , , Linux-Arch 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> X-Mailer: Sylpheed 2.4.8 (GTK+ 2.12.5; x86_64-redhat-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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.