diff options
| author | Sasha Levin <sashal@kernel.org> | 2018-11-02 09:54:00 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-11-10 07:42:59 -0800 |
| commit | eba69ae2afef955377e17b746ef14c5a245f4bdb (patch) | |
| tree | 76838ced0ac05b194750320572e2751c6d352839 /arch/x86/include/asm | |
| parent | ced272d8da2029f488edc12dd03b354a88c6cbc5 (diff) | |
Revert "x86/mm: Expand static page table for fixmap space"
This reverts commit 3a8304b7ad2e291777e8499e39390145d932a2fd, which was
upstream commit 05ab1d8a4b36ee912b7087c6da127439ed0a903e.
Ben Hutchings writes:
This backport is incorrect. The part that updated __startup_64() in
arch/x86/kernel/head64.c was dropped, presumably because that function
doesn't exist in 4.9. However that seems to be an essential of the
fix. In 4.9 the startup_64 routine in arch/x86/kernel/head_64.S would
need to be changed instead.
I also found that this introduces new boot-time warnings on some
systems if CONFIG_DEBUG_WX is enabled.
So, unless someone provides fixes for those issues, I think this should
be reverted for the 4.9 branch.
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'arch/x86/include/asm')
| -rw-r--r-- | arch/x86/include/asm/fixmap.h | 10 | ||||
| -rw-r--r-- | arch/x86/include/asm/pgtable_64.h | 3 |
2 files changed, 1 insertions, 12 deletions
diff --git a/arch/x86/include/asm/fixmap.h b/arch/x86/include/asm/fixmap.h index 25152843dd1f..8554f960e21b 100644 --- a/arch/x86/include/asm/fixmap.h +++ b/arch/x86/include/asm/fixmap.h @@ -14,16 +14,6 @@ #ifndef _ASM_X86_FIXMAP_H #define _ASM_X86_FIXMAP_H -/* - * Exposed to assembly code for setting up initial page tables. Cannot be - * calculated in assembly code (fixmap entries are an enum), but is sanity - * checked in the actual fixmap C code to make sure that the fixmap is - * covered fully. - */ -#define FIXMAP_PMD_NUM 2 -/* fixmap starts downwards from the 507th entry in level2_fixmap_pgt */ -#define FIXMAP_PMD_TOP 507 - #ifndef __ASSEMBLY__ #include <linux/kernel.h> #include <asm/acpi.h> diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h index d5c4df98aac3..221a32ed1372 100644 --- a/arch/x86/include/asm/pgtable_64.h +++ b/arch/x86/include/asm/pgtable_64.h @@ -13,14 +13,13 @@ #include <asm/processor.h> #include <linux/bitops.h> #include <linux/threads.h> -#include <asm/fixmap.h> extern pud_t level3_kernel_pgt[512]; extern pud_t level3_ident_pgt[512]; extern pmd_t level2_kernel_pgt[512]; extern pmd_t level2_fixmap_pgt[512]; extern pmd_t level2_ident_pgt[512]; -extern pte_t level1_fixmap_pgt[512 * FIXMAP_PMD_NUM]; +extern pte_t level1_fixmap_pgt[512]; extern pgd_t init_level4_pgt[]; #define swapper_pg_dir init_level4_pgt |