Skip to content

Commit f435e68

Browse files
author
Ingo Molnar
committed
x86/asm/entry: Fix remaining use of SYSCALL_VECTOR
Commit: 51bb928 ("x86/asm/entry: Remove SYSCALL_VECTOR") Converted most uses of SYSCALL_VECTOR to IA32_SYSCALL_VECTOR, but forgot about lguest. Cc: Brian Gerst <[email protected]> Cc: Andrew Morton <[email protected]> Cc: Andy Lutomirski <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Denys Vlasenko <[email protected]> Cc: H. Peter Anvin <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Thomas Gleixner <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
1 parent 8b455e6 commit f435e68

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

drivers/lguest/interrupts_and_traps.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "lg.h"
2121

2222
/* Allow Guests to use a non-128 (ie. non-Linux) syscall trap. */
23-
static unsigned int syscall_vector = SYSCALL_VECTOR;
23+
static unsigned int syscall_vector = IA32_SYSCALL_VECTOR;
2424
module_param(syscall_vector, uint, 0444);
2525

2626
/* The address of the interrupt handler is split into two bits: */
@@ -333,8 +333,8 @@ void set_interrupt(struct lg_cpu *cpu, unsigned int irq)
333333
*/
334334
static bool could_be_syscall(unsigned int num)
335335
{
336-
/* Normal Linux SYSCALL_VECTOR or reserved vector? */
337-
return num == SYSCALL_VECTOR || num == syscall_vector;
336+
/* Normal Linux IA32_SYSCALL_VECTOR or reserved vector? */
337+
return num == IA32_SYSCALL_VECTOR || num == syscall_vector;
338338
}
339339

340340
/* The syscall vector it wants must be unused by Host. */
@@ -351,7 +351,7 @@ bool check_syscall_vector(struct lguest *lg)
351351
int init_interrupts(void)
352352
{
353353
/* If they want some strange system call vector, reserve it now */
354-
if (syscall_vector != SYSCALL_VECTOR) {
354+
if (syscall_vector != IA32_SYSCALL_VECTOR) {
355355
if (test_bit(syscall_vector, used_vectors) ||
356356
vector_used_by_percpu_irq(syscall_vector)) {
357357
printk(KERN_ERR "lg: couldn't reserve syscall %u\n",
@@ -366,7 +366,7 @@ int init_interrupts(void)
366366

367367
void free_interrupts(void)
368368
{
369-
if (syscall_vector != SYSCALL_VECTOR)
369+
if (syscall_vector != IA32_SYSCALL_VECTOR)
370370
clear_bit(syscall_vector, used_vectors);
371371
}
372372

0 commit comments

Comments
 (0)