diff options
| author | Andreas Gruenbacher <agruenba@redhat.com> | 2017-10-16 15:06:23 +0200 |
|---|---|---|
| committer | Andreas Gruenbacher <agruenba@redhat.com> | 2017-10-16 15:06:23 +0200 |
| commit | 0c9a66ec0e362fe9aff545b755430e56f58f2b96 (patch) | |
| tree | 3ffc63e84133d640b9d7def9102ab62a30da460e /include/linux/sem.h | |
| parent | c2c4be28c248232d5bdfa5911f3b721db771f4f0 (diff) | |
| parent | 9ca250a5137f3df7ffac58b49660beadd5926ace (diff) | |
| download | talos-op-linux-0c9a66ec0e362fe9aff545b755430e56f58f2b96.tar.gz talos-op-linux-0c9a66ec0e362fe9aff545b755430e56f58f2b96.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
Diffstat (limited to 'include/linux/sem.h')
| -rw-r--r-- | include/linux/sem.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/sem.h b/include/linux/sem.h index de2deb8676bd..0083128318f6 100644 --- a/include/linux/sem.h +++ b/include/linux/sem.h @@ -4,6 +4,7 @@ #include <linux/atomic.h> #include <linux/rcupdate.h> #include <linux/cache.h> +#include <linux/time64.h> #include <uapi/linux/sem.h> struct task_struct; @@ -30,7 +31,7 @@ struct sem { /* One sem_array data structure for each set of semaphores in the system. */ struct sem_array { struct kern_ipc_perm sem_perm; /* permissions .. see ipc.h */ - time_t sem_ctime; /* create/last semctl() time */ + time64_t sem_ctime; /* create/last semctl() time */ struct list_head pending_alter; /* pending operations */ /* that alter the array */ struct list_head pending_const; /* pending complex operations */ |
