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 /include/asm-generic/siginfo.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 'include/asm-generic/siginfo.h')
| -rw-r--r-- | include/asm-generic/siginfo.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/siginfo.h b/include/asm-generic/siginfo.h index 942d30b5aab1..0dd4e87f6fba 100644 --- a/include/asm-generic/siginfo.h +++ b/include/asm-generic/siginfo.h | |||
| @@ -192,7 +192,7 @@ typedef struct siginfo { | |||
| 192 | * SIGBUS si_codes | 192 | * SIGBUS si_codes |
| 193 | */ | 193 | */ |
| 194 | #define BUS_ADRALN (__SI_FAULT|1) /* invalid address alignment */ | 194 | #define BUS_ADRALN (__SI_FAULT|1) /* invalid address alignment */ |
| 195 | #define BUS_ADRERR (__SI_FAULT|2) /* non-existant physical address */ | 195 | #define BUS_ADRERR (__SI_FAULT|2) /* non-existent physical address */ |
| 196 | #define BUS_OBJERR (__SI_FAULT|3) /* object specific hardware error */ | 196 | #define BUS_OBJERR (__SI_FAULT|3) /* object specific hardware error */ |
| 197 | /* hardware memory error consumed on a machine check: action required */ | 197 | /* hardware memory error consumed on a machine check: action required */ |
| 198 | #define BUS_MCEERR_AR (__SI_FAULT|4) | 198 | #define BUS_MCEERR_AR (__SI_FAULT|4) |