- 5.4.256

[packages/kernel.git] / gcc13.patch

diff --git a/gcc13.patch b/gcc13.patch
index 3dccb94b4de30186683e627a2a1f406e2f767b1e..f48904c8a7e4419a800b3318f1c8bdc58c23e77d 100644 (file)
--- a/gcc13.patch
+++ b/gcc13.patch
@@ -460,62 +460,3 @@ index b34d11e226366..320afd3cf8e82 100644
 -- 
 cgit 
 
-From 5f2779dfa7b8cc7dfd4a1b6586d86e0d193266f3 Mon Sep 17 00:00:00 2001
-From: Arnd Bergmann <arnd@arndb.de>
-Date: Wed, 18 Jan 2023 09:07:01 +0100
-Subject: blk-iocost: avoid 64-bit division in ioc_timer_fn
-
-The behavior of 'enum' types has changed in gcc-13, so now the
-UNBUSY_THR_PCT constant is interpreted as a 64-bit number because
-it is defined as part of the same enum definition as some other
-constants that do not fit within a 32-bit integer. This in turn
-leads to some inefficient code on 32-bit architectures as well
-as a link error:
-
-arm-linux-gnueabi/bin/arm-linux-gnueabi-ld: block/blk-iocost.o: in function `ioc_timer_fn':
-blk-iocost.c:(.text+0x68e8): undefined reference to `__aeabi_uldivmod'
-arm-linux-gnueabi-ld: blk-iocost.c:(.text+0x6908): undefined reference to `__aeabi_uldivmod'
-
-Split the enum definition to keep the 64-bit timing constants in
-a separate enum type from those constants that can clearly fit
-within a smaller type.
-
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Acked-by: Tejun Heo <tj@kernel.org>
-Link: https://lore.kernel.org/r/20230118080706.3303186-1-arnd@kernel.org
-Signed-off-by: Jens Axboe <axboe@kernel.dk>
----
- block/blk-iocost.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-(limited to 'block')
-
-diff --git a/block/blk-iocost.c b/block/blk-iocost.c
-index 6955605629e4f..b691b6bb498f3 100644
---- a/block/blk-iocost.c
-+++ b/block/blk-iocost.c
-@@ -258,6 +258,11 @@ enum {
-       VRATE_MIN               = VTIME_PER_USEC * VRATE_MIN_PPM / MILLION,
-       VRATE_CLAMP_ADJ_PCT     = 4,
- 
-+      /* switch iff the conditions are met for longer than this */
-+      AUTOP_CYCLE_NSEC        = 10LLU * NSEC_PER_SEC,
-+};
-+
-+enum {
-       /* if IOs end up waiting for requests, issue less */
-       RQ_WAIT_BUSY_PCT        = 5,
- 
-@@ -296,9 +301,6 @@ enum {
-       SURPLUS_SCALE_ABS       = HWEIGHT_WHOLE / 50,   /* + 2% */
-       SURPLUS_MIN_ADJ_DELTA   = HWEIGHT_WHOLE / 33,   /* 3% */
- 
--      /* switch iff the conditions are met for longer than this */
--      AUTOP_CYCLE_NSEC        = 10LLU * NSEC_PER_SEC,
--
-       /*
-        * Count IO size in 4k pages.  The 12bit shift helps keeping
-        * size-proportional components of cost calculation in closer
--- 
-cgit 
-