diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-02-14 23:39:34 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-02-14 23:39:34 +0300 |
| commit | 787fe1d43a21d688afac740f92485e9373d19f01 (patch) | |
| tree | 4d089d0aba0fae0d90aafc78ea5bb28831e25528 /tools | |
| parent | 8b3c75a39cc3cde78332f0e10898104a5e1e2807 (diff) | |
| parent | f56ccc32468ee7885d3a9175e7d2cb608d301521 (diff) | |
| download | linux-787fe1d43a21d688afac740f92485e9373d19f01.tar.xz | |
Merge tag 'memblock-v7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock
Pull memblock updates from Mike Rapoport:
- update tools/include/linux/mm.h to fix memblock tests compilation
- drop redundant struct page* parameter from memblock_free_pages() and
get struct page from the pfn
- add underflow detection for size calculation in memtest and warn
about underflow when VM_DEBUG is enabled
* tag 'memblock-v7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock:
mm/memtest: add underflow detection for size calculation
memblock: drop redundant 'struct page *' argument from memblock_free_pages()
memblock test: include <linux/sizes.h> from tools mm.h stub
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/include/linux/mm.h | 1 | ||||
| -rw-r--r-- | tools/testing/memblock/internal.h | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/include/linux/mm.h b/tools/include/linux/mm.h index 677c37e4a18c..028f3faf46e7 100644 --- a/tools/include/linux/mm.h +++ b/tools/include/linux/mm.h @@ -4,6 +4,7 @@ #include <linux/align.h> #include <linux/mmzone.h> +#include <linux/sizes.h> #define PAGE_SHIFT 12 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) diff --git a/tools/testing/memblock/internal.h b/tools/testing/memblock/internal.h index 0ab4b53bb4f3..009b97bbdd22 100644 --- a/tools/testing/memblock/internal.h +++ b/tools/testing/memblock/internal.h @@ -15,8 +15,7 @@ bool mirrored_kernelcore = false; struct page {}; -void memblock_free_pages(struct page *page, unsigned long pfn, - unsigned int order) +void memblock_free_pages(unsigned long pfn, unsigned int order) { } |