The patch titled
Subject: mm-add-support-for-pud-sized-transparent-hugepages-fix-2
has been added to the -mm tree. Its filename is
mm-add-support-for-pud-sized-transparent-hugepages-fix-2.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mm-add-support-for-pud-sized-transparent-hugepages-fix-2.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mm-add-support-for-pud-sized-transparent-hugepages-fix-2.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-add-support-for-pud-sized-transparent-hugepages-fix-2
arch/x86/Makefile:148: CONFIG_X86_X32 enabled but no binutils support
mm/memory.c: In function 'copy_pmd_range':
mm/memory.c:955: warning: passing argument 1 of 'dump_vma' makes pointer from integer without a cast
include/linux/mmdebug.h:13: note: expected 'const struct vm_area_struct *' but argument is of type 'int'
mm/memory.c: In function 'copy_pud_range':
mm/memory.c:988: warning: passing argument 1 of 'dump_vma' makes pointer from integer without a cast
include/linux/mmdebug.h:13: note: expected 'const struct vm_area_struct *' but argument is of type 'int'
mm/memory.c: In function 'create_huge_pud':
mm/memory.c:3315: error: unknown field 'pud' specified in initializer
mm/memory.c:3315: warning: initialization from incompatible pointer type
mm/memory.c: In function 'wp_huge_pud':
mm/memory.c:3337: error: unknown field 'pud' specified in initializer
mm/memory.c:3337: warning: initialization from incompatible pointer type
make[1]: *** [mm/memory.o] Error 1
make: *** [mm/memory.o] Error 2
Cc: Dan Williams <dan.j.williams@xxxxxxxxx>
Cc: Jan Kara <jack@xxxxxxx>
Cc: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx>
Cc: Matthew Wilcox <willy@xxxxxxxxxxxxxxx>
Cc: Ross Zwisler <ross.zwisler@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memory.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff -puN mm/memory.c~mm-add-support-for-pud-sized-transparent-hugepages-fix-2 mm/memory.c
--- a/mm/memory.c~mm-add-support-for-pud-sized-transparent-hugepages-fix-2
+++ a/mm/memory.c
@@ -952,7 +952,7 @@ static inline int copy_pmd_range(struct
next = pmd_addr_end(addr, end);
if (pmd_trans_huge(*src_pmd) || pmd_devmap(*src_pmd)) {
int err;
- VM_BUG_ON_VMA(vma, next-addr != HPAGE_PMD_SIZE);
+ VM_BUG_ON_VMA(next-addr != HPAGE_PMD_SIZE, vma);
err = copy_huge_pmd(dst_mm, src_mm,
dst_pmd, src_pmd, addr, vma);
if (err == -ENOMEM)
@@ -985,7 +985,7 @@ static inline int copy_pud_range(struct
next = pud_addr_end(addr, end);
if (pud_trans_huge(*src_pud) || pud_devmap(*src_pud)) {
int err;
- VM_BUG_ON_VMA(vma, next-addr != HPAGE_PUD_SIZE);
+ VM_BUG_ON_VMA(next-addr != HPAGE_PUD_SIZE, vma);
err = copy_huge_pud(dst_mm, src_mm,
dst_pud, src_pud, addr, vma);
if (err == -ENOMEM)
@@ -3312,7 +3312,8 @@ static int create_huge_pud(struct mm_str
.gfp_mask = __get_fault_gfp_mask(vma),
.pgoff = linear_page_index(vma, address & HPAGE_PUD_MASK),
.virtual_address = (void __user *)address,
- .pud = pud,
+ .max_pgoff = 0, /* work around gcc union init bug */
+ { .pud = pud },
};
/* No support for anonymous transparent PUD pages yet */
@@ -3334,7 +3335,8 @@ static int wp_huge_pud(struct mm_struct
.gfp_mask = __get_fault_gfp_mask(vma),
.pgoff = linear_page_index(vma, address & HPAGE_PUD_MASK),
.virtual_address = (void __user *)address,
- .pud = pud,
+ .max_pgoff = 0, /* work around gcc union init bug */
+ { .pud = pud },
};
/* No support for anonymous transparent PUD pages yet */
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
i-need-old-gcc.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
drivers-gpu-drm-i915-intel_spritec-fix-build.patch
drivers-gpu-drm-i915-intel_tvc-fix-build.patch
mm-warn-about-vmdata-over-rlimit_data-fix.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-code-clean-up-for-direct-io-fix.patch
ocfs2-fix-ip_unaligned_aio-deadlock-with-dio-work-queue-fix.patch
ocfs2-dlm-move-lock-to-the-tail-of-grant-queue-while-doing-in-place-convert-fix.patch
kernel-locking-lockdepc-make-lockdep-initialize-itself-on-demand.patch
mm.patch
mm-slab-put-the-freelist-at-the-end-of-slab-page-fix.patch
fs-mpagec-mpage_readpages-use-lru_to_page-helper.patch
mm-page_allocc-introduce-kernelcore=mirror-option-fix.patch
mm-page_allocc-rework-code-layout-in-memmap_init_zone.patch
mm-debug-pageallocc-split-out-page-poisoning-from-debug-page_alloc-checkpatch-fixes.patch
mm-page_poisonc-enable-page_poisoning-as-a-separate-option-fix.patch
mm-page_poisoningc-allow-for-zero-poisoning-checkpatch-fixes.patch
mm-madvise-update-comment-on-sys_madvise-fix.patch
mm-simplify-lock_page_memcg-fix.patch
mmfsdax-change-pmd_fault-to-huge_fault-fix.patch
mm-add-support-for-pud-sized-transparent-hugepages-fix.patch
mm-add-support-for-pud-sized-transparent-hugepages-fix-2.patch
x86-add-support-for-pud-sized-transparent-hugepages-fix.patch
x86-add-support-for-pud-sized-transparent-hugepages-fix-2.patch
x86-add-support-for-pud-sized-transparent-hugepages-checkpatch-fixes.patch
ksm-introduce-ksm_max_page_sharing-per-page-deduplication-limit-fix-2.patch
zram-export-the-number-of-available-comp-streams-fix.patch
mm-oom-rework-oom-detection-checkpatch-fixes.patch
mm-use-watermak-checks-for-__gfp_repeat-high-order-allocations-checkpatch-fixes.patch
sched-add-schedule_timeout_idle.patch
btrfs-use-radix_tree_iter_retry-fix.patch
sparc-compat-provide-an-accurate-in_compat_syscall-implementation-fix.patch
sparc-compat-provide-an-accurate-in_compat_syscall-implementation-fix-fix.patch
dma-rename-dma__writecombine-to-dma__wc-checkpatch-fixes.patch
linux-next-git-rejects.patch
drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
do_shared_fault-check-that-mmap_sem-is-held.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
