From: Borislav Petkov <bp@suse.de>
To: Naresh Kamboju <naresh.kamboju@linaro.org>
Cc: Ingo Molnar <mingo@kernel.org>,
hpa@zytor.com, Linus Torvalds <torvalds@linux-foundation.org>,
Thomas Gleixner <tglx@linutronix.de>,
m.mizuma@jp.fujitsu.com, open list <linux-kernel@vger.kernel.org>,
bhe@redhat.com, Peter Zijlstra <peterz@infradead.org>,
linux-tip-commits@vger.kernel.org, lkft-triage@lists.linaro.org,
Arnd Bergmann <arnd@arndb.de>
Subject: Re: [tip:x86/boot] x86/kaslr, ACPI/NUMA: Fix KASLR build error
Date: Mon, 8 Oct 2018 15:01:06 +0200 [thread overview]
Message-ID: <20181008130106.GE6490@zn.tnic> (raw)
In-Reply-To: <CA+G9fYuLJH6XVsS14xjhSqJsUGZ9NXdyytseT2Pr0hoxOeWfAg@mail.gmail.com>
On Mon, Oct 08, 2018 at 04:33:29PM +0530, Naresh Kamboju wrote:
> Linux next build for arm64 failed due to
> numa.c:34:10: fatal error: asm/kaslr.h: No such file or directory
Thanks for letting me know, I guess we could fix that with a weak
function:
---
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)
next prev parent reply other threads:[~2018-10-08 13:01 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-01 14:08 [PATCH v5 0/3] Add a kernel parameter to change the padding size for KASLR Masayoshi Mizuma
2018-10-01 14:08 ` [PATCH v5 1/3] x86/mm: Add a kernel parameter to change the padding used for the physical memory mapping Masayoshi Mizuma
2018-10-02 10:18 ` [tip:x86/boot] " tip-bot for Masayoshi Mizuma
2018-10-01 14:08 ` [PATCH v5 2/3] ACPI / NUMA: Add warning message if the padding size for KASLR is not enough Masayoshi Mizuma
2018-10-02 10:18 ` [tip:x86/boot] ACPI/NUMA: " tip-bot for Masayoshi Mizuma
2018-10-02 15:05 ` Borislav Petkov
2018-10-02 21:19 ` Masayoshi Mizuma
2018-10-03 10:58 ` Masayoshi Mizuma
2018-10-03 12:34 ` Peter Zijlstra
2018-10-03 12:48 ` Borislav Petkov
2018-10-03 13:02 ` Masayoshi Mizuma
2018-10-03 14:21 ` [tip:x86/boot] x86/kaslr, ACPI/NUMA: Fix KASLR build error tip-bot for Peter Zijlstra (Intel)
2018-10-08 11:03 ` Naresh Kamboju
2018-10-08 13:01 ` Borislav Petkov [this message]
2018-10-08 13:48 ` Arnd Bergmann
2018-10-08 14:10 ` Borislav Petkov
2018-10-09 10:39 ` tip-bot for Peter Zijlstra (Intel)
2018-10-01 14:08 ` [PATCH v5 3/3] docs: kernel-parameters.txt: document rand_mem_physical_padding Masayoshi Mizuma
2018-10-02 10:19 ` [tip:x86/boot] Documentation/kernel-parameters.txt: Document rand_mem_physical_padding= tip-bot for Masayoshi Mizuma
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=20181008130106.GE6490@zn.tnic \
--to=bp@suse.de \
--cc=arnd@arndb.de \
--cc=bhe@redhat.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=lkft-triage@lists.linaro.org \
--cc=m.mizuma@jp.fujitsu.com \
--cc=mingo@kernel.org \
--cc=naresh.kamboju@linaro.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/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;
as well as URLs for NNTP newsgroup(s).