[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-302616911da8e868d3f1a00dce517ca30b0e065d@git.kernel.org>
Date: Sat, 14 Apr 2012 11:26:50 -0700
From: tip-bot for Sam Ravnborg <sam@...nborg.org>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...nel.org,
sam@...nborg.org, tj@...nel.org, tglx@...utronix.de
Subject: [tip:x86/mm] x86: Drop obsolete ARCH_BOOTMEM support
Commit-ID: 302616911da8e868d3f1a00dce517ca30b0e065d
Gitweb: http://git.kernel.org/tip/302616911da8e868d3f1a00dce517ca30b0e065d
Author: Sam Ravnborg <sam@...nborg.org>
AuthorDate: Fri, 6 Apr 2012 14:47:35 +0200
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Sat, 14 Apr 2012 14:28:58 +0200
x86: Drop obsolete ARCH_BOOTMEM support
x86 unconditionally uses NO_BOOTMEM so there is no use
of the HAVE_ARCH_BOOTMEM support as mm/bootmem.c is the
only file referencing this symbol.
bootmem_arch_preferred_node() is the function referred
in the mm/bootmem.c code and can thuis be dropped too.
x86 was the sole user of HAVE_ARCH_BOOTMEM - so there is
an opportunity to clean up a little in mm/bootmem.c too
if we do not expect other users to emerge.
Signed-off-by: Sam Ravnborg <sam@...nborg.org>
Cc: Tejun Heo <tj@...nel.org>
Link: http://lkml.kernel.org/r/20120406124735.GA6920@merkur.ravnborg.org
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
arch/x86/Kconfig | 4 ----
arch/x86/include/asm/mmzone_32.h | 6 ------
2 files changed, 0 insertions(+), 10 deletions(-)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 5bed94e..a105ee7 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1255,10 +1255,6 @@ config NODES_SHIFT
Specify the maximum number of NUMA Nodes available on the target
system. Increases memory reserved to accommodate various tables.
-config HAVE_ARCH_BOOTMEM
- def_bool y
- depends on X86_32 && NUMA
-
config HAVE_ARCH_ALLOC_REMAP
def_bool y
depends on X86_32 && NUMA
diff --git a/arch/x86/include/asm/mmzone_32.h b/arch/x86/include/asm/mmzone_32.h
index 55728e1..eb05fb3 100644
--- a/arch/x86/include/asm/mmzone_32.h
+++ b/arch/x86/include/asm/mmzone_32.h
@@ -61,10 +61,4 @@ static inline int pfn_valid(int pfn)
#endif /* CONFIG_DISCONTIGMEM */
-#ifdef CONFIG_NEED_MULTIPLE_NODES
-/* always use node 0 for bootmem on this numa platform */
-#define bootmem_arch_preferred_node(__bdata, size, align, goal, limit) \
- (NODE_DATA(0)->bdata)
-#endif /* CONFIG_NEED_MULTIPLE_NODES */
-
#endif /* _ASM_X86_MMZONE_32_H */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists