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

torvalds · torvalds · commit 08352086de06 · 2015-03-15T15:20:09.000-07:00
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
diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c
@@ -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;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -403,7 +403,7 @@ static int check_free_hole(u64 start, u64 end, u64 size, unsigned alignment)`
`403`	`403`	`unsigned rem;`
`404`	`404`
`405`	`405`	`rem = do_div(tmp, alignment);`
`406`		`- if (tmp)`
	`406`	`+ if (rem)`
`407`	`407`	`start += alignment - rem;`
`408`	`408`	`}`
`409`	`409`