* [PATCH 0/3] [3.18-stable] two more 3.18 build failures
@ 2017-05-04 21:33 Arnd Bergmann
2017-05-04 21:33 ` [PATCH 1/3] [3.18-stable] MIPS: jz4740: fix build error in irq.h Arnd Bergmann
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Arnd Bergmann @ 2017-05-04 21:33 UTC (permalink / raw)
To: gregkh; +Cc: stable
I looked again at the 3.18.51 output from kernelci and found two failing
defconfigs. This fixes both, and leaves just a small number of remaining
warnings for another day.
Arnd
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/3] [3.18-stable] MIPS: jz4740: fix build error in irq.h
2017-05-04 21:33 [PATCH 0/3] [3.18-stable] two more 3.18 build failures Arnd Bergmann
@ 2017-05-04 21:33 ` Arnd Bergmann
2017-05-04 22:58 ` Patch "MIPS: jz4740: fix build error in irq.h" has been added to the 3.18-stable tree gregkh
2017-05-04 21:33 ` [PATCH 2/3] [3.18-stable] MIPS: elf2ecoff: Ignore PT_MIPS_ABIFLAGS program headers Arnd Bergmann
` (2 subsequent siblings)
3 siblings, 1 reply; 6+ messages in thread
From: Arnd Bergmann @ 2017-05-04 21:33 UTC (permalink / raw)
To: gregkh; +Cc: stable, Arnd Bergmann, Lars-Peter Clausen
kernelci found build error on the 3.18 stable tree that don't
show up in later versions:
arch/mips/jz4740/irq.h:21:38: error: 'struct irq_data' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
arch/mips/jz4740/irq.h:20:39: error: 'struct irq_data' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
include/linux/irqdesc.h:92:33: error: 'NR_IRQS' undeclared here (not in a function)
arch/mips/jz4740/irq.c:91:41: error: 'JZ4740_IRQ_BASE' undeclared (first use in this function)
arch/mips/jz4740/irq.c:68:6: error: conflicting types for 'jz4740_irq_resume'
arch/mips/jz4740/irq.c:62:6: error: conflicting types for 'jz4740_irq_suspend'
arch/mips/jz4740/irq.c:49:39: error: 'JZ4740_IRQ_BASE' undeclared (first use in this function)
arch/mips/jz4740/gpio.c:47:32: error: initializer element is not constant
arch/mips/jz4740/gpio.c:46:32: error: initializer element is not constant
arch/mips/jz4740/gpio.c:45:32: error: initializer element is not constant
arch/mips/jz4740/gpio.c:44:32: error: initializer element is not constant
arch/mips/jz4740/gpio.c:447:22: error: assignment from incompatible pointer type [-Werror=incompatible-pointer-types]
arch/mips/jz4740/gpio.c:446:23: error: assignment from incompatible pointer type [-Werror=incompatible-pointer-types]
arch/mips/jz4740/gpio.c:427:14: error: implicit declaration of function 'JZ4740_IRQ_INTC_GPIO' [-Werror=implicit-function-declaration]
arch/mips/jz4740/gpio.c:269:9: error: implicit declaration of function 'JZ4740_IRQ_GPIO' [-Werror=implicit-function-declaration]
The problem seems to be caused by commit 83bc76920080 ("MIPS: JZ4740: Use
generic irq chip") from linux-3.2, but only showed up in a defconfig
build when qi_lb60_defconfig was added in linux-3.13 and that configuration
never successfully built.
The code has changed in a number of ways before 4.4, which builds fine.
While I did not bisect the problem to a specific change, I found a simple
fix by including the obviously missing header.
Cc: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/mips/jz4740/irq.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/mips/jz4740/irq.h b/arch/mips/jz4740/irq.h
index 0f48720b5b63..486db78808cc 100644
--- a/arch/mips/jz4740/irq.h
+++ b/arch/mips/jz4740/irq.h
@@ -16,7 +16,9 @@
#define __MIPS_JZ4740_IRQ_H__
#include <linux/irq.h>
+#include <asm/mach-jz4740/irq.h>
+struct irq_data;
extern void jz4740_irq_suspend(struct irq_data *data);
extern void jz4740_irq_resume(struct irq_data *data);
--
2.9.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] [3.18-stable] MIPS: elf2ecoff: Ignore PT_MIPS_ABIFLAGS program headers.
2017-05-04 21:33 [PATCH 0/3] [3.18-stable] two more 3.18 build failures Arnd Bergmann
2017-05-04 21:33 ` [PATCH 1/3] [3.18-stable] MIPS: jz4740: fix build error in irq.h Arnd Bergmann
@ 2017-05-04 21:33 ` Arnd Bergmann
2017-05-04 21:33 ` [PATCH 3/3] [3.18-stable] MIPS: elf2ecoff: Fix warning due to dead code Arnd Bergmann
2017-05-04 22:39 ` [PATCH 0/3] [3.18-stable] two more 3.18 build failures Greg KH
3 siblings, 0 replies; 6+ messages in thread
From: Arnd Bergmann @ 2017-05-04 21:33 UTC (permalink / raw)
To: gregkh; +Cc: stable, Ralf Baechle, Arnd Bergmann
From: Ralf Baechle <ralf@linux-mips.org>
Commit 26f7c4bd05cf34e63a4a794150ab66a40a5a84a9 upstream.
These are generated by very recent toolchains and result in an error
message when attenpting to convert a kernel from ELF to ECOFF.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/mips/boot/elf2ecoff.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/mips/boot/elf2ecoff.c b/arch/mips/boot/elf2ecoff.c
index 8585078ae50e..51f2ed03a36a 100644
--- a/arch/mips/boot/elf2ecoff.c
+++ b/arch/mips/boot/elf2ecoff.c
@@ -49,7 +49,8 @@
/*
* Some extra ELF definitions
*/
-#define PT_MIPS_REGINFO 0x70000000 /* Register usage information */
+#define PT_MIPS_REGINFO 0x70000000 /* Register usage information */
+#define PT_MIPS_ABIFLAGS 0x70000003 /* Records ABI related flags */
/* -------------------------------------------------------------------- */
@@ -351,7 +352,8 @@ int main(int argc, char *argv[])
/* Section types we can ignore... */
if (ph[i].p_type == PT_NULL || ph[i].p_type == PT_NOTE ||
ph[i].p_type == PT_PHDR
- || ph[i].p_type == PT_MIPS_REGINFO)
+ || ph[i].p_type == PT_MIPS_REGINFO
+ || ph[i].p_type == PT_MIPS_ABIFLAGS)
continue;
/* Section types we can't handle... */
else if (ph[i].p_type != PT_LOAD) {
--
2.9.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] [3.18-stable] MIPS: elf2ecoff: Fix warning due to dead code.
2017-05-04 21:33 [PATCH 0/3] [3.18-stable] two more 3.18 build failures Arnd Bergmann
2017-05-04 21:33 ` [PATCH 1/3] [3.18-stable] MIPS: jz4740: fix build error in irq.h Arnd Bergmann
2017-05-04 21:33 ` [PATCH 2/3] [3.18-stable] MIPS: elf2ecoff: Ignore PT_MIPS_ABIFLAGS program headers Arnd Bergmann
@ 2017-05-04 21:33 ` Arnd Bergmann
2017-05-04 22:39 ` [PATCH 0/3] [3.18-stable] two more 3.18 build failures Greg KH
3 siblings, 0 replies; 6+ messages in thread
From: Arnd Bergmann @ 2017-05-04 21:33 UTC (permalink / raw)
To: gregkh; +Cc: stable, Ralf Baechle, Arnd Bergmann
From: Ralf Baechle <ralf@linux-mips.org>
Commit 2d76e9633b572ae5a64150b638eed77f4afc12db upstream.
HOSTCC arch/mips/boot/elf2ecoff
arch/mips/boot/elf2ecoff.c: In function ‘main’:
arch/mips/boot/elf2ecoff.c:271:8: warning: variable ‘shstrtab’ set but not used [-Wunused-but-set-variable]
char *shstrtab;
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/mips/boot/elf2ecoff.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/arch/mips/boot/elf2ecoff.c b/arch/mips/boot/elf2ecoff.c
index 51f2ed03a36a..6950fee4576c 100644
--- a/arch/mips/boot/elf2ecoff.c
+++ b/arch/mips/boot/elf2ecoff.c
@@ -268,7 +268,6 @@ int main(int argc, char *argv[])
Elf32_Ehdr ex;
Elf32_Phdr *ph;
Elf32_Shdr *sh;
- char *shstrtab;
int i, pad;
struct sect text, data, bss;
struct filehdr efh;
@@ -336,9 +335,6 @@ int main(int argc, char *argv[])
"sh");
if (must_convert_endian)
convert_elf_shdrs(sh, ex.e_shnum);
- /* Read in the section string table. */
- shstrtab = saveRead(infile, sh[ex.e_shstrndx].sh_offset,
- sh[ex.e_shstrndx].sh_size, "shstrtab");
/* Figure out if we can cram the program header into an ECOFF
header... Basically, we can't handle anything but loadable
--
2.9.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 0/3] [3.18-stable] two more 3.18 build failures
2017-05-04 21:33 [PATCH 0/3] [3.18-stable] two more 3.18 build failures Arnd Bergmann
` (2 preceding siblings ...)
2017-05-04 21:33 ` [PATCH 3/3] [3.18-stable] MIPS: elf2ecoff: Fix warning due to dead code Arnd Bergmann
@ 2017-05-04 22:39 ` Greg KH
3 siblings, 0 replies; 6+ messages in thread
From: Greg KH @ 2017-05-04 22:39 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: stable
On Thu, May 04, 2017 at 11:33:03PM +0200, Arnd Bergmann wrote:
> I looked again at the 3.18.51 output from kernelci and found two failing
> defconfigs. This fixes both, and leaves just a small number of remaining
> warnings for another day.
Thanks for these as well, all now applied.
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* Patch "MIPS: jz4740: fix build error in irq.h" has been added to the 3.18-stable tree
2017-05-04 21:33 ` [PATCH 1/3] [3.18-stable] MIPS: jz4740: fix build error in irq.h Arnd Bergmann
@ 2017-05-04 22:58 ` gregkh
0 siblings, 0 replies; 6+ messages in thread
From: gregkh @ 2017-05-04 22:58 UTC (permalink / raw)
To: arnd, gregkh, lars; +Cc: stable, stable-commits
This is a note to let you know that I've just added the patch titled
MIPS: jz4740: fix build error in irq.h
to the 3.18-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
mips-jz4740-fix-build-error-in-irq.h.patch
and it can be found in the queue-3.18 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.
>From arnd@arndb.de Thu May 4 15:37:28 2017
From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 4 May 2017 23:33:04 +0200
Subject: MIPS: jz4740: fix build error in irq.h
To: gregkh@linuxfoundation.org
Cc: stable@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>, Lars-Peter Clausen <lars@metafoo.de>
Message-ID: <20170504213306.645281-2-arnd@arndb.de>
From: Arnd Bergmann <arnd@arndb.de>
kernelci found build error on the 3.18 stable tree that don't
show up in later versions:
arch/mips/jz4740/irq.h:21:38: error: 'struct irq_data' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
arch/mips/jz4740/irq.h:20:39: error: 'struct irq_data' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
include/linux/irqdesc.h:92:33: error: 'NR_IRQS' undeclared here (not in a function)
arch/mips/jz4740/irq.c:91:41: error: 'JZ4740_IRQ_BASE' undeclared (first use in this function)
arch/mips/jz4740/irq.c:68:6: error: conflicting types for 'jz4740_irq_resume'
arch/mips/jz4740/irq.c:62:6: error: conflicting types for 'jz4740_irq_suspend'
arch/mips/jz4740/irq.c:49:39: error: 'JZ4740_IRQ_BASE' undeclared (first use in this function)
arch/mips/jz4740/gpio.c:47:32: error: initializer element is not constant
arch/mips/jz4740/gpio.c:46:32: error: initializer element is not constant
arch/mips/jz4740/gpio.c:45:32: error: initializer element is not constant
arch/mips/jz4740/gpio.c:44:32: error: initializer element is not constant
arch/mips/jz4740/gpio.c:447:22: error: assignment from incompatible pointer type [-Werror=incompatible-pointer-types]
arch/mips/jz4740/gpio.c:446:23: error: assignment from incompatible pointer type [-Werror=incompatible-pointer-types]
arch/mips/jz4740/gpio.c:427:14: error: implicit declaration of function 'JZ4740_IRQ_INTC_GPIO' [-Werror=implicit-function-declaration]
arch/mips/jz4740/gpio.c:269:9: error: implicit declaration of function 'JZ4740_IRQ_GPIO' [-Werror=implicit-function-declaration]
The problem seems to be caused by commit 83bc76920080 ("MIPS: JZ4740: Use
generic irq chip") from linux-3.2, but only showed up in a defconfig
build when qi_lb60_defconfig was added in linux-3.13 and that configuration
never successfully built.
The code has changed in a number of ways before 4.4, which builds fine.
While I did not bisect the problem to a specific change, I found a simple
fix by including the obviously missing header.
Cc: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
arch/mips/jz4740/irq.h | 2 ++
1 file changed, 2 insertions(+)
--- a/arch/mips/jz4740/irq.h
+++ b/arch/mips/jz4740/irq.h
@@ -16,7 +16,9 @@
#define __MIPS_JZ4740_IRQ_H__
#include <linux/irq.h>
+#include <asm/mach-jz4740/irq.h>
+struct irq_data;
extern void jz4740_irq_suspend(struct irq_data *data);
extern void jz4740_irq_resume(struct irq_data *data);
Patches currently in stable-queue which might be from arnd@arndb.de are
queue-3.18/ib-iser-fix-sparse-warnings.patch
queue-3.18/cred-userns-define-current_user_ns-as-a-function.patch
queue-3.18/mips-elf2ecoff-ignore-pt_mips_abiflags-program-headers.patch
queue-3.18/pci-xilinx-fix-harmless-format-string-warning.patch
queue-3.18/arm64-build-vdso-without-libgcov.patch
queue-3.18/arm64-provide-a-namespace-to-ncaps.patch
queue-3.18/alsa-ppc-awacs-shut-up-maybe-uninitialized-warning.patch
queue-3.18/mips-jz4740-fix-build-error-in-irq.h.patch
queue-3.18/net-tg3-avoid-uninitialized-variable-warning.patch
queue-3.18/tty-isicom-fix-big-endian-compile-warning.patch
queue-3.18/mtd-avoid-stack-overflow-in-mtd-cfi-code.patch
queue-3.18/ib-qib-rename-bits_per_page-to-rvt_bits_per_page.patch
queue-3.18/ips-remove-pointless-warning.patch
queue-3.18/powerpc-ptrace-fix-out-of-bounds-array-access-warning.patch
queue-3.18/staging-imx-drm-fix-indentation-warning.patch
queue-3.18/mlx5-avoid-build-warnings-on-32-bit.patch
queue-3.18/mm-cma-silence-warnings-due-to-max-usage.patch
queue-3.18/misdn-avoid-arch-specific-__builtin_return_address-call.patch
queue-3.18/staging-bcm-add-32-bit-host-dependency.patch
queue-3.18/staging-unisys-fix-build-warning-in-periodic_work.patch
queue-3.18/staging-vt6655-fix-overly-large-stack-usage.patch
queue-3.18/drbd-avoid-redefinition-of-bits_per_page.patch
queue-3.18/infiniband-mlx5-avoid-a-compile-time-warning.patch
queue-3.18/arm-cns3xxx-shut-up-frame-size-warning.patch
queue-3.18/ib-ehca-fix-maybe-uninitialized-warnings.patch
queue-3.18/mips-elf2ecoff-fix-warning-due-to-dead-code.patch
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-05-04 22:59 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-04 21:33 [PATCH 0/3] [3.18-stable] two more 3.18 build failures Arnd Bergmann
2017-05-04 21:33 ` [PATCH 1/3] [3.18-stable] MIPS: jz4740: fix build error in irq.h Arnd Bergmann
2017-05-04 22:58 ` Patch "MIPS: jz4740: fix build error in irq.h" has been added to the 3.18-stable tree gregkh
2017-05-04 21:33 ` [PATCH 2/3] [3.18-stable] MIPS: elf2ecoff: Ignore PT_MIPS_ABIFLAGS program headers Arnd Bergmann
2017-05-04 21:33 ` [PATCH 3/3] [3.18-stable] MIPS: elf2ecoff: Fix warning due to dead code Arnd Bergmann
2017-05-04 22:39 ` [PATCH 0/3] [3.18-stable] two more 3.18 build failures Greg KH
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.