Skip to content

Commit c458175

Browse files
committed
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
2 parents 88c144b + 6699c8c commit c458175

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/tile/include/asm/uaccess.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ extern int fixup_exception(struct pt_regs *regs);
146146
#ifdef __tilegx__
147147
#define __get_user_1(x, ptr, ret) __get_user_asm(ld1u, x, ptr, ret)
148148
#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)
150150
#define __get_user_8(x, ptr, ret) __get_user_asm(ld, x, ptr, ret)
151151
#else
152152
#define __get_user_1(x, ptr, ret) __get_user_asm(lb_u, x, ptr, ret)

0 commit comments

Comments
 (0)