From: rlfnb <rlfnb@rlfnb.de>
Date: Fri, 5 Aug 2016 14:41:30 +0000 (+0200)
Subject: made PAE enabled by accident and fixed libmagicrt.h
X-Git-Url: http://zhaoyanbai.com/repos/?a=commitdiff_plain;h=3c71801e8e6dbdf37f19a4fcec47013a123e0a5b;p=minix.git

made PAE enabled by accident and fixed libmagicrt.h

Change-Id: Ia09d8b9a68aa2e1522d66ed93453de9d7d802cb2
---

diff --git a/minix/lib/libmagicrt/include/st/state_transfer.h b/minix/lib/libmagicrt/include/st/state_transfer.h
index 536dc20e0..fcb1217d3 100644
--- a/minix/lib/libmagicrt/include/st/state_transfer.h
+++ b/minix/lib/libmagicrt/include/st/state_transfer.h
@@ -40,7 +40,7 @@ typedef struct _st_init_info_t {
 typedef struct st_alloc_pages {
     int num_pages;
     void *virt_addr;
-    phys_bytes phys_addr;
+    uint32_t phys_addr;
     struct st_alloc_pages *previous;
 } st_alloc_pages;
 
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index eb7f25616..63f3def20 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1268,7 +1268,7 @@ _MKVARS.yes+= \
 	MKSYSDEBUG MKLIVEUPDATE MKLWIP MKLLVMCMDS
 .if (${MACHINE_ARCH} == "i386")
 _MKVARS.yes+= \
-	MKWATCHDOG MKACPI MKPAE MKAPIC MKDEBUGREG MKINSTALLBOOT MKPCI
+	MKWATCHDOG MKACPI MKAPIC MKDEBUGREG MKINSTALLBOOT MKPCI
 .endif
 
 .for var in ${_MKVARS.yes}
@@ -1306,7 +1306,7 @@ _MKVARS.no= \
 
 #MINIX-specific vars
 _MKVARS.no+= \
-	MKIMAGEONLY MKSMALL MKBITCODE MKMAGIC MKASR MKSRC
+	MKIMAGEONLY MKSMALL MKBITCODE MKMAGIC MKPAE MKASR MKSRC
 .if !empty(MACHINE_ARCH:Mearm*)
 _MKVARS.no+= \
 	MKWATCHDOG MKPAE MKACPI MKAPIC MKDEBUGREG MKINSTALLBOOT MKPCI