diff options
| author | Dave Chinner <david@fromorbit.com> | 2015-02-02 10:03:18 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-02-02 10:03:18 +1100 |
| commit | 3fd1b0d158b6b98d9561e2f7f9c6970d95cf71d6 (patch) | |
| tree | 3a32490a8db83ca2ed6da6701af20e3cd6adff2c /fs/xfs/kmem.h | |
| parent | 438c3c8d2bb910966db6fc4140e62d67b3c5f2a8 (diff) | |
| parent | 2ba66237029d1ad6c1a5e2241b0ffbbfff55f750 (diff) | |
| download | linux-3fd1b0d158b6b98d9561e2f7f9c6970d95cf71d6.tar.bz2 | |
Merge branch 'xfs-misc-fixes-for-3.20-3' into for-next
Diffstat (limited to 'fs/xfs/kmem.h')
| -rw-r--r-- | fs/xfs/kmem.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/xfs/kmem.h b/fs/xfs/kmem.h index 64db0e53edea..cc6b768fc068 100644 --- a/fs/xfs/kmem.h +++ b/fs/xfs/kmem.h @@ -63,7 +63,10 @@ kmem_flags_convert(xfs_km_flags_t flags) extern void *kmem_alloc(size_t, xfs_km_flags_t); extern void *kmem_zalloc_large(size_t size, xfs_km_flags_t); extern void *kmem_realloc(const void *, size_t, size_t, xfs_km_flags_t); -extern void kmem_free(const void *); +static inline void kmem_free(const void *ptr) +{ + kvfree(ptr); +} extern void *kmem_zalloc_greedy(size_t *, size_t, size_t); |