X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=lib%2Fmemalign.c;h=e774c19c3ebe9980008b38afacc4c29c475ca666;hb=3d2d14bcb844e72809192311369a642c5d415472;hp=1d1ba9ba2013ea2c3fdba579931ff1743989cdd7;hpb=861e3790be5f1e22b16e827b142147e530205441;p=fio.git diff --git a/lib/memalign.c b/lib/memalign.c index 1d1ba9ba..e774c19c 100644 --- a/lib/memalign.c +++ b/lib/memalign.c @@ -1,9 +1,10 @@ -#include #include -#include +#include #include "memalign.h" -#include "../fio.h" + +#define PTR_ALIGN(ptr, mask) \ + (char *)((uintptr_t)((ptr) + (mask)) & ~(mask)) struct align_footer { unsigned int offset; @@ -16,7 +17,7 @@ void *fio_memalign(size_t alignment, size_t size) assert(!(alignment & (alignment - 1))); - ptr = malloc(size + alignment + size + sizeof(*f) - 1); + ptr = malloc(size + alignment + sizeof(*f) - 1); if (ptr) { ret = PTR_ALIGN(ptr, alignment - 1); f = ret + size;