diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-02-22 17:43:29 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-02-22 17:43:29 +1100 |
| commit | 896c52acc90e6656a4330190a2ec1cb23531130e (patch) | |
| tree | 008dd6ad89f723d15a4713288d00009a0c2cf301 /security | |
| parent | 7a91ca4cfe07f8e62e1f7f5d3195402ec133c9ee (diff) | |
| parent | 38455d3b0a9d59c40822078c9841ee94eaba8f35 (diff) | |
Merge remote-tracking branch 'tip/auto-latest'
Diffstat (limited to 'security')
| -rw-r--r-- | security/commoncap.c | 2 | ||||
| -rw-r--r-- | security/security.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/security/commoncap.c b/security/commoncap.c index 64c2ed9c9015..dbfdaed4cc66 100644 --- a/security/commoncap.c +++ b/security/commoncap.c @@ -93,7 +93,7 @@ int cap_capable(struct task_struct *tsk, const struct cred *cred, int cap, * Determine whether the current process may set the system clock and timezone * information, returning 0 if permission granted, -ve if denied. */ -int cap_settime(struct timespec *ts, struct timezone *tz) +int cap_settime(const struct timespec *ts, const struct timezone *tz) { if (!capable(CAP_SYS_TIME)) return -EPERM; diff --git a/security/security.c b/security/security.c index 08ca967eaa3d..5fee5dd00ff2 100644 --- a/security/security.c +++ b/security/security.c @@ -196,7 +196,7 @@ int security_syslog(int type) return security_ops->syslog(type); } -int security_settime(struct timespec *ts, struct timezone *tz) +int security_settime(const struct timespec *ts, const struct timezone *tz) { return security_ops->settime(ts, tz); } |