lkml.org 
[lkml]   [2008]   [Mar]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5/9] [PATCH] x86: merge includes in smp.h
    Date
    move all include directives from smp_{32,64}.h to smp.h.

    Signed-off-by: Glauber Costa <gcosta@redhat.com>
    ---
    include/asm-x86/smp.h | 13 +++++++++++++
    include/asm-x86/smp_32.h | 13 -------------
    include/asm-x86/smp_64.h | 16 ----------------
    3 files changed, 13 insertions(+), 29 deletions(-)

    diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h
    index eb05804..1cd434d 100644
    --- a/include/asm-x86/smp.h
    +++ b/include/asm-x86/smp.h
    @@ -5,6 +5,19 @@
    #include <linux/init.h>
    #include <asm/percpu.h>

    +/*
    + * We need the APIC definitions automatically as part of 'smp.h'
    + */
    +#ifdef CONFIG_X86_LOCAL_APIC
    +# include <asm/mpspec.h>
    +# include <asm/apic.h>
    +# ifdef CONFIG_X86_IO_APIC
    +# include <asm/io_apic.h>
    +# endif
    +#endif
    +#include <asm/pda.h>
    +#include <asm/thread_info.h>
    +
    extern cpumask_t cpu_callout_map;

    extern int smp_num_siblings;
    diff --git a/include/asm-x86/smp_32.h b/include/asm-x86/smp_32.h
    index 53432db..694d324 100644
    --- a/include/asm-x86/smp_32.h
    +++ b/include/asm-x86/smp_32.h
    @@ -2,19 +2,6 @@
    #define __ASM_SMP_H

    #ifndef __ASSEMBLY__
    -#include <linux/cpumask.h>
    -#include <linux/init.h>
    -
    -/*
    - * We need the APIC definitions automatically as part of 'smp.h'
    - */
    -#ifdef CONFIG_X86_LOCAL_APIC
    -# include <asm/mpspec.h>
    -# include <asm/apic.h>
    -# ifdef CONFIG_X86_IO_APIC
    -# include <asm/io_apic.h>
    -# endif
    -#endif

    extern cpumask_t cpu_callin_map;

    diff --git a/include/asm-x86/smp_64.h b/include/asm-x86/smp_64.h
    index b83151d..eead92e 100644
    --- a/include/asm-x86/smp_64.h
    +++ b/include/asm-x86/smp_64.h
    @@ -1,22 +1,6 @@
    #ifndef __ASM_SMP_H
    #define __ASM_SMP_H

    -#include <linux/cpumask.h>
    -#include <linux/init.h>
    -
    -/*
    - * We need the APIC definitions automatically as part of 'smp.h'
    - */
    -#ifdef CONFIG_X86_LOCAL_APIC
    -# include <asm/mpspec.h>
    -# include <asm/apic.h>
    -# ifdef CONFIG_X86_IO_APIC
    -# include <asm/io_apic.h>
    -# endif
    -#endif
    -#include <asm/pda.h>
    -#include <asm/thread_info.h>
    -
    extern cpumask_t cpu_initialized;
    extern cpumask_t cpu_callin_map;

    --
    1.5.0.6


    \
     
     \ /
      Last update: 2008-03-27 18:17    [W:0.022 / U:2.524 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site