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

Commit 51bb9284 authored by Brian Gerst's avatar Brian Gerst Committed by Ingo Molnar
Browse files

x86/asm/entry: Remove SYSCALL_VECTOR 



Use IA32_SYSCALL_VECTOR for both compat and native.

Signed-off-by: default avatarBrian Gerst <brgerst@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1431185813-15413-4-git-send-email-brgerst@gmail.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent c6e692f9

arch/x86/include/asm/irq_vectors.h

+0 −3
Original line number Diff line number Diff line
@@ -47,9 +47,6 @@ 
#define IRQ_MOVE_CLEANUP_VECTOR		FIRST_EXTERNAL_VECTOR



#define IA32_SYSCALL_VECTOR		0x80

#ifdef CONFIG_X86_32

# define SYSCALL_VECTOR			0x80

#endif



/*

 * Vectors 0x30-0x3f are used for ISA interrupts.

arch/x86/kernel/traps.c

+2 −2
Original line number Diff line number Diff line
@@ -997,8 +997,8 @@ void __init trap_init(void) 
#endif



#ifdef CONFIG_X86_32

	set_system_trap_gate(SYSCALL_VECTOR, &system_call);

	set_bit(SYSCALL_VECTOR, used_vectors);

	set_system_trap_gate(IA32_SYSCALL_VECTOR, &system_call);

	set_bit(IA32_SYSCALL_VECTOR, used_vectors);

#endif



	/*

arch/x86/lguest/boot.c

+2 −2
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ struct lguest_data lguest_data = { 
	.noirq_iret = (u32)lguest_noirq_iret,

	.kernel_address = PAGE_OFFSET,

	.blocked_interrupts = { 1 }, /* Block timer interrupts */

	.syscall_vec = SYSCALL_VECTOR,

	.syscall_vec = IA32_SYSCALL_VECTOR,

};



/*G:037
@@ -866,7 +866,7 @@ static void __init lguest_init_IRQ(void) 
	for (i = FIRST_EXTERNAL_VECTOR; i < FIRST_SYSTEM_VECTOR; i++) {

		/* Some systems map "vectors" to interrupts weirdly.  Not us! */

		__this_cpu_write(vector_irq[i], i - FIRST_EXTERNAL_VECTOR);

		if (i != SYSCALL_VECTOR)

		if (i != IA32_SYSCALL_VECTOR)

			set_intr_gate(i, irq_entries_start +

					8 * (i - FIRST_EXTERNAL_VECTOR));

	}