diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-19 13:18:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-19 13:18:31 -0800 |
| commit | 1092b596a56b6ac5fa3154dc75bfcbb6f27ac757 (patch) | |
| tree | a804de50bae89bba47aaa414e6a4fb033da0dd94 /arch/x86/kernel | |
| parent | 88a57667f2990f00b019d46c8426441c9e516d51 (diff) | |
| parent | 3fb2f4237bb452eb4e98f6a5dbd5a445b4fed9d0 (diff) | |
| download | op-kernel-dev-1092b596a56b6ac5fa3154dc75bfcbb6f27ac757.zip op-kernel-dev-1092b596a56b6ac5fa3154dc75bfcbb6f27ac757.tar.gz | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fix from Ingo Molnar:
"This contains a single TLS ABI validation fix from Andy Lutomirski"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/tls: Don't validate lm in set_thread_area() after all
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/tls.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c index 3e551ee..4e942f3 100644 --- a/arch/x86/kernel/tls.c +++ b/arch/x86/kernel/tls.c @@ -55,12 +55,6 @@ static bool tls_desc_okay(const struct user_desc *info) if (info->seg_not_present) return false; -#ifdef CONFIG_X86_64 - /* The L bit makes no sense for data. */ - if (info->lm) - return false; -#endif - return true; } |
