diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-06-10 00:12:06 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-06-10 00:12:06 +1000 |
commit | accdfc287ba174aa599b14d2fe983ff7560ae673 (patch) | |
tree | 84188cccf4819d88c66e2dd5f7dce9d388e84fc2 /include/drm/drm_mem_util.h | |
parent | 71ea95794f995d50890a5250d8012d07032e751f (diff) | |
parent | 55c8198129dcd224db864bb302d5efb55a421523 (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 |