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

Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

Pull arch/tile update from Chris Metcalf:
"This one-line bug fix unbreaks glibc robust mutexes (among other
things no doubt), from code merged in during the 3.5 merge window but
which we had been running internally at Tilera for almost a year."

* 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
tile: fix bug in get_user() for 4-byte values

Linus Torvalds c458175e 88c144b1

options
unified split
Changed files
+1 -1
arch
tile
include
asm
uaccess.h
+1 -1
arch/tile/include/asm/uaccess.h
··· 146 146 #ifdef __tilegx__ 147 147 #define __get_user_1(x, ptr, ret) __get_user_asm(ld1u, x, ptr, ret) 148 148 #define __get_user_2(x, ptr, ret) __get_user_asm(ld2u, x, ptr, ret) 149 - #define __get_user_4(x, ptr, ret) __get_user_asm(ld4u, x, ptr, ret) 149 + #define __get_user_4(x, ptr, ret) __get_user_asm(ld4s, x, ptr, ret) 150 150 #define __get_user_8(x, ptr, ret) __get_user_asm(ld, x, ptr, ret) 151 151 #else 152 152 #define __get_user_1(x, ptr, ret) __get_user_asm(lb_u, x, ptr, ret)