i386 kernel build fixes #1722
Merged
i386 kernel build fixes #1722
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Collaborator
bsdjhb
commented
Jun 21, 2023
bsdjhb
commented
- Enable common PMAP macros on all platforms.
- vm: Update a few printf formats to uintmax_t to pacify 32-bit build.
- proc_cheri_cap_page: Use PHYS_TO_DMAP_PAGE.
- OFED: Fix a few places that use get_user_pages.
This fixes the build on i386 and other architectures which didn't have a definition of PHYS_TO_DMAP_PAGE but which do have a stub for PHYS_TO_DMAP. Also, one can't use #if PMAP_HAS_DMAP, PMAP_HAS_DMAP is a runtime-only macro as it maps to a variable (not a constant) on powerpc. Use uintmax_t casts to print PAs while here to pacify the build on 32-bit platforms as well as i386 which has 64-bit PAs.
This was a lost race due to PIOD_WRITE_CHERI_CAP landing before the introduction of PHYS_TO_DMAP_PAGE.
|
This doesn't get an i386 kernel fully building for me. For some reason the compiler can't find compiler intrinsic headers like wmmintrin.h, so a bunch of crypto drivers fail to compile. ZFS also fails to compile but I will fix that on the next ZFS merge. |
jrtc27
reviewed
Jun 21, 2023
The first argument needs to be a void * now rather than an integer. cheribuild doesn't notice this for amd64 since it disables OFED even for non-cheri platforms.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.