diff options
| author | cinap_lenrek <cinap_lenrek@felloff.net> | 2019-12-02 08:27:49 +0100 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@felloff.net> | 2019-12-02 08:27:49 +0100 |
| commit | a8152739604244b0ab77c339955d799e63df5ce8 (patch) | |
| tree | 8f62be52020fddbd618031be6013cd8d1e0e4a0c /sys/src | |
| parent | 3681c836cae7455826e28c62ccc48ba5c3a44769 (diff) | |
| parent | d80826d6e5dc74c105934dd5d92f1c60c2468b48 (diff) | |
merge
Diffstat (limited to 'sys/src')
| -rw-r--r-- | sys/src/9/kw/dat.h | 2 | ||||
| -rw-r--r-- | sys/src/9/omap/dat.h | 2 | ||||
| -rw-r--r-- | sys/src/9/pc/main.c | 1 | ||||
| -rw-r--r-- | sys/src/9/pc/vgai81x.c | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/sys/src/9/kw/dat.h b/sys/src/9/kw/dat.h index 84e33ac2d..6e149837b 100644 --- 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 diff --git a/sys/src/9/omap/dat.h b/sys/src/9/omap/dat.h index 710134f56..084b3aee9 100644 --- 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 diff --git a/sys/src/9/pc/main.c b/sys/src/9/pc/main.c index 61db6f113..7d2e86b8d 100644 --- 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)); diff --git a/sys/src/9/pc/vgai81x.c b/sys/src/9/pc/vgai81x.c index 735f33915..0fbd2331e 100644 --- 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) |