lkml.org 
[lkml]   [2007]   [Oct]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[Git pull] x86 bugfixes
    Linus,

    please pull x86 bugfixes from

    ssh://master.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git

    Thanks

    tglx


    Thomas Gleixner (2):
    Revert "i386: export i386 smp_call_function_mask() to modules"
    x86: export smp_ops to allow modular build of KVM

    arch/x86/kernel/smp_32.c | 8 +-------
    include/asm-x86/smp_32.h | 9 ++++++---
    2 files changed, 7 insertions(+), 10 deletions(-)
    diff --git a/arch/x86/kernel/smp_32.c b/arch/x86/kernel/smp_32.c
    index f321153..fcaa026 100644
    --- a/arch/x86/kernel/smp_32.c
    +++ b/arch/x86/kernel/smp_32.c
    @@ -708,10 +708,4 @@ struct smp_ops smp_ops = {
    .smp_send_reschedule = native_smp_send_reschedule,
    .smp_call_function_mask = native_smp_call_function_mask,
    };
    -
    -int smp_call_function_mask(cpumask_t mask, void (*func) (void *info),
    - void *info, int wait)
    -{
    - return smp_ops.smp_call_function_mask(mask, func, info, wait);
    -}
    -EXPORT_SYMBOL(smp_call_function_mask);
    +EXPORT_SYMBOL_GPL(smp_ops);
    diff --git a/include/asm-x86/smp_32.h b/include/asm-x86/smp_32.h
    index 7056d86..e10b7af 100644
    --- a/include/asm-x86/smp_32.h
    +++ b/include/asm-x86/smp_32.h
    @@ -94,9 +94,12 @@ static inline void smp_send_reschedule(int cpu)
    {
    smp_ops.smp_send_reschedule(cpu);
    }
    -extern int smp_call_function_mask(cpumask_t mask,
    - void (*func) (void *info), void *info,
    - int wait);
    +static inline int smp_call_function_mask(cpumask_t mask,
    + void (*func) (void *info), void *info,
    + int wait)
    +{
    + return smp_ops.smp_call_function_mask(mask, func, info, wait);
    +}

    void native_smp_prepare_boot_cpu(void);
    void native_smp_prepare_cpus(unsigned int max_cpus);
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2007-10-26 20:33    [W:0.054 / U:0.152 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site