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
This commit is contained in:
commit
c2da5bdc66
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue