diff options
author | Glauber de Oliveira Costa <gcosta@redhat.com> | 2008-01-30 07:31:12 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:31:12 -0500 |
commit | 6b68f01baa810e9f63fbf39e9d5c3ef1d94a966f (patch) | |
tree | dc7f50673d72677d24dbe9ac8217b832f8d5cb02 /include/asm-x86/paravirt.h | |
parent | 6842ef0e85a9cc1295f3ef933a230f863b01eb0f (diff) |
x86: unify struct desc_ptr
This patch unifies struct desc_ptr between i386 and x86_64.
They can be expressed in the exact same way in C code, only
having to change the name of one of them. As Xgt_desc_struct
is ugly and big, this is the one that goes away.
There's also a padding field in i386, but it is not really
needed in the C structure definition.
Signed-off-by: Glauber de Oliveira Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/asm-x86/paravirt.h')
-rw-r--r-- | include/asm-x86/paravirt.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/asm-x86/paravirt.h b/include/asm-x86/paravirt.h index e95c2a655165..0333fb6988b5 100644 --- a/include/asm-x86/paravirt.h +++ b/include/asm-x86/paravirt.h | |||
@@ -20,7 +20,7 @@ | |||
20 | 20 | ||
21 | struct page; | 21 | struct page; |
22 | struct thread_struct; | 22 | struct thread_struct; |
23 | struct Xgt_desc_struct; | 23 | struct desc_ptr; |
24 | struct tss_struct; | 24 | struct tss_struct; |
25 | struct mm_struct; | 25 | struct mm_struct; |
26 | struct desc_struct; | 26 | struct desc_struct; |
@@ -88,10 +88,10 @@ struct pv_cpu_ops { | |||
88 | 88 | ||
89 | /* Segment descriptor handling */ | 89 | /* Segment descriptor handling */ |
90 | void (*load_tr_desc)(void); | 90 | void (*load_tr_desc)(void); |
91 | void (*load_gdt)(const struct Xgt_desc_struct *); | 91 | void (*load_gdt)(const struct desc_ptr *); |
92 | void (*load_idt)(const struct Xgt_desc_struct *); | 92 | void (*load_idt)(const struct desc_ptr *); |
93 | void (*store_gdt)(struct Xgt_desc_struct *); | 93 | void (*store_gdt)(struct desc_ptr *); |
94 | void (*store_idt)(struct Xgt_desc_struct *); | 94 | void (*store_idt)(struct desc_ptr *); |
95 | void (*set_ldt)(const void *desc, unsigned entries); | 95 | void (*set_ldt)(const void *desc, unsigned entries); |
96 | unsigned long (*store_tr)(void); | 96 | unsigned long (*store_tr)(void); |
97 | void (*load_tls)(struct thread_struct *t, unsigned int cpu); | 97 | void (*load_tls)(struct thread_struct *t, unsigned int cpu); |
@@ -630,11 +630,11 @@ static inline void load_TR_desc(void) | |||
630 | { | 630 | { |
631 | PVOP_VCALL0(pv_cpu_ops.load_tr_desc); | 631 | PVOP_VCALL0(pv_cpu_ops.load_tr_desc); |
632 | } | 632 | } |
633 | static inline void load_gdt(const struct Xgt_desc_struct *dtr) | 633 | static inline void load_gdt(const struct desc_ptr *dtr) |
634 | { | 634 | { |
635 | PVOP_VCALL1(pv_cpu_ops.load_gdt, dtr); | 635 | PVOP_VCALL1(pv_cpu_ops.load_gdt, dtr); |
636 | } | 636 | } |
637 | static inline void load_idt(const struct Xgt_desc_struct *dtr) | 637 | static inline void load_idt(const struct desc_ptr *dtr) |
638 | { | 638 | { |
639 | PVOP_VCALL1(pv_cpu_ops.load_idt, dtr); | 639 | PVOP_VCALL1(pv_cpu_ops.load_idt, dtr); |
640 | } | 640 | } |
@@ -642,11 +642,11 @@ static inline void set_ldt(const void *addr, unsigned entries) | |||
642 | { | 642 | { |
643 | PVOP_VCALL2(pv_cpu_ops.set_ldt, addr, entries); | 643 | PVOP_VCALL2(pv_cpu_ops.set_ldt, addr, entries); |
644 | } | 644 | } |
645 | static inline void store_gdt(struct Xgt_desc_struct *dtr) | 645 | static inline void store_gdt(struct desc_ptr *dtr) |
646 | { | 646 | { |
647 | PVOP_VCALL1(pv_cpu_ops.store_gdt, dtr); | 647 | PVOP_VCALL1(pv_cpu_ops.store_gdt, dtr); |
648 | } | 648 | } |
649 | static inline void store_idt(struct Xgt_desc_struct *dtr) | 649 | static inline void store_idt(struct desc_ptr *dtr) |
650 | { | 650 | { |
651 | PVOP_VCALL1(pv_cpu_ops.store_idt, dtr); | 651 | PVOP_VCALL1(pv_cpu_ops.store_idt, dtr); |
652 | } | 652 | } |