From c8e433109612de4bec3a9c5914c5f34a2b8d6a69 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Thu, 15 Dec 2011 13:41:32 +1030 Subject: [PATCH] --- yaml --- r: 283255 b: refs/heads/master c: b8aa09fd880eb4c2881b9f3c8a8d09c0404cd4eb h: refs/heads/master i: 283253: d6e7da233682bc894cf53ff62957eba9231a0fb4 283251: 4f9c371ef477f1bc8c067a7e5de5233774a5ab6d 283247: 7ece46711d66bcf865f31cf69677410a4195eb23 v: v3 --- [refs] | 2 +- trunk/security/apparmor/lsm.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c3974b11290d..91143d119c7b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 735e93c70434614bffac4a914ca1da72e37d43c0 +refs/heads/master: b8aa09fd880eb4c2881b9f3c8a8d09c0404cd4eb diff --git a/trunk/security/apparmor/lsm.c b/trunk/security/apparmor/lsm.c index 37832026e58a..41ae0c6cb903 100644 --- a/trunk/security/apparmor/lsm.c +++ b/trunk/security/apparmor/lsm.c @@ -671,7 +671,7 @@ static struct security_operations apparmor_ops = { static int param_set_aabool(const char *val, const struct kernel_param *kp); static int param_get_aabool(char *buffer, const struct kernel_param *kp); -#define param_check_aabool(name, p) __param_check(name, p, int) +#define param_check_aabool param_check_bool static struct kernel_param_ops param_ops_aabool = { .set = param_set_aabool, .get = param_get_aabool @@ -679,7 +679,7 @@ static struct kernel_param_ops param_ops_aabool = { static int param_set_aauint(const char *val, const struct kernel_param *kp); static int param_get_aauint(char *buffer, const struct kernel_param *kp); -#define param_check_aauint(name, p) __param_check(name, p, int) +#define param_check_aauint param_check_uint static struct kernel_param_ops param_ops_aauint = { .set = param_set_aauint, .get = param_get_aauint @@ -687,7 +687,7 @@ static struct kernel_param_ops param_ops_aauint = { static int param_set_aalockpolicy(const char *val, const struct kernel_param *kp); static int param_get_aalockpolicy(char *buffer, const struct kernel_param *kp); -#define param_check_aalockpolicy(name, p) __param_check(name, p, int) +#define param_check_aalockpolicy param_check_bool static struct kernel_param_ops param_ops_aalockpolicy = { .set = param_set_aalockpolicy, .get = param_get_aalockpolicy