diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2017-04-02 10:33:48 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-04-02 10:33:48 -0400 |
| commit | bee3f412d6fc94011850f16cddce745d529411a5 (patch) | |
| tree | 01b1823a3bc0cb760129ed15f7ec027a36edc48b /arch/microblaze | |
| parent | d597580d373774b1bdab84b3d26ff0b55162b916 (diff) | |
| parent | 476e75a44b56038bee9207242d4bc718f6b4de06 (diff) | |
Merge branch 'parisc-4.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux into uaccess.parisc
Diffstat (limited to 'arch/microblaze')
| -rw-r--r-- | arch/microblaze/include/asm/page.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/microblaze/include/asm/page.h b/arch/microblaze/include/asm/page.h index fd850879854d..d506bb0893f9 100644 --- a/arch/microblaze/include/asm/page.h +++ b/arch/microblaze/include/asm/page.h | |||
| @@ -95,7 +95,8 @@ typedef struct { unsigned long pgd; } pgd_t; | |||
| 95 | # else /* CONFIG_MMU */ | 95 | # else /* CONFIG_MMU */ |
| 96 | typedef struct { unsigned long ste[64]; } pmd_t; | 96 | typedef struct { unsigned long ste[64]; } pmd_t; |
| 97 | typedef struct { pmd_t pue[1]; } pud_t; | 97 | typedef struct { pmd_t pue[1]; } pud_t; |
| 98 | typedef struct { pud_t pge[1]; } pgd_t; | 98 | typedef struct { pud_t p4e[1]; } p4d_t; |
| 99 | typedef struct { p4d_t pge[1]; } pgd_t; | ||
| 99 | # endif /* CONFIG_MMU */ | 100 | # endif /* CONFIG_MMU */ |
| 100 | 101 | ||
| 101 | # define pte_val(x) ((x).pte) | 102 | # define pte_val(x) ((x).pte) |