diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-09-25 05:37:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-09-25 05:37:35 -0700 |
| commit | ca844c33731a798c28b78bb4e67d3b3d17b63d82 (patch) | |
| tree | bdeb5fc5be03e10d96cdf6b19c95741cce38c2e1 /include | |
| parent | a78e510f4ebfaf5eb674ed94c8c8d7529b534182 (diff) | |
| parent | 2ed33b6bc52b02e2ef1643381ede989738d10ae5 (diff) | |
Merge bk://are.twiddle.net/axp-2.6/
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ppc64/ppc32.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-ppc64/ppc32.h b/include/asm-ppc64/ppc32.h index 2897d3281b43..1d0404897550 100644 --- a/include/asm-ppc64/ppc32.h +++ b/include/asm-ppc64/ppc32.h @@ -32,8 +32,10 @@ typedef struct compat_siginfo { /* POSIX.1b timers */ struct { - unsigned int _timer1; - unsigned int _timer2; + timer_t _tid; /* timer id */ + int _overrun; /* overrun count */ + compat_sigval_t _sigval; /* same as below */ + int _sys_private; /* not to be passed to user */ } _timer; /* POSIX.1b signals */ |