Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754518AbbHXWPx (ORCPT ); Mon, 24 Aug 2015 18:15:53 -0400 Received: from mail1.windriver.com ([147.11.146.13]:47704 "EHLO mail1.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754265AbbHXWPv (ORCPT ); Mon, 24 Aug 2015 18:15:51 -0400 From: Paul Gortmaker To: Andrew Morton CC: , , Paul Gortmaker , Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim Subject: [PATCH 02/10] mm: make slab_common.c explicitly non-modular Date: Mon, 24 Aug 2015 18:14:34 -0400 Message-ID: <1440454482-12250-3-git-send-email-paul.gortmaker@windriver.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1440454482-12250-1-git-send-email-paul.gortmaker@windriver.com> References: <1440454482-12250-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 Content-Length: 1734 Lines: 51 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 remains unchanged with this commit. However one could argue that subsys_initcall() might make more sense here. Cc: Christoph Lameter Cc: Pekka Enberg Cc: David Rientjes Cc: Joonsoo Kim Cc: Andrew Morton Cc: linux-mm@kvack.org Signed-off-by: Paul Gortmaker --- mm/slab_common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/slab_common.c b/mm/slab_common.c index 5ce4faeb16fb..a27aff8d7cdc 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include @@ -1113,7 +1113,7 @@ static int __init slab_proc_init(void) &proc_slabinfo_operations); return 0; } -module_init(slab_proc_init); +device_initcall(slab_proc_init); #endif /* CONFIG_SLABINFO */ static __always_inline void *__do_krealloc(const void *p, size_t new_size, -- 2.5.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/