apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into for-3.9-async

Browse Source 
To receive f56c3196f2 ("async: fix
__lowest_in_progress()").

Signed-off-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
Tejun Heo
2013-01-23 09:31:01 -08:00
parent 0fdff3ec6d 1d85490853
commit c14afb82ff
3468 changed files with 74250 additions and 31438 deletions
Download Patch File Download Diff File Expand all files Collapse all files
init/main.c
+5 -3
View File
@@ -810,10 +810,12 @@ void __init load_default_modules(void)
static int run_init_process(const char *init_filename)
{
argv_init[0] = init_filename;
return kernel_execve(init_filename, argv_init, envp_init);
return do_execve(init_filename,
(const char __user *const __user *)argv_init,
(const char __user *const __user *)envp_init);
}
static void __init kernel_init_freeable(void);
static noinline void __init kernel_init_freeable(void);
static int __ref kernel_init(void *unused)
{
@@ -856,7 +858,7 @@ static int __ref kernel_init(void *unused)
"See Linux Documentation/init.txt for guidance.");
}
static void __init kernel_init_freeable(void)
static noinline void __init kernel_init_freeable(void)
{
/*
* Wait until kthreadd is all set-up.