lkml.org 
[lkml]   [2010]   [Nov]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH UPDATED 3/9] x86: Make default_send_IPI_mask_sequence/allbutself_logical() 32bit only
    Both functions are used only in 32bit.  Put them inside CONFIG_X86_32.
    This is to prepare for logical apicid handling update.

    - Cyrill Gorcunov spotted that I forgot to move declarations in ipi.h
    under CONFIG_X86_32. Fixed.

    Signed-off-by: Tejun Heo <tj@kernel.org>
    Reviewed-by: Pekka Enberg <penberg@kernel.org>
    Cc: Cyrill Gorcunov <gorcunov@gmail.com>
    ---
    Patch updated as per Cyrill's comment. git tree has been updated
    accordingly w/ Reviewed-by's added.

    git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git x86_32-numa

    Thanks.

    arch/x86/include/asm/ipi.h | 8 ++++----
    arch/x86/kernel/apic/ipi.c | 4 ++--
    2 files changed, 6 insertions(+), 6 deletions(-)

    diff --git a/arch/x86/include/asm/ipi.h b/arch/x86/include/asm/ipi.h
    index 0b72282..615fa90 100644
    --- a/arch/x86/include/asm/ipi.h
    +++ b/arch/x86/include/asm/ipi.h
    @@ -123,10 +123,6 @@ extern void default_send_IPI_mask_sequence_phys(const struct cpumask *mask,
    int vector);
    extern void default_send_IPI_mask_allbutself_phys(const struct cpumask *mask,
    int vector);
    -extern void default_send_IPI_mask_sequence_logical(const struct cpumask *mask,
    - int vector);
    -extern void default_send_IPI_mask_allbutself_logical(const struct cpumask *mask,
    - int vector);

    /* Avoid include hell */
    #define NMI_VECTOR 0x02
    @@ -150,6 +146,10 @@ static inline void __default_local_send_IPI_all(int vector)
    }

    #ifdef CONFIG_X86_32
    +extern void default_send_IPI_mask_sequence_logical(const struct cpumask *mask,
    + int vector);
    +extern void default_send_IPI_mask_allbutself_logical(const struct cpumask *mask,
    + int vector);
    extern void default_send_IPI_mask_logical(const struct cpumask *mask,
    int vector);
    extern void default_send_IPI_allbutself(int vector);
    diff --git a/arch/x86/kernel/apic/ipi.c b/arch/x86/kernel/apic/ipi.c
    index 08385e0..5037736 100644
    --- a/arch/x86/kernel/apic/ipi.c
    +++ b/arch/x86/kernel/apic/ipi.c
    @@ -56,6 +56,8 @@ void default_send_IPI_mask_allbutself_phys(const struct cpumask *mask,
    local_irq_restore(flags);
    }

    +#ifdef CONFIG_X86_32
    +
    void default_send_IPI_mask_sequence_logical(const struct cpumask *mask,
    int vector)
    {
    @@ -96,8 +98,6 @@ void default_send_IPI_mask_allbutself_logical(const struct cpumask *mask,
    local_irq_restore(flags);
    }

    -#ifdef CONFIG_X86_32
    -
    /*
    * This is only used on smaller machines.
    */
    --
    1.7.1


    \
     
     \ /
      Last update: 2010-11-11 18:37    [W:0.023 / U:60.140 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site