diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-09-05 07:17:31 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-09-05 07:17:31 (GMT) |
| commit | 14e42917216ab0859827c2d8024df45a917301b4 (patch) | |
| tree | efbea5d1c54387d62a6fd66a21560232cf312fda /arch/m68k/kernel/sys_m68k.c | |
| parent | 292f2b6254c9dbb98def6d3521b07a837545ead0 (diff) | |
| parent | 4266274836e81575ee82498d84f4bd08ab7a7378 (diff) | |
| download | linux-fsl-qoriq-14e42917216ab0859827c2d8024df45a917301b4.tar.xz | |
Merge branch 'fixes' of git://git.alsa-project.org/alsa-kernel into for-next
Diffstat (limited to 'arch/m68k/kernel/sys_m68k.c')
| -rw-r--r-- | arch/m68k/kernel/sys_m68k.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/m68k/kernel/sys_m68k.c b/arch/m68k/kernel/sys_m68k.c index 8623f8d..9a5932e 100644 --- a/arch/m68k/kernel/sys_m68k.c +++ b/arch/m68k/kernel/sys_m68k.c @@ -479,9 +479,13 @@ sys_atomic_cmpxchg_32(unsigned long newval, int oldval, int d3, int d4, int d5, goto bad_access; } - mem_value = *mem; + /* + * No need to check for EFAULT; we know that the page is + * present and writable. + */ + __get_user(mem_value, mem); if (mem_value == oldval) - *mem = newval; + __put_user(newval, mem); pte_unmap_unlock(pte, ptl); up_read(&mm->mmap_sem); |