Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 19433
b: refs/heads/master
c: 4cd7ed9
h: refs/heads/master
i:
  19431: e999d92
v: v3
  • Loading branch information
Paolo 'Blaisorblade' Giarrusso authored and Linus Torvalds committed Feb 1, 2006
1 parent afcd1ed commit a564698
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 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: e5cf888631af95c8022d659d77fb595e0c3ac778
refs/heads/master: 4cd7ed94428babb0cdbf08cc14c257e223186079
8 changes: 6 additions & 2 deletions trunk/include/asm-um/ldt-x86_64.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,13 @@ typedef struct uml_ldt {
} uml_ldt_t;

/*
* macros stolen from include/asm-i386/desc.h
* macros stolen from include/asm-x86_64/desc.h
*/
#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. */
#define LDT_entry_b(info) \
(((info)->base_addr & 0xff000000) | \
(((info)->base_addr & 0x00ff0000) >> 16) | \
Expand All @@ -54,6 +56,7 @@ typedef struct uml_ldt {
((info)->seg_32bit << 22) | \
((info)->limit_in_pages << 23) | \
((info)->useable << 20) | \
/* ((info)->lm << 21) | */ \
0x7000)

#define LDT_empty(info) (\
Expand All @@ -64,6 +67,7 @@ typedef struct uml_ldt {
(info)->seg_32bit == 0 && \
(info)->limit_in_pages == 0 && \
(info)->seg_not_present == 1 && \
(info)->useable == 0 )
(info)->useable == 0 && \
(info)->lm == 0)

#endif

0 comments on commit a564698

Please sign in to comment.