diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-01 18:46:35 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-01 18:46:35 -0500 |
| commit | 7e8f44f8d4fa9bb35e32c161fbcdbd6b9e6400e3 (patch) | |
| tree | cf6d526a070a06b365ab0ceb4e1c3ca9ad94666e /arch/sparc/mm/init_64.h | |
| parent | 138f3c8518976953563a1316d7e0420c72d4ab96 (diff) | |
| parent | 2127816366e0ffbc1426fa69e7b9b2bebd2e2288 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/sparc/mm/init_64.h')
| -rw-r--r-- | arch/sparc/mm/init_64.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/mm/init_64.h b/arch/sparc/mm/init_64.h index c2f772dbd556..77d1b313e344 100644 --- a/arch/sparc/mm/init_64.h +++ b/arch/sparc/mm/init_64.h | |||
| @@ -45,7 +45,7 @@ extern void free_initmem(void); | |||
| 45 | #define VMEMMAP_ALIGN(x) (((x)+VMEMMAP_CHUNK-1UL)&VMEMMAP_CHUNK_MASK) | 45 | #define VMEMMAP_ALIGN(x) (((x)+VMEMMAP_CHUNK-1UL)&VMEMMAP_CHUNK_MASK) |
| 46 | 46 | ||
| 47 | #define VMEMMAP_SIZE ((((1UL << MAX_PHYSADDR_BITS) >> PAGE_SHIFT) * \ | 47 | #define VMEMMAP_SIZE ((((1UL << MAX_PHYSADDR_BITS) >> PAGE_SHIFT) * \ |
| 48 | sizeof(struct page *)) >> VMEMMAP_CHUNK_SHIFT) | 48 | sizeof(struct page)) >> VMEMMAP_CHUNK_SHIFT) |
| 49 | extern unsigned long vmemmap_table[VMEMMAP_SIZE]; | 49 | extern unsigned long vmemmap_table[VMEMMAP_SIZE]; |
| 50 | #endif | 50 | #endif |
| 51 | 51 | ||