memblock test: fix compilation errors
Mike Rapoport
maintainercover memblock test: fix compilation errors
From: "Mike Rapoport (IBM)" <[email protected]>
Hi,
These are small compilation warning fixes for the memblock tests.
If there are no objections I'm going to take them via memblock tree.
Mike Rapoport (IBM) (2):
memblock tests: fix warning: "__ALIGN_KERNEL" redefined memblock tests: fix warning ‘struct seq_file’ declared inside
parameter list
tools/include/linux/mm.h | 2 -- tools/include/linux/seq_file.h | 2 ++ tools/testing/memblock/tests/basic_api.c | 2 +- tools/testing/memblock/tests/common.h | 1 + 4 files changed, 4 insertions(+), 3 deletions(-)
Signature · 1 line
2.39.2
Mike Rapoport
maintainerPATCH 1/2 memblock tests: fix warning: "__ALIGN_KERNEL" redefined
From: "Mike Rapoport (IBM)" <[email protected]>
Building memblock tests produces the following warning:
cc -I. -I../../include -Wall -O2 -fsanitize=address -fsanitize=undefined -D CONFIG_PHYS_ADDR_T_64BIT -c -o main.o main.c
In file included from ../../include/linux/pfn.h:5,
from ./linux/memory_hotplug.h:6,
from ./linux/init.h:7,
from ./linux/memblock.h:11,
from tests/common.h:8,
from tests/basic_api.h:5,
from main.c:2:
../../include/linux/mm.h:14: warning: "__ALIGN_KERNEL" redefined
14 | #define __ALIGN_KERNEL(x, a) __ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1)
|
In file included from ../../include/linux/mm.h:6,
from ../../include/linux/pfn.h:5,
from ./linux/memory_hotplug.h:6,
from ./linux/init.h:7,
from ./linux/memblock.h:11,
from tests/common.h:8,
from tests/basic_api.h:5,
from main.c:2:
../../include/uapi/linux/const.h:31: note: this is the location of the previous definition
31 | #define __ALIGN_KERNEL(x, a) __ALIGN_KERNEL_MASK(x, (__typeof__(x))(a) - 1)
|Remove definitions of __ALIGN_KERNEL and __ALIGN_KERNEL_MASK from tools/include/linux/mm.h to fix it.
--- tools/include/linux/mm.h | 2 -- 1 file changed, 2 deletions(-)
tools/include/linux/mm.h +0 -2
@@ -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))
Signature · 1 line
2.39.2
Mike Rapoport
maintainerPATCH 2/2 memblock tests: fix warning ‘struct seq_file’ declared inside parameter list
In reply to Mike RapoportFrom: "Mike Rapoport (IBM)" <[email protected]>
Building memblock tests produces the following warning:
cc -I. -I../../include -Wall -O2 -fsanitize=address -fsanitize=undefined -D CONFIG_PHYS_ADDR_T_64BIT -c -o main.o main.c
In file included from tests/common.h:9,
from tests/basic_api.h:5,
from main.c:2:./linux/memblock.h:601:50: warning: ‘struct seq_file’ declared inside parameter list will not be visible outside of this definition or declaration
601 | static inline void memtest_report_meminfo(struct seq_file *m) { }
| ^~~~~~~~
Add declaration of 'struct seq_file' to tools/include/linux/seq_file.h to fix it.
--- tools/include/linux/seq_file.h | 2 ++ tools/testing/memblock/tests/basic_api.c | 2 +- tools/testing/memblock/tests/common.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-)
tools/include/linux/seq_file.h +2 -0
@@ -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 */
tools/testing/memblock/tests/basic_api.c +1 -1
@@ -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"
tools/testing/memblock/tests/common.h +1 -0
@@ -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>
Signature · 1 line
2.39.2