Commit 51c47675 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 1722389b fb9086e9

arch/riscv/include/asm/bitops.h

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static __always_inline int variable_fls(unsigned int x) 
({								\

	typeof(x) x_ = (x);					\

	__builtin_constant_p(x_) ?				\

	 (int)((x_ != 0) ? (32 - __builtin_clz(x_)) : 0)	\

	 ((x_ != 0) ? (32 - __builtin_clz(x_)) : 0)		\

	 :							\

	 variable_fls(x_);					\

})

include/linux/bitops.h

+5 −0
Original line number Diff line number Diff line
@@ -47,12 +47,17 @@ extern unsigned long __sw_hweight64(__u64 w); 
	  __builtin_constant_p(*(const unsigned long *)(addr))) ?	\

	 const##op(nr, addr) : op(nr, addr))



/*

 * The following macros are non-atomic versions of their non-underscored

 * counterparts.

 */

#define __set_bit(nr, addr)		bitop(___set_bit, nr, addr)

#define __clear_bit(nr, addr)		bitop(___clear_bit, nr, addr)

#define __change_bit(nr, addr)		bitop(___change_bit, nr, addr)

#define __test_and_set_bit(nr, addr)	bitop(___test_and_set_bit, nr, addr)

#define __test_and_clear_bit(nr, addr)	bitop(___test_and_clear_bit, nr, addr)

#define __test_and_change_bit(nr, addr)	bitop(___test_and_change_bit, nr, addr)



#define test_bit(nr, addr)		bitop(_test_bit, nr, addr)

#define test_bit_acquire(nr, addr)	bitop(_test_bit_acquire, nr, addr)

include/linux/cpumask.h

+7 −43
Original line number Diff line number Diff line
@@ -1033,53 +1033,17 @@ void init_cpu_present(const struct cpumask *src); 
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);



static inline void

set_cpu_active(unsigned int cpu, bool active)

{

	if (active)

		cpumask_set_cpu(cpu, &__cpu_active_mask);

	else

		cpumask_clear_cpu(cpu, &__cpu_active_mask);

}



static inline void

set_cpu_dying(unsigned int cpu, bool dying)

{

	if (dying)

		cpumask_set_cpu(cpu, &__cpu_dying_mask);

	else

		cpumask_clear_cpu(cpu, &__cpu_dying_mask);

}



/**

 * to_cpumask - convert a NR_CPUS bitmap to a struct cpumask *

 * @bitmap: the bitmap

lib/cpumask_kunit.c

+1 −0
Original line number Diff line number Diff line
@@ -152,4 +152,5 @@ static struct kunit_suite test_cpumask_suite = { 
};

kunit_test_suite(test_cpumask_suite);



MODULE_DESCRIPTION("KUnit tests for cpumask");

MODULE_LICENSE("GPL");

lib/find_bit_benchmark.c

+1 −0
Original line number Diff line number Diff line
@@ -194,4 +194,5 @@ static int __init find_bit_test(void) 
}

module_init(find_bit_test);



MODULE_DESCRIPTION("Test for find_*_bit functions");

MODULE_LICENSE("GPL");