diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
| commit | 529c593ece216e4aaffd36bd940cb94f1fa63129 (patch) | |
| tree | 78f1c0b805f5656aa7b0417a043c5346f700a2cf /arch/i386/kernel/trampoline.S | |
| parent | 0bd079751d25808d1972baee5c4eaa1db2227257 (diff) | |
Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c
driver due to the Origin A64 hacks.
Diffstat (limited to 'arch/i386/kernel/trampoline.S')
| -rw-r--r-- | arch/i386/kernel/trampoline.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/trampoline.S b/arch/i386/kernel/trampoline.S index 12c1dbe34..52e00d9be 100644 --- a/arch/i386/kernel/trampoline.S +++ b/arch/i386/kernel/trampoline.S @@ -55,7 +55,7 @@ r_base = . jmp flush_instr flush_instr: ljmpl $__KERNEL_CS, $0x00100000 - # jump to startup_32 + # jump to startup_32 in arch/i386/kernel/head.S idt_48: .word 0 # idt limit = 0 |