diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-30 13:38:53 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-30 13:38:53 +0100 |
| commit | 34f653345018c42cedea89b7f6a4aba3783ebd7b (patch) | |
| tree | 663f490f3e16571516dbcce7a2cb2f2545f79dee /fs/nfs/blocklayout/extents.c | |
| parent | regmap: Allow regmap_bulk_read() to work for "no-bus" regmaps (diff) | |
| parent | Linux 3.13-rc4 (diff) | |
| download | linux-34f653345018c42cedea89b7f6a4aba3783ebd7b.tar.xz linux-34f653345018c42cedea89b7f6a4aba3783ebd7b.zip | |
Merge tag 'v3.13-rc4' into regmap-core
Needed as a subsequent patch is built on some of the fixes.
Linux 3.13-rc4
Diffstat (limited to 'fs/nfs/blocklayout/extents.c')
| -rw-r--r-- | fs/nfs/blocklayout/extents.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/blocklayout/extents.c b/fs/nfs/blocklayout/extents.c index 9c3e117c3ed1..4d0161442565 100644 --- a/fs/nfs/blocklayout/extents.c +++ b/fs/nfs/blocklayout/extents.c @@ -44,7 +44,7 @@ static inline sector_t normalize(sector_t s, int base) { sector_t tmp = s; /* Since do_div modifies its argument */ - return s - do_div(tmp, base); + return s - sector_div(tmp, base); } static inline sector_t normalize_up(sector_t s, int base) |