Commit bf603339 authored by Will Deacon's avatar Will Deacon
Browse files

Merge branch 'x86/asm' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into for-next/asm 

As agreed with Boris, merge in the 'x86/asm' branch from -tip so that we
can select the new 'ARCH_USE_SYM_ANNOTATIONS' Kconfig symbol, which is
required by the BTI kernel patches.

* 'x86/asm' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/asm: Provide a Kconfig symbol for disabling old assembly annotations
  x86/32: Remove CONFIG_DOUBLEFAULT
parents 6a8b55ed 2ce0d7f9

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ config X86 
	select ARCH_USE_BUILTIN_BSWAP

	select ARCH_USE_QUEUED_RWLOCKS

	select ARCH_USE_QUEUED_SPINLOCKS

	select ARCH_USE_SYM_ANNOTATIONS

	select ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH

	select ARCH_WANT_DEFAULT_BPF_JIT	if X86_64

	select ARCH_WANTS_DYNAMIC_TASK_STRUCT

arch/x86/Kconfig.debug

+0 −9
Original line number Diff line number Diff line
@@ -99,15 +99,6 @@ config DEBUG_WX 


	  If in doubt, say "Y".



config DOUBLEFAULT

	default y

	bool "Enable doublefault exception handler" if EXPERT && X86_32

	---help---

	  This option allows trapping of rare doublefault exceptions that

	  would otherwise cause a system to silently reboot. Disabling this

	  option saves about 4k and might cause you much additional grey

	  hair.



config DEBUG_TLBFLUSH

	bool "Set upper limit of TLB entries to flush one-by-one"

	depends on DEBUG_KERNEL

arch/x86/entry/entry_32.S

+0 −2
Original line number Diff line number Diff line
@@ -1536,7 +1536,6 @@ SYM_CODE_START(debug) 
	jmp	common_exception

SYM_CODE_END(debug)



#ifdef CONFIG_DOUBLEFAULT

SYM_CODE_START(double_fault)

1:

	/*
@@ -1576,7 +1575,6 @@ SYM_CODE_START(double_fault) 
	hlt

	jmp 1b

SYM_CODE_END(double_fault)

#endif



/*

 * NMI is doubly nasty.  It can happen on the first instruction of

arch/x86/include/asm/doublefault.h

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#ifndef _ASM_X86_DOUBLEFAULT_H

#define _ASM_X86_DOUBLEFAULT_H



#if defined(CONFIG_X86_32) && defined(CONFIG_DOUBLEFAULT)

#ifdef CONFIG_X86_32

extern void doublefault_init_cpu_tss(void);

#else

static inline void doublefault_init_cpu_tss(void)

arch/x86/include/asm/traps.h

+0 −2
Original line number Diff line number Diff line
@@ -69,9 +69,7 @@ dotraplinkage void do_overflow(struct pt_regs *regs, long error_code); 
dotraplinkage void do_bounds(struct pt_regs *regs, long error_code);

dotraplinkage void do_invalid_op(struct pt_regs *regs, long error_code);

dotraplinkage void do_device_not_available(struct pt_regs *regs, long error_code);

#if defined(CONFIG_X86_64) || defined(CONFIG_DOUBLEFAULT)

dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code, unsigned long cr2);

#endif

dotraplinkage void do_coprocessor_segment_overrun(struct pt_regs *regs, long error_code);

dotraplinkage void do_invalid_TSS(struct pt_regs *regs, long error_code);

dotraplinkage void do_segment_not_present(struct pt_regs *regs, long error_code);

CRA Git | Maintained and supported by SUSTech CRA and CCSE