Skip to content

Commit 9caa7e7

Browse files
torvaldstorvalds
committed
Merge branch 'akpm' (patches from Andrew)
Merge fixes from Andrew Morton: "14 fixes" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: byteswap: try to avoid __builtin_constant_p gcc bug lib/stackdepot: avoid to return 0 handle mm: fix kcompactd hang during memory offlining modpost: fix module autoloading for OF devices with generic compatible property proc: prevent accessing /proc/<PID>/environ until it's ready mm/zswap: provide unique zpool name mm: thp: kvm: fix memory corruption in KVM with THP enabled MAINTAINERS: fix Rajendra Nayak's address mm, cma: prevent nr_isolated_* counters from going negative mm: update min_free_kbytes from khugepaged after core initialization huge pagecache: mmap_sem is unlocked when truncation splits pmd rapidio/mport_cdev: fix uapi type definitions mm: memcontrol: let v2 cgroups follow changes in system swappiness mm: thp: correct split_huge_pages file permission
2 parents 43a3e83 + 7322dd7 commit 9caa7e7

File tree

16 files changed

+252
-182
lines changed

16 files changed

+252
-182
lines changed

‎MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7978,7 +7978,7 @@ F: arch/arm/*omap*/*pm*
79787978
F: drivers/cpufreq/omap-cpufreq.c
79797979

79807980
OMAP POWERDOMAIN SOC ADAPTATION LAYER SUPPORT
7981-
M: Rajendra Nayak <rnayak@ti.com>
7981+
M: Rajendra Nayak <rnayak@codeaurora.org>
79827982
M: Paul Walmsley <paul@pwsan.com>
79837983
L: linux-omap@vger.kernel.org
79847984
S: Maintained

‎arch/arm/kvm/mmu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1004,7 +1004,7 @@ static bool transparent_hugepage_adjust(kvm_pfn_t *pfnp, phys_addr_t *ipap)
10041004
kvm_pfn_t pfn = *pfnp;
10051005
gfn_t gfn = *ipap >> PAGE_SHIFT;
10061006

1007-
if (PageTransCompound(pfn_to_page(pfn))) {
1007+
if (PageTransCompoundMap(pfn_to_page(pfn))) {
10081008
unsigned long mask;
10091009
/*
10101010
* The address we faulted on is backed by a transparent huge

‎arch/x86/kvm/mmu.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2823,7 +2823,7 @@ static void transparent_hugepage_adjust(struct kvm_vcpu *vcpu,
28232823
*/
28242824
if (!is_error_noslot_pfn(pfn) && !kvm_is_reserved_pfn(pfn) &&
28252825
level == PT_PAGE_TABLE_LEVEL &&
2826-
PageTransCompound(pfn_to_page(pfn)) &&
2826+
PageTransCompoundMap(pfn_to_page(pfn)) &&
28272827
!mmu_gfn_lpage_is_disallowed(vcpu, gfn, PT_DIRECTORY_LEVEL)) {
28282828
unsigned long mask;
28292829
/*
@@ -4785,7 +4785,7 @@ static bool kvm_mmu_zap_collapsible_spte(struct kvm *kvm,
47854785
*/
47864786
if (sp->role.direct &&
47874787
!kvm_is_reserved_pfn(pfn) &&
4788-
PageTransCompound(pfn_to_page(pfn))) {
4788+
PageTransCompoundMap(pfn_to_page(pfn))) {
47894789
drop_spte(kvm, sptep);
47904790
need_tlb_flush = 1;
47914791
goto restart;

0 commit comments

Comments
 (0)