Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux...

[linux-2.6-block.git] / arch / x86 / entry / common.c

diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c
index 81c0e12d831c42a62f7622bbfc5682e15a1314f9..a1e71d431fed85f40f939e5765b8fe4bb4a7a411 100644 (file)
--- a/arch/x86/entry/common.c
+++ b/arch/x86/entry/common.c
@@ -40,10 +40,10 @@ static struct thread_info *pt_regs_to_thread_info(struct pt_regs *regs)
 
 #ifdef CONFIG_CONTEXT_TRACKING
 /* Called on entry from user mode with IRQs off. */
-__visible void enter_from_user_mode(void)
+__visible inline void enter_from_user_mode(void)
 {
        CT_WARN_ON(ct_state() != CONTEXT_USER);
-       user_exit();
+       user_exit_irqoff();
 }
 #else
 static inline void enter_from_user_mode(void) {}
@@ -208,7 +208,7 @@ __visible inline void prepare_exit_to_usermode(struct pt_regs *regs)
        ti->status &= ~TS_COMPAT;
 #endif
 
-       user_enter();
+       user_enter_irqoff();
 }
 
 #define SYSCALL_EXIT_WORK_FLAGS                                \