mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-05-08 00:03:46 +00:00
x86/asm/entry: Remove SYSCALL_VECTOR
Use IA32_SYSCALL_VECTOR for both compat and native. Signed-off-by: Brian 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: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
parent
c6e692f95d
commit
51bb92843e
3 changed files with 4 additions and 7 deletions
|
@ -47,9 +47,6 @@
|
||||||
#define IRQ_MOVE_CLEANUP_VECTOR FIRST_EXTERNAL_VECTOR
|
#define IRQ_MOVE_CLEANUP_VECTOR FIRST_EXTERNAL_VECTOR
|
||||||
|
|
||||||
#define IA32_SYSCALL_VECTOR 0x80
|
#define IA32_SYSCALL_VECTOR 0x80
|
||||||
#ifdef CONFIG_X86_32
|
|
||||||
# define SYSCALL_VECTOR 0x80
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Vectors 0x30-0x3f are used for ISA interrupts.
|
* Vectors 0x30-0x3f are used for ISA interrupts.
|
||||||
|
|
|
@ -997,8 +997,8 @@ void __init trap_init(void)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_X86_32
|
#ifdef CONFIG_X86_32
|
||||||
set_system_trap_gate(SYSCALL_VECTOR, &system_call);
|
set_system_trap_gate(IA32_SYSCALL_VECTOR, &system_call);
|
||||||
set_bit(SYSCALL_VECTOR, used_vectors);
|
set_bit(IA32_SYSCALL_VECTOR, used_vectors);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -90,7 +90,7 @@ struct lguest_data lguest_data = {
|
||||||
.noirq_iret = (u32)lguest_noirq_iret,
|
.noirq_iret = (u32)lguest_noirq_iret,
|
||||||
.kernel_address = PAGE_OFFSET,
|
.kernel_address = PAGE_OFFSET,
|
||||||
.blocked_interrupts = { 1 }, /* Block timer interrupts */
|
.blocked_interrupts = { 1 }, /* Block timer interrupts */
|
||||||
.syscall_vec = SYSCALL_VECTOR,
|
.syscall_vec = IA32_SYSCALL_VECTOR,
|
||||||
};
|
};
|
||||||
|
|
||||||
/*G:037
|
/*G:037
|
||||||
|
@ -866,7 +866,7 @@ static void __init lguest_init_IRQ(void)
|
||||||
for (i = FIRST_EXTERNAL_VECTOR; i < FIRST_SYSTEM_VECTOR; i++) {
|
for (i = FIRST_EXTERNAL_VECTOR; i < FIRST_SYSTEM_VECTOR; i++) {
|
||||||
/* Some systems map "vectors" to interrupts weirdly. Not us! */
|
/* Some systems map "vectors" to interrupts weirdly. Not us! */
|
||||||
__this_cpu_write(vector_irq[i], i - FIRST_EXTERNAL_VECTOR);
|
__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 +
|
set_intr_gate(i, irq_entries_start +
|
||||||
8 * (i - FIRST_EXTERNAL_VECTOR));
|
8 * (i - FIRST_EXTERNAL_VECTOR));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue