Fix VM86 compiles. a #include "opt_vm86.h" was missing, and the my_tr
variable was needed in the non-SMP case. Submitted by: Jonathan Lemon <jlemon@americantv.com>
This commit is contained in:
peter
parent
db031c687b
commit
b5d3779b73
@ -34,7 +34,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)genassym.c 5.11 (Berkeley) 5/10/91
|
||||
* $Id: genassym.c,v 1.52 1998/04/04 13:24:08 phk Exp $
|
||||
* $Id: genassym.c,v 1.53 1998/04/06 15:40:10 peter Exp $
|
||||
*/
|
||||
|
||||
#include "opt_vm86.h"
|
||||
@ -208,6 +208,7 @@ main()
|
||||
#ifdef VM86
|
||||
printf("#define\tGD_COMMON_TSSD %d\n", &globaldata->common_tssd);
|
||||
printf("#define\tGD_PRIVATE_TSS %d\n", &globaldata->private_tss);
|
||||
printf("#define\tGD_MY_TR %d\n", &globaldata->my_tr);
|
||||
#endif
|
||||
#ifdef SMP
|
||||
printf("#define\tGD_CPUID %d\n", &globaldata->cpuid);
|
||||
@ -219,9 +220,6 @@ main()
|
||||
printf("#define\tGD_PRV_CMAP2 %d\n", &globaldata->prv_CMAP2);
|
||||
printf("#define\tGD_PRV_CMAP3 %d\n", &globaldata->prv_CMAP3);
|
||||
printf("#define\tGD_INSIDE_INTR %d\n", &globaldata->inside_intr);
|
||||
#ifdef VM86
|
||||
printf("#define\tGD_MY_TR %d\n", &globaldata->my_tr);
|
||||
#endif
|
||||
printf("#define\tPS_GLOBALDATA 0x%x\n", &privatespace->globaldata);
|
||||
printf("#define\tPS_PRVPT 0x%x\n", &privatespace->prvpt);
|
||||
printf("#define\tPS_LAPIC 0x%x\n", &privatespace->lapic);
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id$
|
||||
* $Id: globaldata.h,v 1.1 1998/04/06 15:37:21 peter Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -46,6 +46,7 @@ struct globaldata {
|
||||
#ifdef VM86
|
||||
struct segment_descriptor common_tssd;
|
||||
u_int private_tss;
|
||||
u_int my_tr;
|
||||
#endif
|
||||
#ifdef SMP
|
||||
u_int cpuid;
|
||||
@ -57,11 +58,7 @@ struct globaldata {
|
||||
pt_entry_t *prv_CMAP2;
|
||||
pt_entry_t *prv_CMAP3;
|
||||
int inside_intr;
|
||||
#ifdef VM86
|
||||
u_int my_tr; /* XX VM86 only */
|
||||
#endif
|
||||
#endif
|
||||
|
||||
};
|
||||
|
||||
#ifdef SMP
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)genassym.c 5.11 (Berkeley) 5/10/91
|
||||
* $Id: genassym.c,v 1.52 1998/04/04 13:24:08 phk Exp $
|
||||
* $Id: genassym.c,v 1.53 1998/04/06 15:40:10 peter Exp $
|
||||
*/
|
||||
|
||||
#include "opt_vm86.h"
|
||||
@ -208,6 +208,7 @@ main()
|
||||
#ifdef VM86
|
||||
printf("#define\tGD_COMMON_TSSD %d\n", &globaldata->common_tssd);
|
||||
printf("#define\tGD_PRIVATE_TSS %d\n", &globaldata->private_tss);
|
||||
printf("#define\tGD_MY_TR %d\n", &globaldata->my_tr);
|
||||
#endif
|
||||
#ifdef SMP
|
||||
printf("#define\tGD_CPUID %d\n", &globaldata->cpuid);
|
||||
@ -219,9 +220,6 @@ main()
|
||||
printf("#define\tGD_PRV_CMAP2 %d\n", &globaldata->prv_CMAP2);
|
||||
printf("#define\tGD_PRV_CMAP3 %d\n", &globaldata->prv_CMAP3);
|
||||
printf("#define\tGD_INSIDE_INTR %d\n", &globaldata->inside_intr);
|
||||
#ifdef VM86
|
||||
printf("#define\tGD_MY_TR %d\n", &globaldata->my_tr);
|
||||
#endif
|
||||
printf("#define\tPS_GLOBALDATA 0x%x\n", &privatespace->globaldata);
|
||||
printf("#define\tPS_PRVPT 0x%x\n", &privatespace->prvpt);
|
||||
printf("#define\tPS_LAPIC 0x%x\n", &privatespace->lapic);
|
||||
|
||||
@ -23,9 +23,11 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id$
|
||||
* $Id: globals.s,v 1.1 1998/04/06 15:39:09 peter Exp $
|
||||
*/
|
||||
|
||||
#include "opt_vm86.h"
|
||||
|
||||
#include <machine/asmacros.h>
|
||||
#include <machine/pmap.h>
|
||||
|
||||
@ -72,9 +74,10 @@ globaldata:
|
||||
.set _common_tss,globaldata + GD_COMMON_TSS
|
||||
|
||||
#ifdef VM86
|
||||
.globl _common_tssd,_private_tss
|
||||
.globl _common_tssd,_private_tss,_my_tr
|
||||
.set _common_tssd,globaldata + GD_COMMON_TSSD
|
||||
.set _private_tss,globaldata + GD_PRIVATE_TSS
|
||||
.set _my_tr,globaldata + GD_MY_TR
|
||||
#endif
|
||||
|
||||
#ifdef SMP
|
||||
@ -95,10 +98,6 @@ globaldata:
|
||||
.set _prv_CMAP2,globaldata + GD_PRV_CMAP2
|
||||
.set _prv_CMAP3,globaldata + GD_PRV_CMAP3
|
||||
.set _inside_intr,globaldata + GD_INSIDE_INTR
|
||||
#ifdef VM86
|
||||
.globl _my_tr
|
||||
.set _my_tr,globaldata + GD_MY_TR
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if defined(SMP) || defined(APIC_IO)
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id$
|
||||
* $Id: globaldata.h,v 1.1 1998/04/06 15:37:21 peter Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -46,6 +46,7 @@ struct globaldata {
|
||||
#ifdef VM86
|
||||
struct segment_descriptor common_tssd;
|
||||
u_int private_tss;
|
||||
u_int my_tr;
|
||||
#endif
|
||||
#ifdef SMP
|
||||
u_int cpuid;
|
||||
@ -57,11 +58,7 @@ struct globaldata {
|
||||
pt_entry_t *prv_CMAP2;
|
||||
pt_entry_t *prv_CMAP3;
|
||||
int inside_intr;
|
||||
#ifdef VM86
|
||||
u_int my_tr; /* XX VM86 only */
|
||||
#endif
|
||||
#endif
|
||||
|
||||
};
|
||||
|
||||
#ifdef SMP
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id$
|
||||
* $Id: globaldata.h,v 1.1 1998/04/06 15:37:21 peter Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -46,6 +46,7 @@ struct globaldata {
|
||||
#ifdef VM86
|
||||
struct segment_descriptor common_tssd;
|
||||
u_int private_tss;
|
||||
u_int my_tr;
|
||||
#endif
|
||||
#ifdef SMP
|
||||
u_int cpuid;
|
||||
@ -57,11 +58,7 @@ struct globaldata {
|
||||
pt_entry_t *prv_CMAP2;
|
||||
pt_entry_t *prv_CMAP3;
|
||||
int inside_intr;
|
||||
#ifdef VM86
|
||||
u_int my_tr; /* XX VM86 only */
|
||||
#endif
|
||||
#endif
|
||||
|
||||
};
|
||||
|
||||
#ifdef SMP
|
||||
|
||||
Loading…
Reference in New Issue
Block a user