Merge remote-tracking branch 'nfs/linux-next'

[karo-tx-linux.git] / arch / s390 / kernel / perf_cpum_sf.c

diff --git a/arch/s390/kernel/perf_cpum_sf.c b/arch/s390/kernel/perf_cpum_sf.c
index b973972f6ba5cf8e995a01ef7ba869a4e520b5e8..3d8da1e742c2b72f7741b8e0a48b8e1b185b4530 100644 (file)
--- a/arch/s390/kernel/perf_cpum_sf.c
+++ b/arch/s390/kernel/perf_cpum_sf.c
@@ -1019,11 +1019,13 @@ static int perf_push_sample(struct perf_event *event, struct sf_raw_sample *sfr)
                break;
        }
 
-       /* The host-program-parameter (hpp) contains the pid of
-        * the CPU thread as set by sie64a() in entry.S.
-        * If non-zero assume a guest sample.
+       /*
+        * A non-zero guest program parameter indicates a guest
+        * sample.
+        * Note that some early samples might be misaccounted to
+        * the host.
         */
-       if (sfr->basic.hpp)
+       if (sfr->basic.gpp)
                sde_regs->in_guest = 1;
 
        overflow = 0;