Commit 021fad8b 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, cpufeature: Unbreak compile with gcc 3.x
  x86, pat: Fix memory leak in free_memtype
  x86, k8: Fix section mismatch for powernowk8_exit()
  lib/atomic64_test: fix missing include of linux/kernel.h
  x86: remove last traces of quicklist usage
  x86, setup: Phoenix BIOS fixup is needed on Dell Inspiron Mini 1012
  x86: "nosmp" command line option should force the system into UP mode
  arch/x86/pci: use kasprintf
  x86, apic: ack all pending irqs when crashed/on kexec
parents e9a5f426 1ba4f22c

arch/x86/include/asm/cpufeature.h

+7 −0
Original line number Diff line number Diff line
@@ -332,6 +332,7 @@ static __always_inline __pure bool __static_cpu_has(u8 bit) 
#endif

}



#if __GNUC__ >= 4

#define static_cpu_has(bit)					\

(								\

	__builtin_constant_p(boot_cpu_has(bit)) ?		\
@@ -340,6 +341,12 @@ static __always_inline __pure bool __static_cpu_has(u8 bit) 
		__static_cpu_has(bit) :				\

		boot_cpu_has(bit)				\

)

#else

/*

 * gcc 3.x is too stupid to do the static test; fall back to dynamic.

 */

#define static_cpu_has(bit) boot_cpu_has(bit)

#endif



#endif /* defined(__KERNEL__) && !defined(__ASSEMBLY__) */

arch/x86/kernel/apic/apic.c

+33 −8
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
#include <asm/smp.h>

#include <asm/mce.h>

#include <asm/kvm_para.h>

#include <asm/tsc.h>



unsigned int num_processors;
@@ -1151,8 +1152,13 @@ static void __cpuinit lapic_setup_esr(void) 
 */

void __cpuinit setup_local_APIC(void)

{

	unsigned int value;

	int i, j;

	unsigned int value, queued;

	int i, j, acked = 0;

	unsigned long long tsc = 0, ntsc;

	long long max_loops = cpu_khz;



	if (cpu_has_tsc)

		rdtscll(tsc);



	if (disable_apic) {

		arch_disable_smp_support();
@@ -1204,13 +1210,32 @@ void __cpuinit setup_local_APIC(void) 
	 * the interrupt. Hence a vector might get locked. It was noticed

	 * for timer irq (vector 0x31). Issue an extra EOI to clear ISR.

	 */

	do {

		queued = 0;

		for (i = APIC_ISR_NR - 1; i >= 0; i--)

			queued |= apic_read(APIC_IRR + i*0x10);



		for (i = APIC_ISR_NR - 1; i >= 0; i--) {

			value = apic_read(APIC_ISR + i*0x10);

			for (j = 31; j >= 0; j--) {

			if (value & (1<<j))

				if (value & (1<<j)) {

					ack_APIC_irq();

					acked++;

				}

			}

		}

		if (acked > 256) {

			printk(KERN_ERR "LAPIC pending interrupts after %d EOI\n",

			       acked);

			break;

		}

		if (cpu_has_tsc) {

			rdtscll(ntsc);

			max_loops = (cpu_khz << 10) - (ntsc - tsc);

		} else

			max_loops--;

	} while (queued && max_loops > 0);

	WARN_ON(max_loops <= 0);



	/*

	 * Now that we are all set up, enable the APIC

arch/x86/kernel/cpu/cpufreq/powernow-k8.c

+3 −3
Original line number Diff line number Diff line
@@ -1497,7 +1497,7 @@ static struct cpufreq_driver cpufreq_amd64_driver = { 
 * simply keep the boost-disable flag in sync with the current global

 * state.

 */

static int __cpuinit cpb_notify(struct notifier_block *nb, unsigned long action,

static int cpb_notify(struct notifier_block *nb, unsigned long action,

		      void *hcpu)

{

	unsigned cpu = (long)hcpu;
@@ -1528,7 +1528,7 @@ static int __cpuinit cpb_notify(struct notifier_block *nb, unsigned long action, 
	return NOTIFY_OK;

}



static struct notifier_block __cpuinitdata cpb_nb = {

static struct notifier_block cpb_nb = {

	.notifier_call		= cpb_notify,

};

arch/x86/kernel/setup.c

+11 −0
Original line number Diff line number Diff line
@@ -676,6 +676,17 @@ static struct dmi_system_id __initdata bad_bios_dmi_table[] = { 
			DMI_MATCH(DMI_BOARD_NAME, "DG45FC"),

		},

	},

	/*

	 * The Dell Inspiron Mini 1012 has DMI_BIOS_VENDOR = "Dell Inc.", so

	 * match on the product name.

	 */

	{

		.callback = dmi_low_memory_corruption,

		.ident = "Phoenix BIOS",

		.matches = {

			DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 1012"),

		},

	},

#endif

	{}

};

arch/x86/kernel/smpboot.c

+23 −3
Original line number Diff line number Diff line
@@ -1215,9 +1215,17 @@ __init void prefill_possible_map(void) 
	if (!num_processors)

		num_processors = 1;



	if (setup_possible_cpus == -1)

		possible = num_processors + disabled_cpus;

	else

	i = setup_max_cpus ?: 1;

	if (setup_possible_cpus == -1) {

		possible = num_processors;

#ifdef CONFIG_HOTPLUG_CPU

		if (setup_max_cpus)

			possible += disabled_cpus;

#else

		if (possible > i)

			possible = i;

#endif

	} else

		possible = setup_possible_cpus;



	total_cpus = max_t(int, possible, num_processors + disabled_cpus);
@@ -1230,11 +1238,23 @@ __init void prefill_possible_map(void) 
		possible = nr_cpu_ids;

	}



#ifdef CONFIG_HOTPLUG_CPU

	if (!setup_max_cpus)

#endif

	if (possible > i) {

		printk(KERN_WARNING

			"%d Processors exceeds max_cpus limit of %u\n",

			possible, setup_max_cpus);

		possible = i;

	}



	printk(KERN_INFO "SMP: Allowing %d CPUs, %d hotplug CPUs\n",

		possible, max_t(int, possible - num_processors, 0));



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

		set_cpu_possible(i, true);

	for (; i < NR_CPUS; i++)

		set_cpu_possible(i, false);



	nr_cpu_ids = possible;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE