aboutsummaryrefslogtreecommitdiffstats
path: root/arch/frv/include
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2015-04-14 22:28:32 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2015-04-14 22:28:32 +0100
commit4b2f8838479eb2abe042e094f7d2cced6d5ea772 (patch)
tree5ef3236b354a494c8d71a572896283e44989c696 /arch/frv/include
parentMerge branches 'misc', 'vdso' and 'fixes' into for-next (diff)
parentARM: pmu: add support for interrupt-affinity property (diff)
downloadlinux-dev-4b2f8838479eb2abe042e094f7d2cced6d5ea772.tar.xz
linux-dev-4b2f8838479eb2abe042e094f7d2cced6d5ea772.zip
Merge branch 'devel-stable' into for-next
Diffstat (limited to 'arch/frv/include')
-rw-r--r--arch/frv/include/asm/pgtable.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/frv/include/asm/pgtable.h b/arch/frv/include/asm/pgtable.h
index 93bcf2abd1a1..07d7a7ef8bd5 100644
--- a/arch/frv/include/asm/pgtable.h
+++ b/arch/frv/include/asm/pgtable.h
@@ -123,12 +123,14 @@ extern unsigned long empty_zero_page;
#define PGDIR_MASK (~(PGDIR_SIZE - 1))
#define PTRS_PER_PGD 64
+#define __PAGETABLE_PUD_FOLDED
#define PUD_SHIFT 26
#define PTRS_PER_PUD 1
#define PUD_SIZE (1UL << PUD_SHIFT)
#define PUD_MASK (~(PUD_SIZE - 1))
#define PUE_SIZE 256
+#define __PAGETABLE_PMD_FOLDED
#define PMD_SHIFT 26
#define PMD_SIZE (1UL << PMD_SHIFT)
#define PMD_MASK (~(PMD_SIZE - 1))