diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-09-06 19:48:59 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-09-06 19:48:59 -0400 |
| commit | fff34b3412b9401a76ba9d021db1bd91cb0e02b6 (patch) | |
| tree | 870ed2d1555004e7939d15b5099017aae61c97b8 /arch/s390/include/asm/sparsemem.h | |
| parent | 28e1e58fb668e262648fb8ee8a24154633f40507 (diff) | |
| parent | 636802ef96eebe279b22ad9f9dacfe29291e45c7 (diff) | |
Merge branch 'merge' into next
Brings in various bug fixes from 3.6-rcX
Diffstat (limited to 'arch/s390/include/asm/sparsemem.h')
| -rw-r--r-- | arch/s390/include/asm/sparsemem.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/s390/include/asm/sparsemem.h b/arch/s390/include/asm/sparsemem.h index 0fb34027d3f6..a60d085ddb4d 100644 --- a/arch/s390/include/asm/sparsemem.h +++ b/arch/s390/include/asm/sparsemem.h | |||
| @@ -4,13 +4,11 @@ | |||
| 4 | #ifdef CONFIG_64BIT | 4 | #ifdef CONFIG_64BIT |
| 5 | 5 | ||
| 6 | #define SECTION_SIZE_BITS 28 | 6 | #define SECTION_SIZE_BITS 28 |
| 7 | #define MAX_PHYSADDR_BITS 46 | ||
| 8 | #define MAX_PHYSMEM_BITS 46 | 7 | #define MAX_PHYSMEM_BITS 46 |
| 9 | 8 | ||
| 10 | #else | 9 | #else |
| 11 | 10 | ||
| 12 | #define SECTION_SIZE_BITS 25 | 11 | #define SECTION_SIZE_BITS 25 |
| 13 | #define MAX_PHYSADDR_BITS 31 | ||
| 14 | #define MAX_PHYSMEM_BITS 31 | 12 | #define MAX_PHYSMEM_BITS 31 |
| 15 | 13 | ||
| 16 | #endif /* CONFIG_64BIT */ | 14 | #endif /* CONFIG_64BIT */ |