lkml.org 
[lkml]   [2008]   [Mar]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 05/52] move smp_ops extern declaration to common header
    Date
    the smp_ops symbol is temporarily defined in smp_64.c, but it will soon
    be unified

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

    diff --git a/arch/x86/kernel/smp_64.c b/arch/x86/kernel/smp_64.c
    index 2fd74b0..80dba12 100644
    --- a/arch/x86/kernel/smp_64.c
    +++ b/arch/x86/kernel/smp_64.c
    @@ -528,3 +528,5 @@ asmlinkage void smp_call_function_interrupt(void)
    }
    }

    +struct smp_ops smp_ops;
    +EXPORT_SYMBOL_GPL(smp_ops);
    diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h
    index d11b92b..ee98bee 100644
    --- a/include/asm-x86/smp.h
    +++ b/include/asm-x86/smp.h
    @@ -21,6 +21,9 @@ struct smp_ops {
    int wait);
    };

    +#ifdef CONFIG_SMP
    +extern struct smp_ops smp_ops;
    +#endif

    #ifdef CONFIG_X86_32
    # include "smp_32.h"
    diff --git a/include/asm-x86/smp_32.h b/include/asm-x86/smp_32.h
    index 72faad6..74755e8 100644
    --- a/include/asm-x86/smp_32.h
    +++ b/include/asm-x86/smp_32.h
    @@ -39,8 +39,6 @@ extern void remove_siblinginfo(int cpu);
    extern void set_cpu_sibling_map(int cpu);

    #ifdef CONFIG_SMP
    -extern struct smp_ops smp_ops;
    -
    static inline void smp_prepare_boot_cpu(void)
    {
    smp_ops.smp_prepare_boot_cpu();
    --
    1.5.0.6


    \
     
     \ /
      Last update: 2008-03-03 18:19    [W:0.020 / U:53.812 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site