Signed-off-by: Dave Hansen --- memhotplug-dave/include/asm-ppc64/mmzone.h | 8 -------- memhotplug-dave/include/asm-ppc64/sparsemem.h | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 8 deletions(-) diff -puN include/asm-ppc64/mmzone.h~B-sparse-172-ppc64-sparsemem.h include/asm-ppc64/mmzone.h --- memhotplug/include/asm-ppc64/mmzone.h~B-sparse-172-ppc64-sparsemem.h 2005-04-13 14:20:23.000000000 -0700 +++ memhotplug-dave/include/asm-ppc64/mmzone.h 2005-04-13 14:20:23.000000000 -0700 @@ -16,14 +16,6 @@ * flags field of the struct page */ -/* - * SECTION_SIZE_BITS 2^N: how big each section will be - * MAX_PHYSADDR_BITS 2^N: how much physical address space we have - * MAX_PHYSMEM_BITS 2^N: how much memory we can have in that space - */ -#define SECTION_SIZE_BITS 24 -#define MAX_PHYSADDR_BITS 38 -#define MAX_PHYSMEM_BITS 36 #if defined(CONFIG_NEED_MULTIPLE_NODES) diff -puN /dev/null include/asm-ppc64/sparsemem.h --- /dev/null 2005-03-30 22:36:15.000000000 -0800 +++ memhotplug-dave/include/asm-ppc64/sparsemem.h 2005-04-13 14:20:23.000000000 -0700 @@ -0,0 +1,16 @@ +#ifndef _ASM_PPC64_SPARSEMEM_H +#define _ASM_PPC64_SPARSEMEM_H 1 + +#ifdef CONFIG_SPARSEMEM +/* + * SECTION_SIZE_BITS 2^N: how big each section will be + * MAX_PHYSADDR_BITS 2^N: how much physical address space we have + * MAX_PHYSMEM_BITS 2^N: how much memory we can have in that space + */ +#define SECTION_SIZE_BITS 24 +#define MAX_PHYSADDR_BITS 38 +#define MAX_PHYSMEM_BITS 36 + +#endif /* CONFIG_SPARSEMEM */ + +#endif /* _ASM_PPC64_SPARSEMEM_H */ _