From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755535AbbHYIWy (ORCPT ); Tue, 25 Aug 2015 04:22:54 -0400 Received: from terminus.zytor.com ([198.137.202.10]:38765 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752320AbbHYIWu (ORCPT ); Tue, 25 Aug 2015 04:22:50 -0400 Date: Tue, 25 Aug 2015 01:22:20 -0700 From: tip-bot for Paul Gortmaker Message-ID: Cc: peterz@infradead.org, paul.gortmaker@windriver.com, mingo@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com, torvalds@linux-foundation.org, tglx@linutronix.de Reply-To: torvalds@linux-foundation.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, hpa@zytor.com, paul.gortmaker@windriver.com, mingo@kernel.org, peterz@infradead.org In-Reply-To: <1440459295-21814-3-git-send-email-paul.gortmaker@windriver.com> References: <1440459295-21814-3-git-send-email-paul.gortmaker@windriver.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] x86/mm/pat: Make mm/pageattr[-test] .c explicitly non-modular Git-Commit-ID: 8f45fe441a9836011672436ef007654969b28ccc 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: 8f45fe441a9836011672436ef007654969b28ccc Gitweb: http://git.kernel.org/tip/8f45fe441a9836011672436ef007654969b28ccc Author: Paul Gortmaker AuthorDate: Mon, 24 Aug 2015 19:34:54 -0400 Committer: Ingo Molnar CommitDate: Tue, 25 Aug 2015 09:48:38 +0200 x86/mm/pat: Make mm/pageattr[-test].c explicitly non-modular The file pageattr.c is obj-y and it includes pageattr-test.c based on CPA_DEBUG (a bool), meaning that no code here is currently 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 remains unchanged with this commit. Signed-off-by: Paul Gortmaker Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1440459295-21814-3-git-send-email-paul.gortmaker@windriver.com Signed-off-by: Ingo Molnar --- arch/x86/mm/pageattr-test.c | 4 ++-- arch/x86/mm/pageattr.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c index 8ff686a..5f169d5 100644 --- a/arch/x86/mm/pageattr-test.c +++ b/arch/x86/mm/pageattr-test.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include @@ -256,5 +257,4 @@ static int start_pageattr_test(void) return 0; } - -module_init(start_pageattr_test); +device_initcall(start_pageattr_test); diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c index 727158c..2c44c07 100644 --- a/arch/x86/mm/pageattr.c +++ b/arch/x86/mm/pageattr.c @@ -4,7 +4,6 @@ */ #include #include -#include #include #include #include