search

CTSRD-CHERI / cheribsd

FreeBSD adapted for CHERI-RISC-V and Arm Morello.
http://cheribsd.org
Other
170 stars 60 forks source link

caprevoke: GENERIC-MORELLO-CAPREVOKE kernel build failure #1454

Closed mattdean-digicatapult closed 2 years ago

mattdean-digicatapult commented 2 years ago

When building the GENERIC-MORELLO-CAPREVOKE kernel on the caprevoke branch the build fails with:

~/cheri/cheribsd-caprevoke/sys/arm64/arm64/pmap.c:5015:22: error: use of undeclared identifier 'PMAP_CAPLOADGEN_WIRE'; did you mean 'PMAP_CAPLOADGEN_OK'?
        } else if ((flags & PMAP_CAPLOADGEN_WIRE) && !vm_page_wire_mapped(m)) {
                            ^~~~~~~~~~~~~~~~~~~~
                            PMAP_CAPLOADGEN_OK
~/cheri/cheribsd-caprevoke/sys/vm/pmap.h:132:2: note: 'PMAP_CAPLOADGEN_OK' declared here
        PMAP_CAPLOADGEN_OK            = 0, /* Update done */
        ^
~/cheri/cheribsd-caprevoke/sys/arm64/arm64/pmap.c:5073:15: error: use of undeclared identifier 'PMAP_CAPLOADGEN_WIRE'; did you mean 'PMAP_CAPLOADGEN_OK'?
        if ((flags & PMAP_CAPLOADGEN_WIRE) && (*mp != NULL)) {
                     ^~~~~~~~~~~~~~~~~~~~
                     PMAP_CAPLOADGEN_OK

This is probably due to https://github.com/CTSRD-CHERI/cheribsd/commit/84304ad7376e9e5de0535cc1fe5031c976474b89 not removing the PMAP_CAPLOADGEN_WIRE from the arm64 side.

mattdean-digicatapult commented 2 years ago

Closed by https://github.com/CTSRD-CHERI/cheribsd/pull/1455