diff options
| author | Brian Behlendorf <[email protected]> | 2015-05-11 12:05:05 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2015-05-11 12:15:41 -0700 |
| commit | 3df293404a102398445fc013b67250073db9004e (patch) | |
| tree | baf02335a5ef6e5cf6aa0afdac599236635d6974 /lib/libspl/include | |
| parent | f9cab372917983805e14154df0720d21333326c3 (diff) | |
Fix type mismatch on 32-bit systems
The umem_alloc_aligned() function should not assume that a 'void *'
type is 64-bit. It will not be on 32-bit platforms. Rather than
complicating the ASSERT to handle this it is simply removed.
Additionally, the '%lu' format specifier should not be assumed to
imply a 64-bit value. Fix this by using the 'llu' format specifier
which will always be atleast 64-bit and explicitly casing the
variable to an u_longlong_t. This issue is handled the same way
in many other parts of the code.
Signed-off-by: Brian Behlendorf <[email protected]>
Diffstat (limited to 'lib/libspl/include')
| -rw-r--r-- | lib/libspl/include/umem.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/libspl/include/umem.h b/lib/libspl/include/umem.h index b3ce6e710..b1c9cb7ff 100644 --- a/lib/libspl/include/umem.h +++ b/lib/libspl/include/umem.h @@ -109,8 +109,6 @@ umem_alloc_aligned(size_t size, size_t align, int flags) return (NULL); } - ASSERT0(P2PHASE_TYPED(ptr, align, uint64_t)); - return (ptr); } |