From: Pratyush Yadav <pratyush@kernel.org>
To: Mike Rapoport <rppt@kernel.org>,
Pasha Tatashin <pasha.tatashin@soleen.com>,
Pratyush Yadav <pratyush@kernel.org>,
Alexander Graf <graf@amazon.com>,
Muchun Song <muchun.song@linux.dev>,
Oscar Salvador <osalvador@suse.de>,
David Hildenbrand <david@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Jason Miu <jasonmiu@google.com>,
Jork Loeser <jloeser@linux.microsoft.com>
Cc: kexec@lists.infradead.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v6 19/22] memblock: always include KHO headers
Date: Sat, 1 Aug 2026 10:48:28 +0200 [thread overview]
Message-ID: <20260801084833.1897543-20-pratyush@kernel.org> (raw)
In-Reply-To: <20260801084833.1897543-1-pratyush@kernel.org>
From: "Pratyush Yadav (Google)" <pratyush@kernel.org>
In a coming commit, memblock will start using kho_scratch_overlap()
without a compile guard. The compile guard for the function is in
kexec_handover.h and provides a stub when CONFIG_KEXEC_HANDOVER is
disabled.
Since in memblock the call will exist unconditionally, always include
the KHO headers.
Including these headers unconditionally breaks memblock test
compilation. Add stubs to fix that.
Signed-off-by: Pratyush Yadav (Google) <pratyush@kernel.org>
---
mm/memblock.c | 2 --
tools/testing/memblock/linux/kexec_handover.h | 9 +++++++++
tools/testing/memblock/linux/kho/abi/memblock.h | 10 ++++++++++
tools/testing/memblock/linux/libfdt.h | 9 +++++++++
4 files changed, 28 insertions(+), 2 deletions(-)
create mode 100644 tools/testing/memblock/linux/kexec_handover.h
create mode 100644 tools/testing/memblock/linux/kho/abi/memblock.h
create mode 100644 tools/testing/memblock/linux/libfdt.h
diff --git a/mm/memblock.c b/mm/memblock.c
index 8b2e551435ae..ea735bcd4dd1 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -19,11 +19,9 @@
#include <linux/mutex.h>
#include <linux/string_helpers.h>
-#ifdef CONFIG_KEXEC_HANDOVER
#include <linux/libfdt.h>
#include <linux/kexec_handover.h>
#include <linux/kho/abi/memblock.h>
-#endif /* CONFIG_KEXEC_HANDOVER */
#include <asm/sections.h>
#include <linux/io.h>
diff --git a/tools/testing/memblock/linux/kexec_handover.h b/tools/testing/memblock/linux/kexec_handover.h
new file mode 100644
index 000000000000..bdfd9445b1fd
--- /dev/null
+++ b/tools/testing/memblock/linux/kexec_handover.h
@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef LINUX_KEXEC_HANDOVER_H
+#define LINUX_KEXEC_HANDOVER_H
+
+/*
+ * Header stub to avoid test build breakage; we don't need to actually implement
+ * any KHO functions as they are not used in the tests.
+ */
+#endif /* LINUX_KEXEC_HANDOVER_H */
diff --git a/tools/testing/memblock/linux/kho/abi/memblock.h b/tools/testing/memblock/linux/kho/abi/memblock.h
new file mode 100644
index 000000000000..71cf6982a2b9
--- /dev/null
+++ b/tools/testing/memblock/linux/kho/abi/memblock.h
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
+#ifndef _LINUX_KHO_ABI_MEMBLOCK_H
+#define _LINUX_KHO_ABI_MEMBLOCK_H
+
+/*
+ * Header stub to avoid test build breakage; we don't need to actually define
+ * any ABI as they are not used in the tests.
+ */
+#endif /* _LINUX_KHO_ABI_MEMBLOCK_H */
diff --git a/tools/testing/memblock/linux/libfdt.h b/tools/testing/memblock/linux/libfdt.h
new file mode 100644
index 000000000000..6137b788fe8d
--- /dev/null
+++ b/tools/testing/memblock/linux/libfdt.h
@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _INCLUDE_LIBFDT_H_
+#define _INCLUDE_LIBFDT_H_
+
+/*
+ * Header stub to avoid test build breakage; we don't need to actually implement
+ * any FDT functions as they are not used in the tests.
+ */
+#endif /* _INCLUDE_LIBFDT_H_ */
--
2.55.0.571.g244d577d93-goog
next prev parent reply other threads:[~2026-08-01 8:49 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-01 8:48 [PATCH v6 00/22] kho: make boot time huge page allocation work nicely with KHO Pratyush Yadav
2026-08-01 8:48 ` [PATCH v6 01/22] kho: generalize radix tree APIs Pratyush Yadav
2026-08-01 8:48 ` [PATCH v6 02/22] kho: make radix max key width more obvious Pratyush Yadav
2026-08-01 8:48 ` [PATCH v6 03/22] kho: disallow wide keys in radix tree Pratyush Yadav
2026-08-01 8:48 ` [PATCH v6 04/22] kho: return virtual address of mem_map from kho_get_mem_map() Pratyush Yadav
2026-08-01 8:48 ` [PATCH v6 05/22] kho: store incoming radix tree in kho_in Pratyush Yadav
2026-08-01 8:48 ` [PATCH v6 06/22] kho: move all memory retrieval logic to kho_mem_retrieve() Pratyush Yadav
2026-08-01 8:48 ` [PATCH v6 07/22] kho: add a struct for radix callbacks Pratyush Yadav
2026-08-01 8:48 ` [PATCH v6 08/22] kho: add callback for table pages Pratyush Yadav
2026-08-01 8:48 ` [PATCH v6 09/22] kho: add data argument to radix walk callback Pratyush Yadav
2026-08-01 8:48 ` [PATCH v6 10/22] kho: allow early-boot usage of the KHO radix tree Pratyush Yadav
2026-08-01 8:48 ` [PATCH v6 11/22] kho: allow destroying " Pratyush Yadav
2026-08-01 8:48 ` [PATCH v6 12/22] kho: add kho_radix_init_tree() Pratyush Yadav
2026-08-01 8:48 ` [PATCH v6 13/22] kho: expose kho_scratch_overlap() to kexec_handover.h Pratyush Yadav
2026-08-01 8:48 ` [PATCH v6 14/22] kho: initialize kho_scratch pointer earlier in boot Pratyush Yadav
2026-08-01 8:48 ` [PATCH v6 15/22] kho: initialize preserved memory map radix tree earlier Pratyush Yadav
2026-08-01 8:48 ` [PATCH v6 16/22] mm/mm_init: simplify deferred_free_pages() migratetype init Pratyush Yadav
2026-08-01 8:48 ` [PATCH v6 17/22] mm/mm_init: don't rely on memblock to get KHO scratch migratetype Pratyush Yadav
2026-08-01 8:48 ` [PATCH v6 18/22] kho: extend scratch Pratyush Yadav
2026-08-01 8:48 ` Pratyush Yadav [this message]
2026-08-01 8:48 ` [PATCH v6 20/22] memblock: make HugeTLB bootmem allocation work with KHO Pratyush Yadav
2026-08-01 8:48 ` [PATCH v6 21/22] memblock: add memblock_reserved_hugetlb_size() Pratyush Yadav
2026-08-01 8:48 ` [PATCH v6 22/22] kho: exclude hugetlb memory from scratch size calculation Pratyush Yadav
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=20260801084833.1897543-20-pratyush@kernel.org \
--to=pratyush@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=david@kernel.org \
--cc=graf@amazon.com \
--cc=jasonmiu@google.com \
--cc=jloeser@linux.microsoft.com \
--cc=kexec@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=muchun.song@linux.dev \
--cc=osalvador@suse.de \
--cc=pasha.tatashin@soleen.com \
--cc=rppt@kernel.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 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.