aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/linux/posix-timers.h5
-rw-r--r--include/linux/security.h9
-rw-r--r--include/linux/time.h5
3 files changed, 11 insertions, 8 deletions
diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h
index 3e23844a6990..b2c14cbd47a6 100644
--- a/include/linux/posix-timers.h
+++ b/include/linux/posix-timers.h
@@ -69,7 +69,8 @@ struct k_itimer {
69struct k_clock { 69struct k_clock {
70 int res; /* in nanoseconds */ 70 int res; /* in nanoseconds */
71 int (*clock_getres) (const clockid_t which_clock, struct timespec *tp); 71 int (*clock_getres) (const clockid_t which_clock, struct timespec *tp);
72 int (*clock_set) (const clockid_t which_clock, struct timespec * tp); 72 int (*clock_set) (const clockid_t which_clock,
73 const struct timespec *tp);
73 int (*clock_get) (const clockid_t which_clock, struct timespec * tp); 74 int (*clock_get) (const clockid_t which_clock, struct timespec * tp);
74 int (*timer_create) (struct k_itimer *timer); 75 int (*timer_create) (struct k_itimer *timer);
75 int (*nsleep) (const clockid_t which_clock, int flags, 76 int (*nsleep) (const clockid_t which_clock, int flags,
@@ -89,7 +90,7 @@ void register_posix_clock(const clockid_t clock_id, struct k_clock *new_clock);
89/* error handlers for timer_create, nanosleep and settime */ 90/* error handlers for timer_create, nanosleep and settime */
90int do_posix_clock_nonanosleep(const clockid_t, int flags, struct timespec *, 91int do_posix_clock_nonanosleep(const clockid_t, int flags, struct timespec *,
91 struct timespec __user *); 92 struct timespec __user *);
92int do_posix_clock_nosettime(const clockid_t, struct timespec *tp); 93int do_posix_clock_nosettime(const clockid_t, const struct timespec *tp);
93 94
94/* function to call to trigger timer event */ 95/* function to call to trigger timer event */
95int posix_timer_event(struct k_itimer *timr, int si_private); 96int posix_timer_event(struct k_itimer *timr, int si_private);
diff --git a/include/linux/security.h b/include/linux/security.h
index c642bb8b8f5a..c096aa6fca60 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -53,7 +53,7 @@ struct audit_krule;
53 */ 53 */
54extern int cap_capable(struct task_struct *tsk, const struct cred *cred, 54extern int cap_capable(struct task_struct *tsk, const struct cred *cred,
55 int cap, int audit); 55 int cap, int audit);
56extern int cap_settime(struct timespec *ts, struct timezone *tz); 56extern int cap_settime(const struct timespec *ts, const struct timezone *tz);
57extern int cap_ptrace_access_check(struct task_struct *child, unsigned int mode); 57extern int cap_ptrace_access_check(struct task_struct *child, unsigned int mode);
58extern int cap_ptrace_traceme(struct task_struct *parent); 58extern int cap_ptrace_traceme(struct task_struct *parent);
59extern int cap_capget(struct task_struct *target, kernel_cap_t *effective, kernel_cap_t *inheritable, kernel_cap_t *permitted); 59extern int cap_capget(struct task_struct *target, kernel_cap_t *effective, kernel_cap_t *inheritable, kernel_cap_t *permitted);
@@ -1387,7 +1387,7 @@ struct security_operations {
1387 int (*quotactl) (int cmds, int type, int id, struct super_block *sb); 1387 int (*quotactl) (int cmds, int type, int id, struct super_block *sb);
1388 int (*quota_on) (struct dentry *dentry); 1388 int (*quota_on) (struct dentry *dentry);
1389 int (*syslog) (int type); 1389 int (*syslog) (int type);
1390 int (*settime) (struct timespec *ts, struct timezone *tz); 1390 int (*settime) (const struct timespec *ts, const struct timezone *tz);
1391 int (*vm_enough_memory) (struct mm_struct *mm, long pages); 1391 int (*vm_enough_memory) (struct mm_struct *mm, long pages);
1392 1392
1393 int (*bprm_set_creds) (struct linux_binprm *bprm); 1393 int (*bprm_set_creds) (struct linux_binprm *bprm);
@@ -1669,7 +1669,7 @@ int security_sysctl(struct ctl_table *table, int op);
1669int security_quotactl(int cmds, int type, int id, struct super_block *sb); 1669int security_quotactl(int cmds, int type, int id, struct super_block *sb);
1670int security_quota_on(struct dentry *dentry); 1670int security_quota_on(struct dentry *dentry);
1671int security_syslog(int type); 1671int security_syslog(int type);
1672int security_settime(struct timespec *ts, struct timezone *tz); 1672int security_settime(const struct timespec *ts, const struct timezone *tz);
1673int security_vm_enough_memory(long pages); 1673int security_vm_enough_memory(long pages);
1674int security_vm_enough_memory_mm(struct mm_struct *mm, long pages); 1674int security_vm_enough_memory_mm(struct mm_struct *mm, long pages);
1675int security_vm_enough_memory_kern(long pages); 1675int security_vm_enough_memory_kern(long pages);
@@ -1904,7 +1904,8 @@ static inline int security_syslog(int type)
1904 return 0; 1904 return 0;
1905} 1905}
1906 1906
1907static inline int security_settime(struct timespec *ts, struct timezone *tz) 1907static inline int security_settime(const struct timespec *ts,
1908 const struct timezone *tz)
1908{ 1909{
1909 return cap_settime(ts, tz); 1910 return cap_settime(ts, tz);
1910} 1911}
diff --git a/include/linux/time.h b/include/linux/time.h
index 38c5206c2673..7c44e7778033 100644
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -145,8 +145,9 @@ static inline u32 arch_gettimeoffset(void) { return 0; }
145#endif 145#endif
146 146
147extern void do_gettimeofday(struct timeval *tv); 147extern void do_gettimeofday(struct timeval *tv);
148extern int do_settimeofday(struct timespec *tv); 148extern int do_settimeofday(const struct timespec *tv);
149extern int do_sys_settimeofday(struct timespec *tv, struct timezone *tz); 149extern int do_sys_settimeofday(const struct timespec *tv,
150 const struct timezone *tz);
150#define do_posix_clock_monotonic_gettime(ts) ktime_get_ts(ts) 151#define do_posix_clock_monotonic_gettime(ts) ktime_get_ts(ts)
151extern long do_utimes(int dfd, const char __user *filename, struct timespec *times, int flags); 152extern long do_utimes(int dfd, const char __user *filename, struct timespec *times, int flags);
152struct itimerval; 153struct itimerval;