diff --git a/[refs] b/[refs] index 19f2f7e5f1c9..02278530b1df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 91f47662dfaa5b459aebe13284c6c38db27350dc +refs/heads/master: f99ebf0a86de13f77bc4ee349de96db9f2f67f2e diff --git a/trunk/init/main.c b/trunk/init/main.c index cd168ebc5924..90926dadc20d 100644 --- a/trunk/init/main.c +++ b/trunk/init/main.c @@ -447,7 +447,7 @@ static void __init setup_command_line(char *command_line) * gcc-3.4 accidentally inlines this function, so use noinline. */ -static void noinline __init_refok rest_init(void) +static noinline void __init_refok rest_init(void) __releases(kernel_lock) { int pid; @@ -786,7 +786,7 @@ static void run_init_process(char *init_filename) /* 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 int noinline init_post(void) +static noinline int init_post(void) { free_initmem(); unlock_kernel();