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

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

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

arch/mips/include/asm/byteorder.h

+2 −3
Original line number Diff line number Diff line
@@ -51,8 +51,7 @@ static inline __attribute_const__ __u64 __arch_swab64(__u64 x) 
{

	__asm__(

	"	dsbh	%0, %1\n"

	"	dshd	%0, %0			\n"

	"	drotr	%0, %0, 32		\n"

	"	dshd	%0, %0"

	: "=r" (x)

	: "r" (x));

arch/mips/include/asm/elf.h

+1 −1
Original line number Diff line number Diff line
@@ -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