diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-07-22 10:46:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-07-22 10:46:30 -0700 |
| commit | bdd1d82e7d02bd2764a68a5cc54533dfc2ba452a (patch) | |
| tree | 2fb501fab4fe4c34032b0f5a231d2c965303b85e /arch/ia64/kernel | |
| parent | Merge tag 'devicetree-fixes-for-6.5-1' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| parent | ia64: mmap: Consider pgoff when searching for free mapping (diff) | |
| download | linux-bdd1d82e7d02bd2764a68a5cc54533dfc2ba452a.tar.gz linux-bdd1d82e7d02bd2764a68a5cc54533dfc2ba452a.zip | |
Merge tag 'io_uring-6.5-2023-07-21' of git://git.kernel.dk/linux
Pull io_uring fixes from Jens Axboe:
- Fix for io-wq not always honoring REQ_F_NOWAIT, if it was set and
punted directly (eg via DRAIN) (me)
- Capability check fix (Ondrej)
- Regression fix for the mmap changes that went into 6.4, which
apparently broke IA64 (Helge)
* tag 'io_uring-6.5-2023-07-21' of git://git.kernel.dk/linux:
ia64: mmap: Consider pgoff when searching for free mapping
io_uring: Fix io_uring mmap() by using architecture-provided get_unmapped_area()
io_uring: treat -EAGAIN for REQ_F_NOWAIT as final for io-wq
io_uring: don't audit the capability check in io_uring_create()
Diffstat (limited to 'arch/ia64/kernel')
| -rw-r--r-- | arch/ia64/kernel/sys_ia64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c index 6e948d015332..eb561cc93632 100644 --- a/arch/ia64/kernel/sys_ia64.c +++ b/arch/ia64/kernel/sys_ia64.c @@ -63,7 +63,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len info.low_limit = addr; info.high_limit = TASK_SIZE; info.align_mask = align_mask; - info.align_offset = 0; + info.align_offset = pgoff << PAGE_SHIFT; return vm_unmapped_area(&info); } |