aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/uml
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2016-02-25 21:54:39 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2016-02-25 21:54:39 +0000
commitcb04b8d58201f6aa35f99b76ee8b3435beb7a01e (patch)
treef6b54298f21d3ba2166fd1621f86390e5c554f1a /target/linux/uml
parent53814290e7f58f205c74ad1c2f8cedb7e1c2b5ef (diff)
downloadupstream-cb04b8d58201f6aa35f99b76ee8b3435beb7a01e.tar.gz
upstream-cb04b8d58201f6aa35f99b76ee8b3435beb7a01e.tar.bz2
upstream-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')
-rw-r--r--target/linux/uml/patches-4.4/100-link-libpthread.patch2
-rw-r--r--target/linux/uml/patches-4.4/101-mconsole-exec.patch18
-rw-r--r--target/linux/uml/patches-4.4/102-pseudo-random-mac.patch6
3 files changed, 13 insertions, 13 deletions
diff --git a/target/linux/uml/patches-4.4/100-link-libpthread.patch b/target/linux/uml/patches-4.4/100-link-libpthread.patch
index 297f6d528f..2ffab6bbfb 100644
--- a/target/linux/uml/patches-4.4/100-link-libpthread.patch
+++ b/target/linux/uml/patches-4.4/100-link-libpthread.patch
@@ -1,6 +1,6 @@
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
-@@ -62,7 +62,7 @@
+@@ -62,7 +62,7 @@ vmlinux_link()
-Wl,--start-group \
${KBUILD_VMLINUX_MAIN} \
-Wl,--end-group \
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(&current->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);
diff --git a/target/linux/uml/patches-4.4/102-pseudo-random-mac.patch b/target/linux/uml/patches-4.4/102-pseudo-random-mac.patch
index 57598f9964..fc54f603c0 100644
--- a/target/linux/uml/patches-4.4/102-pseudo-random-mac.patch
+++ b/target/linux/uml/patches-4.4/102-pseudo-random-mac.patch
@@ -11,7 +11,7 @@ Applies to vanilla kernel 3.9.4.
===============================================================================
--- a/arch/um/Kconfig.net
+++ b/arch/um/Kconfig.net
-@@ -21,6 +21,19 @@
+@@ -21,6 +21,19 @@ config UML_NET
enable at least one of the following transport options to actually
make use of UML networking.
@@ -47,7 +47,7 @@ Applies to vanilla kernel 3.9.4.
#define DRIVER_NAME "uml-netdev"
static DEFINE_SPINLOCK(opened_lock);
-@@ -295,11 +302,47 @@
+@@ -295,11 +302,47 @@ static void uml_net_user_timer_expire(un
#endif
}
@@ -95,7 +95,7 @@ Applies to vanilla kernel 3.9.4.
if (str == NULL)
goto random;
-@@ -340,9 +383,26 @@
+@@ -340,9 +383,26 @@ static void setup_etheraddr(struct net_d
return;
random: