diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-09-12 16:51:22 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-09-12 16:51:22 +0200 |
| commit | a791dc135325862fdf491ac088f54993710e2515 (patch) | |
| tree | 3fe941c0d8b8d315ad4b2235836462e0820f98ae /include/asm-generic/bitops/non-atomic.h | |
| parent | driver core: remove make_class_name declaration (diff) | |
| parent | Linux 6.0-rc5 (diff) | |
| download | linux-dev-a791dc135325862fdf491ac088f54993710e2515.tar.xz linux-dev-a791dc135325862fdf491ac088f54993710e2515.zip | |
Merge 6.0-rc5 into driver-core-next
We need the driver core and debugfs changes in this branch.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/asm-generic/bitops/non-atomic.h')
| -rw-r--r-- | include/asm-generic/bitops/non-atomic.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-generic/bitops/non-atomic.h b/include/asm-generic/bitops/non-atomic.h index 5c37ced343ae..71f8d54a5195 100644 --- a/include/asm-generic/bitops/non-atomic.h +++ b/include/asm-generic/bitops/non-atomic.h @@ -13,6 +13,7 @@ #define arch___test_and_change_bit generic___test_and_change_bit #define arch_test_bit generic_test_bit +#define arch_test_bit_acquire generic_test_bit_acquire #include <asm-generic/bitops/non-instrumented-non-atomic.h> |