Commit 2e856966 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 7ef5f41c ed2b03ed
...@@ -50,9 +50,8 @@ static inline __attribute_const__ __u32 __arch_swab32(__u32 x) ...@@ -50,9 +50,8 @@ static inline __attribute_const__ __u32 __arch_swab32(__u32 x)
static inline __attribute_const__ __u64 __arch_swab64(__u64 x) static inline __attribute_const__ __u64 __arch_swab64(__u64 x)
{ {
__asm__( __asm__(
" dsbh %0, %1 \n" " dsbh %0, %1\n"
" dshd %0, %0 \n" " dshd %0, %0"
" drotr %0, %0, 32 \n"
: "=r" (x) : "=r" (x)
: "r" (x)); : "r" (x));
......
...@@ -232,7 +232,7 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG]; ...@@ -232,7 +232,7 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
*/ */
#ifdef __MIPSEB__ #ifdef __MIPSEB__
#define ELF_DATA ELFDATA2MSB #define ELF_DATA ELFDATA2MSB
#elif __MIPSEL__ #elif defined(__MIPSEL__)
#define ELF_DATA ELFDATA2LSB #define ELF_DATA ELFDATA2LSB
#endif #endif
#define ELF_ARCH EM_MIPS #define ELF_ARCH EM_MIPS
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment