The following commit has been merged into the x86/cleanups branch of tip:

Commit-ID:     0877ad1c4e7ab0b873c3a63c157ed2ae34eab77b
Gitweb:        https://git.kernel.org/tip/0877ad1c4e7ab0b873c3a63c157ed2ae34eab77b
Author:        Nikolay Borisov <nik.borisov@suse.com>
AuthorDate:    Mon, 14 Jul 2025 20:02:58 +03:00
Committer:     Borislav Petkov (AMD) <bp@alien8.de>
CommitterDate: Mon, 14 Jul 2025 21:34:42 +02:00

x86/mm: Remove duplicated __PAGE_KERNEL(_EXEC) definitions

__PAGE_KERNEL(_EXEC) is defined twice, just remove the superfluous set.

No functional changes.

Signed-off-by: Nikolay Borisov <nik.borisov@suse.com>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/20250714170258.390175-1-nik.borisov@suse.com
---
 arch/x86/include/asm/pgtable_types.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
index b74ec5c..a5731fb 100644
--- a/arch/x86/include/asm/pgtable_types.h
+++ b/arch/x86/include/asm/pgtable_types.h
@@ -214,9 +214,6 @@ enum page_cache_mode {
 #define PAGE_READONLY	     __pg(__PP|   0|_USR|___A|__NX|   0|   0|   0)
 #define PAGE_READONLY_EXEC   __pg(__PP|   0|_USR|___A|   0|   0|   0|   0)
 
-#define __PAGE_KERNEL		 (__PP|__RW|   0|___A|__NX|___D|   0|___G)
-#define __PAGE_KERNEL_EXEC	 (__PP|__RW|   0|___A|   0|___D|   0|___G)
-
 /*
  * Page tables needs to have Write=1 in order for any lower PTEs to be
  * writable. This includes shadow stack memory (Write=0, Dirty=1)