lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: clean up include/asm-x86/desc_64.h

Browse Source 
White space and coding style clenaup.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Thomas Gleixner
2008-01-30 13:30:13 +01:00
committed by Ingo Molnar
parent 78aa1f66f7
commit 4edc8f5454
1 changed files with 51 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
include/asm-x86/desc_64.h
View File

@@ -1,4 +1,4 @@
/* Written 2000 by Andi Kleen */ /* Written 2000 by Andi Kleen */
#ifndef __ARCH_DESC_H #ifndef __ARCH_DESC_H
#define __ARCH_DESC_H #define __ARCH_DESC_H
@@ -35,7 +35,7 @@ static inline unsigned long __store_tr(void)
* something other than this. * something other than this.
*/ */
extern struct desc_struct default_ldt[]; 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[]; extern struct desc_ptr cpu_gdt_descr[];
/* the cpu gdt accessor */ /* the cpu gdt accessor */
@@ -51,40 +51,45 @@ static inline void store_gdt(struct desc_ptr *ptr)
asm("sgdt %w0":"=m" (*ptr)); asm("sgdt %w0":"=m" (*ptr));
} }
static inline void _set_gate(void *adr, unsigned type, unsigned long func, unsigned dpl, unsigned ist) static inline void _set_gate(void *adr, unsigned type, unsigned long func,
unsigned dpl, unsigned ist)
{ {
struct gate_struct s; struct gate_struct s;
s.offset_low = PTR_LOW(func);
s.offset_low = PTR_LOW(func);
s.segment = __KERNEL_CS; s.segment = __KERNEL_CS;
s.ist = ist; s.ist = ist;
s.p = 1; s.p = 1;
s.dpl = dpl; s.dpl = dpl;
s.zero0 = 0; s.zero0 = 0;
s.zero1 = 0; s.zero1 = 0;
s.type = type; s.type = type;
s.offset_middle = PTR_MIDDLE(func); s.offset_middle = PTR_MIDDLE(func);
s.offset_high = PTR_HIGH(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); * 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) static inline void set_intr_gate(int nr, void *func)
{ {
BUG_ON((unsigned)nr > 0xFF); 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); 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); 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) static inline void set_system_gate_ist(int nr, void *func, unsigned ist)
{ {
@@ -101,24 +106,25 @@ static inline void store_idt(struct desc_ptr *dtr)
asm("sidt %w0":"=m" (*dtr)); asm("sidt %w0":"=m" (*dtr));
} }
static inline void set_tssldt_descriptor(void *ptr, unsigned long tss, unsigned type, static inline void set_tssldt_descriptor(void *ptr, unsigned long tss,
unsigned size) unsigned type, unsigned size)
{ {
struct ldttss_desc d; struct ldttss_desc d;
memset(&d,0,sizeof(d));
memset(&d, 0, sizeof(d));
d.limit0 = size & 0xFFFF; d.limit0 = size & 0xFFFF;
d.base0 = PTR_LOW(tss); d.base0 = PTR_LOW(tss);
d.base1 = PTR_MIDDLE(tss) & 0xFF; d.base1 = PTR_MIDDLE(tss) & 0xFF;
d.type = type; d.type = type;
d.p = 1; d.p = 1;
d.limit1 = (size >> 16) & 0xF; d.limit1 = (size >> 16) & 0xF;
d.base2 = (PTR_MIDDLE(tss) >> 8) & 0xFF; d.base2 = (PTR_MIDDLE(tss) >> 8) & 0xFF;
d.base3 = PTR_HIGH(tss); d.base3 = PTR_HIGH(tss);
memcpy(ptr, &d, 16); memcpy(ptr, &d, 16);
} }
static inline void set_tss_desc(unsigned cpu, void *addr) static inline void set_tss_desc(unsigned cpu, void *addr)
{ {
/* /*
* sizeof(unsigned long) coming from an extra "long" at the end * sizeof(unsigned long) coming from an extra "long" at the end
* of the iobitmap. See tss_struct definition in processor.h * of the iobitmap. See tss_struct definition in processor.h
@@ -129,18 +135,18 @@ static inline void set_tss_desc(unsigned cpu, void *addr)
set_tssldt_descriptor(&cpu_gdt(cpu)[GDT_ENTRY_TSS], set_tssldt_descriptor(&cpu_gdt(cpu)[GDT_ENTRY_TSS],
(unsigned long)addr, DESC_TSS, (unsigned long)addr, DESC_TSS,
IO_BITMAP_OFFSET + IO_BITMAP_BYTES + sizeof(unsigned long) - 1); IO_BITMAP_OFFSET + IO_BITMAP_BYTES + sizeof(unsigned long) - 1);
} }
static inline void set_ldt_desc(unsigned cpu, void *addr, int size) static inline void set_ldt_desc(unsigned cpu, void *addr, int size)
{ {
set_tssldt_descriptor(&cpu_gdt(cpu)[GDT_ENTRY_LDT], (unsigned long)addr, set_tssldt_descriptor(&cpu_gdt(cpu)[GDT_ENTRY_LDT], (unsigned long)addr,
DESC_LDT, size * 8 - 1); DESC_LDT, size * 8 - 1);
} }
#define LDT_entry_a(info) \ #define LDT_entry_a(info) \
((((info)->base_addr & 0x0000ffff) << 16) | ((info)->limit & 0x0ffff)) ((((info)->base_addr & 0x0000ffff) << 16) | ((info)->limit & 0x0ffff))
/* Don't allow setting of the lm bit. It is useless anyways because /* Don't allow setting of the lm bit. It is useless anyways because
64bit system calls require __USER_CS. */ 64bit system calls require __USER_CS. */
#define LDT_entry_b(info) \ #define LDT_entry_b(info) \
(((info)->base_addr & 0xff000000) | \ (((info)->base_addr & 0xff000000) | \
(((info)->base_addr & 0x00ff0000) >> 16) | \ (((info)->base_addr & 0x00ff0000) >> 16) | \
@@ -172,12 +178,12 @@ static inline void load_TLS(struct thread_struct *t, unsigned int cpu)
for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++) for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
gdt[i] = t->tls_array[i]; gdt[i] = t->tls_array[i];
} }
/* /*
* load one particular LDT into the current CPU * 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; int count = pc->size;
@@ -185,7 +191,7 @@ static inline void load_LDT_nolock (mm_context_t *pc, int cpu)
clear_LDT(); clear_LDT();
return; return;
} }
set_ldt_desc(cpu, pc->ldt, count); set_ldt_desc(cpu, pc->ldt, count);
load_LDT_desc(); load_LDT_desc();
} }
@@ -193,6 +199,7 @@ static inline void load_LDT_nolock (mm_context_t *pc, int cpu)
static inline void load_LDT(mm_context_t *pc) static inline void load_LDT(mm_context_t *pc)
{ {
int cpu = get_cpu(); int cpu = get_cpu();
load_LDT_nolock(pc, cpu); load_LDT_nolock(pc, cpu);
put_cpu(); put_cpu();
} }