From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 26 Jul 2024 16:50:36 +0000 (-0700)
Subject: Merge tag 'bitmap-6.11-rc1' of https://github.com:/norov/linux
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=51c4767503d5d3a5a0ae4dcb19b7f7cf38b40c6c;p=users%2Fdwmw2%2Flinux.git

Merge tag 'bitmap-6.11-rc1' of https://github.com:/norov/linux

Pull bitmap updates from Yury Norov:
 "Random fixes"

* tag 'bitmap-6.11-rc1' of https://github.com:/norov/linux:
  riscv: Remove unnecessary int cast in variable_fls()
  radix tree test suite: put definition of bitmap_clear() into lib/bitmap.c
  bitops: Add a comment explaining the double underscore macros
  lib: bitmap: add missing MODULE_DESCRIPTION() macros
  cpumask: introduce assign_cpu() macro
---

51c4767503d5d3a5a0ae4dcb19b7f7cf38b40c6c
diff --cc include/linux/cpumask.h
index 099e8b32dd68a,18410acdbc9e7..801a7e524113e
--- a/include/linux/cpumask.h
+++ b/include/linux/cpumask.h
@@@ -1033,32 -1083,13 +1033,14 @@@ void init_cpu_present(const struct cpum
  void init_cpu_possible(const struct cpumask *src);
  void init_cpu_online(const struct cpumask *src);
  
- static inline void
- set_cpu_possible(unsigned int cpu, bool possible)
- {
- 	if (possible)
- 		cpumask_set_cpu(cpu, &__cpu_possible_mask);
- 	else
- 		cpumask_clear_cpu(cpu, &__cpu_possible_mask);
- }
+ #define assign_cpu(cpu, mask, val)	\
+ 	assign_bit(cpumask_check(cpu), cpumask_bits(mask), (val))
  
- static inline void
- set_cpu_enabled(unsigned int cpu, bool can_be_onlined)
- {
- 	if (can_be_onlined)
- 		cpumask_set_cpu(cpu, &__cpu_enabled_mask);
- 	else
- 		cpumask_clear_cpu(cpu, &__cpu_enabled_mask);
- }
- 
- static inline void
- set_cpu_present(unsigned int cpu, bool present)
- {
- 	if (present)
- 		cpumask_set_cpu(cpu, &__cpu_present_mask);
- 	else
- 		cpumask_clear_cpu(cpu, &__cpu_present_mask);
- }
+ #define set_cpu_possible(cpu, possible)	assign_cpu((cpu), &__cpu_possible_mask, (possible))
++#define set_cpu_enabled(cpu, enabled)	assign_cpu((cpu), &__cpu_possible_mask, (enabled))
+ #define set_cpu_present(cpu, present)	assign_cpu((cpu), &__cpu_present_mask, (present))
+ #define set_cpu_active(cpu, active)	assign_cpu((cpu), &__cpu_active_mask, (active))
+ #define set_cpu_dying(cpu, dying)	assign_cpu((cpu), &__cpu_dying_mask, (dying))
  
  void set_cpu_online(unsigned int cpu, bool online);