diff options
Diffstat (limited to 'arch/x86/include/asm/processor.h')
| -rw-r--r-- | arch/x86/include/asm/processor.h | 11 | 
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index 21a114914ba4..cfd29ee8c3da 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -186,15 +186,6 @@ extern void identify_boot_cpu(void);  extern void identify_secondary_cpu(struct cpuinfo_x86 *);  extern void print_cpu_info(struct cpuinfo_x86 *);  void print_cpu_msr(struct cpuinfo_x86 *); -extern void init_scattered_cpuid_features(struct cpuinfo_x86 *c); -extern u32 get_scattered_cpuid_leaf(unsigned int level, -				    unsigned int sub_leaf, -				    enum cpuid_regs_idx reg); -extern unsigned int init_intel_cacheinfo(struct cpuinfo_x86 *c); -extern void init_amd_cacheinfo(struct cpuinfo_x86 *c); - -extern void detect_extended_topology(struct cpuinfo_x86 *c); -extern void detect_ht(struct cpuinfo_x86 *c);  #ifdef CONFIG_X86_32  extern int have_cpuid_p(void); @@ -421,7 +412,7 @@ extern asmlinkage void ignore_sysret(void);  void save_fsgs_for_kvm(void);  #endif  #else	/* X86_64 */ -#ifdef CONFIG_CC_STACKPROTECTOR +#ifdef CONFIG_STACKPROTECTOR  /*   * Make sure stack canary segment base is cached-aligned:   *   "For Intel Atom processors, avoid non zero segment base address  | 
