summaryrefslogtreecommitdiffstats
path: root/include/asm-x86_64/ia32.h
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@shinybook.infradead.org>2005-07-02 14:39:09 +0200
committerDavid Woodhouse <dwmw2@shinybook.infradead.org>2005-07-02 14:39:09 +0200
commitd2f6409584e2c62ffad81690562330ff3bf4a458 (patch)
tree3bdfb97d0b51be2f7f414f2107e97603c1206abb /include/asm-x86_64/ia32.h
parentAUDIT: Use KERN_NOTICE for printk of audit records (diff)
parent[PATCH] alpha smp fix (part #2) (diff)
downloadlinux-d2f6409584e2c62ffad81690562330ff3bf4a458.tar.xz
linux-d2f6409584e2c62ffad81690562330ff3bf4a458.zip
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-x86_64/ia32.h')
-rw-r--r--include/asm-x86_64/ia32.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86_64/ia32.h b/include/asm-x86_64/ia32.h
index c0a7717923ed..6efa00fe4e7b 100644
--- a/include/asm-x86_64/ia32.h
+++ b/include/asm-x86_64/ia32.h
@@ -94,7 +94,7 @@ typedef struct compat_siginfo{
/* POSIX.1b timers */
struct {
- int _tid; /* timer id */
+ compat_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 */