From patchwork Thu Dec 17 19:11:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Gortmaker X-Patchwork-Id: 7876421 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 20307BEEE5 for ; Thu, 17 Dec 2015 19:16:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 565D42015A for ; Thu, 17 Dec 2015 19:16:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5BB9B20117 for ; Thu, 17 Dec 2015 19:16:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754840AbbLQTLn (ORCPT ); Thu, 17 Dec 2015 14:11:43 -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 Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail.windriver.com (8.15.2/8.15.1) with ESMTPS id tBHJBWrG027371 (version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL); Thu, 17 Dec 2015 11:11:32 -0800 (PST) Received: from yow-lpgnfs-02.corp.ad.wrs.com (128.224.149.8) by ALA-HCA.corp.ad.wrs.com (147.11.189.40) with Microsoft SMTP Server id 14.3.248.2; Thu, 17 Dec 2015 11:11:30 -0800 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 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 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");