Messages in this thread Patch in this message |  | | From | Keith Owens <> | Subject | [patch] 2.4.0-test9-pre6 bluesmoke | Date | Sat, 23 Sep 2000 11:27:26 +1100 |
| |
Against 2.4.0-test9-pre6. Removes redundant code for trap 18, it used to be reserved but is now used for bluesmoke. Renames mcheck_fault to do_machine_check for consistency, all other C code for traps uses do_xxx. Adds parameters to do_machine_check for consistency, all other C code for traps declare pt_regs and error_code.
Index: 0-test9-pre6.1/arch/i386/kernel/traps.c --- 0-test9-pre6.1/arch/i386/kernel/traps.c Sat, 23 Sep 2000 11:16:56 +1100 kaos (linux-2.4/A/c/1_traps.c 1.1.2.2.1.1.2.1.2.3.1.1 644) +++ 0-test9-pre6.1(w)/arch/i386/kernel/traps.c Sat, 23 Sep 2000 11:20:14 +1100 kaos (linux-2.4/A/c/1_traps.c 1.1.2.2.1.1.2.1.2.4 644) @@ -92,7 +92,6 @@ asmlinkage void general_protection(void) asmlinkage void page_fault(void); asmlinkage void coprocessor_error(void); asmlinkage void simd_coprocessor_error(void); -asmlinkage void reserved(void); asmlinkage void alignment_check(void); asmlinkage void spurious_interrupt_bug(void); asmlinkage void machine_check(void); @@ -312,7 +311,6 @@ DO_ERROR(10, SIGSEGV, "invalid TSS", inv DO_ERROR(11, SIGBUS, "segment not present", segment_not_present) DO_ERROR(12, SIGBUS, "stack segment", stack_segment) DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, get_cr2()) -DO_ERROR(18, SIGSEGV, "reserved", reserved) asmlinkage void do_general_protection(struct pt_regs * regs, long error_code) { Index: 0-test9-pre6.1/arch/i386/kernel/entry.S --- 0-test9-pre6.1/arch/i386/kernel/entry.S Tue, 19 Sep 2000 10:36:07 +1100 kaos (linux-2.4/A/c/3_entry.S 1.1.2.2.2.2.1.4 644) +++ 0-test9-pre6.1(w)/arch/i386/kernel/entry.S Sat, 23 Sep 2000 11:20:14 +1100 kaos (linux-2.4/A/c/3_entry.S 1.1.2.2.2.2.1.5 644) @@ -381,11 +381,6 @@ ENTRY(coprocessor_segment_overrun) pushl $ SYMBOL_NAME(do_coprocessor_segment_overrun) jmp error_code -ENTRY(reserved) - pushl $0 - pushl $ SYMBOL_NAME(do_reserved) - jmp error_code - ENTRY(double_fault) pushl $ SYMBOL_NAME(do_double_fault) jmp error_code @@ -416,7 +411,7 @@ ENTRY(page_fault) ENTRY(machine_check) pushl $0 - pushl $ SYMBOL_NAME(mcheck_fault) + pushl $ SYMBOL_NAME(do_machine_check) jmp error_code ENTRY(spurious_interrupt_bug) Index: 0-test9-pre6.1/arch/i386/kernel/bluesmoke.c --- 0-test9-pre6.1/arch/i386/kernel/bluesmoke.c Thu, 21 Sep 2000 10:48:20 +1100 kaos (linux-2.4/c/d/7_bluesmoke. 1.1.1.2 644) +++ 0-test9-pre6.1(w)/arch/i386/kernel/bluesmoke.c Sat, 23 Sep 2000 11:20:15 +1100 kaos (linux-2.4/c/d/7_bluesmoke. 1.2.1.1 644) @@ -10,7 +10,7 @@ static int banks = 0; -void mcheck_fault(void) +void do_machine_check(struct pt_regs * regs, long error_code) { int recover=1; u32 alow, ahigh, high, low; - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org Please read the FAQ at http://www.tux.org/lkml/
|  |