sched: Fix OOPS when build_sched_domains() percpu allocation fails

[linux-flexiantxendom0-3.2.10.git] / kernel / range.c

diff --git a/kernel/range.c b/kernel/range.c
index 74e2e61..9b8ae2d 100644 (file)
--- a/kernel/range.c
+++ b/kernel/range.c
@@ -1,16 +1,12 @@
 /*
  * Range add and subtract
  */
-#include <linux/module.h>
+#include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/sort.h>
 
 #include <linux/range.h>
 
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
-#endif
-
 int add_range(struct range *range, int az, int nr_range, u64 start, u64 end)
 {
        if (start >= end)
@@ -123,7 +119,7 @@ static int cmp_range(const void *x1, const void *x2)
 
 int clean_sort_range(struct range *range, int az)
 {
-       int i, j, k = az - 1, nr_range = 0;
+       int i, j, k = az - 1, nr_range = az;
 
        for (i = 0; i < k; i++) {
                if (range[i].end)