From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 497E8C4332F for ; Tue, 8 Nov 2022 21:35:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229842AbiKHVfZ (ORCPT ); Tue, 8 Nov 2022 16:35:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55310 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229452AbiKHVfX (ORCPT ); Tue, 8 Nov 2022 16:35:23 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B63105C755; Tue, 8 Nov 2022 13:35:22 -0800 (PST) Date: Tue, 08 Nov 2022 21:35:18 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1667943320; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dwI1cOu1CAqRFRpZ/qAxaAT22s+X8nsjOxog7of8jq0=; b=EOtfLMR0iqmpcRvEzNg//JD7cRfag+8Qu+/LsrUI+gMHur0Zk7ocE5nDXrqKfUXqAbfBPI 0JIOTydxex7m7fn4p+k4v/QSIA7eVihFzKNOgHrAbbTIo41O9fSuD6v2YUIpjgw5ych5jC rH4boX4ntxS6qJrwd506cBdxJ2w06z1+9ezCyuYgXsMFSmT4wL7n5/0xdK/f4zF7jjAlhY 1gaqXfztCbJ15VU47sAVocqeyvQn4oS8K48LThRHby2hAu3SRz8URzBqY+2nnlCwdYNnx6 SZiuv9+VCnlFU2O4rBQwosB5e92GEegDot8z/cPWEQllW4vIVMOe/XhkW2yyxA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1667943320; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dwI1cOu1CAqRFRpZ/qAxaAT22s+X8nsjOxog7of8jq0=; b=5Bq666RNTfL0TNiI79i5Xpl0vmE3SVtornf/3yQIUw2O1HouSp9HEP3muBIe7g9G9BJ0l0 kYxWSgbvcnenFjAA== From: "tip-bot2 for Jiapeng Chong" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/cleanups] x86: Fix misc small issues Cc: Abaci Robot , Jiapeng Chong , Borislav Petkov , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <1620902768-53822-1-git-send-email-jiapeng.chong@linux.alibaba.com> References: <1620902768-53822-1-git-send-email-jiapeng.chong@linux.alibaba.com> MIME-Version: 1.0 Message-ID: <166794331892.4906.5411586974851313804.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/cleanups branch of tip: Commit-ID: 6426773410fd829c15b59575afe531d66abc7201 Gitweb: https://git.kernel.org/tip/6426773410fd829c15b59575afe531d66abc7201 Author: Jiapeng Chong AuthorDate: Tue, 08 Nov 2022 22:09:51 +01:00 Committer: Borislav Petkov CommitterDate: Tue, 08 Nov 2022 22:16:08 +01:00 x86: Fix misc small issues Fix: ./arch/x86/kernel/traps.c: asm/proto.h is included more than once. ./arch/x86/kernel/alternative.c:1610:2-3: Unneeded semicolon. [ bp: Merge into a single patch. ] Reported-by: Abaci Robot Signed-off-by: Jiapeng Chong Signed-off-by: Borislav Petkov Link: https://lore.kernel.org/r/1620902768-53822-1-git-send-email-jiapeng.chong@linux.alibaba.com Link: https://lore.kernel.org/r/20220926054628.116957-1-jiapeng.chong@linux.alibaba.com --- arch/x86/kernel/alternative.c | 2 +- arch/x86/kernel/traps.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index 5cadcea..d5f1e13 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c @@ -1608,7 +1608,7 @@ static void text_poke_loc_init(struct text_poke_loc *tp, void *addr, default: BUG_ON(len != insn.length); - }; + } switch (tp->opcode) { diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index 178015a..c3bff64 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -67,13 +67,13 @@ #ifdef CONFIG_X86_64 #include -#include #else #include #include -#include #endif +#include + DECLARE_BITMAP(system_vectors, NR_VECTORS); static inline void cond_local_irq_enable(struct pt_regs *regs)