From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Gortmaker Date: Fri, 22 Apr 2016 18:07:01 +0000 Subject: [PATCH 1/4] sh: make time.c explicitly non-modular Message-Id: <1461348424-3896-2-git-send-email-paul.gortmaker@windriver.com> List-Id: References: <1461348424-3896-1-git-send-email-paul.gortmaker@windriver.com> In-Reply-To: <1461348424-3896-1-git-send-email-paul.gortmaker@windriver.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-kernel@vger.kernel.org Cc: Paul Gortmaker , Yoshinori Sato , Rich Felker , linux-sh@vger.kernel.org The Makefile currently controlling compilation of this code is: obj-y := debugtraps.o dma-nommu.o dumpstack.o \ [...] syscalls_$(BITS).o time.o topology.o traps.o \ traps_$(BITS).o unwinder.o ...meaning that it currently is not being built as a module by anyone. Lets remove the couple traces of modular code, so that when reading the driver there is no doubt it is builtin-only. Since module_init translates to device_initcall in the non-modular case, the init ordering remains unchanged with this commit. Cc: Yoshinori Sato Cc: Rich Felker Cc: Paul Gortmaker Cc: linux-sh@vger.kernel.org Signed-off-by: Paul Gortmaker --- arch/sh/kernel/time.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c index d6d0a986c6e9..bfe1de98d003 100644 --- a/arch/sh/kernel/time.c +++ b/arch/sh/kernel/time.c @@ -11,7 +11,6 @@ * for more details. */ #include -#include #include #include #include @@ -83,7 +82,7 @@ static int __init rtc_generic_init(void) return PTR_ERR_OR_ZERO(pdev); } -module_init(rtc_generic_init); +device_initcall(rtc_generic_init); void (*board_time_init)(void); -- 2.8.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754717AbcDVSHi (ORCPT ); Fri, 22 Apr 2016 14:07:38 -0400 Received: from mail1.windriver.com ([147.11.146.13]:41348 "EHLO mail1.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754683AbcDVSHg (ORCPT ); Fri, 22 Apr 2016 14:07:36 -0400 From: Paul Gortmaker To: CC: Paul Gortmaker , Yoshinori Sato , Rich Felker , Subject: [PATCH 1/4] sh: make time.c explicitly non-modular Date: Fri, 22 Apr 2016 14:07:01 -0400 Message-ID: <1461348424-3896-2-git-send-email-paul.gortmaker@windriver.com> X-Mailer: git-send-email 2.8.0 In-Reply-To: <1461348424-3896-1-git-send-email-paul.gortmaker@windriver.com> References: <1461348424-3896-1-git-send-email-paul.gortmaker@windriver.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The Makefile currently controlling compilation of this code is: obj-y := debugtraps.o dma-nommu.o dumpstack.o \ [...] syscalls_$(BITS).o time.o topology.o traps.o \ traps_$(BITS).o unwinder.o ...meaning that it currently is not being built as a module by anyone. Lets remove the couple traces of modular code, so that when reading the driver there is no doubt it is builtin-only. Since module_init translates to device_initcall in the non-modular case, the init ordering remains unchanged with this commit. Cc: Yoshinori Sato Cc: Rich Felker Cc: Paul Gortmaker Cc: linux-sh@vger.kernel.org Signed-off-by: Paul Gortmaker --- arch/sh/kernel/time.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c index d6d0a986c6e9..bfe1de98d003 100644 --- a/arch/sh/kernel/time.c +++ b/arch/sh/kernel/time.c @@ -11,7 +11,6 @@ * for more details. */ #include -#include #include #include #include @@ -83,7 +82,7 @@ static int __init rtc_generic_init(void) return PTR_ERR_OR_ZERO(pdev); } -module_init(rtc_generic_init); +device_initcall(rtc_generic_init); void (*board_time_init)(void); -- 2.8.0