Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 333919
b: refs/heads/master
c: d6b2123
h: refs/heads/master
i:
  333917: 9475054
  333915: 5ad1352
  333911: fe9e705
  333903: cdf42c1
  333887: 0a959c9
v: v3
  • Loading branch information
Al Viro committed Oct 12, 2012
1 parent 3ddf2ef commit 9baba68
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ecf89e581acce83e8cd2a5530858be22c64441f7
refs/heads/master: d6b2123802d2b7eee8c62cd0ebd73e8636cbb068
13 changes: 5 additions & 8 deletions trunk/init/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -794,11 +794,11 @@ static void run_init_process(const char *init_filename)
kernel_execve(init_filename, argv_init, envp_init);
}

/* This is a non __init function. Force it to be noinline otherwise gcc
* makes it inline to init() and it becomes part of init.text section
*/
static noinline int init_post(void)
static void __init kernel_init_freeable(void);

static int __ref kernel_init(void *unused)
{
kernel_init_freeable();
/* need to finish all async __init code before freeing the memory */
async_synchronize_full();
free_initmem();
Expand Down Expand Up @@ -835,7 +835,7 @@ static noinline int init_post(void)
"See Linux Documentation/init.txt for guidance.");
}

static int __init kernel_init(void * unused)
static void __init kernel_init_freeable(void)
{
/*
* Wait until kthreadd is all set-up.
Expand Down Expand Up @@ -890,7 +890,4 @@ static int __init kernel_init(void * unused)
* we're essentially up and running. Get rid of the
* initmem segments and start the user-mode stuff..
*/

init_post();
return 0;
}

0 comments on commit 9baba68

Please sign in to comment.