git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
include
/
linux
/
posix-timers.h
diff --git
a/include/linux/posix-timers.h
b/include/linux/posix-timers.h
index
d51243a
..
808227d
100644
(file)
--- a/
include/linux/posix-timers.h
+++ b/
include/linux/posix-timers.h
@@
-5,6
+5,7
@@
#include <linux/list.h>
#include <linux/sched.h>
#include <linux/timex.h>
+#include <linux/alarmtimer.h>
union cpu_time_count {
cputime_t cpu;
@@
-80,6
+81,7
@@
struct k_itimer {
unsigned long incr;
unsigned long expires;
} mmtimer;
+ struct alarm alarmtimer;
} it;
};