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

Commit 3488007a 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: convert Dprintk to pr_debug
parents 47c317a7 cfc1b9a6

arch/x86/kernel/acpi/boot.c

+3 −3
Original line number Diff line number Diff line
@@ -1021,7 +1021,7 @@ void __init mp_config_acpi_legacy_irqs(void) 
	mp_bus_id_to_type[MP_ISA_BUS] = MP_BUS_ISA;

#endif

	set_bit(MP_ISA_BUS, mp_bus_not_pci);

	Dprintk("Bus #%d is ISA\n", MP_ISA_BUS);

	pr_debug("Bus #%d is ISA\n", MP_ISA_BUS);



#ifdef CONFIG_X86_ES7000

	/*
@@ -1127,7 +1127,7 @@ int mp_register_gsi(u32 gsi, int triggering, int polarity) 
		return gsi;

	}

	if (test_bit(ioapic_pin, mp_ioapic_routing[ioapic].pin_programmed)) {

		Dprintk(KERN_DEBUG "Pin %d-%d already programmed\n",

		pr_debug(KERN_DEBUG "Pin %d-%d already programmed\n",

			 mp_ioapic_routing[ioapic].apic_id, ioapic_pin);

#ifdef CONFIG_X86_32

		return (gsi < IRQ_COMPRESSION_START ? gsi : gsi_to_irq[gsi]);

arch/x86/kernel/cpu/perfctr-watchdog.c

+2 −2
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ static void write_watchdog_counter(unsigned int perfctr_msr, 


	do_div(count, nmi_hz);

	if(descr)

		Dprintk("setting %s to -0x%08Lx\n", descr, count);

		pr_debug("setting %s to -0x%08Lx\n", descr, count);

	wrmsrl(perfctr_msr, 0 - count);

}
@@ -261,7 +261,7 @@ static void write_watchdog_counter32(unsigned int perfctr_msr, 


	do_div(count, nmi_hz);

	if(descr)

		Dprintk("setting %s to -0x%08Lx\n", descr, count);

		pr_debug("setting %s to -0x%08Lx\n", descr, count);

	wrmsr(perfctr_msr, (u32)(-count), 0);

}

arch/x86/kernel/setup_percpu.c

+3 −3
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ static void __init setup_node_to_cpumask_map(void) 
	/* allocate the map */

	map = alloc_bootmem_low(nr_node_ids * sizeof(cpumask_t));



	Dprintk(KERN_DEBUG "Node to cpumask map at %p for %d nodes\n",

	pr_debug(KERN_DEBUG "Node to cpumask map at %p for %d nodes\n",

		 map, nr_node_ids);



	/* node_to_cpumask() will now work */
@@ -248,7 +248,7 @@ void __cpuinit numa_set_node(int cpu, int node) 
		per_cpu(x86_cpu_to_node_map, cpu) = node;



	else

		Dprintk(KERN_INFO "Setting node for non-present cpu %d\n", cpu);

		pr_debug("Setting node for non-present cpu %d\n", cpu);

}



void __cpuinit numa_clear_node(int cpu)

arch/x86/kernel/smpboot.c

+26 −26
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ static void __cpuinit smp_callin(void) 
		panic("%s: phys CPU#%d, CPU#%d already present??\n", __func__,

					phys_id, cpuid);

	}

	Dprintk("CPU#%d (phys ID: %d) waiting for CALLOUT\n", cpuid, phys_id);

	pr_debug("CPU#%d (phys ID: %d) waiting for CALLOUT\n", cpuid, phys_id);



	/*

	 * STARTUP IPIs are fragile beasts as they might sometimes
@@ -251,7 +251,7 @@ static void __cpuinit smp_callin(void) 
	 * boards)

	 */



	Dprintk("CALLIN, before setup_local_APIC().\n");

	pr_debug("CALLIN, before setup_local_APIC().\n");

	smp_callin_clear_local_apic();

	setup_local_APIC();

	end_local_APIC_setup();
@@ -266,7 +266,7 @@ static void __cpuinit smp_callin(void) 
	local_irq_enable();

	calibrate_delay();

	local_irq_disable();

	Dprintk("Stack at about %p\n", &cpuid);

	pr_debug("Stack at about %p\n", &cpuid);



	/*

	 * Save our processor parameters
@@ -513,7 +513,7 @@ static void impress_friends(void) 
	/*

	 * Allow the user to impress friends.

	 */

	Dprintk("Before bogomips.\n");

	pr_debug("Before bogomips.\n");

	for_each_possible_cpu(cpu)

		if (cpu_isset(cpu, cpu_callout_map))

			bogosum += cpu_data(cpu).loops_per_jiffy;
@@ -523,7 +523,7 @@ static void impress_friends(void) 
		bogosum/(500000/HZ),

		(bogosum/(5000/HZ))%100);



	Dprintk("Before bogocount - setting activated=1.\n");

	pr_debug("Before bogocount - setting activated=1.\n");

}



static inline void __inquire_remote_apic(int apicid)
@@ -585,7 +585,7 @@ wakeup_secondary_cpu(int logical_apicid, unsigned long start_eip) 
	/* Kick the second */

	apic_write(APIC_ICR, APIC_DM_NMI | APIC_DEST_LOGICAL);



	Dprintk("Waiting for send to finish...\n");

	pr_debug("Waiting for send to finish...\n");

	send_status = safe_apic_wait_icr_idle();



	/*
@@ -596,7 +596,7 @@ wakeup_secondary_cpu(int logical_apicid, unsigned long start_eip) 
	if (maxlvt > 3)			/* Due to the Pentium erratum 3AP.  */

		apic_write(APIC_ESR, 0);

	accept_status = (apic_read(APIC_ESR) & 0xEF);

	Dprintk("NMI sent.\n");

	pr_debug("NMI sent.\n");



	if (send_status)

		printk(KERN_ERR "APIC never delivered???\n");
@@ -631,7 +631,7 @@ wakeup_secondary_cpu(int phys_apicid, unsigned long start_eip) 
		apic_read(APIC_ESR);

	}



	Dprintk("Asserting INIT.\n");

	pr_debug("Asserting INIT.\n");



	/*

	 * Turn INIT on target chip
@@ -644,12 +644,12 @@ wakeup_secondary_cpu(int phys_apicid, unsigned long start_eip) 
	apic_write(APIC_ICR,

		   APIC_INT_LEVELTRIG | APIC_INT_ASSERT | APIC_DM_INIT);



	Dprintk("Waiting for send to finish...\n");

	pr_debug("Waiting for send to finish...\n");

	send_status = safe_apic_wait_icr_idle();



	mdelay(10);



	Dprintk("Deasserting INIT.\n");

	pr_debug("Deasserting INIT.\n");



	/* Target chip */

	apic_write(APIC_ICR2, SET_APIC_DEST_FIELD(phys_apicid));
@@ -657,7 +657,7 @@ wakeup_secondary_cpu(int phys_apicid, unsigned long start_eip) 
	/* Send IPI */

	apic_write(APIC_ICR, APIC_INT_LEVELTRIG | APIC_DM_INIT);



	Dprintk("Waiting for send to finish...\n");

	pr_debug("Waiting for send to finish...\n");

	send_status = safe_apic_wait_icr_idle();



	mb();
@@ -684,14 +684,14 @@ wakeup_secondary_cpu(int phys_apicid, unsigned long start_eip) 
	/*

	 * Run STARTUP IPI loop.

	 */

	Dprintk("#startup loops: %d.\n", num_starts);

	pr_debug("#startup loops: %d.\n", num_starts);



	for (j = 1; j <= num_starts; j++) {

		Dprintk("Sending STARTUP #%d.\n", j);

		pr_debug("Sending STARTUP #%d.\n", j);

		if (maxlvt > 3)		/* Due to the Pentium erratum 3AP.  */

			apic_write(APIC_ESR, 0);

		apic_read(APIC_ESR);

		Dprintk("After apic_write.\n");

		pr_debug("After apic_write.\n");



		/*

		 * STARTUP IPI
@@ -709,9 +709,9 @@ wakeup_secondary_cpu(int phys_apicid, unsigned long start_eip) 
		 */

		udelay(300);



		Dprintk("Startup point 1.\n");

		pr_debug("Startup point 1.\n");



		Dprintk("Waiting for send to finish...\n");

		pr_debug("Waiting for send to finish...\n");

		send_status = safe_apic_wait_icr_idle();



		/*
@@ -724,7 +724,7 @@ wakeup_secondary_cpu(int phys_apicid, unsigned long start_eip) 
		if (send_status || accept_status)

			break;

	}

	Dprintk("After Startup.\n");

	pr_debug("After Startup.\n");



	if (send_status)

		printk(KERN_ERR "APIC never delivered???\n");
@@ -875,7 +875,7 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu) 


	if (get_uv_system_type() != UV_NON_UNIQUE_APIC) {



		Dprintk("Setting warm reset code and vector.\n");

		pr_debug("Setting warm reset code and vector.\n");



		store_NMI_vector(&nmi_high, &nmi_low);
@@ -896,9 +896,9 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu) 
		/*

		 * allow APs to start initializing.

		 */

		Dprintk("Before Callout %d.\n", cpu);

		pr_debug("Before Callout %d.\n", cpu);

		cpu_set(cpu, cpu_callout_map);

		Dprintk("After Callout %d.\n", cpu);

		pr_debug("After Callout %d.\n", cpu);



		/*

		 * Wait 5s total for a response
@@ -911,10 +911,10 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu) 


		if (cpu_isset(cpu, cpu_callin_map)) {

			/* number CPUs logically, starting from 1 (BSP is 0) */

			Dprintk("OK.\n");

			pr_debug("OK.\n");

			printk(KERN_INFO "CPU%d: ", cpu);

			print_cpu_info(&cpu_data(cpu));

			Dprintk("CPU has booted.\n");

			pr_debug("CPU has booted.\n");

		} else {

			boot_error = 1;

			if (*((volatile unsigned char *)trampoline_base)
@@ -959,7 +959,7 @@ int __cpuinit native_cpu_up(unsigned int cpu) 


	WARN_ON(irqs_disabled());



	Dprintk("++++++++++++++++++++=_---CPU UP  %u\n", cpu);

	pr_debug("++++++++++++++++++++=_---CPU UP  %u\n", cpu);



	if (apicid == BAD_APICID || apicid == boot_cpu_physical_apicid ||

	    !physid_isset(apicid, phys_cpu_present_map)) {
@@ -971,7 +971,7 @@ int __cpuinit native_cpu_up(unsigned int cpu) 
	 * Already booted CPU?

	 */

	if (cpu_isset(cpu, cpu_callin_map)) {

		Dprintk("do_boot_cpu %d Already started\n", cpu);

		pr_debug("do_boot_cpu %d Already started\n", cpu);

		return -ENOSYS;

	}
@@ -998,7 +998,7 @@ int __cpuinit native_cpu_up(unsigned int cpu) 
	err = do_boot_cpu(apicid, cpu);

#endif

	if (err) {

		Dprintk("do_boot_cpu failed %d\n", err);

		pr_debug("do_boot_cpu failed %d\n", err);

		return -EIO;

	}
@@ -1202,7 +1202,7 @@ void __init native_smp_prepare_boot_cpu(void) 


void __init native_smp_cpus_done(unsigned int max_cpus)

{

	Dprintk("Boot done.\n");

	pr_debug("Boot done.\n");



	impress_friends();

	smp_checks();

arch/x86/mm/numa_64.c

+0 −4
Original line number Diff line number Diff line
@@ -20,10 +20,6 @@ 
#include <asm/acpi.h>

#include <asm/k8.h>



#ifndef Dprintk

#define Dprintk(x...)

#endif



struct pglist_data *node_data[MAX_NUMNODES] __read_mostly;

EXPORT_SYMBOL(node_data);