* next-20181008 build: 2 failures 22 warnings (next-20181008) [not found] <E1g9cV0-0008Sg-4U@optimist> @ 2018-10-08 21:11 ` Mark Brown 2018-10-08 21:30 ` Borislav Petkov 2018-10-08 21:20 ` Mark Brown 1 sibling, 1 reply; 9+ messages in thread From: Mark Brown @ 2018-10-08 21:11 UTC (permalink / raw) To: linux-arm-kernel On Mon, Oct 08, 2018 at 09:51:30PM +0100, Build bot for Mark Brown wrote: Today's -next fails to build an arm64 defconfig due to: > arm64-defconfig > ../drivers/acpi/numa.c:34:23: fatal error: asm/kaslr.h: No such file or directory caused by 3a387c6d96e69 (x86/kaslr, ACPI/NUMA: Fix KASLR build error) which adds the inclusion unconditionally. -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 488 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181008/f0000753/attachment.sig> ^ permalink raw reply [flat|nested] 9+ messages in thread
* next-20181008 build: 2 failures 22 warnings (next-20181008) 2018-10-08 21:11 ` next-20181008 build: 2 failures 22 warnings (next-20181008) Mark Brown @ 2018-10-08 21:30 ` Borislav Petkov 2018-10-10 4:27 ` Stephen Rothwell 0 siblings, 1 reply; 9+ messages in thread From: Borislav Petkov @ 2018-10-08 21:30 UTC (permalink / raw) To: linux-arm-kernel On Mon, Oct 08, 2018 at 10:11:09PM +0100, Mark Brown wrote: > caused by 3a387c6d96e69 (x86/kaslr, ACPI/NUMA: Fix KASLR build error) > which adds the inclusion unconditionally. This should fix it: --- arch/x86/include/asm/kaslr.h | 2 -- drivers/acpi/numa.c | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/include/asm/kaslr.h b/arch/x86/include/asm/kaslr.h index 95ef3fc01d12..db7ba2feb947 100644 --- a/arch/x86/include/asm/kaslr.h +++ b/arch/x86/include/asm/kaslr.h @@ -6,10 +6,8 @@ unsigned long kaslr_get_random_long(const char *purpose); #ifdef CONFIG_RANDOMIZE_MEMORY void kernel_randomize_memory(void); -void kaslr_check_padding(void); #else static inline void kernel_randomize_memory(void) { } -static inline void kaslr_check_padding(void) { } #endif /* CONFIG_RANDOMIZE_MEMORY */ #endif diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c index 4408e37600ef..ba62004f4d86 100644 --- a/drivers/acpi/numa.c +++ b/drivers/acpi/numa.c @@ -32,7 +32,6 @@ #include <linux/numa.h> #include <linux/nodemask.h> #include <linux/topology.h> -#include <asm/kaslr.h> static nodemask_t nodes_found_map = NODE_MASK_NONE; @@ -433,6 +432,9 @@ acpi_table_parse_srat(enum acpi_srat_type id, handler, max_entries); } +/* To be overridden by architectures */ +void __init __weak kaslr_check_padding(void) { } + int __init acpi_numa_init(void) { int cnt = 0; -- 2.19.0.271.gfe8321ec057f -- Regards/Gruss, Boris. SUSE Linux GmbH, GF: Felix Imend?rffer, Jane Smithard, Graham Norton, HRB 21284 (AG N?rnberg) ^ permalink raw reply related [flat|nested] 9+ messages in thread
* next-20181008 build: 2 failures 22 warnings (next-20181008) 2018-10-08 21:30 ` Borislav Petkov @ 2018-10-10 4:27 ` Stephen Rothwell 2018-10-10 4:33 ` Borislav Petkov 0 siblings, 1 reply; 9+ messages in thread From: Stephen Rothwell @ 2018-10-10 4:27 UTC (permalink / raw) To: linux-arm-kernel Hi Borislav, On Mon, 8 Oct 2018 23:30:18 +0200 Borislav Petkov <bp@suse.de> wrote: > > On Mon, Oct 08, 2018 at 10:11:09PM +0100, Mark Brown wrote: > > caused by 3a387c6d96e69 (x86/kaslr, ACPI/NUMA: Fix KASLR build error) > > which adds the inclusion unconditionally. > > This should fix it: > > --- > arch/x86/include/asm/kaslr.h | 2 -- > drivers/acpi/numa.c | 4 +++- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/x86/include/asm/kaslr.h b/arch/x86/include/asm/kaslr.h > index 95ef3fc01d12..db7ba2feb947 100644 > --- a/arch/x86/include/asm/kaslr.h > +++ b/arch/x86/include/asm/kaslr.h > @@ -6,10 +6,8 @@ unsigned long kaslr_get_random_long(const char *purpose); > > #ifdef CONFIG_RANDOMIZE_MEMORY > void kernel_randomize_memory(void); > -void kaslr_check_padding(void); > #else > static inline void kernel_randomize_memory(void) { } > -static inline void kaslr_check_padding(void) { } > #endif /* CONFIG_RANDOMIZE_MEMORY */ > > #endif > diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c > index 4408e37600ef..ba62004f4d86 100644 > --- a/drivers/acpi/numa.c > +++ b/drivers/acpi/numa.c > @@ -32,7 +32,6 @@ > #include <linux/numa.h> > #include <linux/nodemask.h> > #include <linux/topology.h> > -#include <asm/kaslr.h> > > static nodemask_t nodes_found_map = NODE_MASK_NONE; > > @@ -433,6 +432,9 @@ acpi_table_parse_srat(enum acpi_srat_type id, > handler, max_entries); > } > > +/* To be overridden by architectures */ > +void __init __weak kaslr_check_padding(void) { } > + > int __init acpi_numa_init(void) > { > int cnt = 0; I have added that to linux-next today (pending this or something else turning up in the tip tree). -- Cheers, Stephen Rothwell -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 488 bytes Desc: OpenPGP digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181010/db7f4bad/attachment-0001.sig> ^ permalink raw reply [flat|nested] 9+ messages in thread
* next-20181008 build: 2 failures 22 warnings (next-20181008) 2018-10-10 4:27 ` Stephen Rothwell @ 2018-10-10 4:33 ` Borislav Petkov 2018-10-11 23:37 ` Stephen Rothwell 0 siblings, 1 reply; 9+ messages in thread From: Borislav Petkov @ 2018-10-10 4:33 UTC (permalink / raw) To: linux-arm-kernel On Wed, Oct 10, 2018 at 03:27:04PM +1100, Stephen Rothwell wrote: > I have added that to linux-next today (pending this or something else > turning up in the tip tree). Thx. I have queued a fixed version in the meantime: https://git.kernel.org/tip/9d94e8b1d4f94a3c4cee5ad11a1be460cd070839 -- Regards/Gruss, Boris. SUSE Linux GmbH, GF: Felix Imend?rffer, Jane Smithard, Graham Norton, HRB 21284 (AG N?rnberg) ^ permalink raw reply [flat|nested] 9+ messages in thread
* next-20181008 build: 2 failures 22 warnings (next-20181008) 2018-10-10 4:33 ` Borislav Petkov @ 2018-10-11 23:37 ` Stephen Rothwell 2018-10-12 2:43 ` Stephen Rothwell 0 siblings, 1 reply; 9+ messages in thread From: Stephen Rothwell @ 2018-10-11 23:37 UTC (permalink / raw) To: linux-arm-kernel Hi Boris, On Wed, 10 Oct 2018 06:33:59 +0200 Borislav Petkov <bp@suse.de> wrote: > > On Wed, Oct 10, 2018 at 03:27:04PM +1100, Stephen Rothwell wrote: > > I have added that to linux-next today (pending this or something else > > turning up in the tip tree). > > I have queued a fixed version in the meantime: > > https://git.kernel.org/tip/9d94e8b1d4f94a3c4cee5ad11a1be460cd070839 OK, I will use that until it turns up in the tip auto-latest branch. -- Cheers, Stephen Rothwell -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 488 bytes Desc: OpenPGP digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181012/d6f35306/attachment.sig> ^ permalink raw reply [flat|nested] 9+ messages in thread
* next-20181008 build: 2 failures 22 warnings (next-20181008) 2018-10-11 23:37 ` Stephen Rothwell @ 2018-10-12 2:43 ` Stephen Rothwell 0 siblings, 0 replies; 9+ messages in thread From: Stephen Rothwell @ 2018-10-12 2:43 UTC (permalink / raw) To: linux-arm-kernel Hi Boris, On Fri, 12 Oct 2018 10:37:58 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > On Wed, 10 Oct 2018 06:33:59 +0200 Borislav Petkov <bp@suse.de> wrote: > > > > On Wed, Oct 10, 2018 at 03:27:04PM +1100, Stephen Rothwell wrote: > > > I have added that to linux-next today (pending this or something else > > > turning up in the tip tree). > > > > I have queued a fixed version in the meantime: > > > > https://git.kernel.org/tip/9d94e8b1d4f94a3c4cee5ad11a1be460cd070839 > > OK, I will use that until it turns up in the tip auto-latest branch. It turns out that I can't use that since it is mostly already in the tip tree as commit 3a387c6d96e6 ("x86/kaslr, ACPI/NUMA: Fix KASLR build error") So I will stick with my incremental patch for now. -- Cheers, Stephen Rothwell -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 488 bytes Desc: OpenPGP digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181012/2ee2a938/attachment.sig> ^ permalink raw reply [flat|nested] 9+ messages in thread
* next-20181008 build: 2 failures 22 warnings (next-20181008) [not found] <E1g9cV0-0008Sg-4U@optimist> 2018-10-08 21:11 ` next-20181008 build: 2 failures 22 warnings (next-20181008) Mark Brown @ 2018-10-08 21:20 ` Mark Brown 2018-10-08 21:30 ` Bjorn Helgaas 1 sibling, 1 reply; 9+ messages in thread From: Mark Brown @ 2018-10-08 21:20 UTC (permalink / raw) To: linux-arm-kernel On Mon, Oct 08, 2018 at 09:51:30PM +0100, Build bot for Mark Brown wrote: Today's -next fails to build an arm allmodconfig caused by: > arm-allmodconfig > ../drivers/pci/pcie/aer_inject.c:444:6: error: 'struct pt_regs' has no member named 'ip' introduced in e3fbcc7c4b130(PCI/AER: Covertly inject errors with ftrace hooks). This field is not present on arm. -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 488 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181008/1ecd49d3/attachment-0001.sig> ^ permalink raw reply [flat|nested] 9+ messages in thread
* next-20181008 build: 2 failures 22 warnings (next-20181008) 2018-10-08 21:20 ` Mark Brown @ 2018-10-08 21:30 ` Bjorn Helgaas 2018-10-08 22:35 ` Mark Brown 0 siblings, 1 reply; 9+ messages in thread From: Bjorn Helgaas @ 2018-10-08 21:30 UTC (permalink / raw) To: linux-arm-kernel On Mon, Oct 08, 2018 at 10:20:21PM +0100, Mark Brown wrote: > On Mon, Oct 08, 2018 at 09:51:30PM +0100, Build bot for Mark Brown wrote: > > Today's -next fails to build an arm allmodconfig caused by: > > > arm-allmodconfig > > ../drivers/pci/pcie/aer_inject.c:444:6: error: 'struct pt_regs' has no member named 'ip' > > introduced in e3fbcc7c4b130(PCI/AER: Covertly inject errors with ftrace > hooks). This field is not present on arm. I dropped e3fbcc7c4b130 and related patches already, so this should be gone in my current "next" branch (18b4baa4d9fc). ^ permalink raw reply [flat|nested] 9+ messages in thread
* next-20181008 build: 2 failures 22 warnings (next-20181008) 2018-10-08 21:30 ` Bjorn Helgaas @ 2018-10-08 22:35 ` Mark Brown 0 siblings, 0 replies; 9+ messages in thread From: Mark Brown @ 2018-10-08 22:35 UTC (permalink / raw) To: linux-arm-kernel On Mon, Oct 08, 2018 at 04:30:06PM -0500, Bjorn Helgaas wrote: > On Mon, Oct 08, 2018 at 10:20:21PM +0100, Mark Brown wrote: > > introduced in e3fbcc7c4b130(PCI/AER: Covertly inject errors with ftrace > > hooks). This field is not present on arm. > I dropped e3fbcc7c4b130 and related patches already, so this should be gone > in my current "next" branch (18b4baa4d9fc). Great, thanks! -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 488 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181008/457d0805/attachment.sig> ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2018-10-12 2:43 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <E1g9cV0-0008Sg-4U@optimist>
2018-10-08 21:11 ` next-20181008 build: 2 failures 22 warnings (next-20181008) Mark Brown
2018-10-08 21:30 ` Borislav Petkov
2018-10-10 4:27 ` Stephen Rothwell
2018-10-10 4:33 ` Borislav Petkov
2018-10-11 23:37 ` Stephen Rothwell
2018-10-12 2:43 ` Stephen Rothwell
2018-10-08 21:20 ` Mark Brown
2018-10-08 21:30 ` Bjorn Helgaas
2018-10-08 22:35 ` Mark Brown
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).