tacit/minix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 72455a746b into d5e4fc0151

Browse Source
This commit is contained in:
rlfnb 2017-05-11 06:06:22 +00:00 committed by GitHub
commit a7d72d35c7
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
minix/kernel/arch/i386/pg_utils.c
View File

@ -204,7 +204,7 @@ int pg_mapkernel(void)
void vm_enable_paging(void) void vm_enable_paging(void)
{ {
u32_t cr0, cr4; u32_t cr0, cr4;
int pgeok; int pgeok, paeok;
pgeok = _cpufeature(_CPUF_I386_PGE); pgeok = _cpufeature(_CPUF_I386_PGE);

2
minix/lib/libmagicrt/include/st/state_transfer.h
View File

@ -40,7 +40,7 @@ typedef struct _st_init_info_t {
typedef struct st_alloc_pages { typedef struct st_alloc_pages {
int num_pages; int num_pages;
void *virt_addr; void *virt_addr;
uint32_t phys_addr; phys_bytes phys_addr;
struct st_alloc_pages *previous; struct st_alloc_pages *previous;
} st_alloc_pages; } st_alloc_pages;

2
share/mk/bsd.own.mk
View File

@ -1261,7 +1261,7 @@ _MKVARS.yes+= \
MKSYSDEBUG MKLIVEUPDATE MKLLVMCMDS MKSYSDEBUG MKLIVEUPDATE MKLLVMCMDS
.if (${MACHINE_ARCH} == "i386") .if (${MACHINE_ARCH} == "i386")
_MKVARS.yes+= \ _MKVARS.yes+= \
MKWATCHDOG MKACPI MKAPIC MKDEBUGREG MKINSTALLBOOT MKPCI MKWATCHDOG MKACPI MKPAE MKAPIC MKDEBUGREG MKINSTALLBOOT MKPCI
.endif .endif
.for var in ${_MKVARS.yes} .for var in ${_MKVARS.yes}