Skip to content

Commit 3689f9f

Browse files
torvaldstorvalds
committed
Merge tag 'bitmap-5.17-rc1' of git://github.com/norov/linux
Pull bitmap updates from Yury Norov: - introduce for_each_set_bitrange() - use find_first_*_bit() instead of find_next_*_bit() where possible - unify for_each_bit() macros * tag 'bitmap-5.17-rc1' of git://github.com/norov/linux: vsprintf: rework bitmap_list_string lib: bitmap: add performance test for bitmap_print_to_pagebuf bitmap: unify find_bit operations mm/percpu: micro-optimize pcpu_is_populated() Replace for_each_*_bit_from() with for_each_*_bit() where appropriate find: micro-optimize for_each_{set,clear}_bit() include/linux: move for_each_bit() macros from bitops.h to find.h cpumask: replace cpumask_next_* with cpumask_first_* where appropriate tools: sync tools/bitmap with mother linux all: replace find_next{,_zero}_bit with find_first{,_zero}_bit where appropriate cpumask: use find_first_and_bit() lib: add find_first_and_bit() arch: remove GENERIC_FIND_FIRST_BIT entirely include: move find.h from asm_generic to linux bitops: move find_bit_*_le functions from le.h to find.h bitops: protect find_first_{,zero}_bit properly
2 parents 1c52283 + 15325b4 commit 3689f9f

File tree

73 files changed

+635
-438
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+635
-438
lines changed

‎MAINTAINERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3410,14 +3410,14 @@ M: Yury Norov <yury.norov@gmail.com>
34103410
R: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
34113411
R: Rasmus Villemoes <linux@rasmusvillemoes.dk>
34123412
S: Maintained
3413-
F: include/asm-generic/bitops/find.h
34143413
F: include/linux/bitmap.h
3414+
F: include/linux/find.h
34153415
F: lib/bitmap.c
34163416
F: lib/find_bit.c
34173417
F: lib/find_bit_benchmark.c
34183418
F: lib/test_bitmap.c
3419-
F: tools/include/asm-generic/bitops/find.h
34203419
F: tools/include/linux/bitmap.h
3420+
F: tools/include/linux/find.h
34213421
F: tools/lib/bitmap.c
34223422
F: tools/lib/find_bit.c
34233423

‎arch/alpha/include/asm/bitops.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -430,8 +430,6 @@ static inline unsigned int __arch_hweight8(unsigned int w)
430430

431431
#endif /* __KERNEL__ */
432432

433-
#include <asm-generic/bitops/find.h>
434-
435433
#ifdef __KERNEL__
436434

437435
/*

‎arch/arc/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ config ARC
2020
select COMMON_CLK
2121
select DMA_DIRECT_REMAP
2222
select GENERIC_ATOMIC64 if !ISA_ARCV2 || !(ARC_HAS_LL64 && ARC_HAS_LLSC)
23-
select GENERIC_FIND_FIRST_BIT
2423
# for now, we don't need GENERIC_IRQ_PROBE, CONFIG_GENERIC_IRQ_CHIP
2524
select GENERIC_IRQ_SHOW
2625
select GENERIC_PCI_IOMAP

‎arch/arc/include/asm/bitops.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,6 @@ static inline __attribute__ ((const)) unsigned long __ffs(unsigned long x)
189189
#include <asm-generic/bitops/atomic.h>
190190
#include <asm-generic/bitops/non-atomic.h>
191191

192-
#include <asm-generic/bitops/find.h>
193192
#include <asm-generic/bitops/le.h>
194193
#include <asm-generic/bitops/ext2-atomic-setbit.h>
195194

‎arch/arm/include/asm/bitops.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,6 @@ static inline int find_next_bit_le(const void *p, int size, int offset)
264264

265265
#endif
266266

267-
#include <asm-generic/bitops/find.h>
268267
#include <asm-generic/bitops/le.h>
269268

270269
/*

‎arch/arm64/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ config ARM64
120120
select GENERIC_CPU_AUTOPROBE
121121
select GENERIC_CPU_VULNERABILITIES
122122
select GENERIC_EARLY_IOREMAP
123-
select GENERIC_FIND_FIRST_BIT
124123
select GENERIC_IDLE_POLL_SETUP
125124
select GENERIC_IRQ_IPI
126125
select GENERIC_IRQ_PROBE

‎arch/arm64/include/asm/bitops.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
#include <asm-generic/bitops/ffz.h>
2020
#include <asm-generic/bitops/fls64.h>
21-
#include <asm-generic/bitops/find.h>
2221

2322
#include <asm-generic/bitops/sched.h>
2423
#include <asm-generic/bitops/hweight.h>

‎arch/csky/include/asm/bitops.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ static __always_inline unsigned long __fls(unsigned long x)
5959

6060
#include <asm-generic/bitops/ffz.h>
6161
#include <asm-generic/bitops/fls64.h>
62-
#include <asm-generic/bitops/find.h>
6362

6463
#ifndef _LINUX_BITOPS_H
6564
#error only <linux/bitops.h> can be included directly

‎arch/h8300/include/asm/bitops.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ static inline unsigned long __ffs(unsigned long word)
168168
return result;
169169
}
170170

171-
#include <asm-generic/bitops/find.h>
172171
#include <asm-generic/bitops/sched.h>
173172
#include <asm-generic/bitops/hweight.h>
174173
#include <asm-generic/bitops/lock.h>

‎arch/hexagon/include/asm/bitops.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,6 @@ static inline unsigned long __fls(unsigned long word)
271271
}
272272

273273
#include <asm-generic/bitops/lock.h>
274-
#include <asm-generic/bitops/find.h>
275274

276275
#include <asm-generic/bitops/fls64.h>
277276
#include <asm-generic/bitops/sched.h>

0 commit comments

Comments
 (0)