Merge tag 'v6.1-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[platform/kernel/linux-starfive.git] / kernel / delayacct.c

diff --git a/kernel/delayacct.c b/kernel/delayacct.c
index 164ed9e..e39cb69 100644 (file)
--- a/kernel/delayacct.c
+++ b/kernel/delayacct.c
@@ -214,13 +214,22 @@ void __delayacct_freepages_end(void)
                      &current->delays->freepages_count);
 }
 
-void __delayacct_thrashing_start(void)
+void __delayacct_thrashing_start(bool *in_thrashing)
 {
+       *in_thrashing = !!current->in_thrashing;
+       if (*in_thrashing)
+               return;
+
+       current->in_thrashing = 1;
        current->delays->thrashing_start = local_clock();
 }
 
-void __delayacct_thrashing_end(void)
+void __delayacct_thrashing_end(bool *in_thrashing)
 {
+       if (*in_thrashing)
+               return;
+
+       current->in_thrashing = 0;
        delayacct_end(&current->delays->lock,
                      &current->delays->thrashing_start,
                      &current->delays->thrashing_delay,