linux-libre-lts-grsec{,-knock}-3.14.41_gnu.201505072056-1: updating version

* build with testing gcc-5; apply some upstream fixes for gcc-5 related build problems, disable a few modules that are not trivial to fix and where no simple upstream fix is available

10 files changed, 302 insertions, 56 deletions

diff --git a/kernels/linux-libre-lts-grsec-knock/PKGBUILD b/kernels/linux-libre-lts-grsec-knock/PKGBUILD
index 532ae5978..a39f4519d 100644
--- a/kernels/linux-libre-lts-grsec-knock/PKGBUILD
+++ b/kernels/linux-libre-lts-grsec-knock/PKGBUILD
@@ -12,9 +12,9 @@
 
 pkgbase=linux-libre-lts-grsec-knock   # Build kernel with lts-grsec-knock localname
 _pkgbasever=3.14-gnu
-_pkgver=3.14.40-gnu
+_pkgver=3.14.41-gnu
 _grsecver=3.1
-_timestamp=201505042052
+_timestamp=201505072056
 _knockpatchver=3.16_1
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
@@ -48,20 +48,21 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
         '0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch'
         '0003-module-remove-MODULE_GENERIC_TABLE.patch'
         '0006-genksyms-fix-typeof-handling.patch'
+        'gcc5_buildfixes.diff'
         # loongson-community patch: http://linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/
         # Note: Makefile patching was removed due which we are using specific flags from grsecurity patch
         '3.14.26-8475f027b4-loongson-community.patch')
 sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b'
             'SKIP'
-            'ce132b3c3e72019cea2ab9bf5cb11871531ee60f06157e9ed8edf2115fa07693'
+            '120e97db433d48fb6d099497baa0da5b335eeb5ec48882a5c6911e93b6b08781'
             'SKIP'
-            'bae8bf071ca130e4366fa5cb2f5c0d5170030f8d070dade9ede420a3f6e3be47'
+            '6f826daae44d21c2a993bab1eda741014480392542095c81ec55d660fc30f1b9'
             'SKIP'
             '70cbe962aa01989ffa83490bb0765d6e4c781f6133dc8d768d84bd6716ac0209'
             'SKIP'
-            '42d076a21fde98f17f26d07f66b2739a03c869bdf13d06f45815358579927f4a'
-            '101b135fc9e76b638cd755c293eb0a6d4fad46f27af11e0f8fe5e69671544ac9'
-            '6b38e89f69076203532635eff73741179219ff92e0f9c3359fe73c48d265ee93'
+            'f8f419c5163ba0121a1321049352a5efdf1e872656fcf1d0df03e90e226e5e18'
+            '1a492d913eca774e5885059ddf712a888e10fb2fff4013c117dd744f08438a9e'
+            '2ea3b6d526adedc0eb39be030c9f4e2efa37bff67e495044527d3b978f5784c0'
             'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
             'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494'
             '6de8a8319271809ffdb072b68d53d155eef12438e6d04ff06a5a4db82c34fa8a'
@@ -71,6 +72,7 @@ sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b'
             '52dec83a8805a8642d74d764494acda863e0aa23e3d249e80d4b457e20a3fd29'
             '65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d'
             'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7'
+            '470d6d019d288dce02b4a9758a34ea71d41715663a19a164749212a470a131e7'
             '4637b23fc0cb21520c9da612cd39c38a52bd00c80778e39110fc2e72118f9c10')
 validpgpkeys=(
               '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
@@ -107,6 +109,12 @@ prepare() {
   install -m644 -t drivers/video/logo \
     "${srcdir}/logo_linux_"{clut224.ppm,vga16.ppm,mono.pbm}
 
+  # buildfixes for gcc5
+  # https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/drivers/scsi/qla2xxx/qla_nx2.c?id=9493c2422cae272d6f1f567cbb424195defe4176
+  # https://lkml.org/lkml/2014/11/9/27
+  # https://lkml.org/lkml/2014/12/14/55
+  patch -p1 -i "${srcdir}/gcc5_buildfixes.diff"
+
   # add latest fixes from stable queue, if needed
   # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
 
diff --git a/kernels/linux-libre-lts-grsec-knock/config.i686 b/kernels/linux-libre-lts-grsec-knock/config.i686
index 728526083..520527123 100644
--- a/kernels/linux-libre-lts-grsec-knock/config.i686
+++ b/kernels/linux-libre-lts-grsec-knock/config.i686
@@ -1857,7 +1857,7 @@ CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_SAS=m
+# CONFIG_MEGARAID_SAS is not set
 CONFIG_SCSI_MPT2SAS=m
 CONFIG_SCSI_MPT2SAS_MAX_SGE=128
 # CONFIG_SCSI_MPT2SAS_LOGGING is not set
@@ -5616,21 +5616,21 @@ CONFIG_FB_OLPC_DCON=m
 CONFIG_FB_OLPC_DCON_1=y
 CONFIG_FB_OLPC_DCON_1_5=y
 # CONFIG_PANEL is not set
-CONFIG_R8187SE=m
+# CONFIG_R8187SE is not set
 CONFIG_RTL8192U=m
 CONFIG_RTLLIB=m
 CONFIG_RTLLIB_CRYPTO_CCMP=m
 CONFIG_RTLLIB_CRYPTO_TKIP=m
 CONFIG_RTLLIB_CRYPTO_WEP=m
-CONFIG_RTL8192E=m
-CONFIG_R8712U=m
+# CONFIG_RTL8192E is not set
+# CONFIG_R8712U is not set
 CONFIG_R8188EU=m
 CONFIG_88EU_AP_MODE=y
 CONFIG_88EU_P2P=y
 CONFIG_R8821AE=m
 CONFIG_RTS5139=m
 # CONFIG_RTS5139_DEBUG is not set
-CONFIG_RTS5208=m
+# CONFIG_RTS5208 is not set
 # CONFIG_RTS5208_DEBUG is not set
 # CONFIG_TRANZPORT is not set
 CONFIG_IDE_PHISON=m
@@ -5640,8 +5640,8 @@ CONFIG_USB_SERIAL_QUATECH2=m
 CONFIG_VT6655=m
 CONFIG_VT6656=m
 CONFIG_DX_SEP=m
-CONFIG_WLAGS49_H2=m
-CONFIG_WLAGS49_H25=m
+# CONFIG_WLAGS49_H2 is not set
+# CONFIG_WLAGS49_H25 is not set
 CONFIG_FB_SM7XX=m
 CONFIG_CRYSTALHD=m
 CONFIG_FB_XGI=m
diff --git a/kernels/linux-libre-lts-grsec-knock/config.mips64el b/kernels/linux-libre-lts-grsec-knock/config.mips64el
index c240319cb..9f9d324c7 100644
--- a/kernels/linux-libre-lts-grsec-knock/config.mips64el
+++ b/kernels/linux-libre-lts-grsec-knock/config.mips64el
@@ -1602,7 +1602,7 @@ CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_SAS=m
+# CONFIG_MEGARAID_SAS is not set
 CONFIG_SCSI_MPT2SAS=m
 CONFIG_SCSI_MPT2SAS_MAX_SGE=128
 # CONFIG_SCSI_MPT2SAS_LOGGING is not set
@@ -5049,21 +5049,21 @@ CONFIG_COMEDI_DAS08=m
 CONFIG_COMEDI_NI_LABPC=m
 CONFIG_COMEDI_NI_TIO=m
 # CONFIG_PANEL is not set
-CONFIG_R8187SE=m
+# CONFIG_R8187SE is not set
 CONFIG_RTL8192U=m
 CONFIG_RTLLIB=m
 CONFIG_RTLLIB_CRYPTO_CCMP=m
 CONFIG_RTLLIB_CRYPTO_TKIP=m
 CONFIG_RTLLIB_CRYPTO_WEP=m
-CONFIG_RTL8192E=m
-CONFIG_R8712U=m
+# CONFIG_RTL8192E is not set
+# CONFIG_R8712U is not set
 CONFIG_R8188EU=m
 CONFIG_88EU_AP_MODE=y
 CONFIG_88EU_P2P=y
 CONFIG_R8821AE=m
 CONFIG_RTS5139=m
 # CONFIG_RTS5139_DEBUG is not set
-CONFIG_RTS5208=m
+# CONFIG_RTS5208 is not set
 # CONFIG_RTS5208_DEBUG is not set
 # CONFIG_TRANZPORT is not set
 CONFIG_IDE_PHISON=m
@@ -5073,8 +5073,8 @@ CONFIG_USB_SERIAL_QUATECH2=m
 CONFIG_VT6655=m
 CONFIG_VT6656=m
 CONFIG_DX_SEP=m
-CONFIG_WLAGS49_H2=m
-CONFIG_WLAGS49_H25=m
+# CONFIG_WLAGS49_H2 is not set
+# CONFIG_WLAGS49_H25 is not set
 CONFIG_FB_SM7XX=m
 CONFIG_CRYSTALHD=m
 CONFIG_FB_XGI=m
diff --git a/kernels/linux-libre-lts-grsec-knock/config.x86_64 b/kernels/linux-libre-lts-grsec-knock/config.x86_64
index 65e9ad41f..1e665bfd6 100644
--- a/kernels/linux-libre-lts-grsec-knock/config.x86_64
+++ b/kernels/linux-libre-lts-grsec-knock/config.x86_64
@@ -1814,7 +1814,7 @@ CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_SAS=m
+# CONFIG_MEGARAID_SAS is not set
 CONFIG_SCSI_MPT2SAS=m
 CONFIG_SCSI_MPT2SAS_MAX_SGE=128
 # CONFIG_SCSI_MPT2SAS_LOGGING is not set
@@ -5367,21 +5367,21 @@ CONFIG_COMEDI_DAS08=m
 CONFIG_COMEDI_NI_LABPC=m
 CONFIG_COMEDI_NI_TIO=m
 # CONFIG_PANEL is not set
-CONFIG_R8187SE=m
+# CONFIG_R8187SE is not set
 CONFIG_RTL8192U=m
 CONFIG_RTLLIB=m
 CONFIG_RTLLIB_CRYPTO_CCMP=m
 CONFIG_RTLLIB_CRYPTO_TKIP=m
 CONFIG_RTLLIB_CRYPTO_WEP=m
-CONFIG_RTL8192E=m
-CONFIG_R8712U=m
+# CONFIG_RTL8192E is not set
+# CONFIG_R8712U is not set
 CONFIG_R8188EU=m
 CONFIG_88EU_AP_MODE=y
 CONFIG_88EU_P2P=y
 CONFIG_R8821AE=m
 CONFIG_RTS5139=m
 # CONFIG_RTS5139_DEBUG is not set
-CONFIG_RTS5208=m
+# CONFIG_RTS5208 is not set
 # CONFIG_RTS5208_DEBUG is not set
 # CONFIG_TRANZPORT is not set
 CONFIG_IDE_PHISON=m
@@ -5391,8 +5391,8 @@ CONFIG_USB_SERIAL_QUATECH2=m
 CONFIG_VT6655=m
 CONFIG_VT6656=m
 CONFIG_DX_SEP=m
-CONFIG_WLAGS49_H2=m
-CONFIG_WLAGS49_H25=m
+# CONFIG_WLAGS49_H2 is not set
+# CONFIG_WLAGS49_H25 is not set
 CONFIG_FB_SM7XX=m
 CONFIG_CRYSTALHD=m
 CONFIG_FB_XGI=m
diff --git a/kernels/linux-libre-lts-grsec-knock/gcc5_buildfixes.diff b/kernels/linux-libre-lts-grsec-knock/gcc5_buildfixes.diff
new file mode 100644
index 000000000..f29d60674
--- /dev/null
+++ b/kernels/linux-libre-lts-grsec-knock/gcc5_buildfixes.diff
@@ -0,0 +1,115 @@
+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
++++ b/lib/mpi/mpi-inline.h
+@@ -30,7 +30,7 @@
+ #define G10_MPI_INLINE_H
+ 
+ #ifndef G10_MPI_INLINE_DECL
+-#define G10_MPI_INLINE_DECL  extern inline
++#define G10_MPI_INLINE_DECL  static inline
+ #endif
+ 
+ G10_MPI_INLINE_DECL mpi_limb_t
+diff --git a/lib/mpi/mpi-internal.h b/lib/mpi/mpi-internal.h
+index 60cf765..91ef8ac 100644
+--- a/lib/mpi/mpi-internal.h
++++ b/lib/mpi/mpi-internal.h
+@@ -168,20 +168,24 @@ void mpi_rshift_limbs(MPI a, unsigned int count);
+ int mpi_lshift_limbs(MPI a, unsigned int count);
+ 
+ /*-- mpihelp-add.c --*/
++#ifndef __GNUC__
+ mpi_limb_t mpihelp_add_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+ 			 mpi_size_t s1_size, mpi_limb_t s2_limb);
+-mpi_limb_t mpihelp_add_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+-			 mpi_ptr_t s2_ptr, mpi_size_t size);
+ mpi_limb_t mpihelp_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
+ 		       mpi_ptr_t s2_ptr, mpi_size_t s2_size);
++#endif
++mpi_limb_t mpihelp_add_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
++			 mpi_ptr_t s2_ptr, mpi_size_t size);
+ 
+ /*-- mpihelp-sub.c --*/
++#ifndef __GNUC__
+ mpi_limb_t mpihelp_sub_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+ 			 mpi_size_t s1_size, mpi_limb_t s2_limb);
+-mpi_limb_t mpihelp_sub_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+-			 mpi_ptr_t s2_ptr, mpi_size_t size);
+ mpi_limb_t mpihelp_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
+ 		       mpi_ptr_t s2_ptr, mpi_size_t s2_size);
++#endif
++mpi_limb_t mpihelp_sub_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
++			 mpi_ptr_t s2_ptr, mpi_size_t size);
+ 
+ /*-- mpihelp-cmp.c --*/
+ int mpihelp_cmp(mpi_ptr_t op1_ptr, mpi_ptr_t op2_ptr, mpi_size_t size);
+-- 
+1.9.3
+
diff --git a/kernels/linux-libre-lts-grsec/PKGBUILD b/kernels/linux-libre-lts-grsec/PKGBUILD
index 4520d0bb2..03c1f5269 100644
--- a/kernels/linux-libre-lts-grsec/PKGBUILD
+++ b/kernels/linux-libre-lts-grsec/PKGBUILD
@@ -12,9 +12,9 @@
 
 pkgbase=linux-libre-lts-grsec   # Build kernel with lts-grsec localname
 _pkgbasever=3.14-gnu
-_pkgver=3.14.40-gnu
+_pkgver=3.14.41-gnu
 _grsecver=3.1
-_timestamp=201505042052
+_timestamp=201505072056
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
 _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname
@@ -45,18 +45,19 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
         '0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch'
         '0003-module-remove-MODULE_GENERIC_TABLE.patch'
         '0006-genksyms-fix-typeof-handling.patch'
+        'gcc5_buildfixes.diff'
         # loongson-community patch: http://linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/
         # Note: Makefile patching was removed due which we are using specific flags from grsecurity patch
         '3.14.26-8475f027b4-loongson-community.patch')
 sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b'
             'SKIP'
-            'ce132b3c3e72019cea2ab9bf5cb11871531ee60f06157e9ed8edf2115fa07693'
+            '120e97db433d48fb6d099497baa0da5b335eeb5ec48882a5c6911e93b6b08781'
             'SKIP'
-            'bae8bf071ca130e4366fa5cb2f5c0d5170030f8d070dade9ede420a3f6e3be47'
+            '6f826daae44d21c2a993bab1eda741014480392542095c81ec55d660fc30f1b9'
             'SKIP'
-            'd8d02e727bd240e15cbd61227a128babda150cfb1d2329d4206ff99071817884'
-            '2efe40d528f669e9d82f43ea77727d666dafb2529faa2e9df3eb05657dc4ae9f'
-            '67bb5beb5414b9e9c3c03d800bb0fa2dd95225529ea8c89955619a46c4272e10'
+            '3758c3c26491cbbea0a096724a8f54ac246188b1c8e86a3dbe91ac1d23708d3e'
+            '07447a3299fcd730a17ca5f1ef6e18983e4843b167e65eca0ab479adf64d60c2'
+            'c7863a24550dd068b86b50f74a3a2503289419503d460e526164ea6c246bd443'
             'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
             'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494'
             '6de8a8319271809ffdb072b68d53d155eef12438e6d04ff06a5a4db82c34fa8a'
@@ -66,6 +67,7 @@ sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b'
             '52dec83a8805a8642d74d764494acda863e0aa23e3d249e80d4b457e20a3fd29'
             '65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d'
             'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7'
+            '470d6d019d288dce02b4a9758a34ea71d41715663a19a164749212a470a131e7'
             '4637b23fc0cb21520c9da612cd39c38a52bd00c80778e39110fc2e72118f9c10')
 validpgpkeys=(
               '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
@@ -98,6 +100,12 @@ prepare() {
   install -m644 -t drivers/video/logo \
     "${srcdir}/logo_linux_"{clut224.ppm,vga16.ppm,mono.pbm}
 
+  # buildfixes for gcc5
+  # https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/drivers/scsi/qla2xxx/qla_nx2.c?id=9493c2422cae272d6f1f567cbb424195defe4176
+  # https://lkml.org/lkml/2014/11/9/27
+  # https://lkml.org/lkml/2014/12/14/55
+  patch -p1 -i "${srcdir}/gcc5_buildfixes.diff"
+
   # add latest fixes from stable queue, if needed
   # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
 
diff --git a/kernels/linux-libre-lts-grsec/config.i686 b/kernels/linux-libre-lts-grsec/config.i686
index a351562a1..42f80defb 100644
--- a/kernels/linux-libre-lts-grsec/config.i686
+++ b/kernels/linux-libre-lts-grsec/config.i686
@@ -1856,7 +1856,7 @@ CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_SAS=m
+# CONFIG_MEGARAID_SAS is not set
 CONFIG_SCSI_MPT2SAS=m
 CONFIG_SCSI_MPT2SAS_MAX_SGE=128
 # CONFIG_SCSI_MPT2SAS_LOGGING is not set
@@ -5615,21 +5615,21 @@ CONFIG_FB_OLPC_DCON=m
 CONFIG_FB_OLPC_DCON_1=y
 CONFIG_FB_OLPC_DCON_1_5=y
 # CONFIG_PANEL is not set
-CONFIG_R8187SE=m
+# CONFIG_R8187SE is not set
 CONFIG_RTL8192U=m
 CONFIG_RTLLIB=m
 CONFIG_RTLLIB_CRYPTO_CCMP=m
 CONFIG_RTLLIB_CRYPTO_TKIP=m
 CONFIG_RTLLIB_CRYPTO_WEP=m
-CONFIG_RTL8192E=m
-CONFIG_R8712U=m
+# CONFIG_RTL8192E is not set
+# CONFIG_R8712U is not set
 CONFIG_R8188EU=m
 CONFIG_88EU_AP_MODE=y
 CONFIG_88EU_P2P=y
 CONFIG_R8821AE=m
 CONFIG_RTS5139=m
 # CONFIG_RTS5139_DEBUG is not set
-CONFIG_RTS5208=m
+# CONFIG_RTS5208 is not set
 # CONFIG_RTS5208_DEBUG is not set
 # CONFIG_TRANZPORT is not set
 CONFIG_IDE_PHISON=m
@@ -5639,8 +5639,8 @@ CONFIG_USB_SERIAL_QUATECH2=m
 CONFIG_VT6655=m
 CONFIG_VT6656=m
 CONFIG_DX_SEP=m
-CONFIG_WLAGS49_H2=m
-CONFIG_WLAGS49_H25=m
+# CONFIG_WLAGS49_H2 is not set
+# CONFIG_WLAGS49_H25 is not set
 CONFIG_FB_SM7XX=m
 CONFIG_CRYSTALHD=m
 CONFIG_FB_XGI=m
diff --git a/kernels/linux-libre-lts-grsec/config.mips64el b/kernels/linux-libre-lts-grsec/config.mips64el
index 131a21a7d..6e024df2e 100644
--- a/kernels/linux-libre-lts-grsec/config.mips64el
+++ b/kernels/linux-libre-lts-grsec/config.mips64el
@@ -1601,7 +1601,7 @@ CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_SAS=m
+# CONFIG_MEGARAID_SAS is not set
 CONFIG_SCSI_MPT2SAS=m
 CONFIG_SCSI_MPT2SAS_MAX_SGE=128
 # CONFIG_SCSI_MPT2SAS_LOGGING is not set
@@ -5048,21 +5048,21 @@ CONFIG_COMEDI_DAS08=m
 CONFIG_COMEDI_NI_LABPC=m
 CONFIG_COMEDI_NI_TIO=m
 # CONFIG_PANEL is not set
-CONFIG_R8187SE=m
+# CONFIG_R8187SE is not set
 CONFIG_RTL8192U=m
 CONFIG_RTLLIB=m
 CONFIG_RTLLIB_CRYPTO_CCMP=m
 CONFIG_RTLLIB_CRYPTO_TKIP=m
 CONFIG_RTLLIB_CRYPTO_WEP=m
-CONFIG_RTL8192E=m
-CONFIG_R8712U=m
+# CONFIG_RTL8192E is not set
+# CONFIG_R8712U is not set
 CONFIG_R8188EU=m
 CONFIG_88EU_AP_MODE=y
 CONFIG_88EU_P2P=y
 CONFIG_R8821AE=m
 CONFIG_RTS5139=m
 # CONFIG_RTS5139_DEBUG is not set
-CONFIG_RTS5208=m
+# CONFIG_RTS5208 is not set
 # CONFIG_RTS5208_DEBUG is not set
 # CONFIG_TRANZPORT is not set
 CONFIG_IDE_PHISON=m
@@ -5072,8 +5072,8 @@ CONFIG_USB_SERIAL_QUATECH2=m
 CONFIG_VT6655=m
 CONFIG_VT6656=m
 CONFIG_DX_SEP=m
-CONFIG_WLAGS49_H2=m
-CONFIG_WLAGS49_H25=m
+# CONFIG_WLAGS49_H2 is not set
+# CONFIG_WLAGS49_H25 is not set
 CONFIG_FB_SM7XX=m
 CONFIG_CRYSTALHD=m
 CONFIG_FB_XGI=m
diff --git a/kernels/linux-libre-lts-grsec/config.x86_64 b/kernels/linux-libre-lts-grsec/config.x86_64
index 2e0ecaba2..0d7be6238 100644
--- a/kernels/linux-libre-lts-grsec/config.x86_64
+++ b/kernels/linux-libre-lts-grsec/config.x86_64
@@ -1813,7 +1813,7 @@ CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_SAS=m
+# CONFIG_MEGARAID_SAS is not set
 CONFIG_SCSI_MPT2SAS=m
 CONFIG_SCSI_MPT2SAS_MAX_SGE=128
 # CONFIG_SCSI_MPT2SAS_LOGGING is not set
@@ -5366,21 +5366,21 @@ CONFIG_COMEDI_DAS08=m
 CONFIG_COMEDI_NI_LABPC=m
 CONFIG_COMEDI_NI_TIO=m
 # CONFIG_PANEL is not set
-CONFIG_R8187SE=m
+# CONFIG_R8187SE is not set
 CONFIG_RTL8192U=m
 CONFIG_RTLLIB=m
 CONFIG_RTLLIB_CRYPTO_CCMP=m
 CONFIG_RTLLIB_CRYPTO_TKIP=m
 CONFIG_RTLLIB_CRYPTO_WEP=m
-CONFIG_RTL8192E=m
-CONFIG_R8712U=m
+# CONFIG_RTL8192E is not set
+# CONFIG_R8712U is not set
 CONFIG_R8188EU=m
 CONFIG_88EU_AP_MODE=y
 CONFIG_88EU_P2P=y
 CONFIG_R8821AE=m
 CONFIG_RTS5139=m
 # CONFIG_RTS5139_DEBUG is not set
-CONFIG_RTS5208=m
+# CONFIG_RTS5208 is not set
 # CONFIG_RTS5208_DEBUG is not set
 # CONFIG_TRANZPORT is not set
 CONFIG_IDE_PHISON=m
@@ -5390,8 +5390,8 @@ CONFIG_USB_SERIAL_QUATECH2=m
 CONFIG_VT6655=m
 CONFIG_VT6656=m
 CONFIG_DX_SEP=m
-CONFIG_WLAGS49_H2=m
-CONFIG_WLAGS49_H25=m
+# CONFIG_WLAGS49_H2 is not set
+# CONFIG_WLAGS49_H25 is not set
 CONFIG_FB_SM7XX=m
 CONFIG_CRYSTALHD=m
 CONFIG_FB_XGI=m
diff --git a/kernels/linux-libre-lts-grsec/gcc5_buildfixes.diff b/kernels/linux-libre-lts-grsec/gcc5_buildfixes.diff
new file mode 100644
index 000000000..f29d60674
--- /dev/null
+++ b/kernels/linux-libre-lts-grsec/gcc5_buildfixes.diff
@@ -0,0 +1,115 @@
+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
++++ b/lib/mpi/mpi-inline.h
+@@ -30,7 +30,7 @@
+ #define G10_MPI_INLINE_H
+ 
+ #ifndef G10_MPI_INLINE_DECL
+-#define G10_MPI_INLINE_DECL  extern inline
++#define G10_MPI_INLINE_DECL  static inline
+ #endif
+ 
+ G10_MPI_INLINE_DECL mpi_limb_t
+diff --git a/lib/mpi/mpi-internal.h b/lib/mpi/mpi-internal.h
+index 60cf765..91ef8ac 100644
+--- a/lib/mpi/mpi-internal.h
++++ b/lib/mpi/mpi-internal.h
+@@ -168,20 +168,24 @@ void mpi_rshift_limbs(MPI a, unsigned int count);
+ int mpi_lshift_limbs(MPI a, unsigned int count);
+ 
+ /*-- mpihelp-add.c --*/
++#ifndef __GNUC__
+ mpi_limb_t mpihelp_add_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+ 			 mpi_size_t s1_size, mpi_limb_t s2_limb);
+-mpi_limb_t mpihelp_add_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+-			 mpi_ptr_t s2_ptr, mpi_size_t size);
+ mpi_limb_t mpihelp_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
+ 		       mpi_ptr_t s2_ptr, mpi_size_t s2_size);
++#endif
++mpi_limb_t mpihelp_add_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
++			 mpi_ptr_t s2_ptr, mpi_size_t size);
+ 
+ /*-- mpihelp-sub.c --*/
++#ifndef __GNUC__
+ mpi_limb_t mpihelp_sub_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+ 			 mpi_size_t s1_size, mpi_limb_t s2_limb);
+-mpi_limb_t mpihelp_sub_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+-			 mpi_ptr_t s2_ptr, mpi_size_t size);
+ mpi_limb_t mpihelp_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
+ 		       mpi_ptr_t s2_ptr, mpi_size_t s2_size);
++#endif
++mpi_limb_t mpihelp_sub_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
++			 mpi_ptr_t s2_ptr, mpi_size_t size);
+ 
+ /*-- mpihelp-cmp.c --*/
+ int mpihelp_cmp(mpi_ptr_t op1_ptr, mpi_ptr_t op2_ptr, mpi_size_t size);
+-- 
+1.9.3
+