From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754919AbbLQTLp (ORCPT ); Thu, 17 Dec 2015 14:11:45 -0500 Received: from mail.windriver.com ([147.11.1.11]:61222 "EHLO mail.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754754AbbLQTLc (ORCPT ); Thu, 17 Dec 2015 14:11:32 -0500 From: Paul Gortmaker To: CC: Paul Gortmaker , Alexander Viro , Subject: [PATCH 8/8] fs: make binfmt_elf.c explicitly non-modular Date: Thu, 17 Dec 2015 14:11:06 -0500 Message-ID: <1450379466-23115-9-git-send-email-paul.gortmaker@windriver.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1450379466-23115-1-git-send-email-paul.gortmaker@windriver.com> References: <1450379466-23115-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 Kconfig currently controlling compilation of this code is: config BINFMT_ELF bool "Kernel support for ELF binaries" ...meaning that it currently is not being built as a module by anyone. Lets remove the modular code that is essentially orphaned, so that when reading the driver there is no doubt it is builtin-only. Since this file was already using core_initcall and not module_init, we have no changes in initcall ordering with this commit. We don't replace module.h with init.h since the file already has that. We delete the MODULE_LICENSE tag and capture that information at the top of the file alongside author comments, etc. Cc: Alexander Viro Cc: linux-fsdevel@vger.kernel.org Signed-off-by: Paul Gortmaker --- fs/binfmt_elf.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index 3a93755e880f..c26450ffbdc9 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -7,9 +7,9 @@ * Tools". * * Copyright 1993, 1994: Eric Youngdale (ericy@cais.com). + * License: GPL */ -#include #include #include #include @@ -2324,13 +2324,4 @@ static int __init init_elf_binfmt(void) register_binfmt(&elf_format); return 0; } - -static void __exit exit_elf_binfmt(void) -{ - /* Remove the COFF and ELF loaders. */ - unregister_binfmt(&elf_format); -} - core_initcall(init_elf_binfmt); -module_exit(exit_elf_binfmt); -MODULE_LICENSE("GPL"); -- 2.6.1