linux-kernel - [PATCH] MIPS: perf: fix build failure

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <1498254731-5248-1-git-send-email-sudipm.mukherjee@gmail.com>
Date:   Fri, 23 Jun 2017 22:52:11 +0100
From:   Sudip Mukherjee <sudipm.mukherjee@...il.com>
To:     Peter Zijlstra <peterz@...radead.org>,
        Ingo Molnar <mingo@...hat.com>,
        Arnaldo Carvalho de Melo <acme@...nel.org>,
        Alexander Shishkin <alexander.shishkin@...ux.intel.com>,
        Ralf Baechle <ralf@...ux-mips.org>
Cc:     linux-kernel@...r.kernel.org, linux-mips@...ux-mips.org,
        Sudip Mukherjee <sudipm.mukherjee@...il.com>
Subject: [PATCH] MIPS: perf: fix build failure

The build of gpr_defconfig is failing with the error:
arch/mips/kernel/perf_event_mipsxx.c:
	In function 'mipsxx_pmu_map_raw_event':
arch/mips/kernel/perf_event_mipsxx.c:1614:2:
	error: duplicate case value

Patch - f7a31b5e7874 ("MIPS: perf: Remove incorrect odd/even counter
handling for I6400") removed the previous case and added it as a
separate case. But patch dd71e57bacb5 ("MIPS: perf: add I6500 handling")
added it back to its old location and thus giving us two duplicate case.

Fixes: dd71e57bacb5 ("MIPS: perf: add I6500 handling")
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@...il.com>
---

The build log is available at:
https://travis-ci.org/sudipm-mukherjee/parport/jobs/246092909

 arch/mips/kernel/perf_event_mipsxx.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/mips/kernel/perf_event_mipsxx.c b/arch/mips/kernel/perf_event_mipsxx.c
index 4b93cc0..733b612 100644
--- a/arch/mips/kernel/perf_event_mipsxx.c
+++ b/arch/mips/kernel/perf_event_mipsxx.c
@@ -1597,7 +1597,6 @@ static const struct mips_perf_event *mipsxx_pmu_map_raw_event(u64 config)
 		break;
 	case CPU_P5600:
 	case CPU_P6600:
-	case CPU_I6400:
 	case CPU_I6500:
 		/* 8-bit event numbers */
 		raw_id = config & 0x1ff;
-- 
1.9.1