shithub: riscv

Info  •  Files  •  Log  •  Branches

merge

--- a/sys/src/9/kw/dat.h

+++ b/sys/src/9/kw/dat.h

@@ -72,6 +72,8 @@

 	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 @@

 	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 @@

 	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 @@

 {

 	Pcidev *p;

 	int size;

-	Mach *mach0;

 	ulong *pgtbl, *rp, fbuf, fbend;

 	if(scr->mmio)