summaryrefslogtreecommitdiff
path: root/arch/x86/vdso
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2014-05-21 10:22:59 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-08-07 14:30:26 -0700
commitd6b0ea8a938e4c05a00139793a405b764e63e37b (patch)
treec5adc35e60473270721b460bee280bd64fbf3c3a /arch/x86/vdso
parent562eebeb9c07101e49f6803fd018ac45a01e3f43 (diff)
downloadlinux-3.10-d6b0ea8a938e4c05a00139793a405b764e63e37b.tar.gz
linux-3.10-d6b0ea8a938e4c05a00139793a405b764e63e37b.tar.bz2
linux-3.10-d6b0ea8a938e4c05a00139793a405b764e63e37b.zip
Revert "x86-64, modify_ldt: Make support for 16-bit segments a runtime option"
commit 7ed6fb9b5a5510e4ef78ab27419184741169978a upstream. This reverts commit fa81511bb0bbb2b1aace3695ce869da9762624ff in preparation of merging in the proper fix (espfix64). Signed-off-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/vdso')
-rw-r--r--arch/x86/vdso/vdso32-setup.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
index 0f134c7cfc2..0faad646f5f 100644
--- a/arch/x86/vdso/vdso32-setup.c
+++ b/arch/x86/vdso/vdso32-setup.c
@@ -41,7 +41,6 @@ enum {
#ifdef CONFIG_X86_64
#define vdso_enabled sysctl_vsyscall32
#define arch_setup_additional_pages syscall32_setup_pages
-extern int sysctl_ldt16;
#endif
/*
@@ -381,13 +380,6 @@ static ctl_table abi_table2[] = {
.mode = 0644,
.proc_handler = proc_dointvec
},
- {
- .procname = "ldt16",
- .data = &sysctl_ldt16,
- .maxlen = sizeof(int),
- .mode = 0644,
- .proc_handler = proc_dointvec
- },
{}
};