Commit 292b4d09 authored by Harvey Harrison's avatar Harvey Harrison Committed by Linus Torvalds
Browse files

avr32: introduce asm/swab.h 



Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 991c0e6d

arch/avr32/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line 
include include/asm-generic/Kbuild.asm



header-y	+= swab.h

header-y	+= cachectl.h

arch/avr32/include/asm/byteorder.h

+2 −29
Original line number Diff line number Diff line
@@ -4,34 +4,7 @@ 
#ifndef __ASM_AVR32_BYTEORDER_H

#define __ASM_AVR32_BYTEORDER_H



#include <asm/types.h>

#include <linux/compiler.h>

#include <asm/swab.h>

#include <linux/byteorder/big_endian.h>



#define __BIG_ENDIAN

#define __SWAB_64_THRU_32__



#ifdef __CHECKER__

extern unsigned long __builtin_bswap_32(unsigned long x);

extern unsigned short __builtin_bswap_16(unsigned short x);

#endif



/*

 * avr32-linux-gcc versions earlier than 4.2 improperly sign-extends

 * the result.

 */

#if !(__GNUC__ == 4 && __GNUC_MINOR__ < 2)

static inline __attribute_const__ __u16 __arch_swab16(__u16 val)

{

	return __builtin_bswap_16(val);

}

#define __arch_swab16 __arch_swab16



static inline __attribute_const__ __u32 __arch_swab32(__u32 val)

{

	return __builtin_bswap_32(val);

}

#define __arch_swab32 __arch_swab32

#endif



#include <linux/byteorder.h>

#endif /* __ASM_AVR32_BYTEORDER_H */

arch/avr32/include/asm/swab.h

0 → 100644
+35 −0
Original line number Diff line number Diff line 
/*

 * AVR32 byteswapping functions.

 */

#ifndef __ASM_AVR32_SWAB_H

#define __ASM_AVR32_SWAB_H



#include <asm/types.h>

#include <linux/compiler.h>



#define __SWAB_64_THRU_32__



#ifdef __CHECKER__

extern unsigned long __builtin_bswap_32(unsigned long x);

extern unsigned short __builtin_bswap_16(unsigned short x);

#endif



/*

 * avr32-linux-gcc versions earlier than 4.2 improperly sign-extends

 * the result.

 */

#if !(__GNUC__ == 4 && __GNUC_MINOR__ < 2)

static inline __attribute_const__ __u16 __arch_swab16(__u16 val)

{

	return __builtin_bswap_16(val);

}

#define __arch_swab16 __arch_swab16



static inline __attribute_const__ __u32 __arch_swab32(__u32 val)

{

	return __builtin_bswap_32(val);

}

#define __arch_swab32 __arch_swab32

#endif



#endif /* __ASM_AVR32_SWAB_H */