summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-11-26 17:12:12 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2019-11-26 17:12:12 -0800
commitc2da5bdc66a377f0b82ee959f19f5a6774706b83 (patch)
treee97326a86f335061666f799d80de86197d0b54c8 /arch/x86
parent168829ad09ca9cdfdc664b2110d0e3569932c12d (diff)
parent0bcd7762727dd8ba9b9b6f828e5a4cbd5da4f725 (diff)
downloadlinux-c2da5bdc66a377f0b82ee959f19f5a6774706b83.tar.bz2
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 merge fix from Ingo Molnar: "I missed one other semantic conflict that can result in build failures on certain stripped down x86 32-bit configs, for example 32-bit 'allnoconfig' where CONFIG_X86_IOPL_IOPERM gets turned off" * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/iopl: Make 'struct tss_struct' constant size again
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/include/asm/processor.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index b4e29d8b9e5a..e51afbb0cbfb 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -411,9 +411,7 @@ struct tss_struct {
*/
struct x86_hw_tss x86_tss;
-#ifdef CONFIG_X86_IOPL_IOPERM
struct x86_io_bitmap io_bitmap;
-#endif
} __aligned(PAGE_SIZE);
DECLARE_PER_CPU_PAGE_ALIGNED(struct tss_struct, cpu_tss_rw);