Merge commit 'v2.6.30-rc6' into perfcounters/core
[linux-2.6.git] / arch / x86 / kernel / cpu / common.c
index a86769e..591012f 100644 (file)
@@ -1205,6 +1205,8 @@ void __cpuinit cpu_init(void)
        load_TR_desc();
        load_LDT(&init_mm.context);
 
+       t->x86_tss.io_bitmap_base = offsetof(struct tss_struct, io_bitmap);
+
 #ifdef CONFIG_DOUBLEFAULT
        /* Set up doublefault TSS pointer in the GDT */
        __set_tss_desc(cpu, GDT_ENTRY_DOUBLEFAULT_TSS, &doublefault_tss);