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/ia64/include/asm/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 'arch/ia64/include/asm/siginfo.h')
| -rw-r--r-- | arch/ia64/include/asm/siginfo.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/siginfo.h b/arch/ia64/include/asm/siginfo.h index 118d42979003..c8fcaa2ac48f 100644 --- a/arch/ia64/include/asm/siginfo.h +++ b/arch/ia64/include/asm/siginfo.h | |||
| @@ -62,6 +62,7 @@ typedef struct siginfo { | |||
| 62 | int _imm; /* immediate value for "break" */ | 62 | int _imm; /* immediate value for "break" */ |
| 63 | unsigned int _flags; /* see below */ | 63 | unsigned int _flags; /* see below */ |
| 64 | unsigned long _isr; /* isr */ | 64 | unsigned long _isr; /* isr */ |
| 65 | short _addr_lsb; /* lsb of faulting address */ | ||
| 65 | } _sigfault; | 66 | } _sigfault; |
| 66 | 67 | ||
| 67 | /* SIGPOLL */ | 68 | /* SIGPOLL */ |