The patch titled
Subject: psi-cgroup-support-checkpatch-fixes
has been removed from the -mm tree. Its filename was
psi-cgroup-support-checkpatch-fixes.patch
This patch was dropped because it was folded into psi-cgroup-support.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: psi-cgroup-support-checkpatch-fixes
WARNING: please, no spaces at the start of a line
#250: FILE: kernel/cgroup/cgroup.c:4554:
+ {$
ERROR: code indent should use tabs where possible
#251: FILE: kernel/cgroup/cgroup.c:4555:
+ .name = "cpu.pressure",$
WARNING: please, no spaces at the start of a line
#251: FILE: kernel/cgroup/cgroup.c:4555:
+ .name = "cpu.pressure",$
ERROR: code indent should use tabs where possible
#252: FILE: kernel/cgroup/cgroup.c:4556:
+ .flags = CFTYPE_NOT_ON_ROOT,$
WARNING: please, no spaces at the start of a line
#252: FILE: kernel/cgroup/cgroup.c:4556:
+ .flags = CFTYPE_NOT_ON_ROOT,$
ERROR: code indent should use tabs where possible
#253: FILE: kernel/cgroup/cgroup.c:4557:
+ .seq_show = cgroup_cpu_pressure_show,$
WARNING: please, no spaces at the start of a line
#253: FILE: kernel/cgroup/cgroup.c:4557:
+ .seq_show = cgroup_cpu_pressure_show,$
WARNING: please, no spaces at the start of a line
#254: FILE: kernel/cgroup/cgroup.c:4558:
+ },$
WARNING: please, no spaces at the start of a line
#255: FILE: kernel/cgroup/cgroup.c:4559:
+ {$
ERROR: code indent should use tabs where possible
#256: FILE: kernel/cgroup/cgroup.c:4560:
+ .name = "memory.pressure",$
WARNING: please, no spaces at the start of a line
#256: FILE: kernel/cgroup/cgroup.c:4560:
+ .name = "memory.pressure",$
ERROR: code indent should use tabs where possible
#257: FILE: kernel/cgroup/cgroup.c:4561:
+ .flags = CFTYPE_NOT_ON_ROOT,$
WARNING: please, no spaces at the start of a line
#257: FILE: kernel/cgroup/cgroup.c:4561:
+ .flags = CFTYPE_NOT_ON_ROOT,$
ERROR: code indent should use tabs where possible
#258: FILE: kernel/cgroup/cgroup.c:4562:
+ .seq_show = cgroup_memory_pressure_show,$
WARNING: please, no spaces at the start of a line
#258: FILE: kernel/cgroup/cgroup.c:4562:
+ .seq_show = cgroup_memory_pressure_show,$
WARNING: please, no spaces at the start of a line
#259: FILE: kernel/cgroup/cgroup.c:4563:
+ },$
WARNING: please, no spaces at the start of a line
#260: FILE: kernel/cgroup/cgroup.c:4564:
+ {$
ERROR: code indent should use tabs where possible
#261: FILE: kernel/cgroup/cgroup.c:4565:
+ .name = "io.pressure",$
WARNING: please, no spaces at the start of a line
#261: FILE: kernel/cgroup/cgroup.c:4565:
+ .name = "io.pressure",$
ERROR: code indent should use tabs where possible
#262: FILE: kernel/cgroup/cgroup.c:4566:
+ .flags = CFTYPE_NOT_ON_ROOT,$
WARNING: please, no spaces at the start of a line
#262: FILE: kernel/cgroup/cgroup.c:4566:
+ .flags = CFTYPE_NOT_ON_ROOT,$
ERROR: code indent should use tabs where possible
#263: FILE: kernel/cgroup/cgroup.c:4567:
+ .seq_show = cgroup_io_pressure_show,$
WARNING: please, no spaces at the start of a line
#263: FILE: kernel/cgroup/cgroup.c:4567:
+ .seq_show = cgroup_io_pressure_show,$
WARNING: please, no spaces at the start of a line
#264: FILE: kernel/cgroup/cgroup.c:4568:
+ },$
WARNING: please, no spaces at the start of a line
#322: FILE: kernel/sched/psi.c:424:
+ cgroup = task->cgroups->dfl_cgrp;$
WARNING: please, no spaces at the start of a line
#323: FILE: kernel/sched/psi.c:425:
+ while (cgroup && (parent = cgroup_parent(cgroup))) {$
WARNING: suspect code indent for conditional statements (7, 15)
#323: FILE: kernel/sched/psi.c:425:
+ while (cgroup && (parent = cgroup_parent(cgroup))) {
+ struct psi_group *group;
ERROR: code indent should use tabs where possible
#324: FILE: kernel/sched/psi.c:426:
+ struct psi_group *group;$
WARNING: please, no spaces at the start of a line
#324: FILE: kernel/sched/psi.c:426:
+ struct psi_group *group;$
ERROR: code indent should use tabs where possible
#326: FILE: kernel/sched/psi.c:428:
+ group = cgroup_psi(cgroup);$
WARNING: please, no spaces at the start of a line
#326: FILE: kernel/sched/psi.c:428:
+ group = cgroup_psi(cgroup);$
ERROR: code indent should use tabs where possible
#327: FILE: kernel/sched/psi.c:429:
+ psi_group_change(group, cpu, now, clear, set);$
WARNING: please, no spaces at the start of a line
#327: FILE: kernel/sched/psi.c:429:
+ psi_group_change(group, cpu, now, clear, set);$
ERROR: code indent should use tabs where possible
#329: FILE: kernel/sched/psi.c:431:
+ cgroup = parent;$
WARNING: please, no spaces at the start of a line
#329: FILE: kernel/sched/psi.c:431:
+ cgroup = parent;$
WARNING: please, no spaces at the start of a line
#330: FILE: kernel/sched/psi.c:432:
+ }$
WARNING: braces {} are not necessary for any arm of this statement
#378: FILE: kernel/sched/psi.c:537:
+ if (task_on_rq_queued(task)) {
[...]
+ } else if (task->in_iowait) {
[...]
total: 13 errors, 24 warnings, 334 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.
NOTE: Whitespace errors detected.
You may wish to use scripts/cleanpatch or scripts/cleanfile
./patches/psi-cgroup-support.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: Johannes Weiner <jweiner@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/cgroup/cgroup.c | 30 +++++++++++++++---------------
kernel/sched/psi.c | 19 +++++++++----------
2 files changed, 24 insertions(+), 25 deletions(-)
diff -puN kernel/cgroup/cgroup.c~psi-cgroup-support-checkpatch-fixes kernel/cgroup/cgroup.c
--- a/kernel/cgroup/cgroup.c~psi-cgroup-support-checkpatch-fixes
+++ a/kernel/cgroup/cgroup.c
@@ -4551,21 +4551,21 @@ static struct cftype cgroup_base_files[]
.seq_show = cpu_stat_show,
},
#ifdef CONFIG_PSI
- {
- .name = "cpu.pressure",
- .flags = CFTYPE_NOT_ON_ROOT,
- .seq_show = cgroup_cpu_pressure_show,
- },
- {
- .name = "memory.pressure",
- .flags = CFTYPE_NOT_ON_ROOT,
- .seq_show = cgroup_memory_pressure_show,
- },
- {
- .name = "io.pressure",
- .flags = CFTYPE_NOT_ON_ROOT,
- .seq_show = cgroup_io_pressure_show,
- },
+ {
+ .name = "cpu.pressure",
+ .flags = CFTYPE_NOT_ON_ROOT,
+ .seq_show = cgroup_cpu_pressure_show,
+ },
+ {
+ .name = "memory.pressure",
+ .flags = CFTYPE_NOT_ON_ROOT,
+ .seq_show = cgroup_memory_pressure_show,
+ },
+ {
+ .name = "io.pressure",
+ .flags = CFTYPE_NOT_ON_ROOT,
+ .seq_show = cgroup_io_pressure_show,
+ },
#endif
{ } /* terminate */
};
diff -puN kernel/sched/psi.c~psi-cgroup-support-checkpatch-fixes kernel/sched/psi.c
--- a/kernel/sched/psi.c~psi-cgroup-support-checkpatch-fixes
+++ a/kernel/sched/psi.c
@@ -422,15 +422,15 @@ void psi_task_change(struct task_struct
psi_group_change(&psi_system, cpu, now, clear, set);
#ifdef CONFIG_CGROUPS
- cgroup = task->cgroups->dfl_cgrp;
- while (cgroup && (parent = cgroup_parent(cgroup))) {
- struct psi_group *group;
+ cgroup = task->cgroups->dfl_cgrp;
+ while (cgroup && (parent = cgroup_parent(cgroup))) {
+ struct psi_group *group;
- group = cgroup_psi(cgroup);
- psi_group_change(group, cpu, now, clear, set);
+ group = cgroup_psi(cgroup);
+ psi_group_change(group, cpu, now, clear, set);
- cgroup = parent;
- }
+ cgroup = parent;
+ }
#endif
}
@@ -535,11 +535,10 @@ void cgroup_move_task(struct task_struct
rq = task_rq_lock(task, &rf);
- if (task_on_rq_queued(task)) {
+ if (task_on_rq_queued(task))
task_flags = TSK_RUNNING;
- } else if (task->in_iowait) {
+ else if (task->in_iowait)
task_flags = TSK_IOWAIT;
- }
if (task->flags & PF_MEMSTALL)
task_flags |= TSK_MEMSTALL;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-return-erofs-when-filesystem-becomes-read-only-checkpatch-fixes.patch
mm.patch
tools-modifying-page-types-to-include-shared-map-counts-checkpatch-fixes.patch
tools-modifying-page-types-to-include-shared-map-counts-fix-checkpatch-fixes.patch
tools-adding-support-for-idle-page-tracking-to-tool-fix.patch
mm-drop-vm_bug_on-from-__get_free_pages-fix.patch
mm-list_lruc-fold-__list_lru_count_one-into-its-caller.patch
mm-fadvise-fix-signed-overflow-ubsan-complaint-fix.patch
mm-sparsemem-defer-the-ms-section_mem_map-clearing-fix.patch
mm-sparse-optimize-memmap-allocation-during-sparse_init-checkpatch-fixes.patch
mm-sparse-abstract-sparse-buffer-allocations-fix.patch
mm-sparse-abstract-sparse-buffer-allocations-fix-fix.patch
psi-cgroup-support.patch
mm-soft-offline-close-the-race-against-page-allocation-fix.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
mm-oom-cgroup-aware-oom-killer-fix.patch
mm-oom-cgroup-aware-oom-killer-fix-2.patch
mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix-2-fix.patch
kernel-hung_taskc-allow-to-set-checking-interval-separately-from-timeout-fix.patch
linux-next-rejects.patch
fs-fix-double-prealloc_shrinker-in-sget_fc-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
