From: "tip-bot2 for Jiapeng Chong" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Abaci Robot <abaci@linux.alibaba.com>,
Jiapeng Chong <jiapeng.chong@linux.alibaba.com>,
Borislav Petkov <bp@suse.de>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/cleanups] x86: Fix misc small issues
Date: Tue, 08 Nov 2022 21:35:18 -0000 [thread overview]
Message-ID: <166794331892.4906.5411586974851313804.tip-bot2@tip-bot2> (raw)
In-Reply-To: <1620902768-53822-1-git-send-email-jiapeng.chong@linux.alibaba.com>
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 <jiapeng.chong@linux.alibaba.com>
AuthorDate: Tue, 08 Nov 2022 22:09:51 +01:00
Committer: Borislav Petkov <bp@suse.de>
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 <abaci@linux.alibaba.com>
Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
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 <asm/x86_init.h>
-#include <asm/proto.h>
#else
#include <asm/processor-flags.h>
#include <asm/setup.h>
-#include <asm/proto.h>
#endif
+#include <asm/proto.h>
+
DECLARE_BITMAP(system_vectors, NR_VECTORS);
static inline void cond_local_irq_enable(struct pt_regs *regs)
prev parent reply other threads:[~2022-11-08 21:35 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-13 10:46 [PATCH] x86/traps: Fix duplicate included asm/proto.h Jiapeng Chong
2022-11-08 21:35 ` tip-bot2 for Jiapeng Chong [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=166794331892.4906.5411586974851313804.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=abaci@linux.alibaba.com \
--cc=bp@suse.de \
--cc=jiapeng.chong@linux.alibaba.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.