Commit e0d4140e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'bitmap-for-6.19-rc5' of https://github.com/norov/linux 

Pull bitmap fix from Yury Norov:
 "Fix Rust build for architectures implementing their own find_bit() ops
  (arm and m68k)"

* tag 'bitmap-for-6.19-rc5' of https://github.com/norov/linux:
  rust: bitops: fix missing _find_* functions on 32-bit ARM
parents d19954ee 6a069876

rust/helpers/bitops.c

+42 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0



#include <linux/bitops.h>

#include <linux/find.h>



void rust_helper___set_bit(unsigned long nr, unsigned long *addr)

{
@@ -21,3 +22,44 @@ void rust_helper_clear_bit(unsigned long nr, volatile unsigned long *addr) 
{

	clear_bit(nr, addr);

}



/*

 * The rust_helper_ prefix is intentionally omitted below so that the

 * declarations in include/linux/find.h are compatible with these helpers.

 *

 * Note that the below #ifdefs mean that the helper is only created if C does

 * not provide a definition.

 */

#ifdef find_first_zero_bit

__rust_helper

unsigned long _find_first_zero_bit(const unsigned long *p, unsigned long size)

{

	return find_first_zero_bit(p, size);

}

#endif /* find_first_zero_bit */



#ifdef find_next_zero_bit

__rust_helper

unsigned long _find_next_zero_bit(const unsigned long *addr,

				  unsigned long size, unsigned long offset)

{

	return find_next_zero_bit(addr, size, offset);

}

#endif /* find_next_zero_bit */



#ifdef find_first_bit

__rust_helper

unsigned long _find_first_bit(const unsigned long *addr, unsigned long size)

{

	return find_first_bit(addr, size);

}

#endif /* find_first_bit */



#ifdef find_next_bit

__rust_helper

unsigned long _find_next_bit(const unsigned long *addr, unsigned long size,

			     unsigned long offset)

{

	return find_next_bit(addr, size, offset);

}

#endif /* find_next_bit */