Skip to contentSkip to conversation

Revert "dm cache: fix arm link errors with inline"

PATCH In review Nick Desaulniers 3 participants 3 messages Nov 11, 2020 – Nov 12, 2020 Device mapper

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Revert "dm cache: fix arm link errors with inline"

This reverts commit 43aeaa29573924df76f44eda2bbd94ca36e407b5.

Since
commit 0bddd227f3dc ("Documentation: update for gcc 4.9 requirement") the minimum supported version of GCC is gcc-4.9. It's now safe to remove this code.

---
 drivers/md/dm-cache-target.c | 4 ----
 1 file changed, 4 deletions(-)
drivers/md/dm-cache-target.c +0 -4
index 9644424591da..4bc453f5bbaa 100644
@@ -712,10 +712,6 @@ static bool block_size_is_power_of_two(struct cache *cache)
 	return cache->sectors_per_block_shift >= 0;
 }
 
-/* gcc on ARM generates spurious references to __udivdi3 and __umoddi3 */
-#if defined(CONFIG_ARM) && __GNUC__ == 4 && __GNUC_MINOR__ <= 6
-__always_inline
-#endif
 static dm_block_t block_div(dm_block_t b, uint32_t n)
 {
 	do_div(b, n);
Signature · 1 line
2.29.2.222.g5d2a92d10f8-goog
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 31 lines · Nick Desaulniers

This reverts commit 43aeaa29573924df76f44eda2bbd94ca36e407b5.

Since
commit 0bddd227f3dc ("Documentation: update for gcc 4.9 requirement") the minimum supported version of GCC is gcc-4.9. It's now safe to remove this code.

---
 drivers/md/dm-cache-target.c | 4 ----
 1 file changed, 4 deletions(-)
drivers/md/dm-cache-target.c +0 -4
index 9644424591da..4bc453f5bbaa 100644
@@ -712,10 +712,6 @@ static bool block_size_is_power_of_two(struct cache *cache)
 	return cache->sectors_per_block_shift >= 0;
 }
 
-/* gcc on ARM generates spurious references to __udivdi3 and __umoddi3 */
-#if defined(CONFIG_ARM) && __GNUC__ == 4 && __GNUC_MINOR__ <= 6
-__always_inline
-#endif
 static dm_block_t block_div(dm_block_t b, uint32_t n)
 {
 	do_div(b, n);
Signature · 1 line
2.29.2.222.g5d2a92d10f8-goog
Reviewed-by on v1 1/1
#2 lore raw
In reply to Nick Desaulniers
Quoted 9 lines · Nick Desaulniers' via Clang Built Linux

This reverts commit 43aeaa29573924df76f44eda2bbd94ca36e407b5.

Since
commit 0bddd227f3dc ("Documentation: update for gcc 4.9 requirement") the minimum supported version of GCC is gcc-4.9. It's now safe to remove this code.

Quoted 22 lines
---
 drivers/md/dm-cache-target.c | 4 ----
 1 file changed, 4 deletions(-)
drivers/md/dm-cache-target.c +0 -4
index 9644424591da..4bc453f5bbaa 100644
@@ -712,10 +712,6 @@ static bool block_size_is_power_of_two(struct cache *cache)
 	return cache->sectors_per_block_shift >= 0;
 }
 
-/* gcc on ARM generates spurious references to __udivdi3 and __umoddi3 */
-#if defined(CONFIG_ARM) && __GNUC__ == 4 && __GNUC_MINOR__ <= 6
-__always_inline
-#endif
 static dm_block_t block_div(dm_block_t b, uint32_t n)
 {
 	do_div(b, n);
Signature · 1 line
2.29.2.222.g5d2a92d10f8-goog