[RFC,08/13] x86/boot: Rename USE_EARLY_PGTABLE_L5
diff mbox series

Message ID 20191003212400.31130-9-rick.p.edgecombe@intel.com
State New
Headers show
Series
  • XOM for KVM guest userspace
Related show

Commit Message

Edgecombe, Rick P Oct. 3, 2019, 9:23 p.m. UTC
Rename USE_EARLY_PGTABLE_L5 to USE_EARLY_PGTABLE so that it can be used
by other early boot detectable page table features.

Signed-off-by: Rick Edgecombe <rick.p.edgecombe@intel.com>
---
 arch/x86/boot/compressed/misc.h         | 2 +-
 arch/x86/include/asm/pgtable_64_types.h | 4 ++--
 arch/x86/kernel/cpu/common.c            | 2 +-
 arch/x86/kernel/head64.c                | 2 +-
 arch/x86/mm/kasan_init_64.c             | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

Patch
diff mbox series

diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/misc.h
index c8181392f70d..45a23aa807bd 100644
--- a/arch/x86/boot/compressed/misc.h
+++ b/arch/x86/boot/compressed/misc.h
@@ -14,7 +14,7 @@ 
 #undef CONFIG_KASAN
 
 /* cpu_feature_enabled() cannot be used this early */
-#define USE_EARLY_PGTABLE_L5
+#define USE_EARLY_PGTABLE
 
 #include <linux/linkage.h>
 #include <linux/screen_info.h>
diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
index 52e5f5f2240d..6b55b837ead4 100644
--- a/arch/x86/include/asm/pgtable_64_types.h
+++ b/arch/x86/include/asm/pgtable_64_types.h
@@ -23,7 +23,7 @@  typedef struct { pteval_t pte; } pte_t;
 #ifdef CONFIG_X86_5LEVEL
 extern unsigned int __pgtable_l5_enabled;
 
-#ifdef USE_EARLY_PGTABLE_L5
+#ifdef USE_EARLY_PGTABLE
 /*
  * cpu_feature_enabled() is not available in early boot code.
  * Use variable instead.
@@ -34,7 +34,7 @@  static inline bool pgtable_l5_enabled(void)
 }
 #else
 #define pgtable_l5_enabled() cpu_feature_enabled(X86_FEATURE_LA57)
-#endif /* USE_EARLY_PGTABLE_L5 */
+#endif /* USE_EARLY_PGTABLE */
 
 #else
 #define pgtable_l5_enabled() 0
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index f125bf7ecb6f..4f08e164c0b1 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -1,6 +1,6 @@ 
 // SPDX-License-Identifier: GPL-2.0-only
 /* cpu_feature_enabled() cannot be used this early */
-#define USE_EARLY_PGTABLE_L5
+#define USE_EARLY_PGTABLE
 
 #include <linux/memblock.h>
 #include <linux/linkage.h>
diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
index 29ffa495bd1c..55f5294c3cdf 100644
--- a/arch/x86/kernel/head64.c
+++ b/arch/x86/kernel/head64.c
@@ -8,7 +8,7 @@ 
 #define DISABLE_BRANCH_PROFILING
 
 /* cpu_feature_enabled() cannot be used this early */
-#define USE_EARLY_PGTABLE_L5
+#define USE_EARLY_PGTABLE
 
 #include <linux/init.h>
 #include <linux/linkage.h>
diff --git a/arch/x86/mm/kasan_init_64.c b/arch/x86/mm/kasan_init_64.c
index 296da58f3013..9466d7abae49 100644
--- a/arch/x86/mm/kasan_init_64.c
+++ b/arch/x86/mm/kasan_init_64.c
@@ -3,7 +3,7 @@ 
 #define pr_fmt(fmt) "kasan: " fmt
 
 /* cpu_feature_enabled() cannot be used this early */
-#define USE_EARLY_PGTABLE_L5
+#define USE_EARLY_PGTABLE
 
 #include <linux/memblock.h>
 #include <linux/kasan.h>