Ignore:
Timestamp:
2010-07-02T14:19:30Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
89c57b6
Parents:
fe7abd0 (diff), e3ee9b9 (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/include/interrupt.h

    rfe7abd0 rcefb126  
    112112extern void (* eoi_function)(void);
    113113
    114 extern void decode_istate(int n, istate_t *istate);
    115114extern void interrupt_init(void);
    116115extern void trap_virtual_enable_irqs(uint16_t irqmask);
    117116extern void trap_virtual_disable_irqs(uint16_t irqmask);
    118 
    119 /* AMD64 - specific page handler */
    120 extern void ident_page_fault(unsigned int, istate_t *);
    121117
    122118#endif
Note: See TracChangeset for help on using the changeset viewer.