diff options
| author | Linus Torvalds | 2008-03-27 17:14:07 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2008-03-27 17:14:07 +0100 |
| commit | 074fcab574a36edec35d2e74955250f2e17d6000 (patch) | |
| tree | 390ae7918c13494108f3c59ea137efb0647ee4e5 /include | |
| parent | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/... (diff) | |
| parent | avr32: Fix bug in early resource allocation code (diff) | |
| download | kernel-qcow2-linux-074fcab574a36edec35d2e74955250f2e17d6000.tar.gz kernel-qcow2-linux-074fcab574a36edec35d2e74955250f2e17d6000.tar.xz kernel-qcow2-linux-074fcab574a36edec35d2e74955250f2e17d6000.zip | |
Merge branch 'avr32-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
* 'avr32-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
avr32: Fix bug in early resource allocation code
avr32: Build fix for CONFIG_BUG=n
avr32: Work around byteswap bug in gcc < 4.2
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-avr32/byteorder.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/asm-avr32/byteorder.h b/include/asm-avr32/byteorder.h index 402ff4125cdc..d77b48ba7338 100644 --- a/include/asm-avr32/byteorder.h +++ b/include/asm-avr32/byteorder.h @@ -12,8 +12,14 @@ 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) #define __arch__swab32(x) __builtin_bswap_32(x) #define __arch__swab16(x) __builtin_bswap_16(x) +#endif #if !defined(__STRICT_ANSI__) || defined(__KERNEL__) # define __BYTEORDER_HAS_U64__ |