diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-30 07:22:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-30 07:22:38 -0700 |
| commit | be3fd3cc7c2142c46d5dcfec05e6031990d1f2ca (patch) | |
| tree | 606074b5c60ef823ad86174e408904c563eab38d /kernel | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 (diff) | |
| parent | x86: Do not free zero sized per cpu areas (diff) | |
| download | linux-dev-be3fd3cc7c2142c46d5dcfec05e6031990d1f2ca.tar.xz linux-dev-be3fd3cc7c2142c46d5dcfec05e6031990d1f2ca.zip | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Do not free zero sized per cpu areas
x86: Make sure free_init_pages() frees pages on page boundary
x86: Make smp_locks end with page alignment
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/early_res.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel/early_res.c b/kernel/early_res.c index 3cb2c661bb78..31aa9332ef3f 100644 --- a/kernel/early_res.c +++ b/kernel/early_res.c @@ -333,6 +333,12 @@ void __init free_early_partial(u64 start, u64 end) struct early_res *r; int i; + if (start == end) + return; + + if (WARN_ONCE(start > end, " wrong range [%#llx, %#llx]\n", start, end)) + return; + try_next: i = find_overlapped_early(start, end); if (i >= max_early_res) |