Commit f435e68f authored by Ingo Molnar's avatar Ingo Molnar

x86/asm/entry: Fix remaining use of SYSCALL_VECTOR

Commit:

  51bb9284 ("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.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 8b455e65
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "lg.h" #include "lg.h"
/* Allow Guests to use a non-128 (ie. non-Linux) syscall trap. */ /* Allow Guests to use a non-128 (ie. non-Linux) syscall trap. */
static unsigned int syscall_vector = SYSCALL_VECTOR; static unsigned int syscall_vector = IA32_SYSCALL_VECTOR;
module_param(syscall_vector, uint, 0444); module_param(syscall_vector, uint, 0444);
/* The address of the interrupt handler is split into two bits: */ /* 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,8 +333,8 @@ void set_interrupt(struct lg_cpu *cpu, unsigned int irq)
*/ */
static bool could_be_syscall(unsigned int num) static bool could_be_syscall(unsigned int num)
{ {
/* Normal Linux SYSCALL_VECTOR or reserved vector? */ /* Normal Linux IA32_SYSCALL_VECTOR or reserved vector? */
return num == SYSCALL_VECTOR || num == syscall_vector; return num == IA32_SYSCALL_VECTOR || num == syscall_vector;
} }
/* The syscall vector it wants must be unused by Host. */ /* The syscall vector it wants must be unused by Host. */
...@@ -351,7 +351,7 @@ bool check_syscall_vector(struct lguest *lg) ...@@ -351,7 +351,7 @@ bool check_syscall_vector(struct lguest *lg)
int init_interrupts(void) int init_interrupts(void)
{ {
/* If they want some strange system call vector, reserve it now */ /* If they want some strange system call vector, reserve it now */
if (syscall_vector != SYSCALL_VECTOR) { if (syscall_vector != IA32_SYSCALL_VECTOR) {
if (test_bit(syscall_vector, used_vectors) || if (test_bit(syscall_vector, used_vectors) ||
vector_used_by_percpu_irq(syscall_vector)) { vector_used_by_percpu_irq(syscall_vector)) {
printk(KERN_ERR "lg: couldn't reserve syscall %u\n", printk(KERN_ERR "lg: couldn't reserve syscall %u\n",
...@@ -366,7 +366,7 @@ int init_interrupts(void) ...@@ -366,7 +366,7 @@ int init_interrupts(void)
void free_interrupts(void) void free_interrupts(void)
{ {
if (syscall_vector != SYSCALL_VECTOR) if (syscall_vector != IA32_SYSCALL_VECTOR)
clear_bit(syscall_vector, used_vectors); clear_bit(syscall_vector, used_vectors);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment