X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=arch%2Fx86%2Fkernel%2Fentry_64.S;fp=arch%2Fx86%2Fkernel%2Fentry_64.S;h=b232bfcf44fbd87f93d0721976ef831568c0c897;hb=108ec7a7d73e90db280f14581ccddc6f9c928bff;hp=81049db49e373d629a23ef0f511fd0b454814dae;hpb=99273214e17a9772fe7929b7a71fb4a07b22b666;p=pandora-kernel.git

diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index 81049db49e37..b232bfcf44fb 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -398,7 +398,7 @@ ENTRY(save_paranoid)
 	SWAPGS
 	xorl %ebx,%ebx
 1:
-#ifdef CONFIG_KAISER
+#ifdef CONFIG_PAGE_TABLE_ISOLATION
 	/*
 	 * We might have come in between a swapgs and a SWITCH_KERNEL_CR3
 	 * on entry, or between a SWITCH_USER_CR3 and a swapgs on exit.
@@ -1430,7 +1430,7 @@ ENTRY(paranoid_exit)
 paranoid_kernel:
 	movq	%r12, %rbx		/* restore after paranoid_userspace */
 	TRACE_IRQS_IRETQ 0
-#ifdef CONFIG_KAISER
+#ifdef CONFIG_PAGE_TABLE_ISOLATION
 	/* No ALTERNATIVE for X86_FEATURE_KAISER: save_paranoid sets %ebx */
 	testl	$2, %ebx		/* SWITCH_USER_CR3 needed? */
 	jz	paranoid_exit_no_switch
@@ -1600,7 +1600,7 @@ ENTRY(nmi)
 	jnz	nmi_userspace
 nmi_kernel:
 	movq	%r12, %rbx		/* restore after nmi_userspace */
-#ifdef CONFIG_KAISER
+#ifdef CONFIG_PAGE_TABLE_ISOLATION
 	/* No ALTERNATIVE for X86_FEATURE_KAISER: save_paranoid sets %ebx */
 	testl	$2, %ebx		/* SWITCH_USER_CR3 needed? */
 	jz	nmi_exit_no_switch