[PATCH] x86: drop obsolete ARCH_BOOTMEM support

[PATCH] x86: drop obsolete ARCH_BOOTMEM support

[Sam Ravnborg]

>From ae6cdc767f973f39cb205af4b80ff13f35a1b66e Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Fri, 6 Apr 2012 13:37:08 +0200
Subject: [PATCH] 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@ravnborg.org>
Cc: Tejun Heo <tj@kernel.org>
---

I found this while browsing the bootmem code for other reasons.
Build tested on x86-32

	Sam

 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 1d14cc6..553f15e 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1239,10 +1239,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 */
-- 
1.6.0.6

Re: [PATCH] x86: drop obsolete ARCH_BOOTMEM support

[Tejun Heo]

On Fri, Apr 06, 2012 at 02:47:35PM +0200, Sam Ravnborg wrote:
> From ae6cdc767f973f39cb205af4b80ff13f35a1b66e Mon Sep 17 00:00:00 2001
> From: Sam Ravnborg <sam@ravnborg.org>
> Date: Fri, 6 Apr 2012 13:37:08 +0200
> Subject: [PATCH] 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.

avr32 seems to have it too?

-- 
tejun

Re: [PATCH] x86: drop obsolete ARCH_BOOTMEM support

[Yinghai Lu]

On Wed, Apr 11, 2012 at 9:30 AM, Tejun Heo <tj@kernel.org> wrote:
> On Fri, Apr 06, 2012 at 02:47:35PM +0200, Sam Ravnborg wrote:
>> From ae6cdc767f973f39cb205af4b80ff13f35a1b66e Mon Sep 17 00:00:00 2001
>> From: Sam Ravnborg <sam@ravnborg.org>
>> Date: Fri, 6 Apr 2012 13:37:08 +0200
>> Subject: [PATCH] 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.
>
> avr32 seems to have it too?

avr32 is:

config HAVE_ARCH_BOOTMEM
        def_bool n

so that is not used with avr32

Yinghai

Re: [PATCH] x86: drop obsolete ARCH_BOOTMEM support

[Tejun Heo]

On Wed, Apr 11, 2012 at 10:03:50AM -0700, Yinghai Lu wrote:
> On Wed, Apr 11, 2012 at 9:30 AM, Tejun Heo <tj@kernel.org> wrote:
> > On Fri, Apr 06, 2012 at 02:47:35PM +0200, Sam Ravnborg wrote:
> >> From ae6cdc767f973f39cb205af4b80ff13f35a1b66e Mon Sep 17 00:00:00 2001
> >> From: Sam Ravnborg <sam@ravnborg.org>
> >> Date: Fri, 6 Apr 2012 13:37:08 +0200
> >> Subject: [PATCH] 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.
> >
> > avr32 seems to have it too?
> 
> avr32 is:
> 
> config HAVE_ARCH_BOOTMEM
>         def_bool n
> 
> so that is not used with avr32

Yeah, then better remove the reference from there too, right?

Thanks.

-- 
tejun

Re: [PATCH] x86: drop obsolete ARCH_BOOTMEM support

[Sam Ravnborg]

On Wed, Apr 11, 2012 at 10:11:15AM -0700, Tejun Heo wrote:
> On Wed, Apr 11, 2012 at 10:03:50AM -0700, Yinghai Lu wrote:
> > On Wed, Apr 11, 2012 at 9:30 AM, Tejun Heo <tj@kernel.org> wrote:
> > > On Fri, Apr 06, 2012 at 02:47:35PM +0200, Sam Ravnborg wrote:
> > >> From ae6cdc767f973f39cb205af4b80ff13f35a1b66e Mon Sep 17 00:00:00 2001
> > >> From: Sam Ravnborg <sam@ravnborg.org>
> > >> Date: Fri, 6 Apr 2012 13:37:08 +0200
> > >> Subject: [PATCH] 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.
> > >
> > > avr32 seems to have it too?
> > 
> > avr32 is:
> > 
> > config HAVE_ARCH_BOOTMEM
> >         def_bool n
> > 
> > so that is not used with avr32
> 
> Yeah, then better remove the reference from there too, right?
Yep - will do tomorrow.

	Sam

[tip:x86/mm] x86: Drop obsolete ARCH_BOOTMEM support

[tip-bot for Sam Ravnborg]

Commit-ID:  302616911da8e868d3f1a00dce517ca30b0e065d
Gitweb:     http://git.kernel.org/tip/302616911da8e868d3f1a00dce517ca30b0e065d
Author:     Sam Ravnborg <sam@ravnborg.org>
AuthorDate: Fri, 6 Apr 2012 14:47:35 +0200
Committer:  Ingo Molnar <mingo@kernel.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@ravnborg.org>
Cc: Tejun Heo <tj@kernel.org>
Link: http://lkml.kernel.org/r/20120406124735.GA6920@merkur.ravnborg.org
Signed-off-by: Ingo Molnar <mingo@kernel.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 */