Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 88937
b: refs/heads/master
c: b776190
h: refs/heads/master
i:
  88935: 2e8ec4e
v: v3
  • Loading branch information
Joe Perches authored and Ingo Molnar committed Apr 17, 2008
1 parent 79a6895 commit f97ae12
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2cade899df7d9cc9e977a24898b0bd5a6f4a8dfd
refs/heads/master: b77619001e3acd228209bfdd864734cfdddb3d92
15 changes: 8 additions & 7 deletions trunk/include/asm-x86/desc_defs.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,19 @@
* incrementally. We keep the signature as a struct, rather than an union,
* so we can get rid of it transparently in the future -- glommer
*/
// 8 byte segment descriptor
/* 8 byte segment descriptor */
struct desc_struct {
union {
struct { unsigned int a, b; };
struct {
unsigned int a;
unsigned int b;
};
struct {
u16 limit0;
u16 base0;
unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
};

};
} __attribute__((packed));

Expand All @@ -39,7 +41,7 @@ enum {
GATE_TASK = 0x5,
};

// 16byte gate
/* 16byte gate */
struct gate_struct64 {
u16 offset_low;
u16 segment;
Expand All @@ -56,10 +58,10 @@ struct gate_struct64 {
enum {
DESC_TSS = 0x9,
DESC_LDT = 0x2,
DESCTYPE_S = 0x10, /* !system */
DESCTYPE_S = 0x10, /* !system */
};

// LDT or TSS descriptor in the GDT. 16 bytes.
/* LDT or TSS descriptor in the GDT. 16 bytes. */
struct ldttss_desc64 {
u16 limit0;
u16 base0;
Expand All @@ -84,7 +86,6 @@ struct desc_ptr {
unsigned long address;
} __attribute__((packed)) ;


#endif /* !__ASSEMBLY__ */

#endif

0 comments on commit f97ae12

Please sign in to comment.