From patchwork Tue Oct 2 16:36:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 11964 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 0BCFC23EFF for ; Tue, 2 Oct 2012 16:37:57 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id B184CA18710 for ; Tue, 2 Oct 2012 16:37:56 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so14608949iej.11 for ; Tue, 02 Oct 2012 09:37:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-provags-id:x-gm-message-state; bh=Sj0aEAXtDqOY8ldkNIB4PH+MndqIX5BMzsYim/fcFy8=; b=bFL1rdH5MoWadiFmPTR1A70NKz1HK5chDO+RzY45HjGbnvkS/uLBp43otJ12Zua7Rs Y8eRG2iMqsM1V36JYuiPqE13JEFkClhD1rnb48b9nwVkMo725d17ZxtgfTeCnewcGvsj 5PoVZG2ULnQgctNGnjfrJYBaQjcDAakCW8ZyGEh/cwBPh2vlDlaMl88uWKSp6a1POi1m hgiGZknV+JfVEH8xiG4Z91H7yQmyW90NjnkDFPzm22N5enCBkb7/fQR5p99meMGSrU9Y s+zFCfyqwRwxC+KPQlvsjnxhT7NwapnTWO7AILIcoI2DDsefkvBhlcpjXOUdbZU9LnTH pI5w== Received: by 10.50.154.137 with SMTP id vo9mr8817051igb.28.1349195876404; Tue, 02 Oct 2012 09:37:56 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp92149igc; Tue, 2 Oct 2012 09:37:55 -0700 (PDT) Received: by 10.180.79.7 with SMTP id f7mr23052847wix.22.1349195875054; Tue, 02 Oct 2012 09:37:55 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.126.186]) by mx.google.com with ESMTPS id o1si1710162wea.147.2012.10.02.09.37.54 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 02 Oct 2012 09:37:55 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.126.186 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.126.186; Authentication-Results: mx.google.com; spf=neutral (google.com: 212.227.126.186 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) smtp.mail=arnd@arndb.de Received: from localhost.localdomain (HSI-KBW-149-172-5-253.hsi13.kabel-badenwuerttemberg.de [149.172.5.253]) by mrelayeu.kundenserver.de (node=mrbap0) with ESMTP (Nemesis) id 0MbJMy-1T2f542TvI-00JBLH; Tue, 02 Oct 2012 18:37:14 +0200 From: Arnd Bergmann To: linux-arm-kernel@infradead.org Cc: arm@kernel.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Jason Cooper , Andrew Lunn Subject: [PATCH 11/17] ARM: mv78xx0: mark mv78xx0_timer_init as __init_refok Date: Tue, 2 Oct 2012 18:36:50 +0200 Message-Id: <1349195816-2225-12-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1349195816-2225-1-git-send-email-arnd@arndb.de> References: <1349195816-2225-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:EC7p05dGVDFtyqMzNiRcLlVyC/bDD6NYiyAX6gRzDHE +u2fDPzP9dUO3EDtttDibAw6D7nLVr+zow/ic50OtvZmBTaWbx 5O9YkCR/Dge3n/JFbbVN3ZsJsn8f6NV7VkFP9HNq3ZHPK6WCPO YJA1WJq8zw6eFgvNPtmKdP0nwxgvyb+AJNdRldyijiKNvnN+0W +ANLV/wb8+XPvvu0g+b00RkotUIsAEREjks28qYb48UXSXzefF 78m7KbgPBknbpiHXuVQ1UkGOT9Tz5Xh/GL4KeXr4pu3LyvS84+ 6OaWTCFQMVbeOm7Xn9VHyXmK8swwq7YqbyeGqL89cvn9vj532v p1wycBPGcGZXgXhV9SHYnm97maXB4XOAYCadLdFXl+SMqEC+gZ +oZO8PC6PAv0Q== X-Gm-Message-State: ALoCoQmhAghLay7vd3BXbhK1d6WGzy7Sl0fFIhcgM0eUUoFcB43oQenzJis934YXb4iQ+EwwXv8u The sys_timer init function is only called at __init time, so it's safe to mark mv78xx0_timer_init as __init_refok, which allows us to call orion_time_init without getting a link time warning. Without this patch, building mv78xx0_defconfig results in: WARNING: vmlinux.o(.text+0x15470): Section mismatch in reference from the function mv78xx0_timer_init() to the function .init.text:orion_time_init() The function mv78xx0_timer_init() references the function __init orion_time_init(). This is often because mv78xx0_timer_init lacks a __init annotation or the annotation of orion_time_init is wrong. Signed-off-by: Arnd Bergmann Cc: Jason Cooper Cc: Andrew Lunn --- arch/arm/mach-mv78xx0/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-mv78xx0/common.c b/arch/arm/mach-mv78xx0/common.c index 3057f7d..e251ebc 100644 --- a/arch/arm/mach-mv78xx0/common.c +++ b/arch/arm/mach-mv78xx0/common.c @@ -341,7 +341,7 @@ void __init mv78xx0_init_early(void) orion_time_set_base(TIMER_VIRT_BASE); } -static void mv78xx0_timer_init(void) +static void __init_refok mv78xx0_timer_init(void) { orion_time_init(BRIDGE_VIRT_BASE, BRIDGE_INT_TIMER1_CLR, IRQ_MV78XX0_TIMER_1, get_tclk());