summaryrefslogtreecommitdiffstats
path: root/rust
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2023-03-03 23:51:15 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2023-03-03 23:51:15 +0100
commit34c108a02c30627bcd4875e4f32c915acc45305f (patch)
tree137f2dd1db6ac7d8f78f02cfd0ce5d58262d3559 /rust
parentMerge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi (diff)
parentrust: bindgen: Add `alt_instr` as opaque type (diff)
downloadlinux-34c108a02c30627bcd4875e4f32c915acc45305f.tar.xz
linux-34c108a02c30627bcd4875e4f32c915acc45305f.zip
Merge tag 'rust-fixes-6.3-rc1' of https://github.com/Rust-for-Linux/linux
Pull Rust fix from Miguel Ojeda: "A single build error fix: there was a change during the merge window to a C header parsed by the Rust bindings generator, introducing a type that it does not handle well. The fix tells the generator to treat the type as opaque (for now)" * tag 'rust-fixes-6.3-rc1' of https://github.com/Rust-for-Linux/linux: rust: bindgen: Add `alt_instr` as opaque type
Diffstat (limited to 'rust')
-rw-r--r--rust/bindgen_parameters1
1 files changed, 1 insertions, 0 deletions
diff --git a/rust/bindgen_parameters b/rust/bindgen_parameters
index be4963bf7203..552d9a85925b 100644
--- a/rust/bindgen_parameters
+++ b/rust/bindgen_parameters
@@ -6,6 +6,7 @@
--opaque-type local_apic
# Packed type cannot transitively contain a `#[repr(align)]` type.
+--opaque-type alt_instr
--opaque-type x86_msi_data
--opaque-type x86_msi_addr_lo