Module Name: src
Committed By: maya
Date: Sun Feb 26 10:49:25 UTC 2017
Modified Files:
src/sys/arch/i386/pnpbios: pnpbios.c
Log Message:
catch up with i386 rename of gdt to gdtstore
fixes i386 ALL kernel build (pnpbios is disabled in GENERIC)
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/i386/pnpbios/pnpbios.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/pnpbios/pnpbios.c
diff -u src/sys/arch/i386/pnpbios/pnpbios.c:1.72 src/sys/arch/i386/pnpbios/pnpbios.c:1.73
--- src/sys/arch/i386/pnpbios/pnpbios.c:1.72 Sun Oct 13 06:55:34 2013
+++ src/sys/arch/i386/pnpbios/pnpbios.c Sun Feb 26 10:49:25 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pnpbios.c,v 1.72 2013/10/13 06:55:34 riz Exp $ */
+/* $NetBSD: pnpbios.c,v 1.73 2017/02/26 10:49:25 maya Exp $ */
/*
* Copyright (c) 2000 Jason R. Thorpe. All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pnpbios.c,v 1.72 2013/10/13 06:55:34 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pnpbios.c,v 1.73 2017/02/26 10:49:25 maya Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -332,14 +332,14 @@ pnpbios_attach(device_t parent, device_t
}
pnpbios_scratchbuf = malloc(PNPBIOS_BUFSIZE, M_DEVBUF, M_NOWAIT);
- setsegment(&gdt[GPNPBIOSCODE_SEL].sd, codeva, 0xffff,
+ setsegment(&gdtstore[GPNPBIOSCODE_SEL].sd, codeva, 0xffff,
SDT_MEMERA, SEL_KPL, 0, 0);
- setsegment(&gdt[GPNPBIOSDATA_SEL].sd, datava, 0xffff,
+ setsegment(&gdtstore[GPNPBIOSDATA_SEL].sd, datava, 0xffff,
SDT_MEMRWA, SEL_KPL, 0, 0);
- setsegment(&gdt[GPNPBIOSSCRATCH_SEL].sd,
+ setsegment(&gdtstore[GPNPBIOSSCRATCH_SEL].sd,
pnpbios_scratchbuf, PNPBIOS_BUFSIZE - 1,
SDT_MEMRWA, SEL_KPL, 0, 0);
- setsegment(&gdt[GPNPBIOSTRAMP_SEL].sd,
+ setsegment(&gdtstore[GPNPBIOSTRAMP_SEL].sd,
pnpbiostramp, epnpbiostramp - pnpbiostramp - 1,
SDT_MEMERA, SEL_KPL, 1, 0);
