diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-06-08 20:48:01 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-06-08 20:48:20 +0200 |
| commit | 9dda1658a9bd450d65da5153a2427955785d17c2 (patch) | |
| tree | c563b728d879c2b446a8f1c33ce351ffb1f1d34e /arch/x86/kernel/traps.c | |
| parent | b72e7464e4cf80117938e6adb8c22fdc1ca46d42 (diff) | |
| parent | a49976d14f780942dafafbbf16f891c27d385ea0 (diff) | |
| download | blackbird-op-linux-9dda1658a9bd450d65da5153a2427955785d17c2.tar.gz blackbird-op-linux-9dda1658a9bd450d65da5153a2427955785d17c2.zip | |
Merge branch 'x86/asm' into x86/core, to prepare for new patch
Collect all changes to arch/x86/entry/entry_64.S, before applying
patch that changes most of the file.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/traps.c')
| -rw-r--r-- | arch/x86/kernel/traps.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index c30bbb5d56e2..de379366f6d1 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -72,8 +72,7 @@ gate_desc debug_idt_table[NR_VECTORS] __page_aligned_bss; #else #include <asm/processor-flags.h> #include <asm/setup.h> - -asmlinkage int system_call(void); +#include <asm/proto.h> #endif /* Must be page-aligned because the real IDT is used in a fixmap. */ @@ -980,12 +979,12 @@ void __init trap_init(void) set_bit(i, used_vectors); #ifdef CONFIG_IA32_EMULATION - set_system_intr_gate(IA32_SYSCALL_VECTOR, ia32_syscall); + set_system_intr_gate(IA32_SYSCALL_VECTOR, entry_INT80_compat); set_bit(IA32_SYSCALL_VECTOR, used_vectors); #endif #ifdef CONFIG_X86_32 - set_system_trap_gate(IA32_SYSCALL_VECTOR, &system_call); + set_system_trap_gate(IA32_SYSCALL_VECTOR, entry_INT80_32); set_bit(IA32_SYSCALL_VECTOR, used_vectors); #endif |
