diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2025-06-01 21:41:07 -0700 | 
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2025-06-01 21:41:07 -0700 | 
| commit | 4f9786035f9e519db41375818e1d0b5f20da2f10 (patch) | |
| tree | b307ecc9ab55c44ace462e59549c6d7976da5bfd /rust/kernel/task.rs | |
| parent | ca39500f6af9cfe6823dc5aa8fbaed788d6e35b2 (diff) | |
| parent | a95ef0199e80f3384eb992889322957d26c00102 (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 6.16 merge window.
Diffstat (limited to 'rust/kernel/task.rs')
| -rw-r--r-- | rust/kernel/task.rs | 6 | 
1 files changed, 4 insertions, 2 deletions
diff --git a/rust/kernel/task.rs b/rust/kernel/task.rs index 07bc22a7645c..9e6f6854948d 100644 --- a/rust/kernel/task.rs +++ b/rust/kernel/task.rs @@ -23,6 +23,8 @@ pub const MAX_SCHEDULE_TIMEOUT: c_long = c_long::MAX;  pub const TASK_INTERRUPTIBLE: c_int = bindings::TASK_INTERRUPTIBLE as c_int;  /// Bitmask for tasks that are sleeping in an uninterruptible state.  pub const TASK_UNINTERRUPTIBLE: c_int = bindings::TASK_UNINTERRUPTIBLE as c_int; +/// Bitmask for tasks that are sleeping in a freezable state. +pub const TASK_FREEZABLE: c_int = bindings::TASK_FREEZABLE as c_int;  /// Convenience constant for waking up tasks regardless of whether they are in interruptible or  /// uninterruptible sleep.  pub const TASK_NORMAL: c_uint = bindings::TASK_NORMAL as c_uint; @@ -106,7 +108,7 @@ unsafe impl Send for Task {}  unsafe impl Sync for Task {}  /// The type of process identifiers (PIDs). -type Pid = bindings::pid_t; +pub type Pid = bindings::pid_t;  /// The type of user identifiers (UIDs).  #[derive(Copy, Clone)] @@ -320,7 +322,7 @@ impl Task {      /// Wakes up the task.      pub fn wake_up(&self) { -        // SAFETY: It's always safe to call `signal_pending` on a valid task, even if the task +        // SAFETY: It's always safe to call `wake_up_process` on a valid task, even if the task          // running.          unsafe { bindings::wake_up_process(self.as_ptr()) };      }  | 
