Pull misc fixes from Andrew Morton: "Nine hotfixes. Six for MM, three for other areas. Four of these patches address post-6.0 issues" * tag 'mm-hotfixes-stable-2022-12-10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: memcg: fix possible use-after-free in memcg_write_event_control() MAINTAINERS: update Muchun Song's email mm/gup: fix gup_pud_range() for dax mmap: fix do_brk_flags() modifying obviously incorrect VMAs mm/swap: fix SWP_PFN_BITS with CONFIG_PHYS_ADDR_T_64BIT on 32bit tmpfs: fix data loss from failed fallocate kselftests: cgroup: update kmem test precision tolerance mm: do not BUG_ON missing brk mapping, because userspace can unmap it mailmap: update Matti Vaittinen's email address
Showing the changes to include/linux (1 of 7 files). Show all
Unified · Split
| @@ -33,11 +33,13 @@ · 32 unmodified lines | |||
| 33 | * can use the extra bits to store other information besides PFN. | 33 | * can use the extra bits to store other information besides PFN. |
| 34 | */ | 34 | */ |
| 35 | #ifdef MAX_PHYSMEM_BITS | 35 | #ifdef MAX_PHYSMEM_BITS |
| 36 | #define SWP_PFN_BITS (MAX_PHYSMEM_BITS - PAGE_SHIFT) | 36 | #define SWP_PFN_BITS (MAX_PHYSMEM_BITS - PAGE_SHIFT) |
| 37 | #else /* MAX_PHYSMEM_BITS */ | 37 | #else /* MAX_PHYSMEM_BITS */ |
| 38 | #define SWP_PFN_BITS (BITS_PER_LONG - PAGE_SHIFT) | 38 | #define SWP_PFN_BITS min_t(int, \ |
| 39 | sizeof(phys_addr_t) * 8 - PAGE_SHIFT, \ | ||
| 40 | SWP_TYPE_SHIFT) | ||
| 39 | #endif /* MAX_PHYSMEM_BITS */ | 41 | #endif /* MAX_PHYSMEM_BITS */ |
| 40 | #define SWP_PFN_MASK (BIT(SWP_PFN_BITS) - 1) | 42 | #define SWP_PFN_MASK (BIT(SWP_PFN_BITS) - 1) |
| 41 | 43 | ||
| 42 | /** | 44 | /** |
| 43 | * Migration swap entry specific bitfield definitions. Layout: | 45 | * Migration swap entry specific bitfield definitions. Layout: |