diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2020-02-01 13:47:17 +0300 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2020-02-01 13:47:17 +0300 |
| commit | 4c25df5640ae6e4491ee2c50d3f70c1559ef037d (patch) | |
| tree | 9d68b0361918926d7d7b6d78090dcfb942ec4e72 /arch/arc/include/asm/hugepage.h | |
| parent | 34b5a946a9543ce38d8ad1aacc4362533a813db7 (diff) | |
| parent | 3d7dfd632f9b60cfce069b4da517e6b1a1c3f613 (diff) | |
| download | linux-4c25df5640ae6e4491ee2c50d3f70c1559ef037d.tar.xz | |
Merge branch 'topic/user-access-begin' into next
Merge the user_access_begin() series from Christophe. This is based on
a commit from Linus that went into v5.5-rc7.
Diffstat (limited to 'arch/arc/include/asm/hugepage.h')
| -rw-r--r-- | arch/arc/include/asm/hugepage.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arc/include/asm/hugepage.h b/arch/arc/include/asm/hugepage.h index 9a74ce71a767..30ac40fed2c5 100644 --- a/arch/arc/include/asm/hugepage.h +++ b/arch/arc/include/asm/hugepage.h @@ -8,7 +8,6 @@ #define _ASM_ARC_HUGEPAGE_H #include <linux/types.h> -#define __ARCH_USE_5LEVEL_HACK #include <asm-generic/pgtable-nopmd.h> static inline pte_t pmd_pte(pmd_t pmd) |