diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-22 09:54:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-22 09:54:34 -0800 |
| commit | 6fb11e6508eac9d2e01ba748fc13afdd657224ab (patch) | |
| tree | badf5fa97da02eab53826465ea9da21079eac0dc /lib | |
| parent | 3e1e21c7bfcfa9bf06c07f48a13faca2f62b3339 (diff) | |
| parent | b1b1e15ef6b80facf76d6757649dfd7295eda29f (diff) | |
| download | op-kernel-dev-6fb11e6508eac9d2e01ba748fc13afdd657224ab.zip op-kernel-dev-6fb11e6508eac9d2e01ba748fc13afdd657224ab.tar.gz | |
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"Six fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
ocfs2: NFS hangs in __ocfs2_cluster_lock due to race with ocfs2_unblock_lock
reiserfs: fix dereference of ERR_PTR
ratelimit: fix bug in time interval by resetting right begin time
mm: fix kernel crash in khugepaged thread
mm: fix mlock accouting
thp: change pmd_trans_huge_lock() interface to return ptl
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ratelimit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ratelimit.c b/lib/ratelimit.c index 40e03ea..2c5de86 100644 --- a/lib/ratelimit.c +++ b/lib/ratelimit.c @@ -49,7 +49,7 @@ int ___ratelimit(struct ratelimit_state *rs, const char *func) if (rs->missed) printk(KERN_WARNING "%s: %d callbacks suppressed\n", func, rs->missed); - rs->begin = 0; + rs->begin = jiffies; rs->printed = 0; rs->missed = 0; } |
