Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.transmeta.com>2003-06-16 00:34:28 -0700
committerLinus Torvalds <torvalds@home.transmeta.com>2003-06-16 00:34:28 -0700
commit4053dd4be635468187c6a1ec22e99feef82e313e (patch)
tree45d494944cb8fed5e41cfa2f0487b38457150d70
parentb0139aa1a9287cc355d200dceba622be7d151dfd (diff)
parentf664df30d684706d82093394843c6f844862e1d9 (diff)
Merge bk://are.twiddle.net/axp-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
-rw-r--r--arch/alpha/kernel/osf_sys.c9
-rw-r--r--include/asm-alpha/ide.h2
2 files changed, 6 insertions, 5 deletions
diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
index 75f5aa0e6a90..c42a9d7b84b0 100644
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
@@ -822,7 +822,6 @@ osf_setsysinfo(unsigned long op, void *buffer, unsigned long nbytes,
affects all sorts of things, like timeval and itimerval. */
extern struct timezone sys_tz;
-extern int do_sys_settimeofday(struct timeval *tv, struct timezone *tz);
extern int do_getitimer(int which, struct itimerval *value);
extern int do_setitimer(int which, struct itimerval *, struct itimerval *);
extern asmlinkage int sys_utimes(char *, struct timeval *);
@@ -901,11 +900,11 @@ osf_gettimeofday(struct timeval32 *tv, struct timezone *tz)
asmlinkage int
osf_settimeofday(struct timeval32 *tv, struct timezone *tz)
{
- struct timeval ktv;
+ struct timespec kts;
struct timezone ktz;
if (tv) {
- if (get_tv32(&ktv, tv))
+ if (get_tv32((struct timeval *)&kts, tv))
return -EFAULT;
}
if (tz) {
@@ -913,7 +912,9 @@ osf_settimeofday(struct timeval32 *tv, struct timezone *tz)
return -EFAULT;
}
- return do_sys_settimeofday(tv ? &ktv : NULL, tz ? &ktz : NULL);
+ kts.tv_nsec *= 1000;
+
+ return do_sys_settimeofday(tv ? &kts : NULL, tz ? &ktz : NULL);
}
asmlinkage int
diff --git a/include/asm-alpha/ide.h b/include/asm-alpha/ide.h
index bf5b19788cd9..603d85ab15d9 100644
--- a/include/asm-alpha/ide.h
+++ b/include/asm-alpha/ide.h
@@ -75,7 +75,7 @@ static __inline__ void ide_init_default_hwifs(void)
for (index = 0; index < MAX_HWIFS; index++) {
ide_init_hwif_ports(&hw, ide_default_io_base(index), 0, NULL);
hw.irq = ide_default_irq(ide_default_io_base(index));
- ide_register_hw(&hw);
+ ide_register_hw(&hw, NULL);
}
#endif
}