diff options
author | Felix Blyakher <felixb@sgi.com> | 2009-04-01 17:58:39 -0400 |
---|---|---|
committer | Felix Blyakher <felixb@sgi.com> | 2009-04-01 17:58:39 -0400 |
commit | f36345ff9a4a77f2cc576a2777b6256d5c8798fa (patch) | |
tree | 7ae4c607f6baae74060c2e385f744e171fbbf92b /init/main.c | |
parent | 1aacc064e029f0017384e463121b98f06d3a2cc3 (diff) | |
parent | 8b53ef33d9d8fa5f771ae11cc6a6e7bc0182beec (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'init/main.c')
-rw-r--r-- | init/main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/init/main.c b/init/main.c index d6b388fbffa6..07c8658ffca5 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -793,6 +793,7 @@ static void run_init_process(char *init_filename) | |||
793 | * makes it inline to init() and it becomes part of init.text section | 793 | * makes it inline to init() and it becomes part of init.text section |
794 | */ | 794 | */ |
795 | static noinline int init_post(void) | 795 | static noinline int init_post(void) |
796 | __releases(kernel_lock) | ||
796 | { | 797 | { |
797 | /* need to finish all async __init code before freeing the memory */ | 798 | /* need to finish all async __init code before freeing the memory */ |
798 | async_synchronize_full(); | 799 | async_synchronize_full(); |