Commit 08352086 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 1ee89c51 046d669c

drivers/gpu/drm/drm_mm.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}