Commit 64267734 authored by Jiapeng Chong's avatar Jiapeng Chong Committed by Borislav Petkov
Browse files

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: default avatarAbaci Robot <abaci@linux.alibaba.com>
Signed-off-by: default avatarJiapeng Chong <jiapeng.chong@linux.alibaba.com>
Signed-off-by: default avatarBorislav 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
parent d632bf6f

arch/x86/kernel/alternative.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {

arch/x86/kernel/traps.c

+2 −2
Original line number Diff line number Diff line
@@ -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)