summaryrefslogtreecommitdiffstats
path: root/arch/ia64/ia32
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2008-04-17 19:12:27 +0200
committerTony Luck <tony.luck@intel.com>2008-04-17 19:12:27 +0200
commit14d0647c98f52e2d76113d44de6b771ec87a934f (patch)
tree4b9407b00ad0b5baf5ee6245a4157a07062680b5 /arch/ia64/ia32
parentPull fsys_gettimeofday into release branch (diff)
parent[IA64] VIRT_CPU_ACCOUNTING (accurate cpu time accounting) (diff)
downloadlinux-14d0647c98f52e2d76113d44de6b771ec87a934f.tar.xz
linux-14d0647c98f52e2d76113d44de6b771ec87a934f.zip
Pull virt-cpu-accounting into release branch
Diffstat (limited to 'arch/ia64/ia32')
-rw-r--r--arch/ia64/ia32/elfcore32.h14
1 files changed, 13 insertions, 1 deletions
diff --git a/arch/ia64/ia32/elfcore32.h b/arch/ia64/ia32/elfcore32.h
index 446c9aac924d..9a3abf58cea3 100644
--- a/arch/ia64/ia32/elfcore32.h
+++ b/arch/ia64/ia32/elfcore32.h
@@ -30,7 +30,19 @@ struct elf_siginfo
int si_errno; /* errno */
};
-#define jiffies_to_timeval(a,b) do { (b)->tv_usec = 0; (b)->tv_sec = (a)/HZ; }while(0)
+#ifdef CONFIG_VIRT_CPU_ACCOUNTING
+/*
+ * Hacks are here since types between compat_timeval (= pair of s32) and
+ * ia64-native timeval (= pair of s64) are not compatible, at least a file
+ * arch/ia64/ia32/../../../fs/binfmt_elf.c will get warnings from compiler on
+ * use of cputime_to_timeval(), which usually an alias of jiffies_to_timeval().
+ */
+#define cputime_to_timeval(a,b) \
+ do { (b)->tv_usec = 0; (b)->tv_sec = (a)/NSEC_PER_SEC; } while(0)
+#else
+#define jiffies_to_timeval(a,b) \
+ do { (b)->tv_usec = 0; (b)->tv_sec = (a)/HZ; } while(0)
+#endif
struct elf_prstatus
{