Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ca719a3 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Crypto stuff from Herbert:
  "This push fixes a potential boot hang in ccp and an incorrect
   CPU capability check in aegis/morus on x86."

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: x86/aegis,morus - Do not require OSXSAVE for SSE2
  crypto: ccp - add timeout support in the SEV command
parents f21f7fa2 24568b47

arch/x86/crypto/aegis128-aesni-glue.c

+0 −1
Original line number Diff line number Diff line
@@ -379,7 +379,6 @@ static int __init crypto_aegis128_aesni_module_init(void) 
{

	if (!boot_cpu_has(X86_FEATURE_XMM2) ||

	    !boot_cpu_has(X86_FEATURE_AES) ||

	    !boot_cpu_has(X86_FEATURE_OSXSAVE) ||

	    !cpu_has_xfeatures(XFEATURE_MASK_SSE, NULL))

		return -ENODEV;

arch/x86/crypto/aegis128l-aesni-glue.c

+0 −1
Original line number Diff line number Diff line
@@ -379,7 +379,6 @@ static int __init crypto_aegis128l_aesni_module_init(void) 
{

	if (!boot_cpu_has(X86_FEATURE_XMM2) ||

	    !boot_cpu_has(X86_FEATURE_AES) ||

	    !boot_cpu_has(X86_FEATURE_OSXSAVE) ||

	    !cpu_has_xfeatures(XFEATURE_MASK_SSE, NULL))

		return -ENODEV;

arch/x86/crypto/aegis256-aesni-glue.c

+0 −1
Original line number Diff line number Diff line
@@ -379,7 +379,6 @@ static int __init crypto_aegis256_aesni_module_init(void) 
{

	if (!boot_cpu_has(X86_FEATURE_XMM2) ||

	    !boot_cpu_has(X86_FEATURE_AES) ||

	    !boot_cpu_has(X86_FEATURE_OSXSAVE) ||

	    !cpu_has_xfeatures(XFEATURE_MASK_SSE, NULL))

		return -ENODEV;

arch/x86/crypto/morus1280-sse2-glue.c

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ MORUS1280_DECLARE_ALGS(sse2, "morus1280-sse2", 350); 
static int __init crypto_morus1280_sse2_module_init(void)

{

	if (!boot_cpu_has(X86_FEATURE_XMM2) ||

	    !boot_cpu_has(X86_FEATURE_OSXSAVE) ||

	    !cpu_has_xfeatures(XFEATURE_MASK_SSE, NULL))

		return -ENODEV;

arch/x86/crypto/morus640-sse2-glue.c

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ MORUS640_DECLARE_ALGS(sse2, "morus640-sse2", 400); 
static int __init crypto_morus640_sse2_module_init(void)

{

	if (!boot_cpu_has(X86_FEATURE_XMM2) ||

	    !boot_cpu_has(X86_FEATURE_OSXSAVE) ||

	    !cpu_has_xfeatures(XFEATURE_MASK_SSE, NULL))

		return -ENODEV;