diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-25 09:27:27 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-25 09:27:27 -0400 |
| commit | 38b22b6e9f46ab8f73ef5734f0e0a000766a9258 (patch) | |
| tree | 2ccc41ef55918d3af43e444bde7648562a031559 /arch/sparc64/kernel/signal32.c | |
| parent | 3357d4c75f1fb67e7304998c4ad4e9a9fed66fa4 (diff) | |
| parent | b3e112bcc19abd8e9657dca34a87316786e096f3 (diff) | |
Automerge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'arch/sparc64/kernel/signal32.c')
| -rw-r--r-- | arch/sparc64/kernel/signal32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/signal32.c b/arch/sparc64/kernel/signal32.c index 9a375e975cff..f28428f4170e 100644 --- a/arch/sparc64/kernel/signal32.c +++ b/arch/sparc64/kernel/signal32.c | |||
| @@ -102,7 +102,7 @@ typedef struct compat_siginfo{ | |||
| 102 | 102 | ||
| 103 | /* POSIX.1b timers */ | 103 | /* POSIX.1b timers */ |
| 104 | struct { | 104 | struct { |
| 105 | timer_t _tid; /* timer id */ | 105 | compat_timer_t _tid; /* timer id */ |
| 106 | int _overrun; /* overrun count */ | 106 | int _overrun; /* overrun count */ |
| 107 | compat_sigval_t _sigval; /* same as below */ | 107 | compat_sigval_t _sigval; /* same as below */ |
| 108 | int _sys_private; /* not to be passed to user */ | 108 | int _sys_private; /* not to be passed to user */ |