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

Pull UML update from Richard Weinberger:
 "Besides of fixes this contains also support for CONFIG_STACKTRACE by
  Daniel Walter"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
  um: net: Eliminate NULL test after alloc_bootmem
  um: Add support for CONFIG_STACKTRACE
  um: ubd: Fix for processes stuck in D state forever
  um: delete unnecessary bootmem struct page array
  um: remove csum_partial_copy_generic_i386 to clean up exception table

2 files changed, 3 insertions, 6 deletions

diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index 7d26d9c0b2fb..f70dd540655d 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -659,10 +659,6 @@ static int __init eth_setup(char *str)
         }
 
         new = alloc_bootmem(sizeof(*new));
-        if (new == NULL) {
-                printk(KERN_ERR "eth_init : alloc_bootmem failed\n");
-                return 1;
-        }
 
         INIT_LIST_HEAD(&new->list);
         new->index = n;
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index 3716e6952554..e8ab93c3e638 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -1277,7 +1277,7 @@ static void do_ubd_request(struct request_queue *q)
 
         while(1){
                 struct ubd *dev = q->queuedata;
-                if(dev->end_sg == 0){
+                if(dev->request == NULL){
                         struct request *req = blk_fetch_request(q);
                         if(req == NULL)
                                 return;
@@ -1299,7 +1299,8 @@ static void do_ubd_request(struct request_queue *q)
                                 return;
                         }
                         prepare_flush_request(req, io_req);
-                        submit_request(io_req, dev);
+                        if (submit_request(io_req, dev) == false)
+                                return;
                 }
 
                 while(dev->start_sg < dev->end_sg){