projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
fsnotify: Remove special handling of mark destruction on group shutdown
[linux-2.6-microblaze.git]
/
mm
/
memblock.c
diff --git
a/mm/memblock.c
b/mm/memblock.c
index
b64b478
..
696f06d
100644
(file)
--- a/
mm/memblock.c
+++ b/
mm/memblock.c
@@
-1118,7
+1118,10
@@
unsigned long __init_memblock memblock_next_valid_pfn(unsigned long pfn,
}
} while (left < right);
- return min(PHYS_PFN(type->regions[right].base), max_pfn);
+ if (right == type->cnt)
+ return max_pfn;
+ else
+ return min(PHYS_PFN(type->regions[right].base), max_pfn);
}
/**