linux-kernel - Re: linux-next: manual merge of the tip tree with the crypto-current tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Fri, 9 Oct 2015 13:09:34 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Ben Hutchings <ben@...adent.org.uk>,
	Dave Hansen <dave.hansen@...ux.intel.com>
Subject: Re: linux-next: manual merge of the tip tree with the
 crypto-current tree

Hi all,

On Fri, 9 Oct 2015 12:47:00 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> diff --cc arch/x86/crypto/camellia_aesni_avx_glue.c
> index bacaa13acac5,12e729bfe71b..000000000000
> --- a/arch/x86/crypto/camellia_aesni_avx_glue.c
> +++ b/arch/x86/crypto/camellia_aesni_avx_glue.c
> @@@ -554,12 -554,8 +554,14 @@@ static int __init camellia_aesni_init(v
>   {
>   	const char *feature_name;
>   
>  +	if (!cpu_has_avx || !cpu_has_aes || !cpu_has_osxsave) {
>  +		pr_info("AVX or AES-NI instructions are not detected.\n");
>  +		return -ENODEV;
>  +	}
>  +
>  +	if (!cpu_has_xfeatures(XSTATE_SSE | XSTATE_YMM, &feature_name)) {

OOPS, I clearly meant to remove that line as well (which I have now done).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/