On Fri, 26 Feb 2010, wzt.wzt@gmail.com wrote:

quoted text
> Signed-off-by: Zhitong Wang <zhitong.wangzt@alibaba-inc.com>
> 


Applied to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next-queue


quoted text
> ---
>  security/security.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/security/security.c b/security/security.c
> index 122b748..7da630a 100644
> --- a/security/security.c
> +++ b/security/security.c
> @@ -110,7 +110,7 @@ int __init security_module_enable(struct security_operations *ops)
>   * If there is already a security module registered with the kernel,
>   * an error will be returned.  Otherwise %0 is returned on success.
>   */
> -int register_security(struct security_operations *ops)
> +int __init register_security(struct security_operations *ops)
>  {
>  	if (verify(ops)) {
>  		printk(KERN_DEBUG "%s could not verify "
> -- 
> 1.6.5.3
> 

-- 
James Morris
<jmorris@namei.org>
--
unsubscribe notice
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/