diff options
| author | Gary S. Robertson <gary.robertson@linaro.org> | 2016-01-20 15:36:59 -0600 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2016-01-20 15:36:59 -0600 |
| commit | 370e05d463d66eaada3b4bb9266f019563920eb0 (patch) | |
| tree | 348834a36436338eea1e9f17f1823cae213f92fc /arch/x86/include/asm/desc.h | |
| parent | f93328edc6d139b9b1b5ed6944f7b80b8699cdf7 (diff) | |
| parent | 906d9eadd3b6698fa6ceb9bcdf41da6aa56d0a24 (diff) | |
Merge tag 'lsk-v4.1-15.12-rt' of http://git.linaro.org/kernel/linux-linaro-stable into linux-linaro-lng-v4.1-rtlinux-lng-preempt-rt-4.1.14-2016.03linux-lng-preempt-rt-4.1.14-2016.02linux-lng-preempt-rt-4.1.14-2016.01linux-linaro-lng-v4.1-rt
LSK RT 15.12 v4.1
Conflicts:
linaro/configs/linaro-base.conf
linaro/configs/preempt-rt.conf
linaro/configs/vexpress64.conf
Diffstat (limited to 'arch/x86/include/asm/desc.h')
| -rw-r--r-- | arch/x86/include/asm/desc.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h index a0bf89fd2647..4e10d73cf018 100644 --- a/arch/x86/include/asm/desc.h +++ b/arch/x86/include/asm/desc.h @@ -280,21 +280,6 @@ static inline void clear_LDT(void) set_ldt(NULL, 0); } -/* - * load one particular LDT into the current CPU - */ -static inline void load_LDT_nolock(mm_context_t *pc) -{ - set_ldt(pc->ldt, pc->size); -} - -static inline void load_LDT(mm_context_t *pc) -{ - preempt_disable(); - load_LDT_nolock(pc); - preempt_enable(); -} - static inline unsigned long get_desc_base(const struct desc_struct *desc) { return (unsigned)(desc->base0 | ((desc->base1) << 16) | ((desc->base2) << 24)); |