diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-03-08 16:41:22 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-03-08 16:41:22 +0100 |
| commit | 4e3da46797f8e4d8217d2e3d6857444391b306da (patch) | |
| tree | 4532f3bec8e45fbc69cc8389c4c7316d3eba7ae4 /arch/x86/include/asm/context_tracking.h | |
| parent | 27b4b9319a3c2e8654d45df99ce584c7c2cfe100 (diff) | |
| parent | 8b43876643a737bb74a0e1e557f634eb2453948b (diff) | |
| download | op-kernel-dev-4e3da46797f8e4d8217d2e3d6857444391b306da.zip op-kernel-dev-4e3da46797f8e4d8217d2e3d6857444391b306da.tar.gz | |
Merge branch 'sched/cputime' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks into sched/core
Pull cputime changes from Frederic Weisbecker:
* Generalize exception handling
* Fix race in context tracking state restore on return from exception
and irq exit kernel preemption
* Fix cputime scaling in full dynticks accounting dynamic off-case
* Fix default Kconfig value
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/context_tracking.h')
| -rw-r--r-- | arch/x86/include/asm/context_tracking.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/arch/x86/include/asm/context_tracking.h b/arch/x86/include/asm/context_tracking.h index 1616562..1fe4970 100644 --- a/arch/x86/include/asm/context_tracking.h +++ b/arch/x86/include/asm/context_tracking.h @@ -1,31 +1,10 @@ #ifndef _ASM_X86_CONTEXT_TRACKING_H #define _ASM_X86_CONTEXT_TRACKING_H -#ifndef __ASSEMBLY__ -#include <linux/context_tracking.h> -#include <asm/ptrace.h> - -static inline void exception_enter(struct pt_regs *regs) -{ - user_exit(); -} - -static inline void exception_exit(struct pt_regs *regs) -{ -#ifdef CONFIG_CONTEXT_TRACKING - if (user_mode(regs)) - user_enter(); -#endif -} - -#else /* __ASSEMBLY__ */ - #ifdef CONFIG_CONTEXT_TRACKING # define SCHEDULE_USER call schedule_user #else # define SCHEDULE_USER call schedule #endif -#endif /* !__ASSEMBLY__ */ - #endif |
