[PATCH] make get_be64() compile on pu with NO_UNALIGNED_LOADS

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



1. s/unit64_t/uint64_t/

2. add const-qualifier to *p

3. add missing closing ')'

Signed-off-by: Martin Ågren <martin.agren@xxxxxxxxx>
---
Applies to pu and passes the tests. I think this should be squashed in
somewhere. Perhaps a mismerge in commit d553324d ("Merge branch
'bp/fsmonitor' into pu", 2017-07-21).

 compat/bswap.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/compat/bswap.h b/compat/bswap.h
index 133da1d2b..f86110a72 100644
--- a/compat/bswap.h
+++ b/compat/bswap.h
@@ -188,11 +188,11 @@ static inline void put_be32(void *ptr, uint32_t value)
 	p[3] = value >>  0;
 }
 
-static inline unit64_t get_be64(const void *ptr)
+static inline uint64_t get_be64(const void *ptr)
 {
-	unsigned char *p = ptr;
+	const unsigned char *p = ptr;
 	return  ((uint64_t)get_be32(p) << 32) |
-		((uint64_t)get_be32(p + 4);
+		((uint64_t)get_be32(p + 4));
 }
 
 #endif
-- 
2.14.0.rc0.14.g12cc05b53




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux