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 /drivers/md/bcache/util.h | |
parent | a55f854f079722909039c5093901fcd94ee4389d (diff) | |
parent | 2ae58571e60d40ed3a4a5887eabb030021de8fb9 (diff) |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/md/bcache/util.h')
-rw-r--r-- | drivers/md/bcache/util.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/md/bcache/util.h b/drivers/md/bcache/util.h index 98df7572b5f7..1d04c4859c70 100644 --- a/drivers/md/bcache/util.h +++ b/drivers/md/bcache/util.h @@ -52,10 +52,7 @@ struct closure; #define free_heap(heap) \ do { \ - if (is_vmalloc_addr((heap)->data)) \ - vfree((heap)->data); \ - else \ - kfree((heap)->data); \ + kvfree((heap)->data); \ (heap)->data = NULL; \ } while (0) @@ -163,10 +160,7 @@ do { \ #define free_fifo(fifo) \ do { \ - if (is_vmalloc_addr((fifo)->data)) \ - vfree((fifo)->data); \ - else \ - kfree((fifo)->data); \ + kvfree((fifo)->data); \ (fifo)->data = NULL; \ } while (0) |