diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-01-30 13:30:37 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:30:37 +0100 |
| commit | 8a423ff0c4a0472607bbed6790fdaeec54af2ebb (patch) | |
| tree | 676fab07c33482e2b81cd1596c206c9b5b0c0b1b /include/asm-x86/sparsemem.h | |
| parent | 4757d7d8d00c5f8b2c176ca03b0a8eabbc206664 (diff) | |
| download | op-kernel-dev-8a423ff0c4a0472607bbed6790fdaeec54af2ebb.zip op-kernel-dev-8a423ff0c4a0472607bbed6790fdaeec54af2ebb.tar.gz | |
x86: merge include/asm-x86/sparsemem.h
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/sparsemem.h')
| -rw-r--r-- | include/asm-x86/sparsemem.h | 35 |
1 files changed, 32 insertions, 3 deletions
diff --git a/include/asm-x86/sparsemem.h b/include/asm-x86/sparsemem.h index 3f203b1..fa58cd5 100644 --- a/include/asm-x86/sparsemem.h +++ b/include/asm-x86/sparsemem.h @@ -1,5 +1,34 @@ +#ifndef _ASM_X86_SPARSEMEM_H +#define _ASM_X86_SPARSEMEM_H + +#ifdef CONFIG_SPARSEMEM +/* + * generic non-linear memory support: + * + * 1) we will not split memory into more chunks than will fit into the flags + * field of the struct page + * + * SECTION_SIZE_BITS 2^n: size of each section + * MAX_PHYSADDR_BITS 2^n: max size of physical address space + * MAX_PHYSMEM_BITS 2^n: how much memory we can have in that space + * + */ + #ifdef CONFIG_X86_32 -# include "sparsemem_32.h" -#else -# include "sparsemem_64.h" +# ifdef CONFIG_X86_PAE +# define SECTION_SIZE_BITS 30 +# define MAX_PHYSADDR_BITS 36 +# define MAX_PHYSMEM_BITS 36 +# else +# define SECTION_SIZE_BITS 26 +# define MAX_PHYSADDR_BITS 32 +# define MAX_PHYSMEM_BITS 32 +# endif +#else /* CONFIG_X86_32 */ +# define SECTION_SIZE_BITS 27 /* matt - 128 is convenient right now */ +# define MAX_PHYSADDR_BITS 40 +# define MAX_PHYSMEM_BITS 40 +#endif + +#endif /* CONFIG_SPARSEMEM */ #endif |
