stv0g/eduOS
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'stage6' into stage7

Browse source
This commit is contained in:
Stefan Lankes 2015-01-04 04:55:47 +01:00
commit 8f7e53b90e
1 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
arch/x86/include/asm/gdt.h
View file

@ -110,26 +110,17 @@ typedef struct {
size_t base;
} __attribute__ ((packed)) gdt_ptr_t;
#ifdef CONFIG_LGUEST
// TODO TODO: Just hacked in
#define GDT_ENTRIES 32
#else
#ifdef CONFIG_X86_32
#define GDT_ENTRIES (5+MAX_TASKS)
#define GDT_ENTRIES (5+1)
#else
// a TSS descriptor is twice larger than a code/data descriptor
#define GDT_ENTRIES (5+MAX_TASKS*2)
#define GDT_ENTRIES (5+1*2)
#endif
#if GDT_ENTRIES > 8192
#error Too many GDT entries!
#endif
#endif
/** @brief Installs the global descriptor table
*
* The installation involves the following steps: