Pull sparc fixes from David Miller: "Two small fixes" * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc: sparc64: Wire up compat getpeername and getsockname. sparc64: Remvoe set_fs() from perf_callchain_user().
Unified · Split
| @@ -1849,16 +1849,12 @@ perf_callchain_user(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs · 1848 unmodified lines | |||
| 1849 | { | 1849 | { |
| 1850 | u64 saved_fault_address = current_thread_info()->fault_address; | 1850 | u64 saved_fault_address = current_thread_info()->fault_address; |
| 1851 | u8 saved_fault_code = get_thread_fault_code(); | 1851 | u8 saved_fault_code = get_thread_fault_code(); |
| 1852 | mm_segment_t old_fs; | ||
| 1853 | 1852 | ||
| 1854 | perf_callchain_store(entry, regs->tpc); | 1853 | perf_callchain_store(entry, regs->tpc); |
| 1855 | 1854 | ||
| 1856 | if (!current->mm) | 1855 | if (!current->mm) |
| 1857 | return; | 1856 | return; |
| 1858 | 1857 | ||
| 1859 | old_fs = get_fs(); | ||
| 1860 | set_fs(USER_DS); | ||
| 1861 | |||
| 1862 | flushw_user(); | 1858 | flushw_user(); |
| 1863 | 1859 | ||
| 1864 | pagefault_disable(); | 1860 | pagefault_disable(); |
| @@ -1870,7 +1866,6 @@ perf_callchain_user(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs · 5 unmodified lines | |||
| 1870 | 1866 | ||
| 1871 | pagefault_enable(); | 1867 | pagefault_enable(); |
| 1872 | 1868 | ||
| 1873 | set_fs(old_fs); | ||
| 1874 | set_thread_fault_code(saved_fault_code); | 1869 | set_thread_fault_code(saved_fault_code); |
| 1875 | current_thread_info()->fault_address = saved_fault_address; | 1870 | current_thread_info()->fault_address = saved_fault_address; |
| 1876 | } | 1871 | } |
| @@ -47,9 +47,9 @@ sys_call_table32: · 46 unmodified lines | |||
| 47 | .word sys_recvfrom, sys_setreuid16, sys_setregid16, sys_rename, compat_sys_truncate | 47 | .word sys_recvfrom, sys_setreuid16, sys_setregid16, sys_rename, compat_sys_truncate |
| 48 | /*130*/ .word compat_sys_ftruncate, sys_flock, compat_sys_lstat64, sys_sendto, sys_shutdown | 48 | /*130*/ .word compat_sys_ftruncate, sys_flock, compat_sys_lstat64, sys_sendto, sys_shutdown |
| 49 | .word sys_socketpair, sys_mkdir, sys_rmdir, compat_sys_utimes, compat_sys_stat64 | 49 | .word sys_socketpair, sys_mkdir, sys_rmdir, compat_sys_utimes, compat_sys_stat64 |
| 50 | /*140*/ .word sys_sendfile64, sys_nis_syscall, compat_sys_futex, sys_gettid, compat_sys_getrlimit | 50 | /*140*/ .word sys_sendfile64, sys_getpeername, compat_sys_futex, sys_gettid, compat_sys_getrlimit |
| 51 | .word compat_sys_setrlimit, sys_pivot_root, sys_prctl, sys_pciconfig_read, sys_pciconfig_write | 51 | .word compat_sys_setrlimit, sys_pivot_root, sys_prctl, sys_pciconfig_read, sys_pciconfig_write |
| 52 | /*150*/ .word sys_nis_syscall, sys_inotify_init, sys_inotify_add_watch, sys_poll, sys_getdents64 | 52 | /*150*/ .word sys_getsockname, sys_inotify_init, sys_inotify_add_watch, sys_poll, sys_getdents64 |
| 53 | .word compat_sys_fcntl64, sys_inotify_rm_watch, compat_sys_statfs, compat_sys_fstatfs, sys_oldumount | 53 | .word compat_sys_fcntl64, sys_inotify_rm_watch, compat_sys_statfs, compat_sys_fstatfs, sys_oldumount |
| 54 | /*160*/ .word compat_sys_sched_setaffinity, compat_sys_sched_getaffinity, sys_getdomainname, sys_setdomainname, sys_nis_syscall | 54 | /*160*/ .word compat_sys_sched_setaffinity, compat_sys_sched_getaffinity, sys_getdomainname, sys_setdomainname, sys_nis_syscall |
| 55 | .word sys_quotactl, sys_set_tid_address, compat_sys_mount, compat_sys_ustat, sys_setxattr | 55 | .word sys_quotactl, sys_set_tid_address, compat_sys_mount, compat_sys_ustat, sys_setxattr |