Commit 1c2ffff4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-fixes-for-linus' of... 

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Fix oops in identify_cpu() on CPUs without CPUID
  x86: Clear incorrectly forced X86_FEATURE_LAHF_LM flag
  x86, mce: therm_throt - change when we print messages
  x86: Add reboot quirk for every 5 series MacBook/Pro
parents bc7af9ba e8055139

arch/x86/kernel/cpu/amd.c

+7 −0
Original line number Diff line number Diff line
@@ -400,6 +400,13 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c) 
		level = cpuid_eax(1);

		if((level >= 0x0f48 && level < 0x0f50) || level >= 0x0f58)

			set_cpu_cap(c, X86_FEATURE_REP_GOOD);



		/*

		 * Some BIOSes incorrectly force this feature, but only K8

		 * revision D (model = 0x14) and later actually support it.

		 */

		if (c->x86_model < 0x14)

			clear_cpu_cap(c, X86_FEATURE_LAHF_LM);

	}

	if (c->x86 == 0x10 || c->x86 == 0x11)

		set_cpu_cap(c, X86_FEATURE_REP_GOOD);

arch/x86/kernel/cpu/common.c

+24 −24
Original line number Diff line number Diff line
@@ -59,7 +59,30 @@ void __init setup_cpu_local_masks(void) 
	alloc_bootmem_cpumask_var(&cpu_sibling_setup_mask);

}



static const struct cpu_dev *this_cpu __cpuinitdata;

static void __cpuinit default_init(struct cpuinfo_x86 *c)

{

#ifdef CONFIG_X86_64

	display_cacheinfo(c);

#else

	/* Not much we can do here... */

	/* Check if at least it has cpuid */

	if (c->cpuid_level == -1) {

		/* No cpuid. It must be an ancient CPU */

		if (c->x86 == 4)

			strcpy(c->x86_model_id, "486");

		else if (c->x86 == 3)

			strcpy(c->x86_model_id, "386");

	}

#endif

}



static const struct cpu_dev __cpuinitconst default_cpu = {

	.c_init		= default_init,

	.c_vendor	= "Unknown",

	.c_x86_vendor	= X86_VENDOR_UNKNOWN,

};



static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;



DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {

#ifdef CONFIG_X86_64
@@ -332,29 +355,6 @@ void switch_to_new_gdt(int cpu) 


static const struct cpu_dev *__cpuinitdata cpu_devs[X86_VENDOR_NUM] = {};



static void __cpuinit default_init(struct cpuinfo_x86 *c)

{

#ifdef CONFIG_X86_64

	display_cacheinfo(c);

#else

	/* Not much we can do here... */

	/* Check if at least it has cpuid */

	if (c->cpuid_level == -1) {

		/* No cpuid. It must be an ancient CPU */

		if (c->x86 == 4)

			strcpy(c->x86_model_id, "486");

		else if (c->x86 == 3)

			strcpy(c->x86_model_id, "386");

	}

#endif

}



static const struct cpu_dev __cpuinitconst default_cpu = {

	.c_init	= default_init,

	.c_vendor = "Unknown",

	.c_x86_vendor = X86_VENDOR_UNKNOWN,

};



static void __cpuinit get_model_name(struct cpuinfo_x86 *c)

{

	unsigned int *v;

arch/x86/kernel/cpu/mcheck/therm_throt.c

+11 −7
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 


static DEFINE_PER_CPU(__u64, next_check) = INITIAL_JIFFIES;

static DEFINE_PER_CPU(unsigned long, thermal_throttle_count);

static DEFINE_PER_CPU(bool, thermal_throttle_active);



static atomic_t therm_throt_en		= ATOMIC_INIT(0);
@@ -96,24 +97,27 @@ static int therm_throt_process(int curr) 
{

	unsigned int cpu = smp_processor_id();

	__u64 tmp_jiffs = get_jiffies_64();

	bool was_throttled = __get_cpu_var(thermal_throttle_active);

	bool is_throttled = __get_cpu_var(thermal_throttle_active) = curr;



	if (curr)

	if (is_throttled)

		__get_cpu_var(thermal_throttle_count)++;



	if (time_before64(tmp_jiffs, __get_cpu_var(next_check)))

	if (!(was_throttled ^ is_throttled) &&

	    time_before64(tmp_jiffs, __get_cpu_var(next_check)))

		return 0;



	__get_cpu_var(next_check) = tmp_jiffs + CHECK_INTERVAL;



	/* if we just entered the thermal event */

	if (curr) {

	if (is_throttled) {

		printk(KERN_CRIT "CPU%d: Temperature above threshold, "

		       "cpu clock throttled (total events = %lu)\n", cpu,

		       __get_cpu_var(thermal_throttle_count));

		       "cpu clock throttled (total events = %lu)\n",

		       cpu, __get_cpu_var(thermal_throttle_count));



		add_taint(TAINT_MACHINE_CHECK);

	} else {

		printk(KERN_CRIT "CPU%d: Temperature/speed normal\n", cpu);

	} else if (was_throttled) {

		printk(KERN_INFO "CPU%d: Temperature/speed normal\n", cpu);

	}



	return 1;

arch/x86/kernel/reboot.c

+6 −6
Original line number Diff line number Diff line
@@ -418,20 +418,20 @@ static int __init set_pci_reboot(const struct dmi_system_id *d) 
}



static struct dmi_system_id __initdata pci_reboot_dmi_table[] = {

	{	/* Handle problems with rebooting on Apple MacBook5,2 */

	{	/* Handle problems with rebooting on Apple MacBook5 */

		.callback = set_pci_reboot,

		.ident = "Apple MacBook",

		.ident = "Apple MacBook5",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),

			DMI_MATCH(DMI_PRODUCT_NAME, "MacBook5,2"),

			DMI_MATCH(DMI_PRODUCT_NAME, "MacBook5"),

		},

	},

	{	/* Handle problems with rebooting on Apple MacBookPro5,1 */

	{	/* Handle problems with rebooting on Apple MacBookPro5 */

		.callback = set_pci_reboot,

		.ident = "Apple MacBookPro5,1",

		.ident = "Apple MacBookPro5",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),

			DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5,1"),

			DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5"),

		},

	},

	{ }

CRA Git | Maintained and supported by SUSTech CRA and CCSE