From: Greg Kroah-Hartman Date: Wed, 22 Jun 2016 05:09:53 +0000 (-0700) Subject: 4.4-stable patches X-Git-Tag: v3.14.73~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ba849f394d6379df9caa824574f4387d22a94cda;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: crypto-qat-fix-adf_ctl_drv.c-undefined-reference-to-adf_init_pf_wq.patch --- diff --git a/queue-4.4/crypto-qat-fix-adf_ctl_drv.c-undefined-reference-to-adf_init_pf_wq.patch b/queue-4.4/crypto-qat-fix-adf_ctl_drv.c-undefined-reference-to-adf_init_pf_wq.patch new file mode 100644 index 00000000000..20a8bf5e7b1 --- /dev/null +++ b/queue-4.4/crypto-qat-fix-adf_ctl_drv.c-undefined-reference-to-adf_init_pf_wq.patch @@ -0,0 +1,55 @@ +From 6dc5df71ee5c8b44607928bfe27be50314dcf848 Mon Sep 17 00:00:00 2001 +From: Tadeusz Struk +Date: Fri, 29 Apr 2016 10:43:40 -0700 +Subject: crypto: qat - fix adf_ctl_drv.c:undefined reference to adf_init_pf_wq + +From: Tadeusz Struk + +commit 6dc5df71ee5c8b44607928bfe27be50314dcf848 upstream. + +Fix undefined reference issue reported by kbuild test robot. + +Reported-by: kbuild test robot +Signed-off-by: Tadeusz Struk +Signed-off-by: Herbert Xu +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/crypto/qat/qat_common/adf_common_drv.h | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +--- a/drivers/crypto/qat/qat_common/adf_common_drv.h ++++ b/drivers/crypto/qat/qat_common/adf_common_drv.h +@@ -108,6 +108,8 @@ void adf_dev_shutdown(struct adf_accel_d + + void adf_enable_pf2vf_interrupts(struct adf_accel_dev *accel_dev); + void adf_disable_pf2vf_interrupts(struct adf_accel_dev *accel_dev); ++int adf_init_pf_wq(void); ++void adf_exit_pf_wq(void); + int adf_iov_putmsg(struct adf_accel_dev *accel_dev, u32 msg, u8 vf_nr); + void adf_pf2vf_notify_restarting(struct adf_accel_dev *accel_dev); + int adf_enable_vf2pf_comms(struct adf_accel_dev *accel_dev); +@@ -145,8 +147,6 @@ int adf_enable_aer(struct adf_accel_dev + void adf_disable_aer(struct adf_accel_dev *accel_dev); + int adf_init_aer(void); + void adf_exit_aer(void); +-int adf_init_pf_wq(void); +-void adf_exit_pf_wq(void); + int adf_init_admin_comms(struct adf_accel_dev *accel_dev); + void adf_exit_admin_comms(struct adf_accel_dev *accel_dev); + int adf_send_admin_init(struct adf_accel_dev *accel_dev); +@@ -238,5 +238,14 @@ static inline int adf_sriov_configure(st + static inline void adf_disable_sriov(struct adf_accel_dev *accel_dev) + { + } ++ ++static inline int adf_init_pf_wq(void) ++{ ++ return 0; ++} ++ ++static inline void adf_exit_pf_wq(void) ++{ ++} + #endif + #endif diff --git a/queue-4.4/series b/queue-4.4/series index 75147439c38..8500a0cb1b5 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -61,3 +61,4 @@ mips-fix-64k-page-support-for-32-bit-kernels.patch netfilter-x_tables-validate-e-target_offset-early.patch netfilter-x_tables-make-sure-e-next_offset-covers-remaining-blob-size.patch netfilter-x_tables-fix-unconditional-helper.patch +crypto-qat-fix-adf_ctl_drv.c-undefined-reference-to-adf_init_pf_wq.patch