diff options
author | David S. Miller <davem@davemloft.net> | 2018-10-30 01:17:12 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-10-30 01:17:12 -0400 |
commit | 0f0a691f1ef9af0f8943f601b325a219d1ba8184 (patch) | |
tree | 8db638a361be1b64255cf2b7fc7ced47e52683a6 | |
parent | 4b42745211af552f170f38a1b97f4a112b5da6b2 (diff) |
sparc64: Remvoe set_fs() from perf_callchain_user().
Ever since commit 88b0193d9418 ("perf/callchain: Force USER_DS when
invoking perf_callchain_user()") the caller does this for us.
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | arch/sparc/kernel/perf_event.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/sparc/kernel/perf_event.c b/arch/sparc/kernel/perf_event.c index 67b3e6b3ce5d..47c871394ccb 100644 --- a/arch/sparc/kernel/perf_event.c +++ b/arch/sparc/kernel/perf_event.c | |||
@@ -1849,16 +1849,12 @@ perf_callchain_user(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs | |||
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 | |||
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 | } |