[PATCH 1/3] memblock tests: include memory_hotplug.h in mmzone.h as kernel dose

[PATCH 1/3] memblock tests: include memory_hotplug.h in mmzone.h as kernel dose

[Wei Yang]

In kernel code, memory_hotplug.h is included in mmzone.h instead of in
init.h. Let's sync with kernel.

This is a preparation for move init.h in common include directory.

Signed-off-by: Wei Yang <richard.weiyang@gmail.com>
CC: Mike Rapoport <rppt@kernel.org>
---
 tools/testing/memblock/linux/init.h   | 1 -
 tools/testing/memblock/linux/mmzone.h | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/memblock/linux/init.h b/tools/testing/memblock/linux/init.h
index 828e0ee0bc6c..4aeddce53310 100644
--- a/tools/testing/memblock/linux/init.h
+++ b/tools/testing/memblock/linux/init.h
@@ -4,7 +4,6 @@
 
 #include <linux/compiler.h>
 #include <asm/export.h>
-#include <linux/memory_hotplug.h>
 
 #define __section(section)              __attribute__((__section__(section)))
 
diff --git a/tools/testing/memblock/linux/mmzone.h b/tools/testing/memblock/linux/mmzone.h
index 71546e15bdd3..bb682659a12d 100644
--- a/tools/testing/memblock/linux/mmzone.h
+++ b/tools/testing/memblock/linux/mmzone.h
@@ -3,6 +3,7 @@
 #define _TOOLS_MMZONE_H
 
 #include <linux/atomic.h>
+#include <linux/memory_hotplug.h>
 
 struct pglist_data *first_online_pgdat(void);
 struct pglist_data *next_online_pgdat(struct pglist_data *pgdat);
-- 
2.34.1

[PATCH 2/3] memblock tests: include export.h in linkage.h as kernel dose

[Wei Yang]

In kernel code, linkage.h includes export.h. Let's sync with kernel.

This is a preparation for move init.h in common include directory.

Signed-off-by: Wei Yang <richard.weiyang@gmail.com>
CC: Mike Rapoport <rppt@kernel.org>
---
 tools/include/linux/linkage.h       | 2 ++
 tools/testing/memblock/linux/init.h | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/include/linux/linkage.h b/tools/include/linux/linkage.h
index bc763d500262..20dee24d7e1b 100644
--- a/tools/include/linux/linkage.h
+++ b/tools/include/linux/linkage.h
@@ -1,4 +1,6 @@
 #ifndef _TOOLS_INCLUDE_LINUX_LINKAGE_H
 #define _TOOLS_INCLUDE_LINUX_LINKAGE_H
 
+#include <linux/export.h>
+
 #endif /* _TOOLS_INCLUDE_LINUX_LINKAGE_H */
diff --git a/tools/testing/memblock/linux/init.h b/tools/testing/memblock/linux/init.h
index 4aeddce53310..bd74abc5cba6 100644
--- a/tools/testing/memblock/linux/init.h
+++ b/tools/testing/memblock/linux/init.h
@@ -3,7 +3,6 @@
 #define _LINUX_INIT_H
 
 #include <linux/compiler.h>
-#include <asm/export.h>
 
 #define __section(section)              __attribute__((__section__(section)))
 
-- 
2.34.1

[PATCH 3/3] tools/testing: abstract two init.h into common include directory

[Wei Yang]

Currently we have two test suits define its own init.h. This is a little
redundant.

Let's create a init.h in common include directory and merge these two
into it.

Signed-off-by: Wei Yang <richard.weiyang@gmail.com>
CC: Mike Rapoport <rppt@kernel.org>
CC: "Liam R. Howlett" <Liam.Howlett@oracle.com>
---
 tools/include/linux/compiler.h                   |  4 ----
 tools/{testing/memblock => include}/linux/init.h | 14 +++++++++++---
 tools/testing/radix-tree/linux/init.h            |  2 --
 tools/testing/radix-tree/maple.c                 |  2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)
 rename tools/{testing/memblock => include}/linux/init.h (81%)
 delete mode 100644 tools/testing/radix-tree/linux/init.h

diff --git a/tools/include/linux/compiler.h b/tools/include/linux/compiler.h
index 8a63a9913495..e0aaabd18a99 100644
--- a/tools/include/linux/compiler.h
+++ b/tools/include/linux/compiler.h
@@ -122,10 +122,6 @@
 # define unlikely(x)		__builtin_expect(!!(x), 0)
 #endif
 
-#ifndef __init
-# define __init
-#endif
-
 #include <linux/types.h>
 
 /*
diff --git a/tools/testing/memblock/linux/init.h b/tools/include/linux/init.h
similarity index 81%
rename from tools/testing/memblock/linux/init.h
rename to tools/include/linux/init.h
index bd74abc5cba6..7ed407976dda 100644
--- a/tools/testing/memblock/linux/init.h
+++ b/tools/include/linux/init.h
@@ -1,9 +1,17 @@
 /* SPDX-License-Identifier: GPL-2.0 */
-#ifndef _LINUX_INIT_H
-#define _LINUX_INIT_H
+#ifndef _TOOLS_LINUX_INIT_H_
+#define _TOOLS_LINUX_INIT_H_
 
 #include <linux/compiler.h>
 
+#ifndef __init
+# define __init
+#endif
+
+#ifndef __exit
+# define __exit
+#endif
+
 #define __section(section)              __attribute__((__section__(section)))
 
 #define __initconst
@@ -29,4 +37,4 @@ struct obs_kernel_param {
 #define early_param(str, fn)						\
 	__setup_param(str, fn, fn, 1)
 
-#endif
+#endif /*  _TOOLS_LINUX_INIT_H_ */
diff --git a/tools/testing/radix-tree/linux/init.h b/tools/testing/radix-tree/linux/init.h
deleted file mode 100644
index 81563c3dfce7..000000000000
--- a/tools/testing/radix-tree/linux/init.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define __init
-#define __exit
diff --git a/tools/testing/radix-tree/maple.c b/tools/testing/radix-tree/maple.c
index f1caf4bcf937..d6c72838652c 100644
--- a/tools/testing/radix-tree/maple.c
+++ b/tools/testing/radix-tree/maple.c
@@ -14,7 +14,7 @@
 #include "test.h"
 #include <stdlib.h>
 #include <time.h>
-#include "linux/init.h"
+#include <linux/init.h>
 
 #define module_init(x)
 #define module_exit(x)
-- 
2.34.1

Re: [PATCH 1/3] memblock tests: include memory_hotplug.h in mmzone.h as kernel dose

[Mike Rapoport]

On Fri, 12 Jul 2024 03:51:36 +0000, Wei Yang wrote:
> In kernel code, memory_hotplug.h is included in mmzone.h instead of in
> init.h. Let's sync with kernel.
> 
> This is a preparation for move init.h in common include directory.
> 
> 

Applied to for-next branch of memblock.git tree, thanks!

[1/3] memblock tests: include memory_hotplug.h in mmzone.h as kernel dose
      commit: b6087e14abae4cef271e563d9e15df3a872c3646
[2/3] memblock tests: include export.h in linkage.h as kernel dose
      commit: 5e45c26c128e59edf97f81434ea0364763da2a11
[3/3] tools/testing: abstract two init.h into common include directory
      commit: f56de22145544aa1e6c922c8f3b37157c820c8e3

tree: https://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock
branch: for-next

--
Sincerely yours,
Mike.