[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/5] x86_64: allow compilation if ! USER32
From: |
Luca Dariz |
Subject: |
[PATCH 1/5] x86_64: allow compilation if ! USER32 |
Date: |
Mon, 27 Feb 2023 21:44:57 +0100 |
* i386/intel/pmap.c: remove #error and allow compilation, keeping a
reminder to fix the pmap module.
---
i386/intel/pmap.c | 6 ++++--
1 file 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__ */
--
2.30.2
- [PATCH 0/5] basic syscall support on x86_64, Luca Dariz, 2023/02/27
- [PATCH 4/5] x86_64: fix user trap during syscall with an invalid user stack, Luca Dariz, 2023/02/27
- [PATCH 3/5] fix port name copyin, Luca Dariz, 2023/02/27
- [PATCH 1/5] x86_64: allow compilation if ! USER32,
Luca Dariz <=
- [PATCH 2/5] fix copyin/outmsg header for ! USER32, Luca Dariz, 2023/02/27
- [PATCH 5/5] x86_64: add 64-bit syscall entry point, Luca Dariz, 2023/02/27
- Re: [PATCH 5/5] x86_64: add 64-bit syscall entry point, Samuel Thibault, 2023/02/27
- Re: [PATCH 5/5] x86_64: add 64-bit syscall entry point, Luca Dariz, 2023/02/28
- Re: [PATCH 5/5] x86_64: add 64-bit syscall entry point, Samuel Thibault, 2023/02/28
- Re: [PATCH 5/5] x86_64: add 64-bit syscall entry point, Sergey Bugaev, 2023/02/28
- Re: [PATCH 5/5] x86_64: add 64-bit syscall entry point, Samuel Thibault, 2023/02/28
- Re: [PATCH 5/5] x86_64: add 64-bit syscall entry point, Sergey Bugaev, 2023/02/28