Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Changbin Du <changbin.du@huawei.com>
To:     Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
        Dave Hansen <dave.hansen@linux.intel.com>, <x86@kernel.org>
CC:     "H. Peter Anvin" <hpa@zytor.com>, <linux-kernel@vger.kernel.org>,
        <hw.huiwang@huawei.com>, Changbin Du <changbin.du@huawei.com>
Subject: [PATCH] x86: use HW_BREAKPOINT_RW where possible
Date:   Tue, 8 Nov 2022 10:12:52 +0800
Message-ID: <20221108021252.605986-1-changbin.du@huawei.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 7BIT
Content-Type:   text/plain; charset=US-ASCII
Precedence: bulk

Use enum HW_BREAKPOINT_RW where possible instead of individual
(HW_BREAKPOINT_R | HW_BREAKPOINT_W).

Signed-off-by: Changbin Du <changbin.du@huawei.com>
---
 arch/x86/kernel/hw_breakpoint.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/hw_breakpoint.c b/arch/x86/kernel/hw_breakpoint.c
index 668a4a6533d9..cccfb446ce80 100644
--- a/arch/x86/kernel/hw_breakpoint.c
+++ b/arch/x86/kernel/hw_breakpoint.c
@@ -213,7 +213,7 @@ int arch_bp_generic_fields(int x86_len, int x86_type,
 		*gen_type = HW_BREAKPOINT_W;
 		break;
 	case X86_BREAKPOINT_RW:
-		*gen_type = HW_BREAKPOINT_W | HW_BREAKPOINT_R;
+		*gen_type = HW_BREAKPOINT_RW;
 		break;
 	default:
 		return -EINVAL;
@@ -347,7 +347,7 @@ static int arch_build_bp_info(struct perf_event *bp,
 	case HW_BREAKPOINT_W:
 		hw->type = X86_BREAKPOINT_WRITE;
 		break;
-	case HW_BREAKPOINT_W | HW_BREAKPOINT_R:
+	case HW_BREAKPOINT_RW:
 		hw->type = X86_BREAKPOINT_RW;
 		break;
 	case HW_BREAKPOINT_X:
-- 
2.25.1