diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2026-02-11 18:52:27 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2026-02-11 18:52:27 +0100 |
| commit | b1195183ed42f1522fae3fe44ebee3af437aa000 (patch) | |
| tree | a0ea8797c7b816bf50fe57b0a549da325afbd88d /mm | |
| parent | bf2c3138ae3694d4687cbe451c774c288ae2ad06 (diff) | |
| parent | e3372ffb5f9e2dda3da259b768aab6271672b90d (diff) | |
Merge tag 'kvm-s390-next-7.0-1' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
- gmap rewrite: completely new memory management for kvm/s390
- vSIE improvement
- maintainership change for s390 vfio-pci
- small quality of life improvement for protected guests
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/khugepaged.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 97d1b2824386..be3a2a603fb1 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -343,15 +343,6 @@ int hugepage_madvise(struct vm_area_struct *vma, { switch (advice) { case MADV_HUGEPAGE: -#ifdef CONFIG_S390 - /* - * qemu blindly sets MADV_HUGEPAGE on all allocations, but s390 - * can't handle this properly after s390_enable_sie, so we simply - * ignore the madvise to prevent qemu from causing a SIGSEGV. - */ - if (mm_has_pgste(vma->vm_mm)) - return 0; -#endif *vm_flags &= ~VM_NOHUGEPAGE; *vm_flags |= VM_HUGEPAGE; /* |