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

Commit cda417dd authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86, ioapic: Factor out print_IO_APIC() to only print one io apic 



It is getting too big after the interrupt remaping entries debug
print out was added.

Original print_IO_APIC() becomes print_IO_APICs().
New print_IO_APIC() will only print one ioapic's registers

As a side-effect this clean-up also made checkpatch.pl happier.

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Cc: Naga Chumbalkar <nagananda.chumbalkar@hp.com>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Link: http://lkml.kernel.org/r/4E9542D3.5000008@oracle.com


Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 3a61d7fe

arch/x86/kernel/apic/io_apic.c

+24 −22
Original line number Diff line number Diff line
@@ -1512,30 +1512,14 @@ static void __init setup_timer_IRQ0_pin(unsigned int apic_id, unsigned int pin, 
	ioapic_write_entry(apic_id, pin, entry);

}





__apicdebuginit(void) print_IO_APIC(void)

__apicdebuginit(void) print_IO_APIC(int apic)

{

	int apic, i;

	int i;

	union IO_APIC_reg_00 reg_00;

	union IO_APIC_reg_01 reg_01;

	union IO_APIC_reg_02 reg_02;

	union IO_APIC_reg_03 reg_03;

	unsigned long flags;

	struct irq_cfg *cfg;

	unsigned int irq;



	printk(KERN_DEBUG "number of MP IRQ sources: %d.\n", mp_irq_entries);

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

		printk(KERN_DEBUG "number of IO-APIC #%d registers: %d.\n",

		       mpc_ioapic_id(i), ioapics[i].nr_registers);



	/*

	 * We are a bit conservative about what we expect.  We have to

	 * know about every hardware change ASAP.

	 */

	printk(KERN_INFO "testing the IO APIC.......................\n");



	for (apic = 0; apic < nr_ioapics; apic++) {



	raw_spin_lock_irqsave(&ioapic_lock, flags);

	reg_00.raw = io_apic_read(apic, 0);
@@ -1638,6 +1622,26 @@ __apicdebuginit(void) print_IO_APIC(void) 
	}

}



__apicdebuginit(void) print_IO_APICs(void)

{

	int apic, i;

	struct irq_cfg *cfg;

	unsigned int irq;



	printk(KERN_DEBUG "number of MP IRQ sources: %d.\n", mp_irq_entries);

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

		printk(KERN_DEBUG "number of IO-APIC #%d registers: %d.\n",

		       mpc_ioapic_id(i), ioapics[i].nr_registers);



	/*

	 * We are a bit conservative about what we expect.  We have to

	 * know about every hardware change ASAP.

	 */

	printk(KERN_INFO "testing the IO APIC.......................\n");



	for (apic = 0; apic < nr_ioapics; apic++)

		print_IO_APIC(apic);



	printk(KERN_DEBUG "IRQ to pin mappings:\n");

	for_each_active_irq(irq) {

		struct irq_pin_list *entry;
@@ -1655,8 +1659,6 @@ __apicdebuginit(void) print_IO_APIC(void) 
	}



	printk(KERN_INFO ".................................... done.\n");



	return;

}



__apicdebuginit(void) print_APIC_field(int base)
@@ -1850,7 +1852,7 @@ __apicdebuginit(int) print_ICs(void) 
		return 0;



	print_local_APICs(show_lapic);

	print_IO_APIC();

	print_IO_APICs();



	return 0;

}