diff options
| author | Jiri Kosina <jkosina@suse.com> | 2024-01-08 20:57:04 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.com> | 2024-01-08 20:57:04 +0100 |
| commit | 6b93f350e55f3f2ee071dd41109d936abfba8ebf (patch) | |
| tree | 481336b357ef1c1ac4a3a7517dd20294fe9b1c45 /include/linux/migrate.h | |
| parent | b0a1fe4610de5761a66de0e43540fc3d59638402 (diff) | |
| parent | 584f35a3647d42980af495fc0bc5c51eb174aa35 (diff) | |
Merge branch 'for-6.8/amd-sfh' into for-linus
- addition of new interfaces to export User presence information and
Ambient light from amd-sfh to other drivers within the kernel (Basavaraj
Natikar)
Diffstat (limited to 'include/linux/migrate.h')
| -rw-r--r-- | include/linux/migrate.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/migrate.h b/include/linux/migrate.h index 711dd9412561..2ce13e8a309b 100644 --- a/include/linux/migrate.h +++ b/include/linux/migrate.h @@ -142,10 +142,10 @@ const struct movable_operations *page_movable_ops(struct page *page) } #ifdef CONFIG_NUMA_BALANCING -int migrate_misplaced_page(struct page *page, struct vm_area_struct *vma, +int migrate_misplaced_folio(struct folio *folio, struct vm_area_struct *vma, int node); #else -static inline int migrate_misplaced_page(struct page *page, +static inline int migrate_misplaced_folio(struct folio *folio, struct vm_area_struct *vma, int node) { return -EAGAIN; /* can't migrate now */ |