merge
This commit is contained in:
commit
a815273960
4 changed files with 4 additions and 2 deletions
|
@ -72,6 +72,8 @@ enum
|
||||||
FPinit,
|
FPinit,
|
||||||
FPactive,
|
FPactive,
|
||||||
FPinactive,
|
FPinactive,
|
||||||
|
|
||||||
|
FPillegal= 0x100,
|
||||||
};
|
};
|
||||||
|
|
||||||
struct Confmem
|
struct Confmem
|
||||||
|
|
|
@ -96,6 +96,8 @@ enum
|
||||||
FPinit,
|
FPinit,
|
||||||
FPactive,
|
FPactive,
|
||||||
FPinactive,
|
FPinactive,
|
||||||
|
|
||||||
|
FPillegal= 0x100,
|
||||||
};
|
};
|
||||||
|
|
||||||
struct Confmem
|
struct Confmem
|
||||||
|
|
|
@ -589,7 +589,6 @@ procsetup(Proc *p)
|
||||||
p->pcycles = -p->kentry;
|
p->pcycles = -p->kentry;
|
||||||
|
|
||||||
memset(p->gdt, 0, sizeof(p->gdt));
|
memset(p->gdt, 0, sizeof(p->gdt));
|
||||||
p->ldt = nil;
|
|
||||||
p->nldt = 0;
|
p->nldt = 0;
|
||||||
|
|
||||||
memset(p->dr, 0, sizeof(p->dr));
|
memset(p->dr, 0, sizeof(p->dr));
|
||||||
|
|
|
@ -55,7 +55,6 @@ i81xenable(VGAscr* scr)
|
||||||
{
|
{
|
||||||
Pcidev *p;
|
Pcidev *p;
|
||||||
int size;
|
int size;
|
||||||
Mach *mach0;
|
|
||||||
ulong *pgtbl, *rp, fbuf, fbend;
|
ulong *pgtbl, *rp, fbuf, fbend;
|
||||||
|
|
||||||
if(scr->mmio)
|
if(scr->mmio)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue