Merge tag 'x86_tdx_for_6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

[linux-block.git] / arch / x86 / kernel / asm-offsets.c

diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
index 8650f29387e07540e5fce28498a12c25204fe191..283dcd2f62c8f7a10896346795a82ccd8411d233 100644 (file)
--- a/arch/x86/kernel/asm-offsets.c
+++ b/arch/x86/kernel/asm-offsets.c
@@ -7,6 +7,7 @@
 #define COMPILE_OFFSETS
 
 #include <linux/crypto.h>
+#include <crypto/aria.h>
 #include <linux/sched.h>
 #include <linux/stddef.h>
 #include <linux/hardirq.h>
@@ -117,5 +118,12 @@ static void __used common(void)
 #ifdef CONFIG_CALL_DEPTH_TRACKING
        OFFSET(X86_call_depth, pcpu_hot, call_depth);
 #endif
+#if IS_ENABLED(CONFIG_CRYPTO_ARIA_AESNI_AVX_X86_64)
+       /* Offset for fields in aria_ctx */
+       BLANK();
+       OFFSET(ARIA_CTX_enc_key, aria_ctx, enc_key);
+       OFFSET(ARIA_CTX_dec_key, aria_ctx, dec_key);
+       OFFSET(ARIA_CTX_rounds, aria_ctx, rounds);
+#endif
 
 }