tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 2e856966 7ef5f41c

+3 -4
+2 -3
arch/mips/include/asm/byteorder.h
··· 50 50 static inline __attribute_const__ __u64 __arch_swab64(__u64 x) 51 51 { 52 52 __asm__( 53 - " dsbh %0, %1 \n" 54 - " dshd %0, %0 \n" 55 - " drotr %0, %0, 32 \n" 53 + " dsbh %0, %1\n" 54 + " dshd %0, %0" 56 55 : "=r" (x) 57 56 : "r" (x)); 58 57
+1 -1
arch/mips/include/asm/elf.h
··· 232 232 */ 233 233 #ifdef __MIPSEB__ 234 234 #define ELF_DATA ELFDATA2MSB 235 - #elif __MIPSEL__ 235 + #elif defined(__MIPSEL__) 236 236 #define ELF_DATA ELFDATA2LSB 237 237 #endif 238 238 #define ELF_ARCH EM_MIPS