Changeset 0dc2fec in mainline for kernel/arch/amd64/src/interrupt.c


Ignore:
Timestamp:
2016-05-22T19:19:43Z (9 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
b272c67a
Parents:
153c7a29 (diff), af2254ec (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes

File:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/amd64/src/interrupt.c

    r153c7a29 r0dc2fec  
    222222        }
    223223       
    224         exc_register(0, "de_fault", true, (iroutine_t) de_fault);
    225         exc_register(7, "nm_fault", true, (iroutine_t) nm_fault);
    226         exc_register(12, "ss_fault", true, (iroutine_t) ss_fault);
    227         exc_register(13, "gp_fault", true, (iroutine_t) gp_fault);
     224        exc_register(VECTOR_DE, "de_fault", true, (iroutine_t) de_fault);
     225        exc_register(VECTOR_NM, "nm_fault", true, (iroutine_t) nm_fault);
     226        exc_register(VECTOR_SS, "ss_fault", true, (iroutine_t) ss_fault);
     227        exc_register(VECTOR_GP, "gp_fault", true, (iroutine_t) gp_fault);
    228228       
    229229#ifdef CONFIG_SMP
Note: See TracChangeset for help on using the changeset viewer.