The patch titled
Subject: include/linux/init.h: use the stringify operator for the __define_initcall macro
has been added to the -mm tree. Its filename is
init-use-the-stringify-operator-for-the-__define_initcall-macro.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Matthew Leach <matthew@xxxxxxxxxxxxx>
Subject: include/linux/init.h: use the stringify operator for the __define_initcall macro
Currently the __define_initcall macro takes three arguments, fn, id and
level. The level argument is exactly the same as the id argument but
wrapped in quotes. To overcome this need to specify three arguments to
the __define_initcall macro, where one argument is the stringification of
another, we can just use the stringification macro instead.
Signed-off-by: Matthew Leach <matthew@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/init.h | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff -puN include/linux/init.h~init-use-the-stringify-operator-for-the-__define_initcall-macro include/linux/init.h
--- a/include/linux/init.h~init-use-the-stringify-operator-for-the-__define_initcall-macro
+++ a/include/linux/init.h
@@ -186,16 +186,16 @@ extern bool initcall_debug;
* can point at the same handler without causing duplicate-symbol build errors.
*/
-#define __define_initcall(level,fn,id) \
+#define __define_initcall(fn,id) \
static initcall_t __initcall_##fn##id __used \
- __attribute__((__section__(".initcall" level ".init"))) = fn
+ __attribute__((__section__(".initcall" #id ".init"))) = fn
/*
* Early initcalls run before initializing SMP.
*
* Only for built-in code, not modules.
*/
-#define early_initcall(fn) __define_initcall("early",fn,early)
+#define early_initcall(fn) __define_initcall(fn,early)
/*
* A "pure" initcall has no dependencies on anything else, and purely
@@ -204,23 +204,23 @@ extern bool initcall_debug;
* This only exists for built-in code, not for modules.
* Keep main.c:initcall_level_names[] in sync.
*/
-#define pure_initcall(fn) __define_initcall("0",fn,0)
+#define pure_initcall(fn) __define_initcall(fn,0)
-#define core_initcall(fn) __define_initcall("1",fn,1)
-#define core_initcall_sync(fn) __define_initcall("1s",fn,1s)
-#define postcore_initcall(fn) __define_initcall("2",fn,2)
-#define postcore_initcall_sync(fn) __define_initcall("2s",fn,2s)
-#define arch_initcall(fn) __define_initcall("3",fn,3)
-#define arch_initcall_sync(fn) __define_initcall("3s",fn,3s)
-#define subsys_initcall(fn) __define_initcall("4",fn,4)
-#define subsys_initcall_sync(fn) __define_initcall("4s",fn,4s)
-#define fs_initcall(fn) __define_initcall("5",fn,5)
-#define fs_initcall_sync(fn) __define_initcall("5s",fn,5s)
-#define rootfs_initcall(fn) __define_initcall("rootfs",fn,rootfs)
-#define device_initcall(fn) __define_initcall("6",fn,6)
-#define device_initcall_sync(fn) __define_initcall("6s",fn,6s)
-#define late_initcall(fn) __define_initcall("7",fn,7)
-#define late_initcall_sync(fn) __define_initcall("7s",fn,7s)
+#define core_initcall(fn) __define_initcall(fn,1)
+#define core_initcall_sync(fn) __define_initcall(fn,1s)
+#define postcore_initcall(fn) __define_initcall(fn,2)
+#define postcore_initcall_sync(fn) __define_initcall(fn,2s)
+#define arch_initcall(fn) __define_initcall(fn,3)
+#define arch_initcall_sync(fn) __define_initcall(fn,3s)
+#define subsys_initcall(fn) __define_initcall(fn,4)
+#define subsys_initcall_sync(fn) __define_initcall(fn,4s)
+#define fs_initcall(fn) __define_initcall(fn,5)
+#define fs_initcall_sync(fn) __define_initcall(fn,5s)
+#define rootfs_initcall(fn) __define_initcall(fn,rootfs)
+#define device_initcall(fn) __define_initcall(fn,6)
+#define device_initcall_sync(fn) __define_initcall(fn,6s)
+#define late_initcall(fn) __define_initcall(fn,7)
+#define late_initcall_sync(fn) __define_initcall(fn,7s)
#define __initcall(fn) device_initcall(fn)
_
Patches currently in -mm which might be from matthew@xxxxxxxxxxxxx are
init-use-the-stringify-operator-for-the-__define_initcall-macro.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
