diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-15 10:16:15 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-15 10:16:15 -0400 |
| commit | 1a10390708d675ebf1a2f5e169a5165626afbd88 (patch) | |
| tree | d9ee7d10abd65e580fb74152a501089f51174225 /lib/ratelimit.c | |
| parent | 239bd83104ec6bcba90221d8b0973d2565142ef8 (diff) | |
| parent | b635acec48bcaa9183fcbf4e3955616b0d4119b5 (diff) | |
Merge branch 'linus' into x86/cpu
Diffstat (limited to 'lib/ratelimit.c')
| -rw-r--r-- | lib/ratelimit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ratelimit.c b/lib/ratelimit.c index 35136671b215..26187edcc7ea 100644 --- a/lib/ratelimit.c +++ b/lib/ratelimit.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 16 | 16 | ||
| 17 | static DEFINE_SPINLOCK(ratelimit_lock); | 17 | static DEFINE_SPINLOCK(ratelimit_lock); |
| 18 | static unsigned long flags; | ||
| 19 | 18 | ||
| 20 | /* | 19 | /* |
| 21 | * __ratelimit - rate limiting | 20 | * __ratelimit - rate limiting |
| @@ -26,6 +25,8 @@ static unsigned long flags; | |||
| 26 | */ | 25 | */ |
| 27 | int __ratelimit(struct ratelimit_state *rs) | 26 | int __ratelimit(struct ratelimit_state *rs) |
| 28 | { | 27 | { |
| 28 | unsigned long flags; | ||
| 29 | |||
| 29 | if (!rs->interval) | 30 | if (!rs->interval) |
| 30 | return 1; | 31 | return 1; |
| 31 | 32 | ||
