Merge tag 'fixes-2023-09-21' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock

torvalds · torvalds · commit fb8b1b93eed0 · 2023-09-21T08:21:23.000-07:00
Pull memblock test fixes from Mike Rapoport:
 "Fix several compilation errors and warnings in memblock tests"

* tag 'fixes-2023-09-21' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock:
  memblock tests: fix warning ‘struct seq_file’ declared inside parameter list
  memblock tests: fix warning: "__ALIGN_KERNEL" redefined
  memblock tests: Fix compilation errors.
diff --git a/tools/include/linux/mm.h b/tools/include/linux/mm.h
@@ -11,8 +11,6 @@
 
 #define PHYS_ADDR_MAX	(~(phys_addr_t)0)
 
-#define __ALIGN_KERNEL(x, a)		__ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1)
-#define __ALIGN_KERNEL_MASK(x, mask)	(((x) + (mask)) & ~(mask))
 #define ALIGN(x, a)			__ALIGN_KERNEL((x), (a))
 #define ALIGN_DOWN(x, a)		__ALIGN_KERNEL((x) - ((a) - 1), (a))
 
@@ -29,7 +27,7 @@ static inline void *phys_to_virt(unsigned long address)
 	return __va(address);
 }
 
-void reserve_bootmem_region(phys_addr_t start, phys_addr_t end);
+void reserve_bootmem_region(phys_addr_t start, phys_addr_t end, int nid);
 
 static inline void totalram_pages_inc(void)
 {
diff --git a/tools/include/linux/seq_file.h b/tools/include/linux/seq_file.h
@@ -1,4 +1,6 @@
 #ifndef _TOOLS_INCLUDE_LINUX_SEQ_FILE_H
 #define _TOOLS_INCLUDE_LINUX_SEQ_FILE_H
 
+struct seq_file;
+
 #endif /* _TOOLS_INCLUDE_LINUX_SEQ_FILE_H */
diff --git a/tools/testing/memblock/internal.h b/tools/testing/memblock/internal.h
@@ -20,4 +20,8 @@ void memblock_free_pages(struct page *page, unsigned long pfn,
 {
 }
 
+static inline void accept_memory(phys_addr_t start, phys_addr_t end)
+{
+}
+
 #endif
diff --git a/tools/testing/memblock/mmzone.c b/tools/testing/memblock/mmzone.c
@@ -11,7 +11,7 @@ struct pglist_data *next_online_pgdat(struct pglist_data *pgdat)
 	return NULL;
 }
 
-void reserve_bootmem_region(phys_addr_t start, phys_addr_t end)
+void reserve_bootmem_region(phys_addr_t start, phys_addr_t end, int nid)
 {
 }
 
diff --git a/tools/testing/memblock/tests/basic_api.c b/tools/testing/memblock/tests/basic_api.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
+#include "basic_api.h"
 #include <string.h>
 #include <linux/memblock.h>
-#include "basic_api.h"
 
 #define EXPECTED_MEMBLOCK_REGIONS			128
 #define FUNC_ADD					"memblock_add"
diff --git a/tools/testing/memblock/tests/common.h b/tools/testing/memblock/tests/common.h
@@ -5,6 +5,7 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <linux/types.h>
+#include <linux/seq_file.h>
 #include <linux/memblock.h>
 #include <linux/sizes.h>
 #include <linux/printk.h>

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,6 @@`
`11`	`11`
`12`	`12`	`#define PHYS_ADDR_MAX (~(phys_addr_t)0)`
`13`	`13`
`14`		`-#define __ALIGN_KERNEL(x, a) __ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1)`
`15`		`-#define __ALIGN_KERNEL_MASK(x, mask) (((x) + (mask)) & ~(mask))`
`16`	`14`	`#define ALIGN(x, a) __ALIGN_KERNEL((x), (a))`
`17`	`15`	`#define ALIGN_DOWN(x, a) __ALIGN_KERNEL((x) - ((a) - 1), (a))`
`18`	`16`
`@@ -29,7 +27,7 @@ static inline void *phys_to_virt(unsigned long address)`
`29`	`27`	`return __va(address);`
`30`	`28`	`}`
`31`	`29`
`32`		`-void reserve_bootmem_region(phys_addr_t start, phys_addr_t end);`
	`30`	`+void reserve_bootmem_region(phys_addr_t start, phys_addr_t end, int nid);`
`33`	`31`
`34`	`32`	`static inline void totalram_pages_inc(void)`
`35`	`33`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,4 +20,8 @@ void memblock_free_pages(struct page *page, unsigned long pfn,`
`20`	`20`	`{`
`21`	`21`	`}`
`22`	`22`
	`23`	`+static inline void accept_memory(phys_addr_t start, phys_addr_t end)`
	`24`	`+{`
	`25`	`+}`
	`26`	`+`
`23`	`27`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ struct pglist_data next_online_pgdat(struct pglist_data pgdat)`
`11`	`11`	`return NULL;`
`12`	`12`	`}`
`13`	`13`
`14`		`-void reserve_bootmem_region(phys_addr_t start, phys_addr_t end)`
	`14`	`+void reserve_bootmem_region(phys_addr_t start, phys_addr_t end, int nid)`
`15`	`15`	`{`
`16`	`16`	`}`
`17`	`17`