Merge branch 'x86/ras' into x86/core, to fix conflicts

[linux-2.6-block.git] / arch / x86 / kernel / traps.c

diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index 2768bb663f94075b8a69001e881d6905b0fd9e8d..c30bbb5d56e2d8baa74996475cee1bc3a2f74f89 100644 (file)
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -985,8 +985,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
 
        /*