Applied to Maverick linux master with very slight modification to the
commit message.

Thanks,
Leann

On Tue, 2010-09-07 at 21:45 +0200, Daniel Lezcano wrote:
> Function prototype differs when CONFIG_SECURITY is not set leading to
> a warning:
>
> include/linux/security.h: In function ‘security_task_free’:
> include/linux/security.h:2244: warning: no return statement in function returning non-void
>
> The patch that introduced this warning was Maverick commit:
> 2aec770a575b15cb1e43c2e16dff4f00a02a8c9a.
>
> Acked-by: Tim Gardner <tim.gardner@canonical.com>
> Signed-off-by: Daniel Lezcano <daniel.lezcano@free.fr>
> ---
> include/linux/security.h | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/include/linux/security.h b/include/linux/security.h
> index d7d65e0..a380eed 100644
> --- a/include/linux/security.h
> +++ b/include/linux/security.h
> @@ -2240,7 +2240,7 @@ static inline int security_task_create(unsigned long clone_flags)
> return 0;
> }
>
> -static inline int security_task_free(struct task_struct *task)
> +static inline void security_task_free(struct task_struct *task)
> { }
>
> static inline int security_cred_alloc_blank(struct cred *cred, gfp_t gfp)



--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team