diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-01-27 06:29:13 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-01-27 06:29:37 -0500 |
| commit | f97b12cce6dea51880a6a89d4607c29c70a6a841 (patch) | |
| tree | 1f05f6d39975bd213e7506e8a73ae0a59188c75e /kernel/range.c | |
| parent | ccaa8d657117bb1876d471bd91579d774106778d (diff) | |
| parent | 1bae4ce27c9c90344f23c65ea6966c50ffeae2f5 (diff) | |
Merge commit 'v2.6.38-rc2' into core/locking
Reason: Update to mainline before adding the locking cleanup
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/range.c')
| -rw-r--r-- | kernel/range.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/range.c b/kernel/range.c index 471b66acabb5..37fa9b99ad58 100644 --- a/kernel/range.c +++ b/kernel/range.c | |||
| @@ -119,7 +119,7 @@ static int cmp_range(const void *x1, const void *x2) | |||
| 119 | 119 | ||
| 120 | int clean_sort_range(struct range *range, int az) | 120 | int clean_sort_range(struct range *range, int az) |
| 121 | { | 121 | { |
| 122 | int i, j, k = az - 1, nr_range = 0; | 122 | int i, j, k = az - 1, nr_range = az; |
| 123 | 123 | ||
| 124 | for (i = 0; i < k; i++) { | 124 | for (i = 0; i < k; i++) { |
| 125 | if (range[i].end) | 125 | if (range[i].end) |