git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'work.misc' and 'work.dcache' of git://git.kernel.org/pub/scm/linux...
[sfrench/cifs-2.6.git]
/
include
/
linux
/
posix-timers.h
diff --git
a/include/linux/posix-timers.h
b/include/linux/posix-timers.h
index c85704fcdbd2189b517f407ad871b02055924df5..ee7e987ea1b4354ef93a149c997caf75b6269c1b 100644
(file)
--- a/
include/linux/posix-timers.h
+++ b/
include/linux/posix-timers.h
@@
-95,8
+95,8
@@
struct k_itimer {
clockid_t it_clock;
timer_t it_id;
int it_active;
-
int
it_overrun;
-
int
it_overrun_last;
+
s64
it_overrun;
+
s64
it_overrun_last;
int it_requeue_pending;
int it_sigev_notify;
ktime_t it_interval;