diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-03-02 18:18:17 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-03-02 18:18:17 -0800 |
| commit | f69d02e37a85645aa90d18cacfff36dba370f797 (patch) | |
| tree | 64099ad5cba8855452bb5eb518da72a5bac3855a /mm/page_io.c | |
| parent | 7a7fd0de4a9804299793e564a555a49c1fc924cb (diff) | |
| parent | caf6912f3f4af7232340d500a4a2008f81b93f14 (diff) | |
| download | linux-f69d02e37a85645aa90d18cacfff36dba370f797.tar.gz linux-f69d02e37a85645aa90d18cacfff36dba370f797.tar.bz2 linux-f69d02e37a85645aa90d18cacfff36dba370f797.zip | |
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 'mm/page_io.c')
| -rw-r--r-- | mm/page_io.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/mm/page_io.c b/mm/page_io.c index 485fa5cca4a2..c493ce9ebcf5 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -254,11 +254,6 @@ out: return ret; } -static sector_t swap_page_sector(struct page *page) -{ - return (sector_t)__page_file_index(page) << (PAGE_SHIFT - 9); -} - static inline void count_swpout_vm_event(struct page *page) { #ifdef CONFIG_TRANSPARENT_HUGEPAGE |