[folded-merged] bootmem-add-bootmem_type-stub-function-fix-2.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The quilt patch titled
     Subject: bootmem: add bootmem_type stub function
has been removed from the -mm tree.  Its filename was
     bootmem-add-bootmem_type-stub-function-fix-2.patch

This patch was dropped because it was folded into bootmem-stop-using-page-index.patch

------------------------------------------------------
From: Arnd Bergmann <arnd@xxxxxxxx>
Subject: bootmem: add bootmem_type stub function
Date: Tue, 15 Oct 2024 14:36:06 +0000

When CONFIG_HAVE_BOOTMEM_INFO_NODE is disabled, the bootmem_type() and
bootmem_info() functions are not defined:

mm/sparse.c: In function 'free_map_bootmem':
mm/sparse.c:730:24: error: implicit declaration of function 'bootmem_type' [-Wimplicit-function-declaration]
  730 |                 type = bootmem_type(page);
      |                        ^~~~~~~~~~~~

mm/sparse.c: In function 'free_map_bootmem':
mm/sparse.c:735:39: error: implicit declaration of function 'bootmem_info'; did you mean 'bootmem_type'? [-Wimplicit-function-declaration]

Add trivial stub functions to make it build.

Link: https://lkml.kernel.org/r/20241015143802.577613-1-arnd@xxxxxxxxxx
Fixes: 43d552a255a6 ("bootmem: stop using page->index")
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
Cc: "Matthew Wilcox (Oracle)" <willy@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 include/linux/bootmem_info.h |   10 ++++++++++
 1 file changed, 10 insertions(+)

--- a/include/linux/bootmem_info.h~bootmem-add-bootmem_type-stub-function-fix-2
+++ a/include/linux/bootmem_info.h
@@ -62,6 +62,16 @@ static inline void put_page_bootmem(stru
 {
 }
 
+static inline enum bootmem_type bootmem_type(const struct page *page)
+{
+	return SECTION_INFO;
+}
+
+static inline unsigned long bootmem_info(const struct page *page)
+{
+	return 0;
+}
+
 static inline void get_page_bootmem(unsigned long info, struct page *page,
 				    enum bootmem_type type)
 {
_

Patches currently in -mm which might be from arnd@xxxxxxxx are

bootmem-stop-using-page-index.patch
kasan-migrate-copy_user_test-to-kunit-fix.patch





[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux