From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760909AbXGJAFa (ORCPT ); Mon, 9 Jul 2007 20:05:30 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757526AbXGJAFV (ORCPT ); Mon, 9 Jul 2007 20:05:21 -0400 Received: from mailout.stusta.mhn.de ([141.84.69.5]:56172 "EHLO mailhub.stusta.mhn.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1757260AbXGJAFU (ORCPT ); Mon, 9 Jul 2007 20:05:20 -0400 Date: Tue, 10 Jul 2007 02:05:52 +0200 From: Adrian Bunk To: Frank van Maarseveen Cc: linux-kernel@vger.kernel.org, stable@kernel.org, Andrew Morton Subject: [2.6 patch] arch/i386/kernel/smpboot.c:setup_trampoline() must be __cpuinit Message-ID: <20070710000552.GM3492@stusta.de> References: <20070709184200.GA2496@janus> <20070709194540.GJ3492@stusta.de> <20070709194853.GA3601@janus> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20070709194853.GA3601@janus> User-Agent: Mutt/1.5.16 (2007-06-11) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org This patch fixes the following section mismatch reported by Frank van Maarseveen: <-- snip --> ... MODPOST vmlinux WARNING: arch/i386/kernel/built-in.o(.text+0xf201): Section mismatch: reference to .init.data:trampoline_end (between 'setup_trampoline' and 'cpu_coregroup_map') WARNING: arch/i386/kernel/built-in.o(.text+0xf207): Section mismatch: reference to .init.data:trampoline_data (between 'setup_trampoline' and 'cpu_coregroup_map') WARNING: arch/i386/kernel/built-in.o(.text+0xf21a): Section mismatch: reference to .init.data:trampoline_data (between 'setup_trampoline' and 'cpu_coregroup_map') ... <-- snip --> Signed-off-by: Adrian Bunk --- @stable: Harmless but annoying warnings present when building an i386 SMP kernel with CONFIG_HOTPLUG_CPU=n and gcc < 4.0 . --- linux-2.6.22-rc6-mm1/arch/i386/kernel/smpboot.c.old 2007-07-10 01:26:07.000000000 +0200 +++ linux-2.6.22-rc6-mm1/arch/i386/kernel/smpboot.c 2007-07-10 01:26:18.000000000 +0200 @@ -117,7 +117,7 @@ * has made sure it's suitably aligned. */ -static unsigned long __devinit setup_trampoline(void) +static unsigned long __cpuinit setup_trampoline(void) { memcpy(trampoline_base, trampoline_data, trampoline_end - trampoline_data); return virt_to_phys(trampoline_base);