2021-05-13 11:45:06

by Jiapeng Chong

[permalink] [raw]
Subject: [PATCH] x86/traps: Fix duplicate included asm/proto.h

Clean up the following includecheck warning:

./arch/x86/kernel/traps.c: asm/proto.h is included more than once.

No functional change.

Reported-by: Abaci Robot <[email protected]>
Signed-off-by: Jiapeng Chong <[email protected]>
---
arch/x86/kernel/traps.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index 853ea7a..c4710e7 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -64,13 +64,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)
--
1.8.3.1



Subject: [tip: x86/cleanups] x86: Fix misc small issues

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 <[email protected]>
AuthorDate: Tue, 08 Nov 2022 22:09:51 +01:00
Committer: Borislav Petkov <[email protected]>
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 <[email protected]>
Signed-off-by: Jiapeng Chong <[email protected]>
Signed-off-by: Borislav Petkov <[email protected]>
Link: https://lore.kernel.org/r/1620902768-53822-1-git-send-email-jiapeng.chong@linux.alibaba.com
Link: https://lore.kernel.org/r/[email protected]
---
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)