diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-28 06:35:24 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-28 06:35:24 +0100 |
| commit | 6749c5507388f3fc3719f57a54b540ee83f6661a (patch) | |
| tree | c069f990f86b020a14b50759d0c75475eedde186 /include/asm-i386/desc.h | |
| parent | powerpc: Export variables used in conversions to/from cputime_t (diff) | |
| parent | [PATCH] powerpc/iseries: Fix double phys_to_abs bug in htab_bolt_mapping (diff) | |
| download | linux-6749c5507388f3fc3719f57a54b540ee83f6661a.tar.xz linux-6749c5507388f3fc3719f57a54b540ee83f6661a.zip | |
Merge ../powerpc-merge
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)) |