Skip to content

arch/arm64/fvp-v8r: Include nuttx/userspace.h for USERSPACE. - #20653

Merged
acassis merged 1 commit into
apache:masterfrom
casaroli:fvp-userspace-include
Oct 14, 2026
Merged

acassis merged 1 commit into
apache:masterfrom
casaroli:fvp-userspace-include

Conversation

@casaroli

@casaroli casaroli commented Oct 14, 2026 •

Copy link
Copy Markdown
Contributor

Summary

fvp-armv8r:pnsh and fvp-armv8r:pnsh_smp do not compile on master: chip/fvp_boot.c:179: error: 'USERSPACE' undeclared.

fvp_boot.c uses USERSPACE in the protected build, but it got nuttx/userspace.h only indirectly, through stdio.h and nuttx/lib/lib.h. Since #20565, stdio.h does not include nuttx/lib/lib.h. This PR includes nuttx/userspace.h directly.

Impact

Build fix only. These configs fail the Linux (arm64-01) CI job of every PR. apache/nuttx-apps#3845 fixes the other arm64-01 failure (imx93-evk:optee), so this PR depends on it to pass that job.

Testing

fvp-armv8r:pnsh, fvp-armv8r:pnsh_smp: build on master with this PR (they fail without it). tools/checkpatch.sh -f passes.

depends-on: apache/nuttx-apps/pull/3845

fvp_boot.c uses USERSPACE in the protected build, but it got
nuttx/userspace.h only through stdio.h.  stdio.h does not include
nuttx/lib/lib.h any more, so fvp-armv8r:pnsh and fvp-armv8r:pnsh_smp
do not compile.  Include the header directly.

Assisted-by: Claude Code:claude-opus-5-5
Signed-off-by: Marco Casaroli <marco.casaroli@gmail.com>
@github-actions github-actions Bot added Arch: arm64 Issues related to ARM64 (64-bit) architecture Size: XS The size of the change in this PR is very small labels Oct 14, 2026
@github-actions

Copy link
Copy Markdown

MemBrowse Memory Report

No memory changes detected for:

@acassis
acassis merged commit b7a6b65 into apache:master Oct 14, 2026
25 checks passed
@github-actions

Copy link
Copy Markdown

🔗 Cross-repo PR dependencies

The read-only Build run reported the following dependent PR(s) and fetched head SHA(s):

CI run: https://github.com/apache/nuttx/actions/runs/38516745428

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Arch: arm64 Issues related to ARM64 (64-bit) architecture Size: XS The size of the change in this PR is very small

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants