git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
include
/
asm-i386
/
desc.h
diff --git
a/include/asm-i386/desc.h
b/include/asm-i386/desc.h
index
5d126f7
..
3077baf
100644
(file)
--- a/
include/asm-i386/desc.h
+++ b/
include/asm-i386/desc.h
@@
-8,10
+8,12
@@
#include <linux/preempt.h>
#include <linux/smp.h>
#include <linux/preempt.h>
#include <linux/smp.h>
+#include <linux/percpu.h>
#include <asm/mmu.h>
#include <asm/mmu.h>
-extern struct desc_struct cpu_gdt_table[NR_CPUS][GDT_ENTRIES];
+extern struct desc_struct cpu_gdt_table[GDT_ENTRIES];
+DECLARE_PER_CPU(struct desc_struct, cpu_gdt_table[GDT_ENTRIES]);
struct Xgt_desc_struct {
unsigned short size;
struct Xgt_desc_struct {
unsigned short size;
@@
-44,7
+46,7
@@
__asm__ __volatile__ ("movw %w3,0(%2)\n\t" \
static inline void __set_tss_desc(unsigned int cpu, unsigned int entry, void *addr)
{
static inline void __set_tss_desc(unsigned int cpu, unsigned int entry, void *addr)
{
- _set_tssldt_desc(&
cpu_gdt_table[cpu]
[entry], (int)addr,
+ _set_tssldt_desc(&
per_cpu(cpu_gdt_table, cpu)
[entry], (int)addr,
offsetof(struct tss_struct, __cacheline_filler) - 1, 0x89);
}
offsetof(struct tss_struct, __cacheline_filler) - 1, 0x89);
}
@@
-52,7
+54,7
@@
static inline void __set_tss_desc(unsigned int cpu, unsigned int entry, void *ad
static inline void set_ldt_desc(unsigned int cpu, void *addr, unsigned int size)
{
static inline void set_ldt_desc(unsigned int cpu, void *addr, unsigned int size)
{
- _set_tssldt_desc(&
cpu_gdt_table[cpu]
[GDT_ENTRY_LDT], (int)addr, ((size << 3)-1), 0x82);
+ _set_tssldt_desc(&
per_cpu(cpu_gdt_table, cpu)
[GDT_ENTRY_LDT], (int)addr, ((size << 3)-1), 0x82);
}
#define LDT_entry_a(info) \
}
#define LDT_entry_a(info) \
@@
-86,7
+88,7
@@
static inline void set_ldt_desc(unsigned int cpu, void *addr, unsigned int size)
static inline void load_TLS(struct thread_struct *t, unsigned int cpu)
{
static inline void load_TLS(struct thread_struct *t, unsigned int cpu)
{
-#define C(i)
cpu_gdt_table[cpu]
[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i]
+#define C(i)
per_cpu(cpu_gdt_table, cpu)
[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i]
C(0); C(1); C(2);
#undef C
}
C(0); C(1); C(2);
#undef C
}