mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal
Pull misc syscall fixes from Al Viro:
- compat syscall fixes (discussed back in December)
- a couple of "make life easier for sigaltstack stuff by reducing
inter-tree dependencies"
- fix up compiler/asmlinkage calling convention disagreement of
sys_clone()
- misc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal:
sys_clone() needs asmlinkage_protect
make sure that /linuxrc has std{in,out,err}
x32: fix sigtimedwait
x32: fix waitid()
switch compat_sys_wait4() and compat_sys_waitid() to COMPAT_SYSCALL_DEFINE
switch compat_sys_sigaltstack() to COMPAT_SYSCALL_DEFINE
CONFIG_GENERIC_SIGALTSTACK build breakage with asm-generic/syscalls.h
Ensure that kernel_init_freeable() is not inlined into non __init code
This commit is contained in:
commit
3a142ed962
6 changed files with 30 additions and 14 deletions
|
|
@ -36,6 +36,10 @@ __setup("noinitrd", no_initrd);
|
|||
static int init_linuxrc(struct subprocess_info *info, struct cred *new)
|
||||
{
|
||||
sys_unshare(CLONE_FS | CLONE_FILES);
|
||||
/* stdin/stdout/stderr for /linuxrc */
|
||||
sys_open("/dev/console", O_RDWR, 0);
|
||||
sys_dup(0);
|
||||
sys_dup(0);
|
||||
/* move initrd over / and chdir/chroot in initrd root */
|
||||
sys_chdir("/root");
|
||||
sys_mount(".", "/", NULL, MS_MOVE, NULL);
|
||||
|
|
|
|||
|
|
@ -802,7 +802,7 @@ static int run_init_process(const char *init_filename)
|
|||
(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)
|
||||
{
|
||||
|
|
@ -845,7 +845,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.
|
||||
|
|
|
|||
Loading…
Reference in a new issue