diff options
| author | Linus Torvalds | 2009-05-05 21:07:21 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2009-05-05 21:07:21 +0200 |
| commit | 5e30302b9ee75a01d65d8dcf4085254a5da1066d (patch) | |
| tree | d9a0c9a41962640fbfb02415e2f3983adacaa33d /arch/x86/kernel/cpu/common.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes (diff) | |
| parent | x86: show number of core_siblings instead of thread_siblings in /proc/cpuinfo (diff) | |
| download | kernel-qcow2-linux-5e30302b9ee75a01d65d8dcf4085254a5da1066d.tar.gz kernel-qcow2-linux-5e30302b9ee75a01d65d8dcf4085254a5da1066d.tar.xz kernel-qcow2-linux-5e30302b9ee75a01d65d8dcf4085254a5da1066d.zip | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: show number of core_siblings instead of thread_siblings in /proc/cpuinfo
amd-iommu: fix iommu flag masks
x86: initialize io_bitmap_base on 32bit
x86: gettimeofday() vDSO: fix segfault when tv == NULL
Diffstat (limited to 'arch/x86/kernel/cpu/common.c')
| -rw-r--r-- | arch/x86/kernel/cpu/common.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index c4f667896c28..c1caefc82e62 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -1203,6 +1203,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); |