lkml.org 
[lkml]   [2023]   [Sep]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[tip: x86/mm] x86/mm: Move arch_memory_failure() and arch_is_platform_page() definitions from <asm/processor.h> to <asm/pgtable.h>
The following commit has been merged into the x86/mm branch of tip:

Commit-ID: d73a105586434ca919a1a487a467e5664f9300c4
Gitweb: https://git.kernel.org/tip/d73a105586434ca919a1a487a467e5664f9300c4
Author: Ingo Molnar <mingo@kernel.org>
AuthorDate: Fri, 22 Sep 2023 09:29:59 +02:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Fri, 22 Sep 2023 09:32:03 +02:00

x86/mm: Move arch_memory_failure() and arch_is_platform_page() definitions from <asm/processor.h> to <asm/pgtable.h>

<linux/mm.h> relies on these definitions being included first,
which is true currently due to historic header spaghetti,
but in the future <asm/processor.h> will not guaranteed to be
included by the MM code.

Move these definitions over into a suitable MM header.

This is a preparatory patch for x86 header dependency simplifications
and reductions.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org
---
arch/x86/include/asm/pgtable.h | 8 ++++++++
arch/x86/include/asm/processor.h | 8 --------
2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
index d6ad98c..1e12e61 100644
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
@@ -1708,6 +1708,14 @@ static inline bool pud_user_accessible_page(pud_t pud)
}
#endif

+#ifdef CONFIG_X86_SGX
+int arch_memory_failure(unsigned long pfn, int flags);
+#define arch_memory_failure arch_memory_failure
+
+bool arch_is_platform_page(u64 paddr);
+#define arch_is_platform_page arch_is_platform_page
+#endif
+
#endif /* __ASSEMBLY__ */

#endif /* _ASM_X86_PGTABLE_H */
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index 0086920..1b2b138 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -726,14 +726,6 @@ enum mds_mitigations {
MDS_MITIGATION_VMWERV,
};

-#ifdef CONFIG_X86_SGX
-int arch_memory_failure(unsigned long pfn, int flags);
-#define arch_memory_failure arch_memory_failure
-
-bool arch_is_platform_page(u64 paddr);
-#define arch_is_platform_page arch_is_platform_page
-#endif
-
extern bool gds_ucode_mitigated(void);

#endif /* _ASM_X86_PROCESSOR_H */
\
 
 \ /
  Last update: 2023-09-22 16:29    [W:0.019 / U:1.144 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site