Merge branch 'for-linus-4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull UML updates from Richard Weinberger:

 - removal of old and dead code

 - a bug fix for our tty driver

 - other minor cleanups across the code base

* 'for-linus-4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
  um: Make line/tty semantics use true write IRQ
  um: trap: fix spelling mistake, EACCESS -> EACCES
  um: Don't hardcode path as it is architecture dependent
  um: NULL check before kfree is not needed
  um: remove unused AIO code
  um: Give start_idle_thread() a return code
  um: Remove update_debugregs()
  um: Drop own definition of PTRACE_SYSEMU/_SINGLESTEP

diff --combined arch/um/drivers/vector_kern.c
index 10d8d20eb9ecff2184663ba3701b02bac1e1e35a,c84133cf4848e837e5fe55b6ee9af78dc319c8a4..046fa9ea0ccc7dae2ee80381c224916700e612d1
--- 1/arch/um/drivers/vector_kern.c
--- 2/arch/um/drivers/vector_kern.c
+++ b/arch/um/drivers/vector_kern.c
@@@ -9,7 -9,7 +9,7 @@@
   */
  
  #include <linux/version.h>
 -#include <linux/bootmem.h>
 +#include <linux/memblock.h>
  #include <linux/etherdevice.h>
  #include <linux/ethtool.h>
  #include <linux/inetdevice.h>
@@@ -1118,16 -1118,11 +1118,11 @@@ static int vector_net_close(struct net_
                os_close_file(vp->fds->tx_fd);
                vp->fds->tx_fd = -1;
        }
-       if (vp->bpf != NULL)
-               kfree(vp->bpf);
-       if (vp->fds->remote_addr != NULL)
-               kfree(vp->fds->remote_addr);
-       if (vp->transport_data != NULL)
-               kfree(vp->transport_data);
-       if (vp->header_rxbuffer != NULL)
-               kfree(vp->header_rxbuffer);
-       if (vp->header_txbuffer != NULL)
-               kfree(vp->header_txbuffer);
+       kfree(vp->bpf);
+       kfree(vp->fds->remote_addr);
+       kfree(vp->transport_data);
+       kfree(vp->header_rxbuffer);
+       kfree(vp->header_txbuffer);
        if (vp->rx_queue != NULL)
                destroy_queue(vp->rx_queue);
        if (vp->tx_queue != NULL)
@@@ -1580,7 -1575,7 +1575,7 @@@ static int __init vector_setup(char *st
                                 str, error);
                return 1;
        }
 -      new = alloc_bootmem(sizeof(*new));
 +      new = memblock_alloc(sizeof(*new), SMP_CACHE_BYTES);
        INIT_LIST_HEAD(&new->list);
        new->unit = n;
        new->arguments = str;