diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-02 21:30:03 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-02 21:30:03 -0500 |
| commit | 652e8f8d579d61745094e36b4ff085026a332e73 (patch) | |
| tree | 44145576f9cdf0b777dee0d0961f5499ea88bec8 /arch/powerpc/include/asm/highmem.h | |
| parent | 501cb16d3cfdcca99ac26fe122079f2a43b046b8 (diff) | |
| parent | 6c7120902305b3a21460cd2f0f917a39307df566 (diff) | |
Merge commit 'jwb/next' into next
Diffstat (limited to 'arch/powerpc/include/asm/highmem.h')
| -rw-r--r-- | arch/powerpc/include/asm/highmem.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/powerpc/include/asm/highmem.h b/arch/powerpc/include/asm/highmem.h index a286e47100b5..545028f86488 100644 --- a/arch/powerpc/include/asm/highmem.h +++ b/arch/powerpc/include/asm/highmem.h | |||
| @@ -39,15 +39,15 @@ extern pte_t *pkmap_page_table; | |||
| 39 | * chunk of RAM. | 39 | * chunk of RAM. |
| 40 | */ | 40 | */ |
| 41 | /* | 41 | /* |
| 42 | * We use one full pte table with 4K pages. And with 16K/64K pages pte | 42 | * We use one full pte table with 4K pages. And with 16K/64K/256K pages pte |
| 43 | * table covers enough memory (32MB and 512MB resp.) that both FIXMAP | 43 | * table covers enough memory (32MB/512MB/2GB resp.), so that both FIXMAP |
| 44 | * and PKMAP can be placed in single pte table. We use 1024 pages for | 44 | * and PKMAP can be placed in a single pte table. We use 512 pages for PKMAP |
| 45 | * PKMAP in case of 16K/64K pages. | 45 | * in case of 16K/64K/256K page sizes. |
| 46 | */ | 46 | */ |
| 47 | #ifdef CONFIG_PPC_4K_PAGES | 47 | #ifdef CONFIG_PPC_4K_PAGES |
| 48 | #define PKMAP_ORDER PTE_SHIFT | 48 | #define PKMAP_ORDER PTE_SHIFT |
| 49 | #else | 49 | #else |
| 50 | #define PKMAP_ORDER 10 | 50 | #define PKMAP_ORDER 9 |
| 51 | #endif | 51 | #endif |
| 52 | #define LAST_PKMAP (1 << PKMAP_ORDER) | 52 | #define LAST_PKMAP (1 << PKMAP_ORDER) |
| 53 | #ifndef CONFIG_PPC_4K_PAGES | 53 | #ifndef CONFIG_PPC_4K_PAGES |