Merge branch 'akpm' (Andrew's patch-bomb)

Merge misc patches from Andrew Morton:
 "The MM tree is rather stuck while I wait to find out what the heck is
  happening with sched/numa.  Probably I'll need to route around all the
  code which was added to -next, sigh.

  So this is "everything else", or at least most of it - other small
  bits are still awaiting resolutions of various kinds."

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (180 commits)
  lib/decompress.c add __init to decompress_method and data
  kernel/resource.c: fix stack overflow in __reserve_region_with_split()
  omfs: convert to use beXX_add_cpu()
  taskstats: cgroupstats_user_cmd() may leak on error
  aoe: update aoe-internal version number to 50
  aoe: update documentation to better reflect aoe-plus-udev usage
  aoe: remove unused code
  aoe: make dynamic block minor numbers the default
  aoe: update and specify AoE address guards and error messages
  aoe: retain static block device numbers for backwards compatibility
  aoe: support more AoE addresses with dynamic block device minor numbers
  aoe: update documentation with new URL and VM settings reference
  aoe: update copyright year in touched files
  aoe: update internal version number to 49
  aoe: remove unused code and add cosmetic improvements
  aoe: increase net_device reference count while using it
  aoe: associate frames with the AoE storage target
  aoe: disallow unsupported AoE minor addresses
  aoe: do revalidation steps in order
  aoe: failover remote interface based on aoe_deadsecs parameter
  ...

1 files changed, 38 insertions, 12 deletions

diff --git a/kernel/resource.c b/kernel/resource.c
index 34d45886ee84..73f35d4b30b9 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -763,6 +763,7 @@ static void __init __reserve_region_with_split(struct resource *root,
         struct resource *parent = root;
         struct resource *conflict;
         struct resource *res = kzalloc(sizeof(*res), GFP_ATOMIC);
+        struct resource *next_res = NULL;
 
         if (!res)
                 return;
@@ -772,21 +773,46 @@ static void __init __reserve_region_with_split(struct resource *root,
         res->end = end;
         res->flags = IORESOURCE_BUSY;
 
-        conflict = __request_resource(parent, res);
-        if (!conflict)
-                return;
+        while (1) {
 
-        /* failed, split and try again */
-        kfree(res);
+                conflict = __request_resource(parent, res);
+                if (!conflict) {
+                        if (!next_res)
+                                break;
+                        res = next_res;
+                        next_res = NULL;
+                        continue;
+                }
 
-        /* conflict covered whole area */
-        if (conflict->start <= start && conflict->end >= end)
-                return;
+                /* conflict covered whole area */
+                if (conflict->start <= res->start &&
+                                conflict->end >= res->end) {
+                        kfree(res);
+                        WARN_ON(next_res);
+                        break;
+                }
+
+                /* failed, split and try again */
+                if (conflict->start > res->start) {
+                        end = res->end;
+                        res->end = conflict->start - 1;
+                        if (conflict->end < end) {
+                                next_res = kzalloc(sizeof(*next_res),
+                                                GFP_ATOMIC);
+                                if (!next_res) {
+                                        kfree(res);
+                                        break;
+                                }
+                                next_res->name = name;
+                                next_res->start = conflict->end + 1;
+                                next_res->end = end;
+                                next_res->flags = IORESOURCE_BUSY;
+                        }
+                } else {
+                        res->start = conflict->end + 1;
+                }
+        }
 
-        if (conflict->start > start)
-                __reserve_region_with_split(root, start, conflict->start-1, name);
-        if (conflict->end < end)
-                __reserve_region_with_split(root, conflict->end+1, end, name);
 }
 
 void __init reserve_region_with_split(struct resource *root,