merge

2019-12-02 08:27:49 +01:00 · 2019-12-02 08:27:49 +01:00 · a815273960
parent 3681c836ca d80826d6e5
commit a815273960
4 changed files with 4 additions and 2 deletions
--- a/sys/src/9/kw/dat.h
+++ b/sys/src/9/kw/dat.h
@ -72,6 +72,8 @@ enum
 	FPinit,
 	FPactive,
 	FPinactive,
+
+	FPillegal= 0x100,
 };

 struct Confmem
--- a/sys/src/9/omap/dat.h
+++ b/sys/src/9/omap/dat.h
@ -96,6 +96,8 @@ enum
 	FPinit,
 	FPactive,
 	FPinactive,
+
+	FPillegal= 0x100,
 };

 struct Confmem
--- a/sys/src/9/pc/main.c
+++ b/sys/src/9/pc/main.c
@ -589,7 +589,6 @@ procsetup(Proc *p)
 	p->pcycles = -p->kentry;

 	memset(p->gdt, 0, sizeof(p->gdt));
-	p->ldt = nil;
 	p->nldt = 0;
 	
 	memset(p->dr, 0, sizeof(p->dr));
--- a/sys/src/9/pc/vgai81x.c
+++ b/sys/src/9/pc/vgai81x.c
@ -55,7 +55,6 @@ i81xenable(VGAscr* scr)
 {
 	Pcidev *p;
 	int size;
-	Mach *mach0;
 	ulong *pgtbl, *rp, fbuf, fbend;
 	
 	if(scr->mmio)