From 8d68f35488cf8f3060dc1d13bf668d4b0b78c5f1 Mon Sep 17 00:00:00 2001 From: Shan Wei Date: Fri, 21 Jan 2011 10:13:13 +0800 Subject: [PATCH] --- yaml --- r: 235116 b: refs/heads/master c: 1936113c820bc3bfac49c266ccf972f7f8552aae h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/security/apparmor/lsm.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 50f3d8820587..c18bd93f54be 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0f8250265623e57971cbb57fc8d92e58dd883a19 +refs/heads/master: 1936113c820bc3bfac49c266ccf972f7f8552aae diff --git a/trunk/security/apparmor/lsm.c b/trunk/security/apparmor/lsm.c index b7106f192b75..d21a427a35ae 100644 --- a/trunk/security/apparmor/lsm.c +++ b/trunk/security/apparmor/lsm.c @@ -693,11 +693,9 @@ static struct kernel_param_ops param_ops_aalockpolicy = { static int param_set_audit(const char *val, struct kernel_param *kp); static int param_get_audit(char *buffer, struct kernel_param *kp); -#define param_check_audit(name, p) __param_check(name, p, int) static int param_set_mode(const char *val, struct kernel_param *kp); static int param_get_mode(char *buffer, struct kernel_param *kp); -#define param_check_mode(name, p) __param_check(name, p, int) /* Flag values, also controllable via /sys/module/apparmor/parameters * We define special types as we want to do additional mediation.