diff options
| author |  Ingo Molnar <mingo@kernel.org>
| 2024-04-11 15:36:23 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org>
| 2024-04-11 15:36:23 +0200 |
| commit | 5b9b2e6baf9ed944a97d5a29c3386ac79937e8fc (patch) | |
| tree | 542a32b1b625de2e9dc60d0944daf7cbd3357aad /include/asm-generic/bitops/ffs.h | |
| parent | x86/boot: Move kernel cmdline setup earlier in the boot process (again) (diff) | |
| parent | Linux 6.9-rc3 (diff) | |
| download | linux-5b9b2e6baf9ed944a97d5a29c3386ac79937e8fc.tar.gz linux-5b9b2e6baf9ed944a97d5a29c3386ac79937e8fc.tar.bz2 linux-5b9b2e6baf9ed944a97d5a29c3386ac79937e8fc.zip | |
Merge tag 'v6.9-rc3' into x86/boot, to pick up fixes before queueing up more changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/asm-generic/bitops/ffs.h')
| -rw-r--r-- | include/asm-generic/bitops/ffs.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/asm-generic/bitops/ffs.h b/include/asm-generic/bitops/ffs.h index 323fd5d6ae26..4c43f242daeb 100644 --- a/include/asm-generic/bitops/ffs.h +++ b/include/asm-generic/bitops/ffs.h @@ -3,14 +3,14 @@ #define _ASM_GENERIC_BITOPS_FFS_H_ /** - * ffs - find first bit set + * generic_ffs - find first bit set * @x: the word to search * * This is defined the same way as * the libc and compiler builtin ffs routines, therefore * differs in spirit from ffz (man ffs). */ -static inline int ffs(int x) +static inline int generic_ffs(int x) { int r = 1; @@ -39,4 +39,8 @@ static inline int ffs(int x) return r; } +#ifndef __HAVE_ARCH_FFS +#define ffs(x) generic_ffs(x) +#endif + #endif /* _ASM_GENERIC_BITOPS_FFS_H_ */ |