mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-28 11:18:45 +07:00
62d0fd591d
As the bug report [1] pointed out, <linux/vermagic.h> must be included after <linux/module.h>. I believe we should not impose any include order restriction. We often sort include directives alphabetically, but it is just coding style convention. Technically, we can include header files in any order by making every header self-contained. Currently, arch-specific MODULE_ARCH_VERMAGIC is defined in <asm/module.h>, which is not included from <linux/vermagic.h>. Hence, the straight-forward fix-up would be as follows: |--- a/include/linux/vermagic.h |+++ b/include/linux/vermagic.h |@@ -1,5 +1,6 @@ | /* SPDX-License-Identifier: GPL-2.0 */ | #include <generated/utsrelease.h> |+#include <linux/module.h> | | /* Simply sanity version stamp for modules. */ | #ifdef CONFIG_SMP This works enough, but for further cleanups, I split MODULE_ARCH_VERMAGIC definitions into <asm/vermagic.h>. With this, <linux/module.h> and <linux/vermagic.h> will be orthogonal, and the location of MODULE_ARCH_VERMAGIC definitions will be consistent. For arc and ia64, MODULE_PROC_FAMILY is only used for defining MODULE_ARCH_VERMAGIC. I squashed it. For hexagon, nds32, and xtensa, I removed <asm/modules.h> entirely because they contained nothing but MODULE_ARCH_VERMAGIC definition. Kbuild will automatically generate <asm/modules.h> at build-time, wrapping <asm-generic/module.h>. [1] https://lore.kernel.org/lkml/20200411155623.GA22175@zn.tnic Reported-by: Borislav Petkov <bp@suse.de> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Acked-by: Jessica Yu <jeyu@kernel.org>
69 lines
1.9 KiB
C
69 lines
1.9 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
|
|
#ifndef _ASM_VERMAGIC_H
|
|
#define _ASM_VERMAGIC_H
|
|
|
|
#ifdef CONFIG_X86_64
|
|
/* X86_64 does not define MODULE_PROC_FAMILY */
|
|
#elif defined CONFIG_M486SX
|
|
#define MODULE_PROC_FAMILY "486SX "
|
|
#elif defined CONFIG_M486
|
|
#define MODULE_PROC_FAMILY "486 "
|
|
#elif defined CONFIG_M586
|
|
#define MODULE_PROC_FAMILY "586 "
|
|
#elif defined CONFIG_M586TSC
|
|
#define MODULE_PROC_FAMILY "586TSC "
|
|
#elif defined CONFIG_M586MMX
|
|
#define MODULE_PROC_FAMILY "586MMX "
|
|
#elif defined CONFIG_MCORE2
|
|
#define MODULE_PROC_FAMILY "CORE2 "
|
|
#elif defined CONFIG_MATOM
|
|
#define MODULE_PROC_FAMILY "ATOM "
|
|
#elif defined CONFIG_M686
|
|
#define MODULE_PROC_FAMILY "686 "
|
|
#elif defined CONFIG_MPENTIUMII
|
|
#define MODULE_PROC_FAMILY "PENTIUMII "
|
|
#elif defined CONFIG_MPENTIUMIII
|
|
#define MODULE_PROC_FAMILY "PENTIUMIII "
|
|
#elif defined CONFIG_MPENTIUMM
|
|
#define MODULE_PROC_FAMILY "PENTIUMM "
|
|
#elif defined CONFIG_MPENTIUM4
|
|
#define MODULE_PROC_FAMILY "PENTIUM4 "
|
|
#elif defined CONFIG_MK6
|
|
#define MODULE_PROC_FAMILY "K6 "
|
|
#elif defined CONFIG_MK7
|
|
#define MODULE_PROC_FAMILY "K7 "
|
|
#elif defined CONFIG_MK8
|
|
#define MODULE_PROC_FAMILY "K8 "
|
|
#elif defined CONFIG_MELAN
|
|
#define MODULE_PROC_FAMILY "ELAN "
|
|
#elif defined CONFIG_MCRUSOE
|
|
#define MODULE_PROC_FAMILY "CRUSOE "
|
|
#elif defined CONFIG_MEFFICEON
|
|
#define MODULE_PROC_FAMILY "EFFICEON "
|
|
#elif defined CONFIG_MWINCHIPC6
|
|
#define MODULE_PROC_FAMILY "WINCHIPC6 "
|
|
#elif defined CONFIG_MWINCHIP3D
|
|
#define MODULE_PROC_FAMILY "WINCHIP3D "
|
|
#elif defined CONFIG_MCYRIXIII
|
|
#define MODULE_PROC_FAMILY "CYRIXIII "
|
|
#elif defined CONFIG_MVIAC3_2
|
|
#define MODULE_PROC_FAMILY "VIAC3-2 "
|
|
#elif defined CONFIG_MVIAC7
|
|
#define MODULE_PROC_FAMILY "VIAC7 "
|
|
#elif defined CONFIG_MGEODEGX1
|
|
#define MODULE_PROC_FAMILY "GEODEGX1 "
|
|
#elif defined CONFIG_MGEODE_LX
|
|
#define MODULE_PROC_FAMILY "GEODE "
|
|
#else
|
|
#error unknown processor family
|
|
#endif
|
|
|
|
#ifdef CONFIG_X86_32
|
|
# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
|
|
#else
|
|
# define MODULE_ARCH_VERMAGIC ""
|
|
#endif
|
|
|
|
#endif /* _ASM_VERMAGIC_H */
|