[PATCH] init: introduce mm_init()

[PATCH] init: introduce mm_init()

[Pekka J Enberg]

From: Pekka Enberg <penberg@cs.helsinki.fi>

As suggested by Christoph Lameter, introduce mm_init() now that we initialize
all the kernel memory allocations together.

Cc: Christoph Lameter <cl@linux-foundation.org>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---
 init/main.c |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/init/main.c b/init/main.c
index 6d38f96..9e4bc82 100644
--- a/init/main.c
+++ b/init/main.c
@@ -533,6 +533,16 @@ void __init __weak thread_info_cache_init(void)
 {
 }
 
+static void __init mm_init(void)
+{
+	/*
+	 * Set up kernel memory allocators
+	 */
+	mem_init();
+	kmem_cache_init();
+	vmalloc_init();
+}
+
 asmlinkage void __init start_kernel(void)
 {
 	char * command_line;
@@ -590,12 +600,7 @@ asmlinkage void __init start_kernel(void)
 	vfs_caches_init_early();
 	sort_main_extable();
 	trap_init();
-	/*
-	 * Set up kernel memory allocators
-	 */
-	mem_init();
-	kmem_cache_init();
-	vmalloc_init();
+	mm_init();
 	/*
 	 * Set up the scheduler prior starting any interrupts (such as the
 	 * timer interrupt). Full topology setup happens at smp_init()
-- 
1.6.0.4

Re: [PATCH] init: introduce mm_init()

[Linus Torvalds]

On Thu, 11 Jun 2009, Pekka J Enberg wrote:
>  
> +static void __init mm_init(void)
> +{
> +	/*
> +	 * Set up kernel memory allocators
> +	 */
> +	mem_init();
> +	kmem_cache_init();
> +	vmalloc_init();
> +}

Please just put the comments at the top of the function in cases like 
this, ie just

	/*
	 * ...
	 */
	static int __init mm_init(void)
	{
		..
	}

also, I'm now terminally confused about the whole series, so I'm wondering 
if you could re-do the series so that (a) I have a clear picture of what 
to take, and (b) preferably so it's also all bisectable (ie the trap_init 
ordering fixes are done in the initial mm/init.c changes).

		Linus

Re: [PATCH] init: introduce mm_init()

[Christoph Lameter]

You forgot to move it to mm/mm_init.c

On Thu, 11 Jun 2009, Pekka J Enberg wrote:

> From: Pekka Enberg <penberg@cs.helsinki.fi>
>
> As suggested by Christoph Lameter, introduce mm_init() now that we initialize
> all the kernel memory allocations together.
>
> Cc: Christoph Lameter <cl@linux-foundation.org>
> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
> ---
>  init/main.c |   17 +++++++++++------
>  1 files changed, 11 insertions(+), 6 deletions(-)
>
> diff --git a/init/main.c b/init/main.c
> index 6d38f96..9e4bc82 100644
> --- a/init/main.c
> +++ b/init/main.c
> @@ -533,6 +533,16 @@ void __init __weak thread_info_cache_init(void)
>  {
>  }
>
> +static void __init mm_init(void)
> +{
> +	/*
> +	 * Set up kernel memory allocators
> +	 */
> +	mem_init();
> +	kmem_cache_init();
> +	vmalloc_init();
> +}
> +
>  asmlinkage void __init start_kernel(void)
>  {
>  	char * command_line;
> @@ -590,12 +600,7 @@ asmlinkage void __init start_kernel(void)
>  	vfs_caches_init_early();
>  	sort_main_extable();
>  	trap_init();
> -	/*
> -	 * Set up kernel memory allocators
> -	 */
> -	mem_init();
> -	kmem_cache_init();
> -	vmalloc_init();
> +	mm_init();
>  	/*
>  	 * Set up the scheduler prior starting any interrupts (such as the
>  	 * timer interrupt). Full topology setup happens at smp_init()
>

Re: [PATCH] init: introduce mm_init()

[Pekka Enberg]

Hi Linus,

On Thu, 2009-06-11 at 08:56 -0700, Linus Torvalds wrote:
> Please just put the comments at the top of the function in cases like 
> this, ie just
> 
> 	/*
> 	 * ...
> 	 */
> 	static int __init mm_init(void)
> 	{
> 		..
> 	}

Fixed.

On Thu, 2009-06-11 at 08:56 -0700, Linus Torvalds wrote:
> also, I'm now terminally confused about the whole series, so I'm wondering 
> if you could re-do the series so that (a) I have a clear picture of what 
> to take, and (b) preferably so it's also all bisectable (ie the trap_init 
> ordering fixes are done in the initial mm/init.c changes).

Yup, I will do that and send a v3 of the pull request. I am compiling a
kernel here to try out my tree on 32-bit. I think Ingo is busy preparing
his remaining merges now so I haven't gotten confirmation from him
whether my patch fixes the problem he saw or not.

			Pekka

Re: [PATCH] init: introduce mm_init()

[Pekka Enberg]

On Thu, 2009-06-11 at 11:57 -0400, Christoph Lameter wrote:
> You forgot to move it to mm/mm_init.c

OK, but that needs to wait for another day. The patch series is already
getting pretty big and there's no mminit.h in include/linux for this.

			Pekka

Re: [PATCH] init: introduce mm_init()

[Linus Torvalds]

On Thu, 11 Jun 2009, Pekka Enberg wrote:

> On Thu, 2009-06-11 at 11:57 -0400, Christoph Lameter wrote:
> > You forgot to move it to mm/mm_init.c
> 
> OK, but that needs to wait for another day. The patch series is already
> getting pretty big and there's no mminit.h in include/linux for this.

Yeah. Keep it in init/main.c for now. Let's keep it all simple.

		Linus