diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2022-12-10 06:31:11 +0300 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2022-12-10 06:31:11 +0300 |
| commit | 3b91010500eba3601e906b0e92cf84fab4d895d1 (patch) | |
| tree | 6724b9c611dc32115bb2e0d7a6f45d007830b2b8 /include | |
| parent | e0ff428042335c7b62785b3cf911c427a618bc86 (diff) | |
| parent | 4a7ba45b1a435e7097ca0f79a847d0949d0eb088 (diff) | |
| download | linux-3b91010500eba3601e906b0e92cf84fab4d895d1.tar.xz | |
Merge branch 'mm-hotfixes-stable' into mm-stable
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cgroup.h | 1 | ||||
| -rw-r--r-- | include/linux/swapops.h | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h index 528bd44b59e2..2b7d077de7ef 100644 --- a/include/linux/cgroup.h +++ b/include/linux/cgroup.h @@ -68,6 +68,7 @@ struct css_task_iter { struct list_head iters_node; /* css_set->task_iters */ }; +extern struct file_system_type cgroup_fs_type; extern struct cgroup_root cgrp_dfl_root; extern struct css_set init_css_set; diff --git a/include/linux/swapops.h b/include/linux/swapops.h index 27ade4f22abb..b982dd614572 100644 --- a/include/linux/swapops.h +++ b/include/linux/swapops.h @@ -33,11 +33,13 @@ * can use the extra bits to store other information besides PFN. */ #ifdef MAX_PHYSMEM_BITS -#define SWP_PFN_BITS (MAX_PHYSMEM_BITS - PAGE_SHIFT) +#define SWP_PFN_BITS (MAX_PHYSMEM_BITS - PAGE_SHIFT) #else /* MAX_PHYSMEM_BITS */ -#define SWP_PFN_BITS (BITS_PER_LONG - PAGE_SHIFT) +#define SWP_PFN_BITS min_t(int, \ + sizeof(phys_addr_t) * 8 - PAGE_SHIFT, \ + SWP_TYPE_SHIFT) #endif /* MAX_PHYSMEM_BITS */ -#define SWP_PFN_MASK (BIT(SWP_PFN_BITS) - 1) +#define SWP_PFN_MASK (BIT(SWP_PFN_BITS) - 1) /** * Migration swap entry specific bitfield definitions. Layout: |