From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Borislav Petkov <bp@suse.de>
Cc: linaro-kernel@lists.linaro.org,
kernel-build-reports@lists.linaro.org,
Peter Zijlstra <peterz@infradead.org>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will.deacon@arm.com>,
Mark Brown <broonie@kernel.org>,
linux-next@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: Re: next-20181008 build: 2 failures 22 warnings (next-20181008)
Date: Wed, 10 Oct 2018 15:27:04 +1100 [thread overview]
Message-ID: <20181010152704.337ee630@canb.auug.org.au> (raw)
In-Reply-To: <20181008213018.GL6490@zn.tnic>
[-- Attachment #1.1: Type: text/plain, Size: 1800 bytes --]
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
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2018-10-10 4:27 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
[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 [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181010152704.337ee630@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=bp@suse.de \
--cc=broonie@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=kernel-build-reports@lists.linaro.org \
--cc=linaro-kernel@lists.linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-next@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox