The patch titled
Subject: mm, debug: introduce-vm_bug_on_mm-fix-fix.patch
has been added to the -mm tree. Its filename is
mm-debug-mm-introduce-vm_bug_on_mm-fix-fixpatch.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mm-debug-mm-introduce-vm_bug_on_mm-fix-fixpatch.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mm-debug-mm-introduce-vm_bug_on_mm-fix-fixpatch.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: Michal Hocko <mhocko@xxxxxxx>
Subject: mm, debug: introduce-vm_bug_on_mm-fix-fix.patch
dump_mm will fail to compile if the last config options are not defined.
I have hit the following (trimmed down) while doing randconfig:
mm/debug.c: In function `dump_mm':
mm/debug.c:197:3: error: expected `)' before `mm'
mm, mm->mmap, mm->vmacache_seqnum, mm->task_size,
^
include/linux/printk.h:221:21: note: in definition of macro `pr_fmt'
#define pr_fmt(fmt) fmt
^
mm/debug.c:169:2: note: in expansion of macro `pr_emerg'
pr_emerg("mm %p mmap %p seqnum %d task_size %lu\n"
with neither CONFIG_COMPACTION nor CONFIG_NUMA_BALANCING set because
the last format string portion will not have a comma separating other
parameters. There is also a trailing comma at the end of parameters
list.
Fix this by being careful to place commas before mm as the first known
unconditional paramter after formatting patch and also before the last
conditional parameters rather at their end.
Signed-off-by: Michal Hocko <mhocko@xxxxxxx>
Cc: Sasha Levin <sasha.levin@xxxxxxxxxx>
Cc: Valdis Kletnieks <Valdis.Kletnieks@xxxxxx>
Cc: Dave Jones <davej@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/debug.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff -puN mm/debug.c~mm-debug-mm-introduce-vm_bug_on_mm-fix-fixpatch mm/debug.c
--- a/mm/debug.c~mm-debug-mm-introduce-vm_bug_on_mm-fix-fixpatch
+++ a/mm/debug.c
@@ -195,9 +195,9 @@ void dump_mm(const struct mm_struct *mm)
"numa_next_scan %lu numa_scan_offset %lu numa_scan_seq %d\n"
#endif
#if defined(CONFIG_NUMA_BALANCING) || defined(CONFIG_COMPACTION)
- "tlb_flush_pending %d\n",
+ "tlb_flush_pending %d\n"
#endif
- mm, mm->mmap, mm->vmacache_seqnum, mm->task_size,
+ , mm, mm->mmap, mm->vmacache_seqnum, mm->task_size,
#ifdef CONFIG_MMU
mm->get_unmapped_area,
#endif
@@ -218,15 +218,15 @@ void dump_mm(const struct mm_struct *mm)
#ifdef CONFIG_MEMCG
mm->owner,
#endif
- mm->exe_file,
+ mm->exe_file
#ifdef CONFIG_MMU_NOTIFIER
- mm->mmu_notifier_mm,
+ , mm->mmu_notifier_mm
#endif
#ifdef CONFIG_NUMA_BALANCING
- mm->numa_next_scan, mm->numa_scan_offset, mm->numa_scan_seq,
+ , mm->numa_next_scan, mm->numa_scan_offset, mm->numa_scan_seq
#endif
#if defined(CONFIG_NUMA_BALANCING) || defined(CONFIG_COMPACTION)
- mm->tlb_flush_pending
+ , mm->tlb_flush_pending
#endif
);
_
Patches currently in -mm which might be from mhocko@xxxxxxx are
introduce-dump_vma.patch
introduce-dump_vma-fix.patch
introduce-vm_bug_on_vma.patch
convert-a-few-vm_bug_on-callers-to-vm_bug_on_vma.patch
mm-debug-mm-introduce-vm_bug_on_mm-fixpatch.patch
mm-debug-mm-introduce-vm_bug_on_mm-fix-fixpatch.patch
mm-debug-mm-introduce-vm_bug_on_mm-fix-fixpatch-fix.patch
memcg-move-memcg_allocfree_cache_params-to-slab_commonc.patch
memcg-dont-call-memcg_update_all_caches-if-new-cache-id-fits.patch
memcg-move-memcg_update_cache_size-to-slab_commonc.patch
linux-next.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
