Merge branch 'next/pm' of git://git.linaro.org/people/arnd/arm-soc

[firefly-linux-kernel-4.4.55.git] / lib / ratelimit.c

diff --git a/lib/ratelimit.c b/lib/ratelimit.c
index 027a03f4c56d4059b23560c984f5699e44e069d8..c96d500577de57d5d87ffa293d1d630c318b8b92 100644 (file)
--- a/lib/ratelimit.c
+++ b/lib/ratelimit.c
@@ -39,7 +39,7 @@ int ___ratelimit(struct ratelimit_state *rs, const char *func)
         * in addition to the one that will be printed by
         * the entity that is holding the lock already:
         */
-       if (!spin_trylock_irqsave(&rs->lock, flags))
+       if (!raw_spin_trylock_irqsave(&rs->lock, flags))
                return 0;
 
        if (!rs->begin)
@@ -60,7 +60,7 @@ int ___ratelimit(struct ratelimit_state *rs, const char *func)
                rs->missed++;
                ret = 0;
        }
-       spin_unlock_irqrestore(&rs->lock, flags);
+       raw_spin_unlock_irqrestore(&rs->lock, flags);
 
        return ret;
 }