diff options
| author | Mark Brown <broonie@kernel.org> | 2014-11-03 10:13:33 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-03 10:13:33 -0500 |
| commit | ebc01f593b58e1896150fc2e3cbdd0116323c52c (patch) | |
| tree | 23e905a3fdbee3fc8a66ef760b9ed5ef5455e9dd /arch/x86/include/asm/preempt.h | |
| parent | 3f7256fe5fc64132a2dd19695255c990aa2188cf (diff) | |
| parent | 0df1f2487d2f0d04703f142813d53615d62a1da4 (diff) | |
Merge tag 'v3.18-rc3' into asoc-sgtl5000
Linux 3.18-rc3
Diffstat (limited to 'arch/x86/include/asm/preempt.h')
| -rw-r--r-- | arch/x86/include/asm/preempt.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/preempt.h b/arch/x86/include/asm/preempt.h index 7024c12f7bfe..400873450e33 100644 --- a/arch/x86/include/asm/preempt.h +++ b/arch/x86/include/asm/preempt.h | |||
| @@ -105,6 +105,7 @@ static __always_inline bool should_resched(void) | |||
| 105 | # ifdef CONFIG_CONTEXT_TRACKING | 105 | # ifdef CONFIG_CONTEXT_TRACKING |
| 106 | extern asmlinkage void ___preempt_schedule_context(void); | 106 | extern asmlinkage void ___preempt_schedule_context(void); |
| 107 | # define __preempt_schedule_context() asm ("call ___preempt_schedule_context") | 107 | # define __preempt_schedule_context() asm ("call ___preempt_schedule_context") |
| 108 | extern asmlinkage void preempt_schedule_context(void); | ||
| 108 | # endif | 109 | # endif |
| 109 | #endif | 110 | #endif |
| 110 | 111 | ||