Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eed74dfc authored by Ralf Baechle's avatar Ralf Baechle Committed by Linus Torvalds
Browse files

[PATCH] optimise 64bit unaligned access on 32bit kernel 

I've rewriten Atushi's fix for the 64-bit put_unaligned on 32-bit systems
bug to generate more efficient code.

This case has buzilla URL http://bugzilla.kernel.org/show_bug.cgi?id=5138

.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 82a25b56

include/asm-generic/unaligned.h

+6 −6
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 
 * The main single-value unaligned transfer routines.

 */

#define get_unaligned(ptr) \

	((__typeof__(*(ptr)))__get_unaligned((ptr), sizeof(*(ptr))))

	__get_unaligned((ptr), sizeof(*(ptr)))

#define put_unaligned(x,ptr) \

	__put_unaligned((unsigned long)(x), (ptr), sizeof(*(ptr)))

	__put_unaligned((__u64)(x), (ptr), sizeof(*(ptr)))



/*

 * This function doesn't actually exist.  The idea is that when
@@ -36,19 +36,19 @@ struct __una_u16 { __u16 x __attribute__((packed)); }; 
 * Elemental unaligned loads 

 */



static inline unsigned long __uldq(const __u64 *addr)

static inline __u64 __uldq(const __u64 *addr)

{

	const struct __una_u64 *ptr = (const struct __una_u64 *) addr;

	return ptr->x;

}



static inline unsigned long __uldl(const __u32 *addr)

static inline __u32 __uldl(const __u32 *addr)

{

	const struct __una_u32 *ptr = (const struct __una_u32 *) addr;

	return ptr->x;

}



static inline unsigned long __uldw(const __u16 *addr)

static inline __u16 __uldw(const __u16 *addr)

{

	const struct __una_u16 *ptr = (const struct __una_u16 *) addr;

	return ptr->x;
@@ -78,7 +78,7 @@ static inline void __ustw(__u16 val, __u16 *addr) 


#define __get_unaligned(ptr, size) ({		\

	const void *__gu_p = ptr;		\

	unsigned long val;			\

	__typeof__(*(ptr)) val;			\

	switch (size) {				\

	case 1:					\

		val = *(const __u8 *)__gu_p;	\