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

Commit c458175e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 88c144b1 6699c8cd

arch/tile/include/asm/uaccess.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -146,7 +146,7 @@ extern int fixup_exception(struct pt_regs *regs); 
#ifdef __tilegx__

#ifdef __tilegx__

#define __get_user_1(x, ptr, ret) __get_user_asm(ld1u, x, ptr, ret)

#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_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)

#define __get_user_8(x, ptr, ret) __get_user_asm(ld, x, ptr, ret)

#else

#else

#define __get_user_1(x, ptr, ret) __get_user_asm(lb_u, x, ptr, ret)

#define __get_user_1(x, ptr, ret) __get_user_asm(lb_u, x, ptr, ret)