Skip to content

Commit

Permalink
bfs: Temporarily conflict on SCHEDSTATS when SCHED_BFS is enabled
Browse files Browse the repository at this point in the history
In kernel v4.5.2, the stable-queue merged the following commit:

cb25176
sched/debug: Make schedstats a runtime tunable that is disabled by
default

This is a nice optimization but requires time to properly port.  For
now, conflict on BFS so when SCHED_BFS is enabled, SCHEDSTATS disables
automatically.
  • Loading branch information
damentz committed May 2, 2016
1 parent cc59703 commit 27c58ca
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/Kconfig.debug
Expand Up @@ -876,7 +876,7 @@ config SCHED_INFO

config SCHEDSTATS
bool "Collect scheduler statistics"
depends on DEBUG_KERNEL && PROC_FS
depends on DEBUG_KERNEL && PROC_FS && !SCHED_BFS
select SCHED_INFO
help
If you say Y here, additional code will be inserted into the
Expand Down

0 comments on commit 27c58ca

Please sign in to comment.