From patchwork Tue Sep 15 09:02:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zefan Li X-Patchwork-Id: 53630 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by patches.linaro.org (Postfix) with ESMTPS id E31BF22A22 for ; Tue, 15 Sep 2015 09:54:13 +0000 (UTC) Received: by wisv5 with SMTP id v5sf6060665wis.0 for ; Tue, 15 Sep 2015 02:54:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=ocJZxnAmsV4uITyktMIcD0KgQeJGmoaU77C7vgSOM30=; b=KTiFCqggprTE5qgFRoNPmKsWbKy7VpYZB29CcwuLfOvyWJi3FCwGfVG1Qh8fIkoU2Z LfLkhlN545Pw3yTRr2y0gy+NJ8FGqr3kUAdxwoaPM786WjSTvvNr0GVX6n+WBfaleIOV fD0u2VynljVKbT/Jlw2ld9tbgCmqWU69gqeV6d4GF27xPemVjzyUnp24nFn1byYnrPTX pwBSrbeeDvG892qnapxXU2hRZvtOMdZUg+8rIAKFeBgXoXXtQMRc6hq8Fl0rmhwyH7tt vyBrtGRwaV5bzETitS8NX9skIGt7eGwVwHZcn5oV9W8vyHq/1GWlsErBPgEQV0BuauB9 Io4A== X-Gm-Message-State: ALoCoQlCkGtMAnDDNXXqxbCgg/FtXm0Y2EVkjCpJyiqW91iCmSzNxcVtRAL1IPKNpJFe7diB2EQM X-Received: by 10.112.198.33 with SMTP id iz1mr4088431lbc.8.1442310853202; Tue, 15 Sep 2015 02:54:13 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.37.9 with SMTP id u9ls14457laj.52.gmail; Tue, 15 Sep 2015 02:54:13 -0700 (PDT) X-Received: by 10.112.17.105 with SMTP id n9mr12042869lbd.78.1442310852976; Tue, 15 Sep 2015 02:54:12 -0700 (PDT) Received: from mail-lb0-f176.google.com (mail-lb0-f176.google.com. [209.85.217.176]) by mx.google.com with ESMTPS id ug6si12757620lbb.19.2015.09.15.02.54.12 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Sep 2015 02:54:12 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) client-ip=209.85.217.176; Received: by lbcao8 with SMTP id ao8so81650889lbc.3 for ; Tue, 15 Sep 2015 02:54:12 -0700 (PDT) X-Received: by 10.152.26.98 with SMTP id k2mr19107980lag.41.1442310852668; Tue, 15 Sep 2015 02:54:12 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp1687060lbq; Tue, 15 Sep 2015 02:54:11 -0700 (PDT) X-Received: by 10.68.230.33 with SMTP id sv1mr46212537pbc.160.1442310851649; Tue, 15 Sep 2015 02:54:11 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id wk4si30508947pbc.224.2015.09.15.02.54.10; Tue, 15 Sep 2015 02:54:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755620AbbIOJyH (ORCPT + 29 others); Tue, 15 Sep 2015 05:54:07 -0400 Received: from mail.kernel.org ([198.145.29.136]:51491 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753215AbbIOJGW (ORCPT ); Tue, 15 Sep 2015 05:06:22 -0400 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 148402072F; Tue, 15 Sep 2015 09:06:17 +0000 (UTC) Received: from localhost.localdomain (unknown [183.247.163.231]) (using TLSv1.2 with cipher AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C1E9B2069D; Tue, 15 Sep 2015 09:06:14 +0000 (UTC) From: lizf@kernel.org To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Nishanth Menon , Mark Salter , Zefan Li Subject: [PATCH 3.4 019/146] C6x: time: Ensure consistency in __init Date: Tue, 15 Sep 2015 17:02:14 +0800 Message-Id: <1442307861-32031-19-git-send-email-lizf@kernel.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1442307787-31952-1-git-send-email-lizf@kernel.org> References: <1442307787-31952-1-git-send-email-lizf@kernel.org> X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linux-kernel-owner@vger.kernel.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Nishanth Menon 3.4.109-rc1 review patch. If anyone has any objections, please let me know. ------------------ commit f4831605f2dacd12730fe73961c77253cc2ea425 upstream. time_init invokes timer64_init (which is __init annotation) since all of these are invoked at init time, lets maintain consistency by ensuring time_init is marked appropriately as well. This fixes the following warning with CONFIG_DEBUG_SECTION_MISMATCH=y WARNING: vmlinux.o(.text+0x3bfc): Section mismatch in reference from the function time_init() to the function .init.text:timer64_init() The function time_init() references the function __init timer64_init(). This is often because time_init lacks a __init annotation or the annotation of timer64_init is wrong. Fixes: 546a39546c64 ("C6X: time management") Signed-off-by: Nishanth Menon Signed-off-by: Mark Salter Signed-off-by: Zefan Li --- arch/c6x/kernel/time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/c6x/kernel/time.c b/arch/c6x/kernel/time.c index 356ee84..04845aa 100644 --- a/arch/c6x/kernel/time.c +++ b/arch/c6x/kernel/time.c @@ -49,7 +49,7 @@ u64 sched_clock(void) return (tsc * sched_clock_multiplier) >> SCHED_CLOCK_SHIFT; } -void time_init(void) +void __init time_init(void) { u64 tmp = (u64)NSEC_PER_SEC << SCHED_CLOCK_SHIFT;