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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc 

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().
parents 5c99a8d1 1f2b5b8e

arch/sparc/kernel/perf_event.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -1849,16 +1849,12 @@ perf_callchain_user(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs 
{

{

	u64 saved_fault_address = current_thread_info()->fault_address;

	u64 saved_fault_address = current_thread_info()->fault_address;

	u8 saved_fault_code = get_thread_fault_code();

	u8 saved_fault_code = get_thread_fault_code();

	mm_segment_t old_fs;





	perf_callchain_store(entry, regs->tpc);

	perf_callchain_store(entry, regs->tpc);





	if (!current->mm)

	if (!current->mm)

		return;

		return;





	old_fs = get_fs();

	set_fs(USER_DS);



	flushw_user();

	flushw_user();





	pagefault_disable();

	pagefault_disable();
@@ -1870,7 +1866,6 @@ perf_callchain_user(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs 




	pagefault_enable();

	pagefault_enable();





	set_fs(old_fs);

	set_thread_fault_code(saved_fault_code);

	set_thread_fault_code(saved_fault_code);

	current_thread_info()->fault_address = saved_fault_address;

	current_thread_info()->fault_address = saved_fault_address;

}
 
}

arch/sparc/kernel/systbls_64.S

+2 −2
Original line number Original line Diff line number Diff line
@@ -47,9 +47,9 @@ sys_call_table32: 
	.word sys_recvfrom, sys_setreuid16, sys_setregid16, sys_rename, compat_sys_truncate

	.word sys_recvfrom, sys_setreuid16, sys_setregid16, sys_rename, compat_sys_truncate

/*130*/	.word compat_sys_ftruncate, sys_flock, compat_sys_lstat64, sys_sendto, sys_shutdown

/*130*/	.word compat_sys_ftruncate, sys_flock, compat_sys_lstat64, sys_sendto, sys_shutdown

	.word sys_socketpair, sys_mkdir, sys_rmdir, compat_sys_utimes, compat_sys_stat64

	.word sys_socketpair, sys_mkdir, sys_rmdir, compat_sys_utimes, compat_sys_stat64

/*140*/	.word sys_sendfile64, sys_nis_syscall, compat_sys_futex, sys_gettid, compat_sys_getrlimit

/*140*/	.word sys_sendfile64, sys_getpeername, compat_sys_futex, sys_gettid, compat_sys_getrlimit

	.word compat_sys_setrlimit, sys_pivot_root, sys_prctl, sys_pciconfig_read, sys_pciconfig_write

	.word compat_sys_setrlimit, sys_pivot_root, sys_prctl, sys_pciconfig_read, sys_pciconfig_write

/*150*/	.word sys_nis_syscall, sys_inotify_init, sys_inotify_add_watch, sys_poll, sys_getdents64

/*150*/	.word sys_getsockname, sys_inotify_init, sys_inotify_add_watch, sys_poll, sys_getdents64

	.word compat_sys_fcntl64, sys_inotify_rm_watch, compat_sys_statfs, compat_sys_fstatfs, sys_oldumount

	.word compat_sys_fcntl64, sys_inotify_rm_watch, compat_sys_statfs, compat_sys_fstatfs, sys_oldumount

/*160*/	.word compat_sys_sched_setaffinity, compat_sys_sched_getaffinity, sys_getdomainname, sys_setdomainname, sys_nis_syscall

/*160*/	.word compat_sys_sched_setaffinity, compat_sys_sched_getaffinity, sys_getdomainname, sys_setdomainname, sys_nis_syscall

	.word sys_quotactl, sys_set_tid_address, compat_sys_mount, compat_sys_ustat, sys_setxattr

	.word sys_quotactl, sys_set_tid_address, compat_sys_mount, compat_sys_ustat, sys_setxattr

CRA Git | Maintained and supported by SUSTech CRA and CCSE