Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac3048df authored by Pekka Enberg's avatar Pekka Enberg Committed by Ingo Molnar
Browse files

x86: define IA32_SYSCALL_VECTOR on 32-bit to reduce ifdefs 



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: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 31cb45ef

arch/x86/include/asm/irq_vectors.h

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 


#ifdef CONFIG_X86_32

# define SYSCALL_VECTOR			0x80

# define IA32_SYSCALL_VECTOR		0x80

#else

# define IA32_SYSCALL_VECTOR		0x80

#endif

arch/x86/kernel/irqinit.c

+0 −6
Original line number Diff line number Diff line
@@ -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();

arch/x86/kernel/traps.c

+1 −4
Original line number Diff line number Diff line
@@ -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:

	 */