diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-02-27 11:33:51 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-02-27 11:33:51 -0500 |
| commit | dbfedbb98145375106cee7ec7269611d553819dc (patch) | |
| tree | 81d2a6de51b1bb3c704e5385dbc90ca79efa69bc /include/asm-i386/desc.h | |
| parent | 7b0386921db20add25afd8678ed34a9253e512fc (diff) | |
| parent | e95a9ec1bb66e07b138861c743192f06e7b3e4de (diff) | |
| download | talos-op-linux-dbfedbb98145375106cee7ec7269611d553819dc.tar.gz talos-op-linux-dbfedbb98145375106cee7ec7269611d553819dc.zip | |
Merge branch 'master'
Diffstat (limited to 'include/asm-i386/desc.h')
| -rw-r--r-- | include/asm-i386/desc.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-i386/desc.h b/include/asm-i386/desc.h index 494e73bca095..89b8b82c82b3 100644 --- a/include/asm-i386/desc.h +++ b/include/asm-i386/desc.h @@ -24,11 +24,13 @@ struct Xgt_desc_struct { unsigned short pad; } __attribute__ ((packed)); -extern struct Xgt_desc_struct idt_descr, cpu_gdt_descr[NR_CPUS]; +extern struct Xgt_desc_struct idt_descr; +DECLARE_PER_CPU(struct Xgt_desc_struct, cpu_gdt_descr); + static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu) { - return ((struct desc_struct *)cpu_gdt_descr[cpu].address); + return (struct desc_struct *)per_cpu(cpu_gdt_descr, cpu).address; } #define load_TR_desc() __asm__ __volatile__("ltr %w0"::"q" (GDT_ENTRY_TSS*8)) |
