Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add FUTEX_LOCK_PI2 on Linux #2874

Merged
merged 2 commits into from Aug 15, 2022
Merged

Add FUTEX_LOCK_PI2 on Linux #2874

merged 2 commits into from Aug 15, 2022

Conversation

rtzoeller
Copy link
Contributor

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

@rust-highfive
Copy link

r? @Amanieu

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

@rtzoeller
Copy link
Contributor Author

rtzoeller commented Aug 14, 2022

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
Member

Looks good, thanks! @bors r+

@bors
Copy link
Contributor

bors commented Aug 15, 2022

📌 Commit a8f02e9 has been approved by JohnTitor

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Aug 15, 2022

⌛ Testing commit a8f02e9 with merge 26b8795...

@bors
Copy link
Contributor

bors commented Aug 15, 2022

☀️ 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.

None yet

5 participants