Received: by 2002:a25:7ec1:0:0:0:0:0 with SMTP id z184csp769620ybc; Sat, 16 Nov 2019 08:22:28 -0800 (PST) X-Google-Smtp-Source: APXvYqzQKADyZ7ZYskBhpIg1uM9dTL71z5+nz5Ygs89p4APaX6BBrYSOQZGBn/ksUoGfMgH+63i8 X-Received: by 2002:a17:906:2e81:: with SMTP id o1mr10857646eji.284.1573921348721; Sat, 16 Nov 2019 08:22:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573921348; cv=none; d=google.com; s=arc-20160816; b=hRiA1nseZON3z7HBZ3862cTe4lTdo7JkQMqA2wmrAXhbGMsWJud+3N3mSSvSV3mSDi UElgDftAyKH02WNZMB9RrPml6ID6X5f+tNkUW5YIwugAwNEEiXMyOGBXud13rKv+5NwI BtKxU5XlnbSlaQaAZmj07cEJ8xFMIIp5A41Z47t0qks4h9Pk/ycv/+T1oz0J2LgY4TfF TtfzHzqWCgkU+iUszm2I2hY4uO3c8tJ4hg10EF5NbytBa0EbZJdvyDyOnuDrhEJY9CPh a2pmsoFm/iQVG5Q8uNBemXXkC8H0QpQJweDxBHabcKdvgH3ReVbMLa9gY6dxIr4tZlOL lKKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Ro7gMXYXBuljSb/rwRh8OfR7jS8zVXfQc0fFR8hbBIQ=; b=jWjQuA7G+ACc/3y8rNPi2xxX5UWlOW+5HjPd28FlEW04dbM9NB7/nPLSQWnk5im6HM EUGGKO7gEd0WBSh5nII3+5N/AnZb9Wk6F0Crh+T+NRz7jlVyimb9Pe06+RXjTNXRohnW sIbcJVP7XkEZ/Vt1arU9ebNRJKUhk4/S+pUtm7Ia/+56yAssToEIqbp+QIskgO6RKbhF w+cqhsr6IIPJB/mijZEvqgo5h1J6WJ5QHrViqLTceY4ZdwP0ecrtDlE3MgaG74rs+iQY y05QLQBSBKLulYGzw3QlTqS1tWyBS8YtTpIrSrr0st9wSU5z9eQJj+gRvXZenjmtdO8W hKIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=GpT5NiT8; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gg16si7848104ejb.256.2019.11.16.08.22.04; Sat, 16 Nov 2019 08:22:28 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=GpT5NiT8; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730185AbfKPQSs (ORCPT + 99 others); Sat, 16 Nov 2019 11:18:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:52778 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728733AbfKPPq0 (ORCPT ); Sat, 16 Nov 2019 10:46:26 -0500 Received: from sasha-vm.mshome.net (unknown [50.234.116.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A970A2077B; Sat, 16 Nov 2019 15:46:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573919185; bh=xdFKgEX7Pl/f6BxecuW2mYaqqpQDVVagDCzXcf2Qhhw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GpT5NiT8iRaA1/QPLJzQ/Yt+B3gnhAFSRhFS2xa9A5kx562G7/LbwCaXTnyGfhCab aaC71vb9w8vTpRz5VTAMCLnymMXSOX9Yw/MB4CAU0GBowkBQgsypJBgm8Po+TONX28 6Q+8W0Zz3e9jqsJY0KBXOfItei47tr9dpPLD4B2s= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Nickhu , Greentime Hu , Sasha Levin Subject: [PATCH AUTOSEL 4.19 193/237] nds32: Fix bug in bitfield.h Date: Sat, 16 Nov 2019 10:40:28 -0500 Message-Id: <20191116154113.7417-193-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191116154113.7417-1-sashal@kernel.org> References: <20191116154113.7417-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nickhu [ Upstream commit 9aaafac8cffa1c1edb66e19a63841b7c86be07ca ] There two bitfield bug for perfomance counter in bitfield.h: PFM_CTL_offSEL1 21 --> 16 PFM_CTL_offSEL2 27 --> 22 This commit fix it. Signed-off-by: Nickhu Acked-by: Greentime Hu Signed-off-by: Greentime Hu Signed-off-by: Sasha Levin --- arch/nds32/include/asm/bitfield.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/nds32/include/asm/bitfield.h b/arch/nds32/include/asm/bitfield.h index 8e84fc385b946..19b2841219adf 100644 --- a/arch/nds32/include/asm/bitfield.h +++ b/arch/nds32/include/asm/bitfield.h @@ -692,8 +692,8 @@ #define PFM_CTL_offKU1 13 /* Enable user mode event counting for PFMC1 */ #define PFM_CTL_offKU2 14 /* Enable user mode event counting for PFMC2 */ #define PFM_CTL_offSEL0 15 /* The event selection for PFMC0 */ -#define PFM_CTL_offSEL1 21 /* The event selection for PFMC1 */ -#define PFM_CTL_offSEL2 27 /* The event selection for PFMC2 */ +#define PFM_CTL_offSEL1 16 /* The event selection for PFMC1 */ +#define PFM_CTL_offSEL2 22 /* The event selection for PFMC2 */ /* bit 28:31 reserved */ #define PFM_CTL_mskEN0 ( 0x01 << PFM_CTL_offEN0 ) -- 2.20.1