[PATCH] memblock test: include <linux/sizes.h> from tools mm.h stub

Mike Rapoport posted 1 patch 1 month, 1 week ago
tools/include/linux/mm.h | 1 +
1 file changed, 1 insertion(+)
[PATCH] memblock test: include <linux/sizes.h> from tools mm.h stub
Posted by Mike Rapoport 1 month, 1 week ago
From: "Mike Rapoport (Microsoft)" <rppt@kernel.org>

memblock test compilation fails:

memblock.c: In function ‘memblock_validate_numa_coverage’:
memblock.c:784:58: error: ‘SZ_1M’ undeclared (first use in this function)
  784 |                 mem_size_mb = memblock_phys_mem_size() / SZ_1M;
      |                                                          ^~~~~

The SZ_1M is defined in sizes.h, but it is not included by stub version of
mm.h in tools/include/linux.

Add include of sizes.h to tools/include/linux/mm.h to fix the compilation
of memblock tests.

Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
---
 tools/include/linux/mm.h | 1 +
 1 file changed, 1 insertion(+)

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)
-- 
2.51.0

Re: [PATCH] memblock test: include <linux/sizes.h> from tools mm.h stub
Posted by Anshuman Khandual 1 month ago
On 29/12/25 12:09 AM, Mike Rapoport wrote:
> From: "Mike Rapoport (Microsoft)" <rppt@kernel.org>
> 
> memblock test compilation fails:
> 
> memblock.c: In function ‘memblock_validate_numa_coverage’:
> memblock.c:784:58: error: ‘SZ_1M’ undeclared (first use in this function)
>   784 |                 mem_size_mb = memblock_phys_mem_size() / SZ_1M;
>       |                                                          ^~~~~
> 
> The SZ_1M is defined in sizes.h, but it is not included by stub version of
> mm.h in tools/include/linux.
> 
> Add include of sizes.h to tools/include/linux/mm.h to fix the compilation
> of memblock tests.
> 
> Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
> ---
>  tools/include/linux/mm.h | 1 +
>  1 file changed, 1 insertion(+)
> 
> 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)

Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>