diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/x86/include/asm/traps.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/x86/include/asm/traps.h')
| -rw-r--r-- | arch/x86/include/asm/traps.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/traps.h b/arch/x86/include/asm/traps.h index f66cda56781d..0310da67307f 100644 --- a/arch/x86/include/asm/traps.h +++ b/arch/x86/include/asm/traps.h | |||
| @@ -30,6 +30,7 @@ asmlinkage void segment_not_present(void); | |||
| 30 | asmlinkage void stack_segment(void); | 30 | asmlinkage void stack_segment(void); |
| 31 | asmlinkage void general_protection(void); | 31 | asmlinkage void general_protection(void); |
| 32 | asmlinkage void page_fault(void); | 32 | asmlinkage void page_fault(void); |
| 33 | asmlinkage void async_page_fault(void); | ||
| 33 | asmlinkage void spurious_interrupt_bug(void); | 34 | asmlinkage void spurious_interrupt_bug(void); |
| 34 | asmlinkage void coprocessor_error(void); | 35 | asmlinkage void coprocessor_error(void); |
| 35 | asmlinkage void alignment_check(void); | 36 | asmlinkage void alignment_check(void); |