genetlink-replace-custom-concatenate-implementation.patch removed from -mm tree
The quilt patch titled
Subject: genetlink: replace custom CONCATENATE() implementation
has been removed from the -mm tree. Its filename was
genetlink-replace-custom-concatenate-implementation.patch
This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Andy Shevchenko <[email protected]>
Subject: genetlink: replace custom CONCATENATE() implementation
Date: Wed, 19 Jul 2023 00:11:47 +0300
Replace custom implementation of the macros from args.h.
Signed-off-by Andy Shevchenko <[email protected]>
Cc Bjorn Helgaas <[email protected]>
Cc Borislav Petkov (AMD) <[email protected]>
Cc Brendan Higgins <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
Cc Daniel Latypov <[email protected]>
Cc Dave Hansen <[email protected]>
Cc David Gow <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Lorenzo Pieralisi <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Masami Hiramatsu (Google) <[email protected]>
Cc Shuah Khan <[email protected]>
Cc Steven Rostedt (Google) <[email protected]>
Cc Sudeep Holla <[email protected]>
Cc Thomas Gleixner <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
include/linux/genl_magic_func.h | 27 ++++++++++++++------------- include/linux/genl_magic_struct.h | 8 +++----- 2 files changed, 17 insertions(+), 18 deletions(-)
include/linux/genl_magic_func.h renamed from include/linux/genl_magic_func.h~genetlink-replace-custom-concatenate-implementation +14 -13
@@ -2,6 +2,7 @@#ifndef GENL_MAGIC_FUNC_H #define GENL_MAGIC_FUNC_H +#include <linux/args.h> #include <linux/build_bug.h> #include <linux/genl_magic_struct.h>
@@ -23,7 +24,7 @@#define GENL_struct (tag_name, tag_number, s_name, s_fields) \ [tag_name] = { .type = NLA_NESTED }, -static struct nla_policy CONCAT_ (GENL_MAGIC_FAMILY ,_tla_nl_policy )[] = { +static struct nla_policy CONCATENATE (GENL_MAGIC_FAMILY ,_tla_nl_policy )[] = { #include GENL_MAGIC_INCLUDE_FILE };
@@ -209,7 +210,7 @@ static int s_name ## _from_attrs_for_cha* Magic: define op number to op name mapping {{{1 * {{{2 */ -static const char *CONCAT_ (GENL_MAGIC_FAMILY ,_genl_cmd_to_str )(__u8 cmd) +static const char *CONCATENATE (GENL_MAGIC_FAMILY ,_genl_cmd_to_str )(__u8 cmd) {switch (cmd) {#undef GENL_op
@@ -235,7 +236,7 @@ static const char *CONCAT_(GENL_MAGIC_FA .cmd = op_name, \ }, -#define ZZZ_genl_ops CONCAT_(GENL_MAGIC_FAMILY, _genl_ops) +#define ZZZ_genl_ops CONCATENATE(GENL_MAGIC_FAMILY, _genl_ops)static struct genl_ops ZZZ_genl_ops[]__read_mostly = { #include GENL_MAGIC_INCLUDE_FILE };
@@ -248,32 +249,32 @@ static struct genl_ops ZZZ_genl_ops[] __* and provide register/unregister functions. * {{{2 */ -#define ZZZ_genl_family CONCAT_(GENL_MAGIC_FAMILY, _genl_family) +#define ZZZ_genl_family CONCATENATE(GENL_MAGIC_FAMILY, _genl_family)static struct genl_family ZZZ_genl_family;/* * Magic: define multicast groups * Magic: define multicast group registration helper */ -#define ZZZ_genl_mcgrps CONCAT_(GENL_MAGIC_FAMILY, _genl_mcgrps) +#define ZZZ_genl_mcgrps CONCATENATE(GENL_MAGIC_FAMILY, _genl_mcgrps)static const struct genl_multicast_group ZZZ_genl_mcgrps[] = { #undef GENL_mc_group #define GENL_mc_group(group) { .name = #group, }, #include GENL_MAGIC_INCLUDE_FILE }; -enum CONCAT_(GENL_MAGIC_FAMILY, group_ids) { +enum CONCATENATE(GENL_MAGIC_FAMILY, group_ids) {#undef GENL_mc_group -#define GENL_mc_group (group) CONCAT_(GENL_MAGIC_FAMILY, _group_ ## group), +#define GENL_mc_group (group) CONCATENATE(GENL_MAGIC_FAMILY, _group_ ## group),#include GENL_MAGIC_INCLUDE_FILE };#undef GENL_mc_group#define GENL_mc_group (group) \ -static int CONCAT_(GENL_MAGIC_FAMILY, _genl_multicast_ ## group)( \ +static int CONCATENATE(GENL_MAGIC_FAMILY, _genl_multicast_ ## group)( \ struct sk_buff *skb, gfp_t flags) \ { \ unsigned int group_id = \ - CONCAT_(GENL_MAGIC_FAMILY, _group_ ## group); \ + CONCATENATE(GENL_MAGIC_FAMILY, _group_ ## group); \ return genlmsg_multicast(&ZZZ_genl_family, skb, 0, \ group_id, flags); \ }
@@ -289,8 +290,8 @@ static struct genl_family ZZZ_genl_famil #ifdef GENL_MAGIC_FAMILY_HDRSZ .hdrsize = NLA_ALIGN(GENL_MAGIC_FAMILY_HDRSZ), #endif - .maxattr = ARRAY_SIZE(CONCAT_(GENL_MAGIC_FAMILY, _tla_nl_policy))-1, - .policy = CONCAT_(GENL_MAGIC_FAMILY, _tla_nl_policy), + .maxattr = ARRAY_SIZE(CONCATENATE(GENL_MAGIC_FAMILY, _tla_nl_policy))-1, + .policy = CONCATENATE(GENL_MAGIC_FAMILY, _tla_nl_policy), .ops = ZZZ_genl_ops, .n_ops = ARRAY_SIZE(ZZZ_genl_ops), .mcgrps = ZZZ_genl_mcgrps,
@@ -299,12 +300,12 @@ static struct genl_family ZZZ_genl_famil .module = THIS_MODULE, }; -int CONCAT_ (GENL_MAGIC_FAMILY ,_genl_register )(void ) +int CONCATENATE (GENL_MAGIC_FAMILY ,_genl_register )(void ) {return genl_register_family (&ZZZ_genl_family); } -void CONCAT_ (GENL_MAGIC_FAMILY ,_genl_unregister )(void ) +void CONCATENATE (GENL_MAGIC_FAMILY ,_genl_unregister )(void ) {genl_unregister_family (&ZZZ_genl_family); }
include/linux/genl_magic_struct.h renamed from include/linux/genl_magic_struct.h~genetlink-replace-custom-concatenate-implementation +3 -5
@@ -14,14 +14,12 @@# error "you need to define GENL_MAGIC_INCLUDE_FILE before inclusion"#endif +#include <linux/args.h> #include <linux/genetlink.h> #include <linux/types.h> -#define CONCAT__ (a,b) a ## b -#define CONCAT_ (a,b) CONCAT__(a,b) - -extern int CONCAT_ (GENL_MAGIC_FAMILY ,_genl_register )(void ); -extern void CONCAT_ (GENL_MAGIC_FAMILY ,_genl_unregister )(void ); +extern int CONCATENATE (GENL_MAGIC_FAMILY ,_genl_register )(void ); +extern void CONCATENATE (GENL_MAGIC_FAMILY ,_genl_unregister )(void );/* * Extension of genl attribute validation policies {{{2
_
Patches currently in -mm which might be from [email protected] are