]> git.hungrycats.org Git - linux/commitdiff
Merge tag 'rust-fixes-7.4' of git://git.kernel.org/pub/scm/linux/kernel/git/ojeda...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 29 Oct 2026 19:40:12 +0000 (09:40 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 29 Oct 2026 19:40:12 +0000 (09:40 -1000)
Pull Rust fixes from Miguel Ojeda:
 "Toolchain and infrastructure:

   - Fix 'objtool' warnings for the upcoming Rust 1.101.0 (expected
     2026-12-24) by adding one more 'noreturn' function

  'kernel' crate:

   - Fix KCFI failures on every call from C to Rust IRQ handlers and
     'hrtimer' callbacks by giving the C enum bindings the correct
     'cfi_encoding'. Also prevent the same issue for DMA callbacks
     taking 'dma_data_direction'

   - 'workqueue' module: fix a runtime warning when queueing work on the
     deprecated 'system_wq' by switching to 'system_{percpu,dfl}_wq'"

* tag 'rust-fixes-7.4' of git://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux:
  rust: dma: declare cfi_encoding for dma_data_direction
  rust: hrtimer: declare cfi_encoding for hrtimer_restart
  rust: irq: declare cfi_encoding for irqreturn
  objtool/rust: add one more `noreturn` Rust function for Rust 1.101.0
  rust: workqueue: replace deprecated system_wq with system_{percpu,dfl}_wq

1  2 
drivers/android/binder/process.rs
rust/bindgen_parameters
rust/kernel/dma.rs
rust/kernel/sync/lock/spinlock.rs
rust/kernel/time/hrtimer.rs

Simple merge
index 39aae62dca6690bf11acc339b15324cf478cfea0,8577e7663e0273ae7c446edfaf22255fe15b88c7..5bab3cf0633603ce9427f2498a327734253ad11b
  --opaque-type spinlock
  
  # enums that appear in indirect function calls should specify a cfi type
 +--newtype-enum fwctl_rpc_scope
 +--with-attribute-custom-enum=fwctl_rpc_scope='#[cfi_encoding="15fwctl_rpc_scope"]'
+ --newtype-enum dma_data_direction
+ --with-attribute-custom-enum=dma_data_direction='#[cfi_encoding="18dma_data_direction"]'
+ --newtype-enum hrtimer_restart
+ --with-attribute-custom-enum=hrtimer_restart='#[cfi_encoding="15hrtimer_restart"]'
+ --newtype-enum irqreturn
+ --with-attribute-custom-enum=irqreturn='#[cfi_encoding="9irqreturn"]'
  --newtype-enum lru_status
  --with-attribute-custom-enum=lru_status='#[cfi_encoding="10lru_status"]'
  
Simple merge
Simple merge
Simple merge