lkml.org 
[lkml]   [2008]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 14/18] x86: merge header files in apic_xx.c
    Date
    Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
    ---
    arch/x86/kernel/apic_32.c | 8 ++++++++
    arch/x86/kernel/apic_64.c | 7 ++++++-
    2 files changed, 14 insertions(+), 1 deletions(-)
    diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
    index 87566a3..749adb5 100644
    --- a/arch/x86/kernel/apic_32.c
    +++ b/arch/x86/kernel/apic_32.c
    @@ -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>
    diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
    index b7268f5..ebe417b 100644
    --- a/arch/x86/kernel/apic_64.c
    +++ b/arch/x86/kernel/apic_64.c
    @@ -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
    --
    1.5.4.5


    \
     
     \ /
      Last update: 2008-08-24 11:11    [from the cache]
    ©2003-2014 Jasper Spaans. Advertise on this site