powerpc: Set init_bootmem_done on NUMA platforms as well (d3f6204a) · Commits · 戴 / test

For some obscure reason, we only set init_bootmem_done after initializing bootmem when NUMA isn't enabled. We even document this next to the declaration of that global in system.h which of course I didn't read before I had to debug why some WIP code wasn't working properly... This patch changes it so that we always set it after bootmem is initialized which should have always been the case... go figure ! Signed-off-by:

Benjamin Herrenschmidt <benh@kernel.crashing.org>

arch/powerpc/include/asm/system.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -211,7 +211,7 @@ extern struct task_struct _switch(struct thread_struct prev,

		extern unsigned int rtas_data;
		extern int mem_init_done; /* set on boot once kmalloc can be called */
		extern int init_bootmem_done; /* set on !NUMA once bootmem is available */
		extern int init_bootmem_done; /* set once bootmem is available */
		extern phys_addr_t memory_limit;
		extern unsigned long klimit;

arch/powerpc/mm/numa.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -981,6 +981,8 @@ void __init do_init_bootmem(void)
		mark_reserved_regions_for_nid(nid);
		sparse_memory_present_with_active_regions(nid);
		}

		init_bootmem_done = 1;
		}

		void __init paging_init(void)

Admin message