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

Pull crypto updates from Herbert Xu:
 "Here is the crypto update for 4.14:

  API:
   - Defer scompress scratch buffer allocation to first use.
   - Add __crypto_xor that takes separte src and dst operands.
   - Add ahash multiple registration interface.
   - Revamped aead/skcipher algif code to fix async IO properly.

  Drivers:
   - Add non-SIMD fallback code path on ARM for SVE.
   - Add AMD Security Processor framework for ccp.
   - Add support for RSA in ccp.
   - Add XTS-AES-256 support for CCP version 5.
   - Add support for PRNG in sun4i-ss.
   - Add support for DPAA2 in caam.
   - Add ARTPEC crypto support.
   - Add Freescale RNGC hwrng support.
   - Add Microchip / Atmel ECC driver.
   - Add support for STM32 HASH module"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (116 commits)
  crypto: af_alg - get_page upon reassignment to TX SGL
  crypto: cavium/nitrox - Fix an error handling path in 'nitrox_probe()'
  crypto: inside-secure - fix an error handling path in safexcel_probe()
  crypto: rockchip - Don't dequeue the request when device is busy
  crypto: cavium - add release_firmware to all return case
  crypto: sahara - constify platform_device_id
  MAINTAINERS: Add ARTPEC crypto maintainer
  crypto: axis - add ARTPEC-6/7 crypto accelerator driver
  crypto: hash - add crypto_(un)register_ahashes()
  dt-bindings: crypto: add ARTPEC crypto
  crypto: algif_aead - fix comment regarding memory layout
  crypto: ccp - use dma_mapping_error to check map error
  lib/mpi: fix build with clang
  crypto: sahara - Remove leftover from previous used spinlock
  crypto: sahara - Fix dma unmap direction
  crypto: af_alg - consolidation of duplicate code
  crypto: caam - Remove unused dentry members
  crypto: ccp - select CONFIG_CRYPTO_RSA
  crypto: ccp - avoid uninitialized variable warning
  crypto: serpent - improve __serpent_setkey with UBSAN
  ...

1 files changed, 12 insertions, 12 deletions

diff --git a/lib/mpi/longlong.h b/lib/mpi/longlong.h
index 93336502af08..57fd45ab7af1 100644
--- a/lib/mpi/longlong.h
+++ b/lib/mpi/longlong.h
@@ -176,8 +176,8 @@ extern UDItype __udiv_qrnnd(UDItype *, UDItype, UDItype, UDItype);
 #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
         __asm__ ("adds %1, %4, %5\n" \
                 "adc  %0, %2, %3" \
-        : "=r" ((USItype)(sh)), \
-                "=&r" ((USItype)(sl)) \
+        : "=r" (sh), \
+                "=&r" (sl) \
         : "%r" ((USItype)(ah)), \
                 "rI" ((USItype)(bh)), \
                 "%r" ((USItype)(al)), \
@@ -185,15 +185,15 @@ extern UDItype __udiv_qrnnd(UDItype *, UDItype, UDItype, UDItype);
 #define sub_ddmmss(sh, sl, ah, al, bh, bl) \
         __asm__ ("subs %1, %4, %5\n" \
                 "sbc  %0, %2, %3" \
-        : "=r" ((USItype)(sh)), \
-                "=&r" ((USItype)(sl)) \
+        : "=r" (sh), \
+                "=&r" (sl) \
         : "r" ((USItype)(ah)), \
                 "rI" ((USItype)(bh)), \
                 "r" ((USItype)(al)), \
                 "rI" ((USItype)(bl)))
 #if defined __ARM_ARCH_2__ || defined __ARM_ARCH_3__
 #define umul_ppmm(xh, xl, a, b) \
-        __asm__ ("%@ Inlined umul_ppmm\n" \
+        __asm__ ("@ Inlined umul_ppmm\n" \
                 "mov    %|r0, %2, lsr #16               @ AAAA\n" \
                 "mov    %|r2, %3, lsr #16               @ BBBB\n" \
                 "bic    %|r1, %2, %|r0, lsl #16         @ aaaa\n" \
@@ -206,19 +206,19 @@ extern UDItype __udiv_qrnnd(UDItype *, UDItype, UDItype, UDItype);
                 "addcs  %|r2, %|r2, #65536\n" \
                 "adds   %1, %|r1, %|r0, lsl #16\n" \
                 "adc    %0, %|r2, %|r0, lsr #16" \
-        : "=&r" ((USItype)(xh)), \
-                "=r" ((USItype)(xl)) \
+        : "=&r" (xh), \
+                "=r" (xl) \
         : "r" ((USItype)(a)), \
                 "r" ((USItype)(b)) \
         : "r0", "r1", "r2")
 #else
 #define umul_ppmm(xh, xl, a, b) \
-        __asm__ ("%@ Inlined umul_ppmm\n" \
-                "umull %r1, %r0, %r2, %r3" \
-        : "=&r" ((USItype)(xh)), \
-                        "=&r" ((USItype)(xl)) \
+        __asm__ ("@ Inlined umul_ppmm\n" \
+                "umull %1, %0, %2, %3" \
+        : "=&r" (xh), \
+                "=&r" (xl) \
         : "r" ((USItype)(a)), \
-                        "r" ((USItype)(b)) \
+                "r" ((USItype)(b)) \
         : "r0", "r1")
 #endif
 #define UMUL_TIME 20