The patch titled Subject: psi-pressure-stall-information-for-cpu-memory-and-io-fix has been added to the -mm tree. Its filename is psi-pressure-stall-information-for-cpu-memory-and-io-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/psi-pressure-stall-information-for-cpu-memory-and-io-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/psi-pressure-stall-information-for-cpu-memory-and-io-fix.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/process/submit-checklist.rst 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: psi-pressure-stall-information-for-cpu-memory-and-io-fix fix CONFIG_SCHED_INFO=n build Cc: Johannes Weiner <hannes@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- kernel/sched/stats.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff -puN kernel/sched/stats.h~psi-pressure-stall-information-for-cpu-memory-and-io-fix kernel/sched/stats.h --- a/kernel/sched/stats.h~psi-pressure-stall-information-for-cpu-memory-and-io-fix +++ a/kernel/sched/stats.h @@ -248,10 +248,10 @@ sched_info_switch(struct rq *rq, struct } #else /* !CONFIG_SCHED_INFO: */ -# define sched_info_queued(rq, t) do { } while (0) -# define sched_info_reset_dequeued(t) do { } while (0) -# define sched_info_dequeued(rq, t) do { } while (0) -# define sched_info_depart(rq, t) do { } while (0) -# define sched_info_arrive(rq, next) do { } while (0) -# define sched_info_switch(rq, t, next) do { } while (0) +# define sched_info_queued(rq, t, wakeup) do { } while (0) +# define sched_info_reset_dequeued(t) do { } while (0) +# define sched_info_dequeued(rq, t, sleep) do { } while (0) +# define sched_info_depart(rq, t) do { } while (0) +# define sched_info_arrive(rq, next) do { } while (0) +# define sched_info_switch(rq, t, next) do { } while (0) #endif /* CONFIG_SCHED_INFO */ _ 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-pressure-stall-information-for-cpu-memory-and-io-fix.patch psi-cgroup-support-checkpatch-fixes.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