Skip to content

Add FUTEX_LOCK_PI2 on Linux#2874

Merged
bors merged 2 commits into
rust-lang:masterfrom
rtzoeller:FUTEX_LOCK_PI2
Aug 15, 2022
Merged

Add FUTEX_LOCK_PI2 on Linux#2874
bors merged 2 commits into
rust-lang:masterfrom
rtzoeller:FUTEX_LOCK_PI2

Conversation

@rtzoeller

Copy link
Copy Markdown
Contributor

Tested using a modified version of the linux-futex crate.

@rust-highfive

Copy link
Copy Markdown

r? @Amanieu

(rust-highfive has picked a reviewer for you, use r? to override)

@rtzoeller

rtzoeller commented Aug 14, 2022

Copy link
Copy Markdown
Contributor Author

Hmm, FUTEX_LOCK_PI2 was added to the Linux kernel in 5.14, but the Docker images are using Ubuntu Focal which uses an older kernel/headers.

What's the best way to handle this?

EDIT: I've explicitly ignored it in the build.rs file. Hopefully this is acceptable.

FUTEX_LOCK_PI2 was added in Linux 5.14, which the automated tests do not yet use.
@JohnTitor

Copy link
Copy Markdown
Member

Looks good, thanks! @bors r+

@bors

bors commented Aug 15, 2022

Copy link
Copy Markdown
Contributor

📌 Commit a8f02e9 has been approved by JohnTitor

It is now in the queue for this repository.

@bors

bors commented Aug 15, 2022

Copy link
Copy Markdown
Contributor

⌛ Testing commit a8f02e9 with merge 26b8795...

@bors

bors commented Aug 15, 2022

Copy link
Copy Markdown
Contributor

☀️ Test successful - checks-actions, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13, checks-cirrus-freebsd-14
Approved by: JohnTitor
Pushing 26b8795 to master...

@bors bors merged commit 26b8795 into rust-lang:master Aug 15, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants