Merge tag 'clk-for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/clk...

[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 afe05bfb7e008a723388ff6c39f2d83d5693ad65..b973972f6ba5cf8e995a01ef7ba869a4e520b5e8 100644 (file)
--- a/arch/s390/kernel/perf_cpum_sf.c
+++ b/arch/s390/kernel/perf_cpum_sf.c
@@ -1019,12 +1019,9 @@ static int perf_push_sample(struct perf_event *event, struct sf_raw_sample *sfr)
                break;
        }
 
-       /* The host-program-parameter (hpp) contains the sie control
-        * block that is set by sie64a() in entry64.S.  Check if hpp
-        * refers to a valid control block and set sde_regs flags
-        * accordingly.  This would allow to use hpp values for other
-        * purposes too.
-        * For now, simply use a non-zero value as guest indicator.
+       /* 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.
         */
        if (sfr->basic.hpp)
                sde_regs->in_guest = 1;