Commit 6ec22f9b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

* 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Limit number of per cpu TSC sync messages
  x86: dumpstack, 64-bit: Disable preemption when walking the IRQ/exception stacks
  x86: dumpstack: Clean up the x86_stack_ids[][] initalization and other details
  x86, cpu: mv display_cacheinfo -> cpu_detect_cache_sizes
  x86: Suppress stack overrun message for init_task
  x86: Fix cpu_devs[] initialization in early_cpu_init()
  x86: Remove CPU cache size output for non-Intel too
  x86: Minimise printk spew from per-vendor init code
  x86: Remove the CPU cache size printk's
  cpumask: Avoid cpumask_t in arch/x86/kernel/apic/nmi.c
  x86: Make sure we also print a Code: line for show_regs()
parents 83be7d76 9b3660a5

arch/x86/kernel/apic/nmi.c

+6 −5
Original line number Diff line number Diff line
@@ -39,7 +39,8 @@ 
int unknown_nmi_panic;

int nmi_watchdog_enabled;



static cpumask_t backtrace_mask __read_mostly;

/* For reliability, we're prepared to waste bits here. */

static DECLARE_BITMAP(backtrace_mask, NR_CPUS) __read_mostly;



/* nmi_active:

 * >0: the lapic NMI watchdog is active, but can be disabled
@@ -414,7 +415,7 @@ nmi_watchdog_tick(struct pt_regs *regs, unsigned reason) 
	}



	/* We can be called before check_nmi_watchdog, hence NULL check. */

	if (cpumask_test_cpu(cpu, &backtrace_mask)) {

	if (cpumask_test_cpu(cpu, to_cpumask(backtrace_mask))) {

		static DEFINE_SPINLOCK(lock);	/* Serialise the printks */



		spin_lock(&lock);
@@ -422,7 +423,7 @@ nmi_watchdog_tick(struct pt_regs *regs, unsigned reason) 
		show_regs(regs);

		dump_stack();

		spin_unlock(&lock);

		cpumask_clear_cpu(cpu, &backtrace_mask);

		cpumask_clear_cpu(cpu, to_cpumask(backtrace_mask));



		rc = 1;

	}
@@ -558,14 +559,14 @@ void arch_trigger_all_cpu_backtrace(void) 
{

	int i;



	cpumask_copy(&backtrace_mask, cpu_online_mask);

	cpumask_copy(to_cpumask(backtrace_mask), cpu_online_mask);



	printk(KERN_INFO "sending NMI to all CPUs:\n");

	apic->send_IPI_all(NMI_VECTOR);



	/* Wait for up to 10 seconds for all CPUs to do the backtrace */

	for (i = 0; i < 10 * 1000; i++) {

		if (cpumask_empty(&backtrace_mask))

		if (cpumask_empty(to_cpumask(backtrace_mask)))

			break;

		mdelay(1);

	}

arch/x86/kernel/cpu/amd.c

+1 −1
Original line number Diff line number Diff line
@@ -535,7 +535,7 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c) 
		}

	}



	display_cacheinfo(c);

	cpu_detect_cache_sizes(c);



	/* Multi core CPU? */

	if (c->extended_cpuid_level >= 0x80000008) {

arch/x86/kernel/cpu/centaur.c

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ static void __cpuinit init_c3(struct cpuinfo_x86 *c) 
		set_cpu_cap(c, X86_FEATURE_REP_GOOD);

	}



	display_cacheinfo(c);

	cpu_detect_cache_sizes(c);

}



enum {

arch/x86/kernel/cpu/common.c

+16 −14
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ void __init setup_cpu_local_masks(void) 
static void __cpuinit default_init(struct cpuinfo_x86 *c)

{

#ifdef CONFIG_X86_64

	display_cacheinfo(c);

	cpu_detect_cache_sizes(c);

#else

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

	/* Check if at least it has cpuid */
@@ -383,7 +383,7 @@ static void __cpuinit get_model_name(struct cpuinfo_x86 *c) 
	}

}



void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c)

void __cpuinit cpu_detect_cache_sizes(struct cpuinfo_x86 *c)

{

	unsigned int n, dummy, ebx, ecx, edx, l2size;
@@ -391,8 +391,6 @@ void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c) 


	if (n >= 0x80000005) {

		cpuid(0x80000005, &dummy, &ebx, &ecx, &edx);

		printk(KERN_INFO "CPU: L1 I Cache: %dK (%d bytes/line), D cache %dK (%d bytes/line)\n",

				edx>>24, edx&0xFF, ecx>>24, ecx&0xFF);

		c->x86_cache_size = (ecx>>24) + (edx>>24);

#ifdef CONFIG_X86_64

		/* On K8 L1 TLB is inclusive, so don't count it */
@@ -422,9 +420,6 @@ void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c) 
#endif



	c->x86_cache_size = l2size;



	printk(KERN_INFO "CPU: L2 Cache: %dK (%d bytes/line)\n",

			l2size, ecx & 0xFF);

}



void __cpuinit detect_ht(struct cpuinfo_x86 *c)
@@ -659,16 +654,22 @@ void __init early_cpu_init(void) 
	const struct cpu_dev *const *cdev;

	int count = 0;



#ifdef PROCESSOR_SELECT

	printk(KERN_INFO "KERNEL supported cpus:\n");

#endif



	for (cdev = __x86_cpu_dev_start; cdev < __x86_cpu_dev_end; cdev++) {

		const struct cpu_dev *cpudev = *cdev;

		unsigned int j;



		if (count >= X86_VENDOR_NUM)

			break;

		cpu_devs[count] = cpudev;

		count++;



#ifdef PROCESSOR_SELECT

		{

			unsigned int j;



			for (j = 0; j < 2; j++) {

				if (!cpudev->c_ident[j])

					continue;
@@ -676,7 +677,8 @@ void __init early_cpu_init(void) 
					cpudev->c_ident[j]);

			}

		}



#endif

	}

	early_identify_cpu(&boot_cpu_data);

}

arch/x86/kernel/cpu/cpu.h

+1 −1
Original line number Diff line number Diff line
@@ -32,6 +32,6 @@ struct cpu_dev { 
extern const struct cpu_dev *const __x86_cpu_dev_start[],

			    *const __x86_cpu_dev_end[];



extern void display_cacheinfo(struct cpuinfo_x86 *c);

extern void cpu_detect_cache_sizes(struct cpuinfo_x86 *c);



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE