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

x86: make headers files the same in io_apic_xx.c 



also make no_timer_check to be global on 64 bit, because vmi_32 is using that.

Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent e955b539

arch/x86/kernel/io_apic_32.c

+12 −3
Original line number Diff line number Diff line
@@ -25,28 +25,37 @@ 
#include <linux/init.h>

#include <linux/delay.h>

#include <linux/sched.h>

#include <linux/bootmem.h>

#include <linux/pci.h>

#include <linux/mc146818rtc.h>

#include <linux/compiler.h>

#include <linux/acpi.h>

#include <linux/module.h>

#include <linux/sysdev.h>

#include <linux/pci.h>

#include <linux/msi.h>

#include <linux/htirq.h>

#include <linux/freezer.h>

#include <linux/kthread.h>

#include <linux/jiffies.h>      /* time_after() */

#ifdef CONFIG_ACPI

#include <acpi/acpi_bus.h>

#endif

#include <linux/bootmem.h>

#include <linux/dmar.h>



#include <asm/idle.h>

#include <asm/io.h>

#include <asm/smp.h>

#include <asm/desc.h>

#include <asm/proto.h>

#include <asm/acpi.h>

#include <asm/dma.h>

#include <asm/timer.h>

#include <asm/i8259.h>

#include <asm/nmi.h>

#include <asm/msidef.h>

#include <asm/hypertransport.h>

#include <asm/setup.h>

#include <asm/irq_remapping.h>



#include <mach_ipi.h>

#include <mach_apic.h>

arch/x86/kernel/io_apic_64.c

+9 −3
Original line number Diff line number Diff line
@@ -27,12 +27,15 @@ 
#include <linux/sched.h>

#include <linux/pci.h>

#include <linux/mc146818rtc.h>

#include <linux/compiler.h>

#include <linux/acpi.h>

#include <linux/module.h>

#include <linux/sysdev.h>

#include <linux/msi.h>

#include <linux/htirq.h>

#include <linux/dmar.h>

#include <linux/jiffies.h>

#include <linux/freezer.h>

#include <linux/kthread.h>

#include <linux/jiffies.h>	/* time_after() */

#ifdef CONFIG_ACPI

#include <acpi/acpi_bus.h>

#endif
@@ -46,14 +49,17 @@ 
#include <asm/proto.h>

#include <asm/acpi.h>

#include <asm/dma.h>

#include <asm/timer.h>

#include <asm/i8259.h>

#include <asm/nmi.h>

#include <asm/msidef.h>

#include <asm/hypertransport.h>

#include <asm/setup.h>

#include <asm/irq_remapping.h>



#include <mach_ipi.h>

#include <mach_apic.h>

#include <mach_apicdef.h>



#define __apicdebuginit(type) static type __init
@@ -1685,7 +1691,7 @@ void disable_IO_APIC(void) 
	disconnect_bsp_APIC(ioapic_i8259.pin != -1);

}



static int no_timer_check;

int no_timer_check __initdata;



static int __init notimercheck(char *s)

{