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/blackfin/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/blackfin/include/asm/traps.h')
| -rw-r--r-- | arch/blackfin/include/asm/traps.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/include/asm/traps.h b/arch/blackfin/include/asm/traps.h index 9fe0da612c09..70c4e511cae6 100644 --- a/arch/blackfin/include/asm/traps.h +++ b/arch/blackfin/include/asm/traps.h | |||
| @@ -57,7 +57,7 @@ | |||
| 57 | #define HWC_x3(level) \ | 57 | #define HWC_x3(level) \ |
| 58 | "External Memory Addressing Error\n" | 58 | "External Memory Addressing Error\n" |
| 59 | #define EXC_0x04(level) \ | 59 | #define EXC_0x04(level) \ |
| 60 | "Unimplmented exception occured\n" \ | 60 | "Unimplmented exception occurred\n" \ |
| 61 | level " - Maybe you forgot to install a custom exception handler?\n" | 61 | level " - Maybe you forgot to install a custom exception handler?\n" |
| 62 | #define HWC_x12(level) \ | 62 | #define HWC_x12(level) \ |
| 63 | "Performance Monitor Overflow\n" | 63 | "Performance Monitor Overflow\n" |