diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-16 17:00:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-16 17:00:15 -0700 |
| commit | c458175eb61843fe9fd37ac3d56b701e98a8cf15 (patch) | |
| tree | 6ad6ce5f1f5e5e6892a513435772ccc36c5148f3 | |
| parent | 88c144b12a943d35500dbfc141c9b33955d2a88a (diff) | |
| parent | 6699c8cda36f296e315068ed9bbe4f03e6ed4044 (diff) | |
| download | linux-c458175eb61843fe9fd37ac3d56b701e98a8cf15.tar.gz linux-c458175eb61843fe9fd37ac3d56b701e98a8cf15.tar.bz2 linux-c458175eb61843fe9fd37ac3d56b701e98a8cf15.zip | |
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
| -rw-r--r-- | arch/tile/include/asm/uaccess.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/tile/include/asm/uaccess.h b/arch/tile/include/asm/uaccess.h index c3dd275f25e2..9ab078a4605d 100644 --- a/arch/tile/include/asm/uaccess.h +++ b/arch/tile/include/asm/uaccess.h @@ -146,7 +146,7 @@ extern int fixup_exception(struct pt_regs *regs); #ifdef __tilegx__ #define __get_user_1(x, ptr, ret) __get_user_asm(ld1u, x, ptr, ret) #define __get_user_2(x, ptr, ret) __get_user_asm(ld2u, x, ptr, ret) -#define __get_user_4(x, ptr, ret) __get_user_asm(ld4u, x, ptr, ret) +#define __get_user_4(x, ptr, ret) __get_user_asm(ld4s, x, ptr, ret) #define __get_user_8(x, ptr, ret) __get_user_asm(ld, x, ptr, ret) #else #define __get_user_1(x, ptr, ret) __get_user_asm(lb_u, x, ptr, ret) |