History

Merge tag 'riscv-for-linus-6.9-mw2' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux

Pull RISC-V updates from Palmer Dabbelt: - Support for various vector-accelerated crypto routines - Hibernation is now enabled for portable kernel builds - mmap_rnd_bits_max is larger on systems with larger VAs - Support for fast GUP - Support for membarrier-based instruction cache synchronization - Support for the Andes hart-level interrupt controller and PMU - Some cleanups around unaligned access speed probing and Kconfig settings - Support for ACPI LPI and CPPC - Various cleanus related to barriers - A handful of fixes * tag 'riscv-for-linus-6.9-mw2' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux: (66 commits) riscv: Fix syscall wrapper for >word-size arguments crypto: riscv - add vector crypto accelerated AES-CBC-CTS crypto: riscv - parallelize AES-CBC decryption riscv: Only flush the mm icache when setting an exec pte riscv: Use kcalloc() instead of kzalloc() riscv/barrier: Add missing space after ',' riscv/barrier: Consolidate fence definitions riscv/barrier: Define RISCV_FULL_BARRIER riscv/barrier: Define __{mb,rmb,wmb} RISC-V: defconfig: Enable CONFIG_ACPI_CPPC_CPUFREQ cpufreq: Move CPPC configs to common Kconfig and add RISC-V ACPI: RISC-V: Add CPPC driver ACPI: Enable ACPI_PROCESSOR for RISC-V ACPI: RISC-V: Add LPI driver cpuidle: RISC-V: Move few functions to arch/riscv riscv: Introduce set_compat_task() in asm/compat.h riscv: Introduce is_compat_thread() into compat.h riscv: add compile-time test into is_compat_task() riscv: Replace direct thread flag check with is_compat_task() riscv: Improve arch_get_mmap_end() macro ...

Linus Torvalds committed 2 years ago

Commit c150b802 parents 1e3cd03 a9ad732105 files · +5183 −747Browse files

Showing the changes to include/asm-generic (4 of 105 files). Show all

Unified · Split

4 files
  1. include/asm-generic/bitops/__ffs.h +6 −2
  2. include/asm-generic/bitops/__fls.h +6 −2
  3. include/asm-generic/bitops/ffs.h +6 −2
  4. include/asm-generic/bitops/fls.h +6 −2
include/asm-generic/bitops/__ffs.h+6−2
@@ -5,12 +5,12 @@ · 4 unmodified lines
55 #include <asm/types.h>
66
77 /**
8− * __ffs - find first bit in word.
8+ * generic___ffs - find first bit in word.
99 * @word: The word to search
1010 *
1111 * Undefined if no bit exists, so code should check against 0 first.
1212 */
13−static __always_inline unsigned long __ffs(unsigned long word)
13+static __always_inline unsigned long generic___ffs(unsigned long word)
1414 {
1515 int num = 0;
1616
@@ -41,4 +41,8 @@ static __always_inline unsigned long __ffs(unsigned long word) · 24 unmodified lines
4141 return num;
4242 }
4343
44+#ifndef __HAVE_ARCH___FFS
45+#define __ffs(word) generic___ffs(word)
46+#endif
47+
4448 #endif /* _ASM_GENERIC_BITOPS___FFS_H_ */
include/asm-generic/bitops/__fls.h+6−2
@@ -5,12 +5,12 @@ · 4 unmodified lines
55 #include <asm/types.h>
66
77 /**
8− * __fls - find last (most-significant) set bit in a long word
8+ * generic___fls - find last (most-significant) set bit in a long word
99 * @word: the word to search
1010 *
1111 * Undefined if no set bit exists, so code should check against 0 first.
1212 */
13−static __always_inline unsigned long __fls(unsigned long word)
13+static __always_inline unsigned long generic___fls(unsigned long word)
1414 {
1515 int num = BITS_PER_LONG - 1;
1616
@@ -41,4 +41,8 @@ static __always_inline unsigned long __fls(unsigned long word) · 24 unmodified lines
4141 return num;
4242 }
4343
44+#ifndef __HAVE_ARCH___FLS
45+#define __fls(word) generic___fls(word)
46+#endif
47+
4448 #endif /* _ASM_GENERIC_BITOPS___FLS_H_ */
include/asm-generic/bitops/ffs.h+6−2
@@ -3,14 +3,14 @@ · 2 unmodified lines
33 #define _ASM_GENERIC_BITOPS_FFS_H_
44
55 /**
6− * ffs - find first bit set
6+ * generic_ffs - find first bit set
77 * @x: the word to search
88 *
99 * This is defined the same way as
1010 * the libc and compiler builtin ffs routines, therefore
1111 * differs in spirit from ffz (man ffs).
1212 */
13−static inline int ffs(int x)
13+static inline int generic_ffs(int x)
1414 {
1515 int r = 1;
1616
@@ -39,4 +39,8 @@ static inline int ffs(int x) · 22 unmodified lines
3939 return r;
4040 }
4141
42+#ifndef __HAVE_ARCH_FFS
43+#define ffs(x) generic_ffs(x)
44+#endif
45+
4246 #endif /* _ASM_GENERIC_BITOPS_FFS_H_ */
include/asm-generic/bitops/fls.h+6−2
@@ -3,14 +3,14 @@ · 2 unmodified lines
33 #define _ASM_GENERIC_BITOPS_FLS_H_
44
55 /**
6− * fls - find last (most-significant) bit set
6+ * generic_fls - find last (most-significant) bit set
77 * @x: the word to search
88 *
99 * This is defined the same way as ffs.
1010 * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
1111 */
1212
13−static __always_inline int fls(unsigned int x)
13+static __always_inline int generic_fls(unsigned int x)
1414 {
1515 int r = 32;
1616
@@ -39,4 +39,8 @@ static __always_inline int fls(unsigned int x) · 22 unmodified lines
3939 return r;
4040 }
4141
42+#ifndef __HAVE_ARCH_FLS
43+#define fls(x) generic_fls(x)
44+#endif
45+
4246 #endif /* _ASM_GENERIC_BITOPS_FLS_H_ */