summaryrefslogtreecommitdiffstats
path: root/kernel/time.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-06-17 13:25:08 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-06-17 13:25:08 +0000
commit59223edaa18759982db0a8aced0e77457d10c68e (patch)
tree89354903b01fa0a447bffeefe00df3044495db2e /kernel/time.c
parentdb7d4daea91e105e3859cf461d7e53b9b77454b2 (diff)
Merge with Linux 2.3.6. Sorry, this isn't tested on silicon, I don't
have a MIPS box at hand.
Diffstat (limited to 'kernel/time.c')
-rw-r--r--kernel/time.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/time.c b/kernel/time.c
index 9fe12559c..911442dad 100644
--- a/kernel/time.c
+++ b/kernel/time.c
@@ -54,13 +54,15 @@ void get_fast_time(struct timeval * t)
do_get_fast_time(t);
}
-#ifndef __alpha__
+#if !defined(__alpha__) && !defined(__ia64__)
/*
* sys_time() can be implemented in user-level using
* sys_gettimeofday(). Is this for backwards compatibility? If so,
* why not move it into the appropriate arch directory (for those
* architectures that need it).
+ *
+ * XXX This function is NOT 64-bit clean!
*/
asmlinkage int sys_time(int * tloc)
{