Pull s390 updates from Vasily Gorbik: - Update maintainers. Niklas Schnelle takes over zpci and Vineeth Vijayan common io code. - Extend cpuinfo to include topology information. - Add new extended counters for IBM z15 and sampling buffer allocation rework in perf code. - Add control over zeroing out memory during system restart. - CCA protected key block version 2 support and other fixes/improvements in crypto code. - Convert to new fallthrough; annotations. - Replace zero-length arrays with flexible-arrays. - QDIO debugfs and other small improvements. - Drop 2-level paging support optimization for compat tasks. Varios mm cleanups. - Remove broken and unused hibernate / power management support. - Remove fake numa support which does not bring any benefits. - Exclude offline CPUs from CPU topology masks to be more consistent with other architectures. - Prevent last branching instruction address leaking to userspace. - Other small various fixes and improvements all over the code. * tag 's390-5.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (57 commits) s390/mm: cleanup init_new_context() callback s390/mm: cleanup virtual memory constants usage s390/mm: remove page table downgrade support s390/qdio: set qdio_irq->cdev at allocation time s390/qdio: remove unused function declarations s390/ccwgroup: remove pm support s390/ap: remove power management code from ap bus and drivers s390/zcrypt: use kvmalloc instead of kmalloc for 256k alloc s390/mm: cleanup arch_get_unmapped_area() and friends s390/ism: remove pm support s390/cio: use fallthrough; s390/vfio: use fallthrough; s390/zcrypt: use fallthrough; s390: use fallthrough; s390/cpum_sf: Fix wrong page count in error message s390/diag: fix display of diagnose call statistics s390/ap: Remove ap device suspend and resume callbacks s390/pci: Improve handling of unset UID s390/pci: Fix zpci_alloc_domain() over allocation s390/qdio: pass ISC as parameter to chsc_sadc() ...
Showing the changes to include/linux (1 of 95 files). Show all
Unified · Split
| @@ -566,38 +566,4 @@ static inline void queue_up_suspend_work(void) {} · 565 unmodified lines | ||
| 566 | 566 | |
| 567 | 567 | #endif /* !CONFIG_PM_AUTOSLEEP */ |
| 568 | 568 | |
| 569 | −#ifdef CONFIG_ARCH_SAVE_PAGE_KEYS | |
| 570 | −/* | |
| 571 | − * The ARCH_SAVE_PAGE_KEYS functions can be used by an architecture | |
| 572 | − * to save/restore additional information to/from the array of page | |
| 573 | − * frame numbers in the hibernation image. For s390 this is used to | |
| 574 | − * save and restore the storage key for each page that is included | |
| 575 | − * in the hibernation image. | |
| 576 | − */ | |
| 577 | −unsigned long page_key_additional_pages(unsigned long pages); | |
| 578 | −int page_key_alloc(unsigned long pages); | |
| 579 | −void page_key_free(void); | |
| 580 | −void page_key_read(unsigned long *pfn); | |
| 581 | −void page_key_memorize(unsigned long *pfn); | |
| 582 | −void page_key_write(void *address); | |
| 583 | − | |
| 584 | −#else /* !CONFIG_ARCH_SAVE_PAGE_KEYS */ | |
| 585 | − | |
| 586 | −static inline unsigned long page_key_additional_pages(unsigned long pages) | |
| 587 | −{ | |
| 588 | − return 0; | |
| 589 | −} | |
| 590 | − | |
| 591 | −static inline int page_key_alloc(unsigned long pages) | |
| 592 | −{ | |
| 593 | − return 0; | |
| 594 | −} | |
| 595 | − | |
| 596 | −static inline void page_key_free(void) {} | |
| 597 | −static inline void page_key_read(unsigned long *pfn) {} | |
| 598 | −static inline void page_key_memorize(unsigned long *pfn) {} | |
| 599 | −static inline void page_key_write(void *address) {} | |
| 600 | − | |
| 601 | −#endif /* !CONFIG_ARCH_SAVE_PAGE_KEYS */ | |
| 602 | − | |
| 603 | 569 | #endif /* _LINUX_SUSPEND_H */ |