The patch titled
Subject: include/linux/mmdebug.h: fix VM_WARN[_*]() with CONFIG_DEBUG_VM=n
has been added to the -mm tree. Its filename is
include-linux-mmdebugh-fix-vm_warn-with-config_debug_vm=n.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/include-linux-mmdebugh-fix-vm_warn-with-config_debug_vm%3Dn.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/include-linux-mmdebugh-fix-vm_warn-with-config_debug_vm%3Dn.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: include/linux/mmdebug.h: fix VM_WARN[_*]() with CONFIG_DEBUG_VM=n
These macros cause the build to break when someone uses their return value
with CONFIG_DEBUG_VM=n:
if (VM_WARN(from > to, "%s called with a negative range\n", __func__))
return -EINVAL;
mm/hugetlb.c: In function 'hugetlb_reserve_pages':
mm/hugetlb.c:4378: error: void value not ignored as it ought to be
Fix this up.
Reported-by: Michal Hocko <mhocko@xxxxxxxxxx>
Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
diff -puN include/linux/mmdebug.h~include-linux-mmdebugh-fix-vm_warn-with-config_debug_vm=n include/linux/mmdebug.h
--- a/include/linux/mmdebug.h~include-linux-mmdebugh-fix-vm_warn-with-config_debug_vm=n
+++ a/include/linux/mmdebug.h
@@ -46,10 +46,10 @@ void dump_mm(const struct mm_struct *mm)
#define VM_BUG_ON_PAGE(cond, page) VM_BUG_ON(cond)
#define VM_BUG_ON_VMA(cond, vma) VM_BUG_ON(cond)
#define VM_BUG_ON_MM(cond, mm) VM_BUG_ON(cond)
-#define VM_WARN_ON(cond) BUILD_BUG_ON_INVALID(cond)
-#define VM_WARN_ON_ONCE(cond) BUILD_BUG_ON_INVALID(cond)
-#define VM_WARN_ONCE(cond, format...) BUILD_BUG_ON_INVALID(cond)
-#define VM_WARN(cond, format...) BUILD_BUG_ON_INVALID(cond)
+#define VM_WARN_ON(cond) ({ BUILD_BUG_ON_INVALID(cond); 0; })
+#define VM_WARN_ON_ONCE(cond) ({ BUILD_BUG_ON_INVALID(cond); 0; })
+#define VM_WARN_ONCE(cond, format...) ({ BUILD_BUG_ON_INVALID(cond); 0; })
+#define VM_WARN(cond, format...) ({ BUILD_BUG_ON_INVALID(cond); 0; })
#endif
#ifdef CONFIG_DEBUG_VIRTUAL
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
i-need-old-gcc.patch
mm-mempolicy-avoid-use-uninitialized-preferred_node-fix.patch
mm-remove-unused-arg-from-memblock_next_valid_pfn.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-without-quota-support-try-to-avoid-calling-quota-recovery-checkpatch-fixes.patch
mm.patch
mm-initialize-pages-on-demand-during-boot-fix-4-fix.patch
mm-initialize-pages-on-demand-during-boot-v5-fix.patch
mm-initialize-pages-on-demand-during-boot-v6-checkpatch-fixes.patch
mm-page_alloc-skip-over-regions-of-invalid-pfns-on-uma-fix.patch
direct-io-minor-cleanups-in-do_blockdev_direct_io-fix.patch
mm-fix-races-between-swapoff-and-flush-dcache-fix.patch
include-linux-mmdebugh-fix-vm_warn-with-config_debug_vm=n.patch
hugetlbfs-check-for-pgoff-value-overflow-v3-fix.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
mm-oom-cgroup-aware-oom-killer-fix.patch
mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix-2-fix.patch
proc-add-seq_put_decimal_ull_width-to-speed-up-proc-pid-smaps-fix.patch
ipc-clamp-semmni-to-the-real-ipcmni-limit-fix.patch
linux-next-rejects.patch
linux-next-fixup.patch
drivers-infiniband-core-verbsc-fix-build-with-gcc-444.patch
drivers-infiniband-ulp-srpt-ib_srptc-fix-build-with-gcc-444.patch
fs-fsnotify-account-fsnotify-metadata-to-kmemcg-fix.patch
headers-untangle-kmemleakh-from-mmh-fix.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
