diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-03-03 05:18:17 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-03-03 05:18:17 +0300 |
| commit | f69d02e37a85645aa90d18cacfff36dba370f797 (patch) | |
| tree | 64099ad5cba8855452bb5eb518da72a5bac3855a /include/linux | |
| parent | 7a7fd0de4a9804299793e564a555a49c1fc924cb (diff) | |
| parent | caf6912f3f4af7232340d500a4a2008f81b93f14 (diff) | |
| download | linux-f69d02e37a85645aa90d18cacfff36dba370f797.tar.xz | |
Merge tag 'misc-5.12-2021-03-02' of git://git.kernel.dk/linux-block
Pull misc fixes from Jens Axboe:
"Two misc fixes that don't belong in other branches:
- Fix a regression with ia64 signals, introduced by the
TIF_NOTIFY_SIGNAL change in 5.11.
- Fix the current swapfile regression from this merge window"
* tag 'misc-5.12-2021-03-02' of git://git.kernel.dk/linux-block:
swap: fix swapfile read/write offset
ia64: don't call handle_signal() unless there's actually a signal queued
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/swap.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/swap.h b/include/linux/swap.h index 32f665b1ee85..4cc6ec3bf0ab 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -485,6 +485,7 @@ struct backing_dev_info; extern int init_swap_address_space(unsigned int type, unsigned long nr_pages); extern void exit_swap_address_space(unsigned int type); extern struct swap_info_struct *get_swap_device(swp_entry_t entry); +sector_t swap_page_sector(struct page *page); static inline void put_swap_device(struct swap_info_struct *si) { |