diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-11-24 13:30:28 -0500 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-11-24 13:30:28 -0500 |
| commit | b03a6c4c7d8ebd8118d668eafdb85f5f76b5437f (patch) | |
| tree | f6ca7059e9c1bc1aac9a6741316f8e07ba349f7f /security/security.c | |
| parent | 24f3f6b5eff92608a62449e33bfac0eed1447d02 (diff) | |
| parent | 3561d43fd289f590fdae672e5eb831b8d5cf0bf6 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'security/security.c')
| -rw-r--r-- | security/security.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/security.c b/security/security.c index 3ef5e2a7a741..1b798d3df710 100644 --- a/security/security.c +++ b/security/security.c | |||
| @@ -197,9 +197,9 @@ int security_quota_on(struct dentry *dentry) | |||
| 197 | return security_ops->quota_on(dentry); | 197 | return security_ops->quota_on(dentry); |
| 198 | } | 198 | } |
| 199 | 199 | ||
| 200 | int security_syslog(int type, bool from_file) | 200 | int security_syslog(int type) |
| 201 | { | 201 | { |
| 202 | return security_ops->syslog(type, from_file); | 202 | return security_ops->syslog(type); |
| 203 | } | 203 | } |
| 204 | 204 | ||
| 205 | int security_settime(struct timespec *ts, struct timezone *tz) | 205 | int security_settime(struct timespec *ts, struct timezone *tz) |