Merge back intel_pstate fixes for v4.6.

[deliverable/linux.git] / arch / x86 / crypto / camellia-aesni-avx2-asm_64.S

diff --git a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
index 0e0b8863a34bd168c618941407b2890c385a442d..16186c18656dfdc67fc7433a48dcc51ee62d9bea 100644 (file)
--- a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
+++ b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
@@ -11,6 +11,7 @@
  */
 
 #include <linux/linkage.h>
+#include <asm/frame.h>
 
 #define CAMELLIA_TABLE_BYTE_LEN 272
 
@@ -766,6 +767,7 @@ __camellia_enc_blk32:
         *      %ymm0..%ymm15: 32 encrypted blocks, order swapped:
         *       7, 8, 6, 5, 4, 3, 2, 1, 0, 15, 14, 13, 12, 11, 10, 9, 8
         */
+       FRAME_BEGIN
 
        leaq 8 * 32(%rax), %rcx;
 
@@ -820,6 +822,7 @@ __camellia_enc_blk32:
                    %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
                    %ymm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 32(%rax));
 
+       FRAME_END
        ret;
 
 .align 8
@@ -852,6 +855,7 @@ __camellia_dec_blk32:
         *      %ymm0..%ymm15: 16 plaintext blocks, order swapped:
         *       7, 8, 6, 5, 4, 3, 2, 1, 0, 15, 14, 13, 12, 11, 10, 9, 8
         */
+       FRAME_BEGIN
 
        leaq 8 * 32(%rax), %rcx;
 
@@ -905,6 +909,7 @@ __camellia_dec_blk32:
                    %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
                    %ymm15, (key_table)(CTX), (%rax), 1 * 32(%rax));
 
+       FRAME_END
        ret;
 
 .align 8
@@ -930,6 +935,7 @@ ENTRY(camellia_ecb_enc_32way)
         *      %rsi: dst (32 blocks)
         *      %rdx: src (32 blocks)
         */
+       FRAME_BEGIN
 
        vzeroupper;
 
@@ -948,6 +954,7 @@ ENTRY(camellia_ecb_enc_32way)
 
        vzeroupper;
 
+       FRAME_END
        ret;
 ENDPROC(camellia_ecb_enc_32way)
 
@@ -957,6 +964,7 @@ ENTRY(camellia_ecb_dec_32way)
         *      %rsi: dst (32 blocks)
         *      %rdx: src (32 blocks)
         */
+       FRAME_BEGIN
 
        vzeroupper;
 
@@ -980,6 +988,7 @@ ENTRY(camellia_ecb_dec_32way)
 
        vzeroupper;
 
+       FRAME_END
        ret;
 ENDPROC(camellia_ecb_dec_32way)
 
@@ -989,6 +998,7 @@ ENTRY(camellia_cbc_dec_32way)
         *      %rsi: dst (32 blocks)
         *      %rdx: src (32 blocks)
         */
+       FRAME_BEGIN
 
        vzeroupper;
 
@@ -1046,6 +1056,7 @@ ENTRY(camellia_cbc_dec_32way)
 
        vzeroupper;
 
+       FRAME_END
        ret;
 ENDPROC(camellia_cbc_dec_32way)
 
@@ -1070,6 +1081,7 @@ ENTRY(camellia_ctr_32way)
         *      %rdx: src (32 blocks)
         *      %rcx: iv (little endian, 128bit)
         */
+       FRAME_BEGIN
 
        vzeroupper;
 
@@ -1184,6 +1196,7 @@ ENTRY(camellia_ctr_32way)
 
        vzeroupper;
 
+       FRAME_END
        ret;
 ENDPROC(camellia_ctr_32way)
 
@@ -1216,6 +1229,7 @@ camellia_xts_crypt_32way:
         *      %r8: index for input whitening key
         *      %r9: pointer to  __camellia_enc_blk32 or __camellia_dec_blk32
         */
+       FRAME_BEGIN
 
        vzeroupper;
 
@@ -1349,6 +1363,7 @@ camellia_xts_crypt_32way:
 
        vzeroupper;
 
+       FRAME_END
        ret;
 ENDPROC(camellia_xts_crypt_32way)