From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751915AbdKJJpG (ORCPT ); Fri, 10 Nov 2017 04:45:06 -0500 Received: from terminus.zytor.com ([65.50.211.136]:52833 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750835AbdKJJpD (ORCPT ); Fri, 10 Nov 2017 04:45:03 -0500 Date: Fri, 10 Nov 2017 01:41:27 -0800 From: tip-bot for Dou Liyang Message-ID: Cc: torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, douly.fnst@cn.fujitsu.com, peterz@infradead.org, tglx@linutronix.de, mingo@kernel.org, hpa@zytor.com Reply-To: peterz@infradead.org, douly.fnst@cn.fujitsu.com, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, hpa@zytor.com, mingo@kernel.org, tglx@linutronix.de In-Reply-To: <1510135792-17429-1-git-send-email-douly.fnst@cn.fujitsu.com> References: <1510135792-17429-1-git-send-email-douly.fnst@cn.fujitsu.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/timers] x86/tsc: Mark cyc2ns_init() and detect_art() __init Git-Commit-ID: 120fc3fbb7787fb70240190cc9c113d1f6523c42 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 120fc3fbb7787fb70240190cc9c113d1f6523c42 Gitweb: https://git.kernel.org/tip/120fc3fbb7787fb70240190cc9c113d1f6523c42 Author: Dou Liyang AuthorDate: Wed, 8 Nov 2017 18:09:52 +0800 Committer: Ingo Molnar CommitDate: Fri, 10 Nov 2017 10:02:08 +0100 x86/tsc: Mark cyc2ns_init() and detect_art() __init These two functions are only called by tsc_init(), which is an __init function during boot time, so mark them __init as well. Signed-off-by: Dou Liyang Acked-by: Thomas Gleixner Cc: Linus Torvalds Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1510135792-17429-1-git-send-email-douly.fnst@cn.fujitsu.com Signed-off-by: Ingo Molnar --- arch/x86/kernel/tsc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index f1326c0..416de29 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c @@ -112,7 +112,7 @@ static void cyc2ns_data_init(struct cyc2ns_data *data) data->cyc2ns_offset = 0; } -static void cyc2ns_init(int cpu) +static void __init cyc2ns_init(int cpu) { struct cyc2ns *c2n = &per_cpu(cyc2ns, cpu); @@ -955,7 +955,7 @@ core_initcall(cpufreq_register_tsc_scaling); /* * If ART is present detect the numerator:denominator to convert to TSC */ -static void detect_art(void) +static void __init detect_art(void) { unsigned int unused[2];