Merge branch 'drm-fixes-3.11' of git://people.freedesktop.org/~agd5f/linux

[karo-tx-linux.git] / include / linux / posix-timers.h

diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h
index 7794d75ed1555c971b7c8f88b5567c5df9e36fee..907f3fd191acaa1573445a0988e5161b8e408ec3 100644 (file)
--- a/include/linux/posix-timers.h
+++ b/include/linux/posix-timers.h
@@ -7,14 +7,20 @@
 #include <linux/timex.h>
 #include <linux/alarmtimer.h>
 
-union cpu_time_count {
-       cputime_t cpu;
-       unsigned long long sched;
-};
+
+static inline unsigned long long cputime_to_expires(cputime_t expires)
+{
+       return (__force unsigned long long)expires;
+}
+
+static inline cputime_t expires_to_cputime(unsigned long long expires)
+{
+       return (__force cputime_t)expires;
+}
 
 struct cpu_timer_list {
        struct list_head entry;
-       union cpu_time_count expires, incr;
+       unsigned long long expires, incr;
        struct task_struct *task;
        int firing;
 };