Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ce27de4 authored by Hugh Dickins's avatar Hugh Dickins Committed by Greg Kroah-Hartman
Browse files

kaiser: delete KAISER_REAL_SWITCH option 




We fail to see what CONFIG_KAISER_REAL_SWITCH is for: it seems to be
left over from early development, and now just obscures tricky parts
of the code.  Delete it before adding PCIDs, or nokaiser boot option.

(Or if there is some good reason to keep the option, then it needs
a help text - and a "depends on KAISER", so that all those without
KAISER are not asked the question.  But we'd much rather delete it.)

Signed-off-by: default avatarHugh Dickins <hughd@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c27cdea5

arch/x86/entry/entry_64.S

+0 −4
Original line number Diff line number Diff line
@@ -1317,9 +1317,7 @@ ENTRY(nmi) 
	/* %rax is saved above, so OK to clobber here */

	movq	%cr3, %rax

	pushq	%rax

#ifdef CONFIG_KAISER_REAL_SWITCH

	andq	$(~KAISER_SHADOW_PGD_OFFSET), %rax

#endif

	movq	%rax, %cr3

#endif

	call	do_nmi
@@ -1560,9 +1558,7 @@ end_repeat_nmi: 
	/* %rax is saved above, so OK to clobber here */

	movq	%cr3, %rax

	pushq	%rax

#ifdef CONFIG_KAISER_REAL_SWITCH

	andq	$(~KAISER_SHADOW_PGD_OFFSET), %rax

#endif

	movq	%rax, %cr3

#endif

arch/x86/include/asm/kaiser.h

+0 −4
Original line number Diff line number Diff line
@@ -21,17 +21,13 @@ 


.macro _SWITCH_TO_KERNEL_CR3 reg

movq %cr3, \reg

#ifdef CONFIG_KAISER_REAL_SWITCH

andq $(~KAISER_SHADOW_PGD_OFFSET), \reg

#endif

movq \reg, %cr3

.endm



.macro _SWITCH_TO_USER_CR3 reg

movq %cr3, \reg

#ifdef CONFIG_KAISER_REAL_SWITCH

orq $(KAISER_SHADOW_PGD_OFFSET), \reg

#endif

movq \reg, %cr3

.endm

security/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -41,10 +41,6 @@ config KAISER 


	  If you are unsure how to answer this question, answer Y.



config KAISER_REAL_SWITCH

	bool "KAISER: actually switch page tables"

	default y



config SECURITYFS

	bool "Enable the securityfs filesystem"

	help