On Thu, 2013-06-06 at 11:24 -0400, Seiji Aguchi wrote:
> --- a/arch/x86/include/asm/desc.h
> +++ b/arch/x86/include/asm/desc.h
> @@ -36,8 +36,8 @@ static inline void fill_ldt(struct desc_struct *desc, const
> struct user_desc *in
>
> extern struct desc_ptr idt_descr;
> extern gate_desc idt_table[];
> -extern struct desc_ptr nmi_idt_descr;
> -extern gate_desc nmi_idt_table[];
> +extern struct desc_ptr debug_idt_descr;
> +extern gate_desc debug_idt_table[];
>
> struct gdt_page {
> struct desc_struct gdt[GDT_ENTRIES];
> @@ -316,7 +316,20 @@ static inline void set_nmi_gate(int gate, void *addr)
> gate_desc s;
>
> pack_gate(&s, GATE_INTERRUPT, (unsigned long)addr, 0, 0, __KERNEL_CS);
> - write_idt_entry(nmi_idt_table, gate, &s);
> + write_idt_entry(debug_idt_table, gate, &s);
> +}
> +#endif
> +
> +#ifdef CONFIG_TRACING
> +extern struct desc_ptr trace_idt_descr;
> +extern gate_desc trace_idt_table[];
> +static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
> +{
> + write_idt_entry(trace_idt_table, entry, gate);
> +}
> +#else
> +static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
> +{
> }
> #endif
Since we are basically down to cosmetic changes, can you make the
renames of these variables into a separate patch. As they are now more
about the debug IDT than a NMI idt, it should have been done before, and
is a separate change to what you are doing here.
>
> @@ -331,6 +344,7 @@ static inline void _set_gate(int gate, unsigned type,
> void *addr,
> * setup time
> */
> write_idt_entry(idt_table, gate, &s);
> + write_trace_idt_entry(gate, &s);
> }
>
> /*
> @@ -360,12 +374,39 @@ static inline void alloc_system_vector(int vector)
> }
> }
>
-- Steve
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
