summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Dariz <luca@orpolo.org>2023-02-27 21:44:57 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2023-02-27 22:34:31 +0100
commitf05dda2af441bdf12fe40192c517c0ac171961ca (patch)
tree7287ef9d8c6448c59b818abc7428d2b85f9ceb0d
parent755921f74772f65d9e06b8c68a8c6617108ee1b4 (diff)
x86_64: allow compilation if ! USER32
* i386/intel/pmap.c: remove #error and allow compilation, keeping a reminder to fix the pmap module. Message-Id: <20230227204501.2492152-2-luca@orpolo.org>
-rw-r--r--i386/intel/pmap.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/i386/intel/pmap.c b/i386/intel/pmap.c
index 302a60cb..40f672b5 100644
--- a/i386/intel/pmap.c
+++ b/i386/intel/pmap.c
@@ -1473,7 +1473,8 @@ void pmap_destroy(pmap_t p)
/* In this case we know we have one PDP for user space */
pt_entry_t *pdp = (pt_entry_t *) ptetokv(p->l4base[lin2l4num(VM_MIN_USER_ADDRESS)]);
#else
-#error "TODO do 64-bit userspace need more that 512G?"
+#warning "TODO do 64-bit userspace need more that 512G?"
+ pt_entry_t *pdp = (pt_entry_t *) ptetokv(p->l4base[lin2l4num(VM_MIN_USER_ADDRESS)]);
#endif /* USER32 */
page_dir = (pt_entry_t *) ptetokv(pdp[i]);
#else /* __x86_64__ */
@@ -2482,7 +2483,8 @@ void pmap_collect(pmap_t p)
/* In this case we know we have one PDP for user space */
pdp = (pt_entry_t *) ptetokv(p->l4base[lin2l4num(VM_MIN_USER_ADDRESS)]);
#else
-#error "TODO do 64-bit userspace need more that 512G?"
+#warning "TODO do 64-bit userspace need more that 512G?"
+ pdp = (pt_entry_t *) ptetokv(p->l4base[lin2l4num(VM_MIN_USER_ADDRESS)]);
#endif /* USER32 */
page_dir = (pt_entry_t *) ptetokv(pdp[i]);
#else /* __x86_64__ */