Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'x86/cpufeature' into irq/numa 



Merge reason: irq/numa didnt build because this commit:

  2759c328: x86: don't call read_apic_id if !cpu_has_apic

Had a dependency on x86/cpufeature changes. Pull in that
(small) branch to fix the dependency.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 3d58f48b 3e0c3737

arch/x86/include/asm/cpufeature.h

+3 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#define X86_FEATURE_TSC		(0*32+ 4) /* Time Stamp Counter */

#define X86_FEATURE_MSR		(0*32+ 5) /* Model-Specific Registers */

#define X86_FEATURE_PAE		(0*32+ 6) /* Physical Address Extensions */

#define X86_FEATURE_MCE		(0*32+ 7) /* Machine Check Architecture */

#define X86_FEATURE_MCE		(0*32+ 7) /* Machine Check Exception */

#define X86_FEATURE_CX8		(0*32+ 8) /* CMPXCHG8 instruction */

#define X86_FEATURE_APIC	(0*32+ 9) /* Onboard APIC */

#define X86_FEATURE_SEP		(0*32+11) /* SYSENTER/SYSEXIT */
@@ -192,11 +192,11 @@ extern const char * const x86_power_flags[32]; 
#define clear_cpu_cap(c, bit)	clear_bit(bit, (unsigned long *)((c)->x86_capability))

#define setup_clear_cpu_cap(bit) do { \

	clear_cpu_cap(&boot_cpu_data, bit);	\

	set_bit(bit, (unsigned long *)cleared_cpu_caps); \

	set_bit(bit, (unsigned long *)cpu_caps_cleared); \

} while (0)

#define setup_force_cpu_cap(bit) do { \

	set_cpu_cap(&boot_cpu_data, bit);	\

	clear_bit(bit, (unsigned long *)cleared_cpu_caps);	\

	set_bit(bit, (unsigned long *)cpu_caps_set);	\

} while (0)



#define cpu_has_fpu		boot_cpu_has(X86_FEATURE_FPU)

arch/x86/include/asm/processor.h

+2 −1
Original line number Diff line number Diff line
@@ -135,7 +135,8 @@ extern struct cpuinfo_x86 boot_cpu_data; 
extern struct cpuinfo_x86	new_cpu_data;



extern struct tss_struct	doublefault_tss;

extern __u32			cleared_cpu_caps[NCAPINTS];

extern __u32			cpu_caps_cleared[NCAPINTS];

extern __u32			cpu_caps_set[NCAPINTS];



#ifdef CONFIG_SMP

DECLARE_PER_CPU_SHARED_ALIGNED(struct cpuinfo_x86, cpu_info);

arch/x86/kernel/cpu/common.c

+12 −5
Original line number Diff line number Diff line
@@ -299,7 +299,8 @@ static const char *__cpuinit table_lookup_model(struct cpuinfo_x86 *c) 
	return NULL;		/* Not found */

}



__u32 cleared_cpu_caps[NCAPINTS] __cpuinitdata;

__u32 cpu_caps_cleared[NCAPINTS] __cpuinitdata;

__u32 cpu_caps_set[NCAPINTS] __cpuinitdata;



void load_percpu_segment(int cpu)

{
@@ -819,6 +820,16 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c) 
#endif



	init_hypervisor(c);



	/*

	 * Clear/Set all flags overriden by options, need do it

	 * before following smp all cpus cap AND.

	 */

	for (i = 0; i < NCAPINTS; i++) {

		c->x86_capability[i] &= ~cpu_caps_cleared[i];

		c->x86_capability[i] |= cpu_caps_set[i];

	}



	/*

	 * On SMP, boot_cpu_data holds the common feature set between

	 * all CPUs; so make sure that we indicate which features are
@@ -831,10 +842,6 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c) 
			boot_cpu_data.x86_capability[i] &= c->x86_capability[i];

	}



	/* Clear all flags overriden by options */

	for (i = 0; i < NCAPINTS; i++)

		c->x86_capability[i] &= ~cleared_cpu_caps[i];



#ifdef CONFIG_X86_MCE

	/* Init Machine Check Exception if available. */

	mcheck_init(c);