aboutsummaryrefslogtreecommitdiffstats
path: root/rust/bindgen_parameters
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-10-14 08:03:44 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-10-14 08:03:44 +0200
commit64f3b5a6bc49adf77d58eddd72a4bfccd492fa24 (patch)
treecdd6aa7a0d21482ae4d1e76d837f3712c8c6481d /rust/bindgen_parameters
parentUSB: chaoskey: Fix possible deadlock chaoskey_list_lock (diff)
parentLinux 6.12-rc3 (diff)
downloadlinux-64f3b5a6bc49adf77d58eddd72a4bfccd492fa24.tar.gz
linux-64f3b5a6bc49adf77d58eddd72a4bfccd492fa24.zip
Merge 6.12-rc3 into usb-next
We need the USB fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'rust/bindgen_parameters')
-rw-r--r--rust/bindgen_parameters5
1 files changed, 5 insertions, 0 deletions
diff --git a/rust/bindgen_parameters b/rust/bindgen_parameters
index a721d466bee4..b7c7483123b7 100644
--- a/rust/bindgen_parameters
+++ b/rust/bindgen_parameters
@@ -24,3 +24,8 @@
# These functions use the `__preserve_most` calling convention, which neither bindgen
# nor Rust currently understand, and which Clang currently declares to be unstable.
--blocklist-function __list_.*_report
+
+# These constants are sometimes not recognized by bindgen depending on config.
+# We use const helpers to aid bindgen, to avoid conflicts when constants are
+# recognized, block generation of the non-helper constants.
+--blocklist-item ARCH_SLAB_MINALIGN