evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

x86: define IA32_SYSCALL_VECTOR on 32-bit to reduce ifdefs

Browse source 
Impact: cleanup

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

Reviewed-by Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Pekka Enberg 2009-04-09 11:52:29 +03:00 • committed by Ingo Molnar
parent 31cb45ef26
commit ac3048dfd4
3 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/x86/include/asm/irq_vectors.h
View file

@ -34,6 +34,7 @@
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
# define SYSCALL_VECTOR 0x80 # define SYSCALL_VECTOR 0x80
# define IA32_SYSCALL_VECTOR 0x80
#else #else
# define IA32_SYSCALL_VECTOR 0x80 # define IA32_SYSCALL_VECTOR 0x80
#endif #endif

6
arch/x86/kernel/irqinit.c
View file

@ -242,15 +242,9 @@ void __init native_init_IRQ(void)
* 'special' SMP interrupts) * 'special' SMP interrupts)
*/ */
for (i = FIRST_EXTERNAL_VECTOR; i < NR_VECTORS; i++) { 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. */ /* IA32_SYSCALL_VECTOR was reserved in trap_init. */
if (i != IA32_SYSCALL_VECTOR) if (i != IA32_SYSCALL_VECTOR)
set_intr_gate(i, interrupt[i-FIRST_EXTERNAL_VECTOR]); set_intr_gate(i, interrupt[i-FIRST_EXTERNAL_VECTOR]);
#endif
} }
apic_intr_init(); apic_intr_init();

5
arch/x86/kernel/traps.c
View file

@ -969,11 +969,8 @@ void __init trap_init(void)
for (i = 0; i < FIRST_EXTERNAL_VECTOR; i++) for (i = 0; i < FIRST_EXTERNAL_VECTOR; i++)
set_bit(i, used_vectors); set_bit(i, used_vectors);
#ifdef CONFIG_X86_64
set_bit(IA32_SYSCALL_VECTOR, used_vectors); set_bit(IA32_SYSCALL_VECTOR, used_vectors);
#else
set_bit(SYSCALL_VECTOR, used_vectors);
#endif
/* /*
* Should be a barrier for any external CPU state: * Should be a barrier for any external CPU state:
*/ */