projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into upstream-fixes
[cascardo/linux.git]
/
include
/
asm-generic
/
unaligned.h
diff --git
a/include/asm-generic/unaligned.h
b/include/asm-generic/unaligned.h
index
4dc8ddb
..
09ec447
100644
(file)
--- a/
include/asm-generic/unaligned.h
+++ b/
include/asm-generic/unaligned.h
@@
-78,7
+78,7
@@
static inline void __ustw(__u16 val, __u16 *addr)
#define __get_unaligned(ptr, size) ({ \
const void *__gu_p = ptr; \
#define __get_unaligned(ptr, size) ({ \
const void *__gu_p = ptr; \
- __
typeof__(*(ptr)) val;
\
+ __
u64 val;
\
switch (size) { \
case 1: \
val = *(const __u8 *)__gu_p; \
switch (size) { \
case 1: \
val = *(const __u8 *)__gu_p; \
@@
-95,7
+95,7
@@
static inline void __ustw(__u16 val, __u16 *addr)
default: \
bad_unaligned_access_length(); \
}; \
default: \
bad_unaligned_access_length(); \
}; \
-
val;
\
+
(__typeof__(*(ptr)))val;
\
})
#define __put_unaligned(val, ptr, size) \
})
#define __put_unaligned(val, ptr, size) \