diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-05-11 01:17:04 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-05-11 01:17:04 -0400 |
commit | f435e68fe74d41a34124e49c07ff9f9cd7954e35 (patch) | |
tree | e1778a16647caa2fe01652e24fdfa65d9682448b /drivers/lguest | |
parent | 8b455e6577f325289cf2d1b20f493b2fe5c6c316 (diff) |
x86/asm/entry: Fix remaining use of SYSCALL_VECTOR
Commit:
51bb92843edc ("x86/asm/entry: Remove SYSCALL_VECTOR")
Converted most uses of SYSCALL_VECTOR to IA32_SYSCALL_VECTOR, but
forgot about lguest.
Cc: 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>
Diffstat (limited to 'drivers/lguest')
-rw-r--r-- | drivers/lguest/interrupts_and_traps.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/lguest/interrupts_and_traps.c b/drivers/lguest/interrupts_and_traps.c index 5e7559be222a..eb934b0242e0 100644 --- a/drivers/lguest/interrupts_and_traps.c +++ b/drivers/lguest/interrupts_and_traps.c | |||
@@ -20,7 +20,7 @@ | |||
20 | #include "lg.h" | 20 | #include "lg.h" |
21 | 21 | ||
22 | /* Allow Guests to use a non-128 (ie. non-Linux) syscall trap. */ | 22 | /* 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; |
24 | module_param(syscall_vector, uint, 0444); | 24 | module_param(syscall_vector, uint, 0444); |
25 | 25 | ||
26 | /* The address of the interrupt handler is split into two bits: */ | 26 | /* 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) | |||
333 | */ | 333 | */ |
334 | static bool could_be_syscall(unsigned int num) | 334 | static bool could_be_syscall(unsigned int num) |
335 | { | 335 | { |
336 | /* Normal Linux SYSCALL_VECTOR or reserved vector? */ | 336 | /* Normal Linux IA32_SYSCALL_VECTOR or reserved vector? */ |
337 | return num == SYSCALL_VECTOR || num == syscall_vector; | 337 | return num == IA32_SYSCALL_VECTOR || num == syscall_vector; |
338 | } | 338 | } |
339 | 339 | ||
340 | /* The syscall vector it wants must be unused by Host. */ | 340 | /* The syscall vector it wants must be unused by Host. */ |
@@ -351,7 +351,7 @@ bool check_syscall_vector(struct lguest *lg) | |||
351 | int init_interrupts(void) | 351 | int init_interrupts(void) |
352 | { | 352 | { |
353 | /* If they want some strange system call vector, reserve it now */ | 353 | /* If they want some strange system call vector, reserve it now */ |
354 | if (syscall_vector != SYSCALL_VECTOR) { | 354 | if (syscall_vector != IA32_SYSCALL_VECTOR) { |
355 | if (test_bit(syscall_vector, used_vectors) || | 355 | if (test_bit(syscall_vector, used_vectors) || |
356 | vector_used_by_percpu_irq(syscall_vector)) { | 356 | vector_used_by_percpu_irq(syscall_vector)) { |
357 | printk(KERN_ERR "lg: couldn't reserve syscall %u\n", | 357 | printk(KERN_ERR "lg: couldn't reserve syscall %u\n", |
@@ -366,7 +366,7 @@ int init_interrupts(void) | |||
366 | 366 | ||
367 | void free_interrupts(void) | 367 | void free_interrupts(void) |
368 | { | 368 | { |
369 | if (syscall_vector != SYSCALL_VECTOR) | 369 | if (syscall_vector != IA32_SYSCALL_VECTOR) |
370 | clear_bit(syscall_vector, used_vectors); | 370 | clear_bit(syscall_vector, used_vectors); |
371 | } | 371 | } |
372 | 372 | ||