diff options
| author |   Chris Wilson <chris@chris-wilson.co.uk> | 2011-02-16 09:36:05 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-02-16 09:44:30 +0000 |
| commit | 9035a97a32836d0e456ddafaaf249a844e6e4b5e (patch) | |
| tree | 41ec3db083bdb46cd831f0d39db1fe294ae7d55f /security/security.c | |
| parent | drm/i915: Move the lvds OpRegion lid detection code to panel and reuse for eDP (diff) | |
| parent | agp/intel: Experiment with a 855GM GWB bit (diff) | |
| download | linux-dev-9035a97a32836d0e456ddafaaf249a844e6e4b5e.tar.xz linux-dev-9035a97a32836d0e456ddafaaf249a844e6e4b5e.zip | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Grab the latest stabilisation bits from -fixes and some suspend and
resume fixes from linus.
Conflicts:
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_irq.c
Diffstat (limited to 'security/security.c')
| -rw-r--r-- | security/security.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/security/security.c b/security/security.c index 739e40362f44..7b7308ace8c5 100644 --- a/security/security.c +++ b/security/security.c @@ -154,10 +154,9 @@ int security_capset(struct cred *new, const struct cred *old, effective, inheritable, permitted); } -int security_capable(int cap) +int security_capable(const struct cred *cred, int cap) { - return security_ops->capable(current, current_cred(), cap, - SECURITY_CAP_AUDIT); + return security_ops->capable(current, cred, cap, SECURITY_CAP_AUDIT); } int security_real_capable(struct task_struct *tsk, int cap) |