From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753492AbbLLVcb (ORCPT ); Sat, 12 Dec 2015 16:32:31 -0500 Received: from mail1.windriver.com ([147.11.146.13]:54001 "EHLO mail1.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753407AbbLLVc3 (ORCPT ); Sat, 12 Dec 2015 16:32:29 -0500 From: Paul Gortmaker To: CC: Paul Gortmaker , Alexander Viro , Jeff Layton , "J. Bruce Fields" , Subject: [PATCH 03/10] fs: make fcntl.c explicitly non-modular Date: Sat, 12 Dec 2015 16:30:05 -0500 Message-ID: <1449955812-10149-4-git-send-email-paul.gortmaker@windriver.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1449955812-10149-1-git-send-email-paul.gortmaker@windriver.com> References: <1449955812-10149-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 meaning that it currently is not being built as a module by anyone. Lets remove the couple traces of modularity so that when reading the code there is no doubt it is builtin-only. Since module_init translates to device_initcall in the non-modular case, the init ordering gets bumped to one level earlier when we use the more appropriate fs_initcall here. However we've made similar changes before without any fallout and none is expected here either. We don't replace module.h with init.h since the file already has that. Cc: Alexander Viro Cc: Jeff Layton Cc: "J. Bruce Fields" Cc: linux-fsdevel@vger.kernel.org Signed-off-by: Paul Gortmaker --- fs/fcntl.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/fcntl.c b/fs/fcntl.c index ee85cd4e136a..b485864eb357 100644 --- a/fs/fcntl.c +++ b/fs/fcntl.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include @@ -755,5 +754,4 @@ static int __init fcntl_init(void) sizeof(struct fasync_struct), 0, SLAB_PANIC, NULL); return 0; } - -module_init(fcntl_init) +fs_initcall(fcntl_init) -- 2.6.1