Commit 707ced0d authored Mar 07, 2006 by Atsushi Nemoto Committed by Linus Torvalds Mar 08, 2006

[PATCH] __get_unaligned() gcc-4 fix



If the 'ptr' is a const, this code cause "assignment of read-only variable"
error on gcc 4.x.

Use __u64 instead of __typeof__(*(ptr)) for temporary variable to get
rid of errors on gcc 4.x.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 81c29a85

include/asm-generic/unaligned.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@ static inline void __ustw(__u16 val, __u16 *addr)

		#define __get_unaligned(ptr, size) ({ \
		const void *__gu_p = ptr; \
		__typeof__(*(ptr)) val; \
		__u64 val; \
		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(); \
		}; \
		val; \
		(__typeof__(*(ptr)))val; \
		})

		#define __put_unaligned(val, ptr, size) \