Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

Pull drm fix from Dave Airlie:
 "An oops snuck in in an -rc3 patch, this fixes it"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  [PATCH] drm/mm: Fix support 4 GiB and larger ranges
This commit is contained in:
Linus Torvalds 2015-03-15 15:20:09 -07:00
commit 08352086de
1 changed files with 1 additions and 1 deletions

View File

@ -403,7 +403,7 @@ static int check_free_hole(u64 start, u64 end, u64 size, unsigned alignment)
unsigned rem;
rem = do_div(tmp, alignment);
if (tmp)
if (rem)
start += alignment - rem;
}