diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-08-17 00:13:53 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-08-17 00:13:53 -0400 |
| commit | 4eebf60b7452fbd551fd7dece855ba7825a49cbc (patch) | |
| tree | 490b4d194ba09c90e10201ab7fc084a0bda0ed27 /arch/mips/kernel/unaligned.c | |
| parent | 8f9cb50789e76f3e224e8861adf650e55c747af4 (diff) | |
| parent | 2c6625cd545bdd66acff14f3394865d43920a5c7 (diff) | |
Merge tag 'v4.2-rc7' into drm-next
Linux 4.2-rc7
Backmerge master for i915 fixes
Diffstat (limited to 'arch/mips/kernel/unaligned.c')
| -rw-r--r-- | arch/mips/kernel/unaligned.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/unaligned.c b/arch/mips/kernel/unaligned.c index af84bef0c90d..eb3efd137fd1 100644 --- a/arch/mips/kernel/unaligned.c +++ b/arch/mips/kernel/unaligned.c | |||
| @@ -438,7 +438,7 @@ do { \ | |||
| 438 | : "memory"); \ | 438 | : "memory"); \ |
| 439 | } while(0) | 439 | } while(0) |
| 440 | 440 | ||
| 441 | #define StoreDW(addr, value, res) \ | 441 | #define _StoreDW(addr, value, res) \ |
| 442 | do { \ | 442 | do { \ |
| 443 | __asm__ __volatile__ ( \ | 443 | __asm__ __volatile__ ( \ |
| 444 | ".set\tpush\n\t" \ | 444 | ".set\tpush\n\t" \ |