![Linus Torvalds](/assets/img/avatar_default.png)
* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (22 commits) x86: Fix code patching for paravirt-alternatives on 486 x86, msr: change msr-reg.o to obj-y, and export its symbols x86: Use hard_smp_processor_id() to get apic id for AMD K8 cpus x86, sched: Workaround broken sched domain creation for AMD Magny-Cours x86, mcheck: Use correct cpumask for shared bank4 x86, cacheinfo: Fixup L3 cache information for AMD multi-node processors x86: Fix CPU llc_shared_map information for AMD Magny-Cours x86, msr: Fix msr-reg.S compilation with gas 2.16.1, on 32-bit too x86: Move kernel_fpu_using to irq_fpu_usable in asm/i387.h x86, msr: fix msr-reg.S compilation with gas 2.16.1 x86, msr: Export the register-setting MSR functions via /dev/*/msr x86, msr: Create _on_cpu helpers for {rw,wr}msr_safe_regs() x86, msr: Have the _safe MSR functions return -EIO, not -EFAULT x86, msr: CFI annotations, cleanups for msr-reg.S x86, asm: Make _ASM_EXTABLE() usable from assembly code x86, asm: Add 32-bit versions of the combined CFI macros x86, AMD: Disable wrongly set X86_FEATURE_LAHF_LM CPUID bit x86, msr: Rewrite AMD rd/wrmsr variants x86, msr: Add rd/wrmsr interfaces with preset registers x86: add specific support for Intel Atom architecture ...
72 lines
2 KiB
C
72 lines
2 KiB
C
#ifndef _ASM_X86_MODULE_H
|
|
#define _ASM_X86_MODULE_H
|
|
|
|
#include <asm-generic/module.h>
|
|
|
|
#ifdef CONFIG_X86_64
|
|
/* X86_64 does not define MODULE_PROC_FAMILY */
|
|
#elif defined CONFIG_M386
|
|
#define MODULE_PROC_FAMILY "386 "
|
|
#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_X86_ELAN
|
|
#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
|
|
# ifdef CONFIG_4KSTACKS
|
|
# define MODULE_STACKSIZE "4KSTACKS "
|
|
# else
|
|
# define MODULE_STACKSIZE ""
|
|
# endif
|
|
# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_STACKSIZE
|
|
#endif
|
|
|
|
#endif /* _ASM_X86_MODULE_H */
|