2 files changed, 3 insertions, 4 deletions

diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
index 1d4e4f279a32..a2fa1899494e 100644
--- a/arch/x86/include/asm/thread_info.h
+++ b/arch/x86/include/asm/thread_info.h
@@ -159,8 +159,7 @@ DECLARE_PER_CPU(unsigned long, kernel_stack);
 static inline struct thread_info *current_thread_info(void)
 {
         struct thread_info *ti;
-        ti = (void *)(this_cpu_read_stable(kernel_stack) +
-                      KERNEL_STACK_OFFSET - THREAD_SIZE);
+        ti = (void *)(this_cpu_sp0() - THREAD_SIZE);
         return ti;
 }
 
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index 9965bd1916db..fa290586ed37 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -174,8 +174,8 @@ void ist_begin_non_atomic(struct pt_regs *regs)
          * will catch asm bugs and any attempt to use ist_preempt_enable
          * from double_fault.
          */
-        BUG_ON(((current_stack_pointer() ^ this_cpu_read_stable(kernel_stack))
-                & ~(THREAD_SIZE - 1)) != 0);
+        BUG_ON((unsigned long)(this_cpu_sp0() - current_stack_pointer()) >=
+               THREAD_SIZE);
 
         preempt_count_sub(HARDIRQ_OFFSET);
 }