diff options
| author | Dave Chinner <david@fromorbit.com> | 2016-05-20 10:33:17 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2016-05-20 10:33:17 +1000 |
| commit | 2a4ad5894c819978dca5595396d54d51c3aca694 (patch) | |
| tree | 62fcfac878219b36da9156785d832184194fd98a /fs/xfs/kmem.h | |
| parent | a7792aad644a259375002db8c9d9e03fd50bf509 (diff) | |
| parent | 6e3e6d55e51774ec7cfc24975749bbddb28a9051 (diff) | |
| download | op-kernel-dev-2a4ad5894c819978dca5595396d54d51c3aca694.zip op-kernel-dev-2a4ad5894c819978dca5595396d54d51c3aca694.tar.gz | |
Merge branch 'xfs-4.7-misc-fixes' into for-next
Diffstat (limited to 'fs/xfs/kmem.h')
| -rw-r--r-- | fs/xfs/kmem.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/kmem.h b/fs/xfs/kmem.h index d1c66e4..689f746 100644 --- a/fs/xfs/kmem.h +++ b/fs/xfs/kmem.h @@ -62,7 +62,7 @@ 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_realloc(const void *, size_t, xfs_km_flags_t); static inline void kmem_free(const void *ptr) { kvfree(ptr); |
