diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-04-25 04:59:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-04-25 04:59:50 -0700 |
| commit | 7789650ffb188cac3b8a40fff515c020d3b4dde4 (patch) | |
| tree | 3da97be842c9ea7c7db312711c18fb5ec71c3565 /include | |
| parent | 79c914d99eff62b80074b5952dfc194c0a677220 (diff) | |
| parent | 54f96635439f76c68259475a1046a49c8c516eae (diff) | |
Merge bk://kernel.bkbits.net/davem/sparc-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sparc64/siginfo.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-sparc64/siginfo.h b/include/asm-sparc64/siginfo.h index a159c71962d1..07df5111880d 100644 --- a/include/asm-sparc64/siginfo.h +++ b/include/asm-sparc64/siginfo.h @@ -37,8 +37,10 @@ typedef struct siginfo32 { /* POSIX.1b timers */ struct { - unsigned int _timer1; - unsigned int _timer2; + timer_t _tid; /* timer id */ + int _overrun; /* overrun count */ + sigval_t32 _sigval; /* same as below */ + int _sys_private; /* not to be passed to user */ } _timer; /* POSIX.1b signals */ |