diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-07-01 15:03:07 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-07-01 15:03:07 +1000 |
| commit | 8ebb88a4ef020cd6d9d0086b278f2e784949c28d (patch) | |
| tree | 68da406ed290e449e7b87583818c37f3c91f8340 /include/drm/drm_mem_util.h | |
| parent | a55f854f079722909039c5093901fcd94ee4389d (diff) | |
| parent | 2ae58571e60d40ed3a4a5887eabb030021de8fb9 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'include/drm/drm_mem_util.h')
| -rw-r--r-- | include/drm/drm_mem_util.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/drm/drm_mem_util.h b/include/drm/drm_mem_util.h index 19a240446fca..e42495ad8136 100644 --- a/include/drm/drm_mem_util.h +++ b/include/drm/drm_mem_util.h @@ -56,10 +56,7 @@ static __inline__ void *drm_malloc_ab(size_t nmemb, size_t size) static __inline void drm_free_large(void *ptr) { - if (!is_vmalloc_addr(ptr)) - return kfree(ptr); - - vfree(ptr); + kvfree(ptr); } #endif |