Skip to content

Commit

Permalink
init: don't call flush_scheduled_work() from do_initcalls()
Browse files Browse the repository at this point in the history
The call to flush_scheduled_work() in do_initcalls() is there to make
sure all works queued to system_wq by initcalls finish before the init
sections are dropped.

However, the call doesn't make much sense at this point - there
already are multiple different workqueues and different subsystems are
free to create and use their own.  Ordering requirements are and
should be expressed explicitly.

Drop the call to prepare for the deprecation and removal of
flush_scheduled_work().

Andrew suggested adding sanity check where the workqueue code checks
whether any pending or running work has the work function in the init
text section.  However, checking this for running works requires the
worker to keep track of the current function being executed, and
checking only the pending works will miss most cases.  As a violation
will almost always be caught by the usual page fault mechanism, I
don't think it would be worthwhile to make the workqueue code track
extra state just for this.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
  • Loading branch information
Tejun Heo committed Dec 24, 2010
1 parent 6dca467 commit ee4569a
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions init/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -775,9 +775,6 @@ static void __init do_initcalls(void)

for (fn = __early_initcall_end; fn < __initcall_end; fn++)
do_one_initcall(*fn);

/* Make sure there is no pending stuff from the initcall sequence */
flush_scheduled_work();
}

/*
Expand Down

0 comments on commit ee4569a

Please sign in to comment.