X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=include%2Fasm-x86%2Fdesc_64.h;h=7d48df72aef2e7349c470b5ba83d4282e13557c3;hb=7462894a7cb03b54b9139f31fab5928366752a78;hp=ac991b5ca0fd501c0b294963031ca505016dbb9e;hpb=96a388de5dc53a8b234b3fd41f3ae2cedc9ffd42;p=powerpc.git

diff --git a/include/asm-x86/desc_64.h b/include/asm-x86/desc_64.h
index ac991b5ca0..7d48df72ae 100644
--- a/include/asm-x86/desc_64.h
+++ b/include/asm-x86/desc_64.h
@@ -1,4 +1,4 @@
-/* Written 2000 by Andi Kleen */ 
+/* Written 2000 by Andi Kleen */
 #ifndef __ARCH_DESC_H
 #define __ARCH_DESC_H
 
@@ -20,75 +20,120 @@ extern struct desc_struct cpu_gdt_table[GDT_ENTRIES];
 #define load_LDT_desc() asm volatile("lldt %w0"::"r" (GDT_ENTRY_LDT*8))
 #define clear_LDT()  asm volatile("lldt %w0"::"r" (0))
 
+static inline unsigned long __store_tr(void)
+{
+       unsigned long tr;
+
+       asm volatile ("str %w0":"=r" (tr));
+       return tr;
+}
+
+#define store_tr(tr) (tr) = __store_tr()
+
 /*
  * This is the ldt that every process will get unless we need
  * something other than this.
  */
 extern struct desc_struct default_ldt[];
-extern struct gate_struct idt_table[]; 
+extern struct gate_struct idt_table[];
 extern struct desc_ptr cpu_gdt_descr[];
 
+static inline void write_ldt_entry(struct desc_struct *ldt,
+				   int entry, u32 entry_low, u32 entry_high)
+{
+	__u32 *lp = (__u32 *)((entry << 3) + (char *)ldt);
+
+	lp[0] = entry_low;
+	lp[1] = entry_high;
+}
+
 /* the cpu gdt accessor */
 #define cpu_gdt(_cpu) ((struct desc_struct *)cpu_gdt_descr[_cpu].address)
 
-static inline void _set_gate(void *adr, unsigned type, unsigned long func, unsigned dpl, unsigned ist)  
+static inline void load_gdt(const struct desc_ptr *ptr)
+{
+	asm volatile("lgdt %w0"::"m" (*ptr));
+}
+
+static inline void store_gdt(struct desc_ptr *ptr)
+{
+       asm("sgdt %w0":"=m" (*ptr));
+}
+
+static inline void _set_gate(void *adr, unsigned type, unsigned long func,
+			     unsigned dpl, unsigned ist)
 {
-	struct gate_struct s; 	
-	s.offset_low = PTR_LOW(func); 
+	struct gate_struct s;
+
+	s.offset_low = PTR_LOW(func);
 	s.segment = __KERNEL_CS;
-	s.ist = ist; 
+	s.ist = ist;
 	s.p = 1;
-	s.dpl = dpl; 
+	s.dpl = dpl;
 	s.zero0 = 0;
-	s.zero1 = 0; 
-	s.type = type; 
-	s.offset_middle = PTR_MIDDLE(func); 
-	s.offset_high = PTR_HIGH(func); 
-	/* does not need to be atomic because it is only done once at setup time */ 
-	memcpy(adr, &s, 16); 
-} 
-
-static inline void set_intr_gate(int nr, void *func) 
-{ 
+	s.zero1 = 0;
+	s.type = type;
+	s.offset_middle = PTR_MIDDLE(func);
+	s.offset_high = PTR_HIGH(func);
+	/*
+	 * does not need to be atomic because it is only done once at
+	 * setup time
+	 */
+	memcpy(adr, &s, 16);
+}
+
+static inline void set_intr_gate(int nr, void *func)
+{
 	BUG_ON((unsigned)nr > 0xFF);
-	_set_gate(&idt_table[nr], GATE_INTERRUPT, (unsigned long) func, 0, 0); 
-} 
+	_set_gate(&idt_table[nr], GATE_INTERRUPT, (unsigned long) func, 0, 0);
+}
 
-static inline void set_intr_gate_ist(int nr, void *func, unsigned ist) 
-{ 
+static inline void set_intr_gate_ist(int nr, void *func, unsigned ist)
+{
 	BUG_ON((unsigned)nr > 0xFF);
-	_set_gate(&idt_table[nr], GATE_INTERRUPT, (unsigned long) func, 0, ist); 
-} 
+	_set_gate(&idt_table[nr], GATE_INTERRUPT, (unsigned long) func, 0, ist);
+}
 
-static inline void set_system_gate(int nr, void *func) 
-{ 
+static inline void set_system_gate(int nr, void *func)
+{
 	BUG_ON((unsigned)nr > 0xFF);
-	_set_gate(&idt_table[nr], GATE_INTERRUPT, (unsigned long) func, 3, 0); 
-} 
+	_set_gate(&idt_table[nr], GATE_INTERRUPT, (unsigned long) func, 3, 0);
+}
 
 static inline void set_system_gate_ist(int nr, void *func, unsigned ist)
 {
 	_set_gate(&idt_table[nr], GATE_INTERRUPT, (unsigned long) func, 3, ist);
 }
 
-static inline void set_tssldt_descriptor(void *ptr, unsigned long tss, unsigned type, 
-					 unsigned size) 
-{ 
+static inline void load_idt(const struct desc_ptr *ptr)
+{
+	asm volatile("lidt %w0"::"m" (*ptr));
+}
+
+static inline void store_idt(struct desc_ptr *dtr)
+{
+       asm("sidt %w0":"=m" (*dtr));
+}
+
+static inline void set_tssldt_descriptor(void *ptr, unsigned long tss,
+					 unsigned type, unsigned size)
+{
 	struct ldttss_desc d;
-	memset(&d,0,sizeof(d)); 
+
+	memset(&d, 0, sizeof(d));
 	d.limit0 = size & 0xFFFF;
-	d.base0 = PTR_LOW(tss); 
-	d.base1 = PTR_MIDDLE(tss) & 0xFF; 
+	d.base0 = PTR_LOW(tss);
+	d.base1 = PTR_MIDDLE(tss) & 0xFF;
 	d.type = type;
-	d.p = 1; 
+	d.p = 1;
 	d.limit1 = (size >> 16) & 0xF;
-	d.base2 = (PTR_MIDDLE(tss) >> 8) & 0xFF; 
-	d.base3 = PTR_HIGH(tss); 
-	memcpy(ptr, &d, 16); 
+	d.base2 = (PTR_MIDDLE(tss) >> 8) & 0xFF;
+	d.base3 = PTR_HIGH(tss);
+	memcpy(ptr, &d, 16);
 }
 
 static inline void set_tss_desc(unsigned cpu, void *addr)
-{ 
+{
 	/*
 	 * sizeof(unsigned long) coming from an extra "long" at the end
 	 * of the iobitmap. See tss_struct definition in processor.h
@@ -99,18 +144,18 @@ static inline void set_tss_desc(unsigned cpu, void *addr)
 	set_tssldt_descriptor(&cpu_gdt(cpu)[GDT_ENTRY_TSS],
 		(unsigned long)addr, DESC_TSS,
 		IO_BITMAP_OFFSET + IO_BITMAP_BYTES + sizeof(unsigned long) - 1);
-} 
+}
 
 static inline void set_ldt_desc(unsigned cpu, void *addr, int size)
-{ 
+{
 	set_tssldt_descriptor(&cpu_gdt(cpu)[GDT_ENTRY_LDT], (unsigned long)addr,
 			      DESC_LDT, size * 8 - 1);
 }
 
 #define LDT_entry_a(info) \
 	((((info)->base_addr & 0x0000ffff) << 16) | ((info)->limit & 0x0ffff))
-/* Don't allow setting of the lm bit. It is useless anyways because 
-   64bit system calls require __USER_CS. */ 
+/* Don't allow setting of the lm bit. It is useless anyways because
+   64bit system calls require __USER_CS. */
 #define LDT_entry_b(info) \
 	(((info)->base_addr & 0xff000000) | \
 	(((info)->base_addr & 0x00ff0000) >> 16) | \
@@ -142,12 +187,12 @@ static inline void load_TLS(struct thread_struct *t, unsigned int cpu)
 
 	for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
 		gdt[i] = t->tls_array[i];
-} 
+}
 
 /*
  * load one particular LDT into the current CPU
  */
-static inline void load_LDT_nolock (mm_context_t *pc, int cpu)
+static inline void load_LDT_nolock(mm_context_t *pc, int cpu)
 {
 	int count = pc->size;
 
@@ -155,7 +200,7 @@ static inline void load_LDT_nolock (mm_context_t *pc, int cpu)
 		clear_LDT();
 		return;
 	}
-		
+
 	set_ldt_desc(cpu, pc->ldt, count);
 	load_LDT_desc();
 }
@@ -163,6 +208,7 @@ static inline void load_LDT_nolock (mm_context_t *pc, int cpu)
 static inline void load_LDT(mm_context_t *pc)
 {
 	int cpu = get_cpu();
+
 	load_LDT_nolock(pc, cpu);
 	put_cpu();
 }