Commit 4c64616b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull x86/debug changes from Ingo Molnar.

* 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Fix section warnings
  x86-64: Fix CFI data for common_interrupt()
  x86: Properly _init-annotate NMI selftest code
  x86/debug: Fix/improve the show_msr=<cpus> debug print out
parents c5c7fb8f 943bc7e1

arch/x86/include/asm/processor.h

+1 −0
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ extern void early_cpu_init(void); 
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 unsigned int init_intel_cacheinfo(struct cpuinfo_x86 *c);

extern unsigned short num_cache_leaves;

arch/x86/kernel/acpi/boot.c

+1 −1
Original line number Diff line number Diff line
@@ -593,7 +593,7 @@ void __init acpi_set_irq_model_ioapic(void) 
#ifdef CONFIG_ACPI_HOTPLUG_CPU

#include <acpi/processor.h>



static void acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)

static void __cpuinitdata acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)

{

#ifdef CONFIG_ACPI_NUMA

	int nid;

arch/x86/kernel/cpu/common.c

+7 −7
Original line number Diff line number Diff line
@@ -933,7 +933,7 @@ static const struct msr_range msr_range_array[] __cpuinitconst = { 
	{ 0xc0011000, 0xc001103b},

};



static void __cpuinit print_cpu_msr(void)

static void __cpuinit __print_cpu_msr(void)

{

	unsigned index_min, index_max;

	unsigned index;
@@ -997,13 +997,13 @@ void __cpuinit print_cpu_info(struct cpuinfo_x86 *c) 
	else

		printk(KERN_CONT "\n");



#ifdef CONFIG_SMP

	__print_cpu_msr();

}



void __cpuinit print_cpu_msr(struct cpuinfo_x86 *c)

{

	if (c->cpu_index < show_msr)

		print_cpu_msr();

#else

	if (show_msr)

		print_cpu_msr();

#endif

		__print_cpu_msr();

}



static __init int setup_disablecpuid(char *arg)

arch/x86/kernel/entry_64.S

+1 −1
Original line number Diff line number Diff line
@@ -812,7 +812,7 @@ ret_from_intr: 


	/* Restore saved previous stack */

	popq %rsi

	CFI_DEF_CFA_REGISTER	rsi

	CFI_DEF_CFA rsi,SS+8-RBP	/* reg/off reset after def_cfa_expr */

	leaq ARGOFFSET-RBP(%rsi), %rsp

	CFI_DEF_CFA_REGISTER	rsp

	CFI_ADJUST_CFA_OFFSET	RBP-ARGOFFSET

arch/x86/kernel/nmi_selftest.c

+19 −18
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/smp.h>

#include <linux/cpumask.h>

#include <linux/delay.h>

#include <linux/init.h>



#include <asm/apic.h>

#include <asm/nmi.h>
@@ -20,35 +21,35 @@ 
#define FAILURE		1

#define TIMEOUT		2



static int nmi_fail;

static int __initdata nmi_fail;



/* check to see if NMI IPIs work on this machine */

static DECLARE_BITMAP(nmi_ipi_mask, NR_CPUS) __read_mostly;

static DECLARE_BITMAP(nmi_ipi_mask, NR_CPUS) __initdata;



static int testcase_total;

static int testcase_successes;

static int expected_testcase_failures;

static int unexpected_testcase_failures;

static int unexpected_testcase_unknowns;

static int __initdata testcase_total;

static int __initdata testcase_successes;

static int __initdata expected_testcase_failures;

static int __initdata unexpected_testcase_failures;

static int __initdata unexpected_testcase_unknowns;



static int nmi_unk_cb(unsigned int val, struct pt_regs *regs)

static int __init nmi_unk_cb(unsigned int val, struct pt_regs *regs)

{

	unexpected_testcase_unknowns++;

	return NMI_HANDLED;

}



static void init_nmi_testsuite(void)

static void __init init_nmi_testsuite(void)

{

	/* trap all the unknown NMIs we may generate */

	register_nmi_handler(NMI_UNKNOWN, nmi_unk_cb, 0, "nmi_selftest_unk");

}



static void cleanup_nmi_testsuite(void)

static void __init cleanup_nmi_testsuite(void)

{

	unregister_nmi_handler(NMI_UNKNOWN, "nmi_selftest_unk");

}



static int test_nmi_ipi_callback(unsigned int val, struct pt_regs *regs)

static int __init test_nmi_ipi_callback(unsigned int val, struct pt_regs *regs)

{

        int cpu = raw_smp_processor_id();
@@ -58,7 +59,7 @@ static int test_nmi_ipi_callback(unsigned int val, struct pt_regs *regs) 
        return NMI_DONE;

}



static void test_nmi_ipi(struct cpumask *mask)

static void __init test_nmi_ipi(struct cpumask *mask)

{

	unsigned long timeout;
@@ -86,7 +87,7 @@ static void test_nmi_ipi(struct cpumask *mask) 
	return;

}



static void remote_ipi(void)

static void __init remote_ipi(void)

{

	cpumask_copy(to_cpumask(nmi_ipi_mask), cpu_online_mask);

	cpumask_clear_cpu(smp_processor_id(), to_cpumask(nmi_ipi_mask));
@@ -94,19 +95,19 @@ static void remote_ipi(void) 
		test_nmi_ipi(to_cpumask(nmi_ipi_mask));

}



static void local_ipi(void)

static void __init local_ipi(void)

{

	cpumask_clear(to_cpumask(nmi_ipi_mask));

	cpumask_set_cpu(smp_processor_id(), to_cpumask(nmi_ipi_mask));

	test_nmi_ipi(to_cpumask(nmi_ipi_mask));

}



static void reset_nmi(void)

static void __init reset_nmi(void)

{

	nmi_fail = 0;

}



static void dotest(void (*testcase_fn)(void), int expected)

static void __init dotest(void (*testcase_fn)(void), int expected)

{

	testcase_fn();

	/*
@@ -131,12 +132,12 @@ static void dotest(void (*testcase_fn)(void), int expected) 
	reset_nmi();

}



static inline void print_testname(const char *testname)

static inline void __init print_testname(const char *testname)

{

	printk("%12s:", testname);

}



void nmi_selftest(void)

void __init nmi_selftest(void)

{

	init_nmi_testsuite();

CRA Git | Maintained and supported by SUSTech CRA and CCSE