x86: Rename variables for debugging

[mirror_ubuntu-artful-kernel.git] / arch / x86 / kernel / cpu / common.c

diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 22018f70a6716e2f57012378c19df770ba607ca0..8f6a0f909d6ff5702e1f5f35f95f7db46749b8f4 100644 (file)
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -1071,8 +1071,8 @@ __setup("clearcpuid=", setup_disablecpuid);
 
 #ifdef CONFIG_X86_64
 struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
-struct desc_ptr nmi_idt_descr = { NR_VECTORS * 16 - 1,
-                                   (unsigned long) nmi_idt_table };
+struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1,
+                                   (unsigned long) debug_idt_table };
 
 DEFINE_PER_CPU_FIRST(union irq_stack_union,
                     irq_stack_union) __aligned(PAGE_SIZE);
@@ -1148,20 +1148,20 @@ int is_debug_stack(unsigned long addr)
                 addr > (__get_cpu_var(debug_stack_addr) - DEBUG_STKSZ));
 }
 
-static DEFINE_PER_CPU(u32, debug_stack_use_ctr);
+DEFINE_PER_CPU(u32, debug_idt_ctr);
 
 void debug_stack_set_zero(void)
 {
-       this_cpu_inc(debug_stack_use_ctr);
-       load_idt((const struct desc_ptr *)&nmi_idt_descr);
+       this_cpu_inc(debug_idt_ctr);
+       load_current_idt();
 }
 
 void debug_stack_reset(void)
 {
-       if (WARN_ON(!this_cpu_read(debug_stack_use_ctr)))
+       if (WARN_ON(!this_cpu_read(debug_idt_ctr)))
                return;
-       if (this_cpu_dec_return(debug_stack_use_ctr) == 0)
-               load_idt((const struct desc_ptr *)&idt_descr);
+       if (this_cpu_dec_return(debug_idt_ctr) == 0)
+               load_current_idt();
 }
 
 #else  /* CONFIG_X86_64 */