diff options
| author | Rob Herring <robh@kernel.org> | 2015-03-10 10:03:04 -0400 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2015-03-10 10:03:04 -0400 |
| commit | 2c192699a7050ef5bdf1e2cc95fdddfbcf524509 (patch) | |
| tree | 945d4553691ecb24151a2fa83b7d489665dd3248 /arch/m32r/include/asm/pgtable-2level.h | |
| parent | 25e8f336e535d10c30216e1ba330fbea98dfccc5 (diff) | |
| parent | 9eccca0843205f87c00404b663188b88eb248051 (diff) | |
Merge tag 'v4.0-rc3' into HEAD
Linux 4.0-rc3
Merging in v4.0-rc3 because commit 30a22c215a00 (console: Fix
console name size mismatch) is a dependency.
Diffstat (limited to 'arch/m32r/include/asm/pgtable-2level.h')
| -rw-r--r-- | arch/m32r/include/asm/pgtable-2level.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/m32r/include/asm/pgtable-2level.h b/arch/m32r/include/asm/pgtable-2level.h index 8fd8ee70266a..421e6ba3a173 100644 --- a/arch/m32r/include/asm/pgtable-2level.h +++ b/arch/m32r/include/asm/pgtable-2level.h | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | * the M32R is two-level, so we don't really have any | 13 | * the M32R is two-level, so we don't really have any |
| 14 | * PMD directory physically. | 14 | * PMD directory physically. |
| 15 | */ | 15 | */ |
| 16 | #define __PAGETABLE_PMD_FOLDED | ||
| 16 | #define PMD_SHIFT 22 | 17 | #define PMD_SHIFT 22 |
| 17 | #define PTRS_PER_PMD 1 | 18 | #define PTRS_PER_PMD 1 |
| 18 | 19 | ||