lkml.org 
[lkml]   [2009]   [Apr]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 12/13] x86: define IA32_SYSCALL_VECTOR on 32-bit to reduce ifdefs
    Date
    Impact: cleanup

    We can remove some #ifdefs if we define IA32_SYSCALL_VECTOR on 32-bit.

    Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
    ---
    arch/x86/include/asm/irq_vectors.h | 1 +
    arch/x86/kernel/irqinit.c | 6 ------
    arch/x86/kernel/traps.c | 5 +----
    3 files changed, 2 insertions(+), 10 deletions(-)

    diff --git a/arch/x86/include/asm/irq_vectors.h b/arch/x86/include/asm/irq_vectors.h
    index 3cbd79b..910b5a3 100644
    --- a/arch/x86/include/asm/irq_vectors.h
    +++ b/arch/x86/include/asm/irq_vectors.h
    @@ -34,6 +34,7 @@

    #ifdef CONFIG_X86_32
    # define SYSCALL_VECTOR 0x80
    +# define IA32_SYSCALL_VECTOR 0x80
    #else
    # define IA32_SYSCALL_VECTOR 0x80
    #endif
    diff --git a/arch/x86/kernel/irqinit.c b/arch/x86/kernel/irqinit.c
    index f3be5e9..f2c60a5 100644
    --- a/arch/x86/kernel/irqinit.c
    +++ b/arch/x86/kernel/irqinit.c
    @@ -242,15 +242,9 @@ void __init native_init_IRQ(void)
    * 'special' SMP interrupts)
    */
    for (i = FIRST_EXTERNAL_VECTOR; i < NR_VECTORS; i++) {
    -#ifdef CONFIG_X86_32
    - /* SYSCALL_VECTOR was reserved in trap_init. */
    - if (i != SYSCALL_VECTOR)
    - set_intr_gate(i, interrupt[i-FIRST_EXTERNAL_VECTOR]);
    -#else
    /* IA32_SYSCALL_VECTOR was reserved in trap_init. */
    if (i != IA32_SYSCALL_VECTOR)
    set_intr_gate(i, interrupt[i-FIRST_EXTERNAL_VECTOR]);
    -#endif
    }

    apic_intr_init();
    diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
    index a1d2883..2310700 100644
    --- a/arch/x86/kernel/traps.c
    +++ b/arch/x86/kernel/traps.c
    @@ -969,11 +969,8 @@ void __init trap_init(void)
    for (i = 0; i < FIRST_EXTERNAL_VECTOR; i++)
    set_bit(i, used_vectors);

    -#ifdef CONFIG_X86_64
    set_bit(IA32_SYSCALL_VECTOR, used_vectors);
    -#else
    - set_bit(SYSCALL_VECTOR, used_vectors);
    -#endif
    +
    /*
    * Should be a barrier for any external CPU state:
    */
    --
    1.5.6.3


    \
     
     \ /
      Last update: 2009-04-07 20:57    [W:0.021 / U:10.548 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site