Changeset 42421


Ignore:
Timestamp:
2014-09-06T00:02:09+02:00 (3 years ago)
Author:
nico
Message:

uml: bump to 3.14.16

Signed-off-by: Nicolas Thill <nico@…>

Location:
trunk/target/linux/uml
Files:
2 added
1 deleted
1 edited
2 copied

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/uml/Makefile

    r41776 r42421  
    2424MAINTAINER:=Florian Fainelli <florian@openwrt.org> 
    2525 
    26 LINUX_VERSION:=3.10.49 
     26LINUX_VERSION:=3.14.16 
    2727 
    2828include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/uml/patches-3.14/101-mconsole-exec.patch

    r42419 r42421  
    1616# - Nothing useful is done with stdin 
    1717# 
    18 diff --git a/arch/um/drivers/mconsole.h b/arch/um/drivers/mconsole.h 
    19 index 8b22535..77cc5f7 100644 
    2018--- a/arch/um/drivers/mconsole.h 
    2119+++ b/arch/um/drivers/mconsole.h 
    22 @@ -85,6 +85,7 @@ extern void mconsole_cad(struct mc_request *req); 
     20@@ -85,6 +85,7 @@ extern void mconsole_cad(struct mc_reque 
    2321 extern void mconsole_stop(struct mc_request *req); 
    2422 extern void mconsole_go(struct mc_request *req); 
     
    2826 extern void mconsole_stack(struct mc_request *req); 
    2927  
    30 diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c 
    31 index 3df3bd5..307bf75 100644 
    3228--- a/arch/um/drivers/mconsole_kern.c 
    3329+++ b/arch/um/drivers/mconsole_kern.c 
     
    4844 #include <asm/switch_to.h> 
    4945  
    50 @@ -121,6 +123,59 @@ void mconsole_log(struct mc_request *req) 
     46@@ -121,6 +123,59 @@ void mconsole_log(struct mc_request *req 
    5147        mconsole_reply(req, "", 0, 0); 
    5248 } 
     
    108104 { 
    109105        struct vfsmount *mnt = task_active_pid_ns(current)->proc_mnt; 
    110 @@ -187,6 +242,7 @@ void mconsole_proc(struct mc_request *req) 
     106@@ -187,6 +242,7 @@ void mconsole_proc(struct mc_request *re 
    111107     stop - pause the UML; it will do nothing until it receives a 'go' \n\ 
    112108     go - continue the UML after a 'stop' \n\ 
     
    116112     stack <pid> - returns the stack of the specified pid\n\ 
    117113 " 
    118 diff --git a/arch/um/drivers/mconsole_user.c b/arch/um/drivers/mconsole_user.c 
    119 index 9920982..3ed0d32 100644 
    120114--- a/arch/um/drivers/mconsole_user.c 
    121115+++ b/arch/um/drivers/mconsole_user.c 
    122 @@ -30,6 +30,7 @@ static struct mconsole_command commands[] = { 
     116@@ -30,6 +30,7 @@ static struct mconsole_command commands[ 
    123117        { "stop", mconsole_stop, MCONSOLE_PROC }, 
    124118        { "go", mconsole_go, MCONSOLE_INTR }, 
     
    128122        { "stack", mconsole_stack, MCONSOLE_INTR }, 
    129123 }; 
    130 diff --git a/arch/um/os-Linux/file.c b/arch/um/os-Linux/file.c 
    131 index c17bd6f..1c55fa8 100644 
    132124--- a/arch/um/os-Linux/file.c 
    133125+++ b/arch/um/os-Linux/file.c 
    134 @@ -519,6 +519,8 @@ int os_create_unix_socket(const char *file, int len, int close_on_exec) 
     126@@ -528,6 +528,8 @@ int os_create_unix_socket(const char *fi 
    135127  
    136128        addr.sun_family = AF_UNIX; 
     
    141133  
    142134        err = bind(sock, (struct sockaddr *) &addr, sizeof(addr)); 
    143 diff --git a/include/linux/kmod.h b/include/linux/kmod.h 
    144 index 0555cc6..476084d 100644 
    145135--- a/include/linux/kmod.h 
    146136+++ b/include/linux/kmod.h 
     
    153143        void *data; 
    154144 }; 
    155 @@ -104,4 +105,6 @@ extern int usermodehelper_read_trylock(void); 
     145@@ -104,4 +105,6 @@ extern int usermodehelper_read_trylock(v 
    156146 extern long usermodehelper_read_lock_wait(long timeout); 
    157147 extern void usermodehelper_read_unlock(void); 
     
    160150+ 
    161151 #endif /* __LINUX_KMOD_H__ */ 
    162 diff --git a/kernel/kmod.c b/kernel/kmod.c 
    163 index 8241906..2d7f718 100644 
    164152--- a/kernel/kmod.c 
    165153+++ b/kernel/kmod.c 
     
    172160  
    173161 #include <trace/events/module.h> 
    174 @@ -206,6 +207,28 @@ static int ____call_usermodehelper(void *data) 
     162@@ -209,6 +210,28 @@ static int ____call_usermodehelper(void 
    175163        flush_signal_handlers(current, 1); 
    176164        spin_unlock_irq(&current->sighand->siglock); 
     
    201189        set_cpus_allowed_ptr(current, cpu_all_mask); 
    202190  
    203 @@ -551,6 +574,20 @@ struct subprocess_info *call_usermodehelper_setup(char *path, char **argv, 
     191@@ -554,6 +577,20 @@ struct subprocess_info *call_usermodehel 
    204192 } 
    205193 EXPORT_SYMBOL(call_usermodehelper_setup); 
  • trunk/target/linux/uml/patches-3.14/102-pseudo-random-mac.patch

    r42419 r42421  
    1010 
    1111=============================================================================== 
    12 diff -aur linux-3.9.4-orig/arch/um/Kconfig.net linux-3.9.4/arch/um/Kconfig.net 
    13 --- linux-3.9.4-orig/arch/um/Kconfig.net        2013-05-24 21:45:59.000000000 +0300 
    14 +++ linux-3.9.4/arch/um/Kconfig.net     2013-06-11 13:07:06.363999999 +0300 
    15 @@ -21,6 +21,19 @@ 
     12--- a/arch/um/Kconfig.net 
     13+++ b/arch/um/Kconfig.net 
     14@@ -21,6 +21,19 @@ config UML_NET 
    1615         enable at least one of the following transport options to actually 
    1716         make use of UML networking. 
     
    3332        bool "Ethertap transport" 
    3433        depends on UML_NET 
    35 diff -aur linux-3.9.4-orig/arch/um/drivers/net_kern.c linux-3.9.4/arch/um/drivers/net_kern.c 
    36 --- linux-3.9.4-orig/arch/um/drivers/net_kern.c 2013-05-24 21:45:59.000000000 +0300 
    37 +++ linux-3.9.4/arch/um/drivers/net_kern.c      2013-06-11 13:09:03.452000001 +0300 
     34--- a/arch/um/drivers/net_kern.c 
     35+++ b/arch/um/drivers/net_kern.c 
    3836@@ -25,6 +25,13 @@ 
    3937 #include <net_kern.h> 
     
    5048  
    5149 static DEFINE_SPINLOCK(opened_lock); 
    52 @@ -295,11 +302,47 @@ 
     50@@ -295,11 +302,47 @@ static void uml_net_user_timer_expire(un 
    5351 #endif 
    5452 } 
     
    9896        if (str == NULL) 
    9997                goto random; 
    100 @@ -340,9 +383,26 @@ 
     98@@ -340,9 +383,26 @@ static void setup_etheraddr(struct net_d 
    10199        return; 
    102100  
     
    125123  
    126124 static DEFINE_SPINLOCK(devices_lock); 
    127 Only in linux-3.9.4/arch/um/drivers: net_kern.c.orig 
    128 Only in linux-3.9.4/arch/um/drivers: net_kern.c.rej 
    129 Only in linux-3.9.4/arch/um/drivers: net_kern.c~ 
Note: See TracChangeset for help on using the changeset viewer.