locking/static_key: always define static_branch_deferred_inc
Subsystems (3)
PATCH 1/1 locking/static_key: always define static_branch_deferred_inc
From: Willem de Bruijn <[email protected]>
This interface is currently only defined if CONFIG_JUMP_LABEL. Make it available also when jump labels are disabled.
---
The original patch went into 5.2-rc1, but this interface is not yet used, so this could target either 5.2 or 5.3.
--- include/linux/jump_label_ratelimit.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
include/linux/jump_label_ratelimit.h +3 -2
@@ -60,8 +60,6 @@ extern void jump_label_update_timeout(struct work_struct *work); 0), \ } -#define static_branch_deferred_inc (x) static_branch_inc(&(x)->key) -#else /* !CONFIG_JUMP_LABEL */ struct static_key_deferred { struct static_key key;
@@ -95,4 +93,7 @@ jump_label_rate_limit(struct static_key_deferred *key,STATIC_KEY_CHECK_USE (key); }#endif /* CONFIG_JUMP_LABEL */ + +#define static_branch_deferred_inc (x) static_branch_inc(&(x)->key) +#endif /* _LINUX_JUMP_LABEL_RATELIMIT_H */
Signature · 1 line
2.22.0.rc2.383.gf4fbbf30c2-goog
Quoted 5 lines · Willem de Bruijn
From: Willem de Bruijn <[email protected]>
This interface is currently only defined if
CONFIG_JUMP_LABEL. Make it available also when jump labels are disabled.
Quoted 7 lines
Fixes ad282a8117d50 ("locking/static_key: Add support for deferred static branches")Signed-off-by Willem de Bruijn <[email protected]>---
The original patch went into 5.2-rc1, but this interface is not yet used, so this could target either 5.2 or 5.3.
Can we drop the Fixes tag? It's an ugly omission but not a bug fix.
Are you planning to switch clean_acked_data_enable() to the helper once merged?
Thanks!
Quoted 21 lines
include/linux/jump_label_ratelimit.h +3
-2@@ -60,8 +60,6 @@ extern void jump_label_update_timeout(struct work_struct *work); 0), \ } -#define static_branch_deferred_inc (x) static_branch_inc(&(x)->key) -#else /* !CONFIG_JUMP_LABEL */ struct static_key_deferred { struct static_key key;@@ -95,4 +93,7 @@ jump_label_rate_limit(struct static_key_deferred *key,STATIC_KEY_CHECK_USE (key); }#endif /* CONFIG_JUMP_LABEL */ + +#define static_branch_deferred_inc (x) static_branch_inc(&(x)->key) +#endif /* _LINUX_JUMP_LABEL_RATELIMIT_H */
Quoted 12 lines · Jakub Kicinski
Quoted 10 lines · Willem de Bruijn
From: Willem de Bruijn <[email protected]>
This interface is currently only defined if
CONFIG_JUMP_LABEL. Make it available also when jump labels are disabled.Fixes ad282a8117d50 ("locking/static_key: Add support for deferred static branches")Signed-off-by Willem de Bruijn <[email protected]>---
Quoted 7 lines
Quoted 2 lines
The original patch went into 5.2-rc1, but this interface is not yet used, so this could target either 5.2 or 5.3.
Can we drop the Fixes tag? It's an ugly omission but not a bug fix.
Are you planning to switch
clean_acked_data_enable()to the helper once merged?
Definitely, can do.
Perhaps it's easiest to send both as a single patch set through net-next, then?
Quoted 17 lines · Willem de Bruijn
Quoted 15 lines · Jakub Kicinski
Quoted 12 lines · Willem de Bruijn
From: Willem de Bruijn <[email protected]>
This interface is currently only defined if
CONFIG_JUMP_LABEL. Make it available also when jump labels are disabled.Fixes ad282a8117d50 ("locking/static_key: Add support for deferred static branches")Signed-off-by Willem de Bruijn <[email protected]>---
The original patch went into 5.2-rc1, but this interface is not yet used, so this could target either 5.2 or 5.3.
Quoted 8 lines
Quoted 4 lines
Can we drop the Fixes tag? It's an ugly omission but not a bug fix.
Are you planning to switch
clean_acked_data_enable()to the helper once merged?Definitely, can do.
Perhaps it's easiest to send both as a single patch set through net-next, then?
I'd think so too, perhaps we can get a blessing from Peter for that :)
Quoted 20 lines · Jakub Kicinski
Quoted 19 lines · Willem de Bruijn
Quoted 17 lines · Jakub Kicinski
Quoted 5 lines · Willem de Bruijn
From: Willem de Bruijn <[email protected]>
This interface is currently only defined if
CONFIG_JUMP_LABEL. Make it available also when jump labels are disabled.Quoted 7 lines
Fixes ad282a8117d50 ("locking/static_key: Add support for deferred static branches")Signed-off-by Willem de Bruijn <[email protected]>---
The original patch went into 5.2-rc1, but this interface is not yet used, so this could target either 5.2 or 5.3.
Can we drop the Fixes tag? It's an ugly omission but not a bug fix.
Quoted 8 lines
Quoted 6 lines
Quoted 2 lines
Are you planning to switch
clean_acked_data_enable()to the helper once merged?Definitely, can do.
Perhaps it's easiest to send both as a single patch set through net-next, then?
I'd think so too, perhaps we can get a blessing from Peter for that :)
Sure that works, I don't think there's anything else pending for this file to conflict with.
Quoted 27 lines · Peter Zijlstra
Quoted 25 lines · Jakub Kicinski
Quoted 24 lines · Willem de Bruijn
Quoted 12 lines · Jakub Kicinski
Quoted 10 lines · Willem de Bruijn
From: Willem de Bruijn <[email protected]>
This interface is currently only defined if
CONFIG_JUMP_LABEL. Make it available also when jump labels are disabled.Fixes ad282a8117d50 ("locking/static_key: Add support for deferred static branches")Signed-off-by Willem de Bruijn <[email protected]>---
Quoted 7 lines
Quoted 2 lines
The original patch went into 5.2-rc1, but this interface is not yet used, so this could target either 5.2 or 5.3.
Can we drop the Fixes tag? It's an ugly omission but not a bug fix.
Are you planning to switch
clean_acked_data_enable()to the helper once merged?Definitely, can do.
Quoted 8 lines
Quoted 3 lines
Quoted 1 line
Perhaps it's easiest to send both as a single patch set through net-next, then?
I'd think so too, perhaps we can get a blessing from Peter for that :)
Sure that works, I don't think there's anything else pending for this file to conflict with.
Great, thanks. Sent
http://patchwork.ozlabs.org/project/netdev/list/?series=113601