diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 16:00:39 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 16:00:39 +1100 |
| commit | 97481cb6a44e877579b686e92e8f89fb8588b76e (patch) | |
| tree | 76094d084d924ea191110926fac7bcc16b5af267 /security | |
| parent | 1bf277bdb1cd998bd02c9a5b457c3b211086d961 (diff) | |
| parent | 6a254c0c7bdfa26245777bee5d63cdfa6bba1ff5 (diff) | |
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
arch/x86/kernel/acpi/sleep.c
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 c923b954b19d..a31b6d9a3b73 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); } |