diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2016-02-25 21:54:39 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2016-02-25 21:54:39 +0000 |
| commit | cb04b8d58201f6aa35f99b76ee8b3435beb7a01e (patch) | |
| tree | f6b54298f21d3ba2166fd1621f86390e5c554f1a /target/linux/uml/patches-4.4/101-mconsole-exec.patch | |
| parent | 53814290e7f58f205c74ad1c2f8cedb7e1c2b5ef (diff) | |
| download | master-31e0f0ae-cb04b8d58201f6aa35f99b76ee8b3435beb7a01e.tar.gz master-31e0f0ae-cb04b8d58201f6aa35f99b76ee8b3435beb7a01e.tar.bz2 master-31e0f0ae-cb04b8d58201f6aa35f99b76ee8b3435beb7a01e.zip | |
kernel: update kernel 4.4 to version 4.4.3
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 48783
Diffstat (limited to 'target/linux/uml/patches-4.4/101-mconsole-exec.patch')
| -rw-r--r-- | target/linux/uml/patches-4.4/101-mconsole-exec.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/target/linux/uml/patches-4.4/101-mconsole-exec.patch b/target/linux/uml/patches-4.4/101-mconsole-exec.patch index 98f04f4a62..879b106bfa 100644 --- a/target/linux/uml/patches-4.4/101-mconsole-exec.patch +++ b/target/linux/uml/patches-4.4/101-mconsole-exec.patch @@ -17,7 +17,7 @@ # --- a/arch/um/drivers/mconsole.h +++ b/arch/um/drivers/mconsole.h -@@ -85,6 +85,7 @@ +@@ -85,6 +85,7 @@ extern void mconsole_cad(struct mc_reque extern void mconsole_stop(struct mc_request *req); extern void mconsole_go(struct mc_request *req); extern void mconsole_log(struct mc_request *req); @@ -43,7 +43,7 @@ #include <asm/uaccess.h> #include <asm/switch_to.h> -@@ -121,6 +123,59 @@ +@@ -121,6 +123,59 @@ void mconsole_log(struct mc_request *req mconsole_reply(req, "", 0, 0); } @@ -103,7 +103,7 @@ void mconsole_proc(struct mc_request *req) { struct vfsmount *mnt = task_active_pid_ns(current)->proc_mnt; -@@ -187,6 +242,7 @@ +@@ -187,6 +242,7 @@ void mconsole_proc(struct mc_request *re stop - pause the UML; it will do nothing until it receives a 'go' \n\ go - continue the UML after a 'stop' \n\ log <string> - make UML enter <string> into the kernel log\n\ @@ -113,7 +113,7 @@ " --- a/arch/um/drivers/mconsole_user.c +++ b/arch/um/drivers/mconsole_user.c -@@ -30,6 +30,7 @@ +@@ -30,6 +30,7 @@ static struct mconsole_command commands[ { "stop", mconsole_stop, MCONSOLE_PROC }, { "go", mconsole_go, MCONSOLE_INTR }, { "log", mconsole_log, MCONSOLE_INTR }, @@ -123,7 +123,7 @@ }; --- a/arch/um/os-Linux/file.c +++ b/arch/um/os-Linux/file.c -@@ -535,6 +535,8 @@ +@@ -535,6 +535,8 @@ int os_create_unix_socket(const char *fi addr.sun_family = AF_UNIX; @@ -134,7 +134,7 @@ err = bind(sock, (struct sockaddr *) &addr, sizeof(addr)); --- a/include/linux/kmod.h +++ b/include/linux/kmod.h -@@ -62,6 +62,7 @@ +@@ -62,6 +62,7 @@ struct subprocess_info { int wait; int retval; int (*init)(struct subprocess_info *info, struct cred *new); @@ -142,7 +142,7 @@ void (*cleanup)(struct subprocess_info *info); void *data; }; -@@ -102,4 +103,6 @@ +@@ -102,4 +103,6 @@ extern int usermodehelper_read_trylock(v extern long usermodehelper_read_lock_wait(long timeout); extern void usermodehelper_read_unlock(void); @@ -159,7 +159,7 @@ #include <asm/uaccess.h> #include <trace/events/module.h> -@@ -222,6 +223,28 @@ +@@ -222,6 +223,28 @@ static int call_usermodehelper_exec_asyn flush_signal_handlers(current, 1); spin_unlock_irq(¤t->sighand->siglock); @@ -188,7 +188,7 @@ /* * Our parent (unbound workqueue) runs with elevated scheduling * priority. Avoid propagating that into the userspace child. -@@ -540,6 +563,20 @@ +@@ -540,6 +563,20 @@ struct subprocess_info *call_usermodehel } EXPORT_SYMBOL(call_usermodehelper_setup); |