|
@@ -487,7 +487,7 @@ void load_percpu_segment(int cpu)
|
|
|
loadsegment(fs, __KERNEL_PERCPU);
|
|
|
#else
|
|
|
__loadsegment_simple(gs, 0);
|
|
|
- wrmsrl(MSR_GS_BASE, (unsigned long)per_cpu(irq_stack_union.gs_base, cpu));
|
|
|
+ wrmsrl(MSR_GS_BASE, cpu_kernelmode_gs_base(cpu));
|
|
|
#endif
|
|
|
load_stack_canary_segment();
|
|
|
}
|
|
@@ -1398,6 +1398,7 @@ __setup("clearcpuid=", setup_clearcpuid);
|
|
|
#ifdef CONFIG_X86_64
|
|
|
DEFINE_PER_CPU_FIRST(union irq_stack_union,
|
|
|
irq_stack_union) __aligned(PAGE_SIZE) __visible;
|
|
|
+EXPORT_PER_CPU_SYMBOL_GPL(irq_stack_union);
|
|
|
|
|
|
/*
|
|
|
* The following percpu variables are hot. Align current_task to
|