From e09b41010ba33a20a87472ee821fa407a5b8da36 Mon Sep 17 00:00:00 2001 From: José Pekkarinen Date: Mon, 11 Apr 2016 10:41:07 +0300 Subject: These changes are the raw update to linux-4.4.6-rt14. Kernel sources are taken from kernel.org, and rt patch from the rt wiki download page. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit During the rebasing, the following patch collided: Force tick interrupt and get rid of softirq magic(I70131fb85). Collisions have been removed because its logic was found on the source already. Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769 Signed-off-by: José Pekkarinen --- kernel/drivers/crypto/qat/qat_common/adf_cfg_user.h | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'kernel/drivers/crypto/qat/qat_common/adf_cfg_user.h') diff --git a/kernel/drivers/crypto/qat/qat_common/adf_cfg_user.h b/kernel/drivers/crypto/qat/qat_common/adf_cfg_user.h index 0c38a155a..ef5988afd 100644 --- a/kernel/drivers/crypto/qat/qat_common/adf_cfg_user.h +++ b/kernel/drivers/crypto/qat/qat_common/adf_cfg_user.h @@ -53,14 +53,6 @@ struct adf_user_cfg_key_val { char key[ADF_CFG_MAX_KEY_LEN_IN_BYTES]; char val[ADF_CFG_MAX_VAL_LEN_IN_BYTES]; - union { - char *user_val_ptr; - uint64_t padding1; - }; - union { - struct adf_user_cfg_key_val *prev; - uint64_t padding2; - }; union { struct adf_user_cfg_key_val *next; uint64_t padding3; @@ -74,10 +66,6 @@ struct adf_user_cfg_section { struct adf_user_cfg_key_val *params; uint64_t padding1; }; - union { - struct adf_user_cfg_section *prev; - uint64_t padding2; - }; union { struct adf_user_cfg_section *next; uint64_t padding3; -- cgit 1.2.3-korg