Merge tag 'perf_core_for_v5.17_rc1' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / arch / nds32 / kernel / perf_event_cpu.c

diff --git a/arch/nds32/kernel/perf_event_cpu.c b/arch/nds32/kernel/perf_event_cpu.c
index 0ce6f9f..a78a879 100644 (file)
--- a/arch/nds32/kernel/perf_event_cpu.c
+++ b/arch/nds32/kernel/perf_event_cpu.c
@@ -1371,11 +1371,6 @@ perf_callchain_user(struct perf_callchain_entry_ctx *entry,
 
        leaf_fp = 0;
 
-       if (perf_guest_cbs && perf_guest_cbs->is_in_guest()) {
-               /* We don't support guest os callchain now */
-               return;
-       }
-
        perf_callchain_store(entry, regs->ipc);
        fp = regs->fp;
        gp = regs->gp;
@@ -1481,10 +1476,6 @@ perf_callchain_kernel(struct perf_callchain_entry_ctx *entry,
 {
        struct stackframe fr;
 
-       if (perf_guest_cbs && perf_guest_cbs->is_in_guest()) {
-               /* We don't support guest os callchain now */
-               return;
-       }
        fr.fp = regs->fp;
        fr.lp = regs->lp;
        fr.sp = regs->sp;
@@ -1493,10 +1484,6 @@ perf_callchain_kernel(struct perf_callchain_entry_ctx *entry,
 
 unsigned long perf_instruction_pointer(struct pt_regs *regs)
 {
-       /* However, NDS32 does not support virtualization */
-       if (perf_guest_cbs && perf_guest_cbs->is_in_guest())
-               return perf_guest_cbs->get_guest_ip();
-
        return instruction_pointer(regs);
 }
 
@@ -1504,18 +1491,10 @@ unsigned long perf_misc_flags(struct pt_regs *regs)
 {
        int misc = 0;
 
-       /* However, NDS32 does not support virtualization */
-       if (perf_guest_cbs && perf_guest_cbs->is_in_guest()) {
-               if (perf_guest_cbs->is_user_mode())
-                       misc |= PERF_RECORD_MISC_GUEST_USER;
-               else
-                       misc |= PERF_RECORD_MISC_GUEST_KERNEL;
-       } else {
-               if (user_mode(regs))
-                       misc |= PERF_RECORD_MISC_USER;
-               else
-                       misc |= PERF_RECORD_MISC_KERNEL;
-       }
+       if (user_mode(regs))
+               misc |= PERF_RECORD_MISC_USER;
+       else
+               misc |= PERF_RECORD_MISC_KERNEL;
 
        return misc;
 }