diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2025-07-04 21:54:55 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2025-07-04 21:54:55 +0200 |
| commit | 250d0579da5db2052cce2891a5eaa87450851354 (patch) | |
| tree | 8d1cfac42ce405cc758079666442a3b3684f9e48 /include/linux | |
| parent | 964209202ebe1569c858337441e87ef0f9d71416 (diff) | |
| parent | 3e7e5adcd2a86783c441edf6f518fc903e3c4e7c (diff) | |
Merge branch 'pm-sleep'
Merge fixes related to system sleep for 6.16-rc5:
- Fix typo in the ABI documentation (Sumanth Gavini).
- Allow swap to be used a bit longer during system suspend and
hibernation to avoid suspend failures under memory pressure (Mario
Limonciello).
* pm-sleep:
PM: sleep: docs: Replace "diasble" with "disable"
PM: Restrict swap use to later in the suspend sequence
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/suspend.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/suspend.h b/include/linux/suspend.h index b1c76c8f2c82..6a3f92098872 100644 --- a/include/linux/suspend.h +++ b/include/linux/suspend.h @@ -446,6 +446,8 @@ extern int unregister_pm_notifier(struct notifier_block *nb); extern void ksys_sync_helper(void); extern void pm_report_hw_sleep_time(u64 t); extern void pm_report_max_hw_sleep(u64 t); +void pm_restrict_gfp_mask(void); +void pm_restore_gfp_mask(void); #define pm_notifier(fn, pri) { \ static struct notifier_block fn##_nb = \ @@ -492,6 +494,9 @@ static inline int unregister_pm_notifier(struct notifier_block *nb) static inline void pm_report_hw_sleep_time(u64 t) {}; static inline void pm_report_max_hw_sleep(u64 t) {}; +static inline void pm_restrict_gfp_mask(void) {} +static inline void pm_restore_gfp_mask(void) {} + static inline void ksys_sync_helper(void) {} #define pm_notifier(fn, pri) do { (void)(fn); } while (0) |