diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-06-04 22:31:39 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-06-04 22:31:39 +1000 |
| commit | add87f2d7d93774f468b1bd1b509332f459bcb4f (patch) | |
| tree | 8c55a18a6037992f345e4c21737152c1442067c5 /drivers/gpu/drm/nouveau/nouveau_gem.c | |
| parent | c0b99e74f908ab5af85cb4e5fdb2308e7170caf5 (diff) | |
| parent | ae7c3198b07c9bc811cd2e6ee185fc70f89b40f7 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_gem.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_gem.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c index 0e690bf19fc9..af1ee517f372 100644 --- a/drivers/gpu/drm/nouveau/nouveau_gem.c +++ b/drivers/gpu/drm/nouveau/nouveau_gem.c @@ -555,10 +555,7 @@ nouveau_gem_pushbuf_validate(struct nouveau_channel *chan, static inline void u_free(void *addr) { - if (!is_vmalloc_addr(addr)) - kfree(addr); - else - vfree(addr); + kvfree(addr); } static inline void * |