On 03/15/2012 01:11 PM, Jussi Kivilinna wrote:
> This caused conflict with camellia-x86_64 when compiled into kernel, same
> function names and not static.
>
> Reported-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
> Signed-off-by: Jussi Kivilinna <jussi.kivilinna@xxxxxxxx>
Acked-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
Thanks.
> ---
> arch/x86/crypto/twofish_glue_3way.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/x86/crypto/twofish_glue_3way.c b/arch/x86/crypto/twofish_glue_3way.c
> index 408fc0c..922ab24 100644
> --- a/arch/x86/crypto/twofish_glue_3way.c
> +++ b/arch/x86/crypto/twofish_glue_3way.c
> @@ -668,7 +668,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
> @@ -681,7 +681,7 @@ int __init init(void)
> return crypto_register_algs(tf_algs, ARRAY_SIZE(tf_algs));
> }
>
> -void __exit fini(void)
> +static void __exit fini(void)
> {
> crypto_unregister_algs(tf_algs, ARRAY_SIZE(tf_algs));
> }
>
--
~Randy
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
