diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-15 15:20:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-15 15:20:09 -0700 |
| commit | 08352086de06c95f4bd9a56cd03b231919bf9627 (patch) | |
| tree | eb9ee0d5ec2943f46293af8fdd0699a8a181ea2b | |
| parent | 1ee89c519a0aca101d2e173c5544a52877d763ec (diff) | |
| parent | 046d669c62f37323ef0329c41d83a03c06b2087d (diff) | |
| download | linux-08352086de06c95f4bd9a56cd03b231919bf9627.tar.gz linux-08352086de06c95f4bd9a56cd03b231919bf9627.tar.bz2 linux-08352086de06c95f4bd9a56cd03b231919bf9627.zip | |
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
| -rw-r--r-- | drivers/gpu/drm/drm_mm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c index 7fc6f8bd4821..1134526286c8 100644 --- 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; } |