diff options
Diffstat (limited to 'libre/linux-libre-lts/gcc5_buildfixes.diff')
-rw-r--r-- | libre/linux-libre-lts/gcc5_buildfixes.diff | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/libre/linux-libre-lts/gcc5_buildfixes.diff b/libre/linux-libre-lts/gcc5_buildfixes.diff index f29d60674..e8a85b055 100644 --- a/libre/linux-libre-lts/gcc5_buildfixes.diff +++ b/libre/linux-libre-lts/gcc5_buildfixes.diff @@ -1,69 +1,3 @@ -From 9493c2422cae272d6f1f567cbb424195defe4176 Mon Sep 17 00:00:00 2001 -From: Chen Gang <gang.chen.5i5j@gmail.com> -Date: Sat, 1 Nov 2014 19:46:12 +0800 -Subject: qla2xxx: remove redundant declaration in 'qla_gbl.h' - -Remove 2 redundant extern inline functions: qla8044_set_qsnt_ready() and -qla8044_need_reset_handler(). At present, within upstream next kernel -source code, they are only used within "drivers/scsi/qla2xxx/qla_nx2.c". - -The related error and warnings (with allmodconfig under tile): - - CC [M] drivers/scsi/qla2xxx/qla_nx2.o - drivers/scsi/qla2xxx/qla_nx2.c:1633:1: error: static declaration of 'qla8044_need_reset_handler' follows non-static declaration - qla8044_need_reset_handler(struct scsi_qla_host *vha) - ^ - In file included from drivers/scsi/qla2xxx/qla_def.h:3706:0, - from drivers/scsi/qla2xxx/qla_nx2.c:11: - drivers/scsi/qla2xxx/qla_gbl.h:756:20: note: previous declaration of 'qla8044_need_reset_handler' was here - extern inline void qla8044_need_reset_handler(struct scsi_qla_host *vha); - ^ - drivers/scsi/qla2xxx/qla_gbl.h:756:20: warning: inline function 'qla8044_need_reset_handler' declared but never defined - make[3]: *** [drivers/scsi/qla2xxx/qla_nx2.o] Error 1 - make[2]: *** [drivers/scsi/qla2xxx] Error 2 - make[1]: *** [drivers/scsi] Error 2 - make: *** [drivers] Error 2 - - CC [M] drivers/scsi/qla2xxx/qla_tmpl.o - In file included from drivers/scsi/qla2xxx/qla_def.h:3706:0, - from drivers/scsi/qla2xxx/qla_tmpl.c:7: - drivers/scsi/qla2xxx/qla_gbl.h:755:20: warning: inline function 'qla8044_set_qsnt_ready' declared but never defined - extern inline void qla8044_set_qsnt_ready(struct scsi_qla_host *vha); - ^ - -Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com> -Acked-by: Saurav Kashyap <saurav.kashyap@qlogic.com> -Signed-off-by: Christoph Hellwig <hch@lst.de> - -diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h -index b1865a7..7686bfe 100644 ---- a/drivers/scsi/qla2xxx/qla_gbl.h -+++ b/drivers/scsi/qla2xxx/qla_gbl.h -@@ -752,8 +752,6 @@ extern void qla8044_set_idc_dontreset(struct scsi_qla_host *ha); - extern int qla8044_rd_direct(struct scsi_qla_host *vha, const uint32_t crb_reg); - extern void qla8044_wr_direct(struct scsi_qla_host *vha, - const uint32_t crb_reg, const uint32_t value); --extern inline void qla8044_set_qsnt_ready(struct scsi_qla_host *vha); --extern inline void qla8044_need_reset_handler(struct scsi_qla_host *vha); - extern int qla8044_device_state_handler(struct scsi_qla_host *vha); - extern void qla8044_clear_qsnt_ready(struct scsi_qla_host *vha); - extern void qla8044_clear_drv_active(struct qla_hw_data *); -diff --git a/drivers/scsi/qla2xxx/qla_nx2.c b/drivers/scsi/qla2xxx/qla_nx2.c -index 24a8528..ed4d6b6 100644 ---- a/drivers/scsi/qla2xxx/qla_nx2.c -+++ b/drivers/scsi/qla2xxx/qla_nx2.c -@@ -238,7 +238,7 @@ qla8044_rmw_crb_reg(struct scsi_qla_host *vha, - return; - } - --inline void -+static inline void - qla8044_set_qsnt_ready(struct scsi_qla_host *vha) - { - uint32_t qsnt_state; --- -cgit v0.10.2 - diff --git a/lib/mpi/mpi-inline.h b/lib/mpi/mpi-inline.h index e2b3985..c245ea3 100644 --- a/lib/mpi/mpi-inline.h |