diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-22 10:17:19 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-22 10:17:19 -0800 |
| commit | 2e8569669805c2d2620527464c395279b74892fc (patch) | |
| tree | 16d8974c86dbea0972d1d9a4033b074ff188bde7 | |
| parent | 7ef5f41c16fdddfc14e882a57200334614d8ffd6 (diff) | |
| parent | ed2b03ed3cec2a4719d04ef208319f9de6a4258a (diff) | |
| download | linux-2e8569669805c2d2620527464c395279b74892fc.tar.gz linux-2e8569669805c2d2620527464c395279b74892fc.tar.bz2 linux-2e8569669805c2d2620527464c395279b74892fc.zip | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
MIPS: MIPS64R2: Fix buggy __arch_swab64
MIPS: Fix preprocessor warnings flaged by GCC 4.4
| -rw-r--r-- | arch/mips/include/asm/byteorder.h | 5 | ||||
| -rw-r--r-- | arch/mips/include/asm/elf.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/mips/include/asm/byteorder.h b/arch/mips/include/asm/byteorder.h index 2988d29a0867..33790b9e0cc0 100644 --- a/arch/mips/include/asm/byteorder.h +++ b/arch/mips/include/asm/byteorder.h @@ -50,9 +50,8 @@ static inline __attribute_const__ __u32 __arch_swab32(__u32 x) static inline __attribute_const__ __u64 __arch_swab64(__u64 x) { __asm__( - " dsbh %0, %1 \n" - " dshd %0, %0 \n" - " drotr %0, %0, 32 \n" + " dsbh %0, %1\n" + " dshd %0, %0" : "=r" (x) : "r" (x)); diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h index a8eac1697b3d..d58f128aa747 100644 --- a/arch/mips/include/asm/elf.h +++ b/arch/mips/include/asm/elf.h @@ -232,7 +232,7 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG]; */ #ifdef __MIPSEB__ #define ELF_DATA ELFDATA2MSB -#elif __MIPSEL__ +#elif defined(__MIPSEL__) #define ELF_DATA ELFDATA2LSB #endif #define ELF_ARCH EM_MIPS |