The patch titled
Subject: mm-change-the-call-sites-of-numa-statistics-items-checkpatch-fixes
has been removed from the -mm tree. Its filename was
mm-change-the-call-sites-of-numa-statistics-items-checkpatch-fixes.patch
This patch was dropped because it was folded into mm-change-the-call-sites-of-numa-statistics-items.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-change-the-call-sites-of-numa-statistics-items-checkpatch-fixes
ERROR: "foo * bar" should be "foo *bar"
#249: FILE: include/linux/vmstat.h:222:
+extern void __inc_numa_state(struct zone * zone,
WARNING: line over 80 characters
#402: FILE: mm/vmstat.c:768:
+ changes += fold_diff(global_zone_diff, global_numa_diff, global_node_diff);
WARNING: Missing a blank line after declarations
#459: FILE: mm/vmstat.c:862:
+ int v = pset->vm_numa_stat_diff[i];
+ pset->vm_numa_stat_diff[i] = 0;
ERROR: space required before the open parenthesis '('
#571: FILE: mm/vmstat.c:1641:
+ for(i = 0; i < NR_VM_NUMA_STAT_ITEMS; i++)
WARNING: line over 80 characters
#588: FILE: mm/vmstat.c:1752:
+ __func__, vmstat_text[i + NR_VM_ZONE_STAT_ITEMS], val);
total: 2 errors, 4 warnings, 460 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
./patches/mm-change-the-call-sites-of-numa-statistics-items.patch has style problems, please review.
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
Please run checkpatch prior to sending patches
Cc: Kemi Wang <kemi.wang@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/vmstat.h | 8 +++-----
mm/vmstat.c | 6 ++++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff -puN include/linux/vmstat.h~mm-change-the-call-sites-of-numa-statistics-items-checkpatch-fixes include/linux/vmstat.h
--- a/include/linux/vmstat.h~mm-change-the-call-sites-of-numa-statistics-items-checkpatch-fixes
+++ a/include/linux/vmstat.h
@@ -219,12 +219,10 @@ static inline unsigned long node_page_st
#ifdef CONFIG_NUMA
-extern void __inc_numa_state(struct zone * zone,
- enum numa_stat_item item);
+extern void __inc_numa_state(struct zone *zone, enum numa_stat_item item);
extern unsigned long sum_zone_node_page_state(int node,
- enum zone_stat_item item);
-extern unsigned long sum_zone_numa_state(int node,
- enum numa_stat_item item);
+ enum zone_stat_item item);
+extern unsigned long sum_zone_numa_state(int node, enum numa_stat_item item);
extern unsigned long node_page_state(struct pglist_data *pgdat,
enum node_stat_item item);
#else
diff -puN mm/vmstat.c~mm-change-the-call-sites-of-numa-statistics-items-checkpatch-fixes mm/vmstat.c
--- a/mm/vmstat.c~mm-change-the-call-sites-of-numa-statistics-items-checkpatch-fixes
+++ a/mm/vmstat.c
@@ -765,7 +765,8 @@ static int refresh_cpu_vm_stats(bool do_
}
#ifdef CONFIG_NUMA
- changes += fold_diff(global_zone_diff, global_numa_diff, global_node_diff);
+ changes += fold_diff(global_zone_diff, global_numa_diff,
+ global_node_diff);
#else
changes += fold_diff(global_zone_diff, global_node_diff);
#endif
@@ -859,6 +860,7 @@ void drain_zonestat(struct zone *zone, s
for (i = 0; i < NR_VM_NUMA_STAT_ITEMS; i++)
if (pset->vm_numa_stat_diff[i]) {
int v = pset->vm_numa_stat_diff[i];
+
pset->vm_numa_stat_diff[i] = 0;
atomic_long_add(v, &zone->vm_numa_stat[i]);
atomic_long_add(v, &vm_numa_stat[i]);
@@ -1638,7 +1640,7 @@ static void *vmstat_start(struct seq_fil
v += NR_VM_ZONE_STAT_ITEMS;
#ifdef CONFIG_NUMA
- for(i = 0; i < NR_VM_NUMA_STAT_ITEMS; i++)
+ for (i = 0; i < NR_VM_NUMA_STAT_ITEMS; i++)
v[i] = global_numa_state(i);
v += NR_VM_NUMA_STAT_ITEMS;
#endif
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm-change-the-call-sites-of-numa-statistics-items.patch
add-testcases-for-memset16-32-64-fix.patch
vga-optimise-console-scrolling-fix.patch
lib-add-test-for-bitmap_parselist-fix.patch
bitmap-introduce-bitmap_from_u64-checkpatch-fixes.patch
bitmap-introduce-bitmap_from_u64-checkpatch-fixes-fix.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
