diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-01-05 12:27:46 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-01-05 12:27:46 +0900 |
commit | a7595fe7e8a93a73ce6199dace75a0caca7024c1 (patch) | |
tree | d8ed3959fe722ac5dad69285dea5537fc2535098 /arch/sh/include/asm/pgtable_pmd.h | |
parent | 921a220857cdd3c553cde7c114f9f6757ac80cd5 (diff) | |
parent | 2a5eacca85d39d8b6dffae821d7d260f05584dc7 (diff) |
Merge branch 'sh/pgtable' of git://github.com/mfleming/linux-2.6
Diffstat (limited to 'arch/sh/include/asm/pgtable_pmd.h')
-rw-r--r-- | arch/sh/include/asm/pgtable_pmd.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/include/asm/pgtable_pmd.h b/arch/sh/include/asm/pgtable_pmd.h index 78dc36e1c2dd..42a180e534a8 100644 --- a/arch/sh/include/asm/pgtable_pmd.h +++ b/arch/sh/include/asm/pgtable_pmd.h @@ -17,11 +17,11 @@ #define USER_PTRS_PER_PGD 2 /* PMD bits */ -#define PMD_SHIFT (PAGE_SHIFT + (PAGE_SHIFT - 3)) +#define PMD_SHIFT (PAGE_SHIFT + (PAGE_SHIFT - PTE_MAGNITUDE)) #define PMD_SIZE (1UL << PMD_SHIFT) #define PMD_MASK (~(PMD_SIZE-1)) -#define PTRS_PER_PMD (PAGE_SIZE / sizeof(pmd_t)) +#define PTRS_PER_PMD ((1 << PGDIR_SHIFT) / PMD_SIZE) #define pmd_ERROR(e) \ printk("%s:%d: bad pmd %016llx.\n", __FILE__, __LINE__, pmd_val(e)) |