Commit 773763df authored Aug 24, 2008 by Yinghai Lu Committed by Ingo Molnar Oct 16, 2008

x86: merge header files in apic_xx.c



Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent be7a656f

arch/x86/kernel/apic_32.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -23,11 +23,13 @@
		#include <linux/mc146818rtc.h>
		#include <linux/kernel_stat.h>
		#include <linux/sysdev.h>
		#include <linux/ioport.h>
		#include <linux/cpu.h>
		#include <linux/clockchips.h>
		#include <linux/acpi_pmtmr.h>
		#include <linux/module.h>
		#include <linux/dmi.h>
		#include <linux/dmar.h>

		#include <asm/atomic.h>
		#include <asm/smp.h>
		@@ -36,8 +38,14 @@
		#include <asm/desc.h>
		#include <asm/arch_hooks.h>
		#include <asm/hpet.h>
		#include <asm/pgalloc.h>
		#include <asm/i8253.h>
		#include <asm/nmi.h>
		#include <asm/idle.h>
		#include <asm/proto.h>
		#include <asm/timex.h>
		#include <asm/apic.h>
		#include <asm/i8259.h>

		#include <mach_apic.h>
		#include <mach_apicdef.h>

arch/x86/kernel/apic_64.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -24,9 +24,11 @@
		#include <linux/kernel_stat.h>
		#include <linux/sysdev.h>
		#include <linux/ioport.h>
		#include <linux/cpu.h>
		#include <linux/clockchips.h>
		#include <linux/acpi_pmtmr.h>
		#include <linux/module.h>
		#include <linux/dmi.h>
		#include <linux/dmar.h>

		#include <asm/atomic.h>
		@@ -34,8 +36,10 @@
		#include <asm/mtrr.h>
		#include <asm/mpspec.h>
		#include <asm/desc.h>
		#include <asm/arch_hooks.h>
		#include <asm/hpet.h>
		#include <asm/pgalloc.h>
		#include <asm/i8253.h>
		#include <asm/nmi.h>
		#include <asm/idle.h>
		#include <asm/proto.h>
		@@ -43,8 +47,9 @@
		#include <asm/apic.h>
		#include <asm/i8259.h>

		#include <mach_ipi.h>
		#include <mach_apic.h>
		#include <mach_apicdef.h>
		#include <mach_ipi.h>

		/*
		* Sanity check