lkml.org 
[lkml]   [2012]   [Mar]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 1/2] crypto: camellia-x86_64 - module init/exit functions should be static
    On 03/15/2012 01:11 PM, Jussi Kivilinna wrote:

    > This caused conflict with twofish-x86_64-3way when compiled into kernel,
    > same function names and not static.

    Have these patches been merged anywhere?
    I'm still seeing build problems in linux-next 20120321.


    > Reported-by: Randy Dunlap <rdunlap@xenotime.net>
    > Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
    > ---
    > arch/x86/crypto/camellia_glue.c | 4 ++--
    > 1 file changed, 2 insertions(+), 2 deletions(-)
    >
    > diff --git a/arch/x86/crypto/camellia_glue.c b/arch/x86/crypto/camellia_glue.c
    > index 1ca36a9..3306dc0 100644
    > --- a/arch/x86/crypto/camellia_glue.c
    > +++ b/arch/x86/crypto/camellia_glue.c
    > @@ -1925,7 +1925,7 @@ static int force;
    > module_param(force, int, 0);
    > MODULE_PARM_DESC(force, "Force module load, ignore CPU blacklist");
    >
    > -int __init init(void)
    > +static int __init init(void)
    > {
    > if (!force && is_blacklisted_cpu()) {
    > printk(KERN_INFO
    > @@ -1938,7 +1938,7 @@ int __init init(void)
    > return crypto_register_algs(camellia_algs, ARRAY_SIZE(camellia_algs));
    > }
    >
    > -void __exit fini(void)
    > +static void __exit fini(void)
    > {
    > crypto_unregister_algs(camellia_algs, ARRAY_SIZE(camellia_algs));
    > }
    >
    >



    --
    ~Randy


    \
     
     \ /
      Last update: 2012-03-22 01:43    [W:0.050 / U:0.356 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site