Commit d73a1055 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86/mm: Move arch_memory_failure() and arch_is_platform_page() definitions... 


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: default avatarIngo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org
parent 8f100467

arch/x86/include/asm/pgtable.h

+8 −0
Original line number Diff line number Diff line
@@ -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 */

arch/x86/include/asm/processor.h

+0 −8
Original line number Diff line number Diff line
@@ -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 */