diff options
| author | Jens Axboe <axboe@fb.com> | 2015-03-13 10:24:49 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-03-13 10:24:49 -0400 |
| commit | 64f9b683b6418d946101a9068d133b6daa3a22aa (patch) | |
| tree | b3a6bc7255631c4f1c270b1d2123b362689f9a61 /mm | |
| parent | c202baf017aea0c860e53131bc55bb1af7177e76 (diff) | |
| parent | 9a30b096b543932de218dd3501b5562e00a8792d (diff) | |
Merge branch 'for-linus' into for-4.1/core
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/page-writeback.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 45e187b2d971..b4fd980a93eb 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c | |||
| @@ -922,7 +922,7 @@ static void global_update_bandwidth(unsigned long thresh, | |||
| 922 | unsigned long now) | 922 | unsigned long now) |
| 923 | { | 923 | { |
| 924 | static DEFINE_SPINLOCK(dirty_lock); | 924 | static DEFINE_SPINLOCK(dirty_lock); |
| 925 | static unsigned long update_time; | 925 | static unsigned long update_time = INITIAL_JIFFIES; |
| 926 | 926 | ||
| 927 | /* | 927 | /* |
| 928 | * check locklessly first to optimize away locking for the most time | 928 | * check locklessly first to optimize away locking for the most time |