Merge branches 'work.misc' and 'work.dcache' of git://git.kernel.org/pub/scm/linux...

[sfrench/cifs-2.6.git] / arch / s390 / kernel / perf_regs.c

diff --git a/arch/s390/kernel/perf_regs.c b/arch/s390/kernel/perf_regs.c
index 54e2d634b849e128c1ec1d1ccc15c600978ed50b..4352a504f2354fe04a5730736958f24c709c7428 100644 (file)
--- a/arch/s390/kernel/perf_regs.c
+++ b/arch/s390/kernel/perf_regs.c
@@ -12,9 +12,6 @@ u64 perf_reg_value(struct pt_regs *regs, int idx)
 {
        freg_t fp;
 
-       if (WARN_ON_ONCE((u32)idx >= PERF_REG_S390_MAX))
-               return 0;
-
        if (idx >= PERF_REG_S390_R0 && idx <= PERF_REG_S390_R15)
                return regs->gprs[idx];
 
@@ -33,7 +30,8 @@ u64 perf_reg_value(struct pt_regs *regs, int idx)
        if (idx == PERF_REG_S390_PC)
                return regs->psw.addr;
 
-       return regs->gprs[idx];
+       WARN_ON_ONCE((u32)idx >= PERF_REG_S390_MAX);
+       return 0;
 }
 
 #define REG_RESERVED (~((1UL << PERF_REG_S390_MAX) - 1))