diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-01-28 16:38:25 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-01-28 16:38:25 -0500 |
| commit | 0ada0a73120c28cc432bcdbac061781465c2f48f (patch) | |
| tree | d17cadd4ea47e25d9e48e7d409a39c84268fbd27 /lib/lmb.c | |
| parent | 6016a363f6b56b46b24655bcfc0499b715851cf3 (diff) | |
| parent | 92dcffb916d309aa01778bf8963a6932e4014d07 (diff) | |
Merge commit 'v2.6.33-rc5' into secretlab/test-devicetree
Diffstat (limited to 'lib/lmb.c')
| -rw-r--r-- | lib/lmb.c | 7 |
1 files changed, 6 insertions, 1 deletions
| @@ -263,7 +263,7 @@ long __init lmb_reserve(u64 base, u64 size) | |||
| 263 | return lmb_add_region(_rgn, base, size); | 263 | return lmb_add_region(_rgn, base, size); |
| 264 | } | 264 | } |
| 265 | 265 | ||
| 266 | long __init lmb_overlaps_region(struct lmb_region *rgn, u64 base, u64 size) | 266 | long lmb_overlaps_region(struct lmb_region *rgn, u64 base, u64 size) |
| 267 | { | 267 | { |
| 268 | unsigned long i; | 268 | unsigned long i; |
| 269 | 269 | ||
| @@ -493,6 +493,11 @@ int __init lmb_is_reserved(u64 addr) | |||
| 493 | return 0; | 493 | return 0; |
| 494 | } | 494 | } |
| 495 | 495 | ||
| 496 | int lmb_is_region_reserved(u64 base, u64 size) | ||
| 497 | { | ||
| 498 | return lmb_overlaps_region(&lmb.reserved, base, size); | ||
| 499 | } | ||
| 500 | |||
| 496 | /* | 501 | /* |
| 497 | * Given a <base, len>, find which memory regions belong to this range. | 502 | * Given a <base, len>, find which memory regions belong to this range. |
| 498 | * Adjust the request and return a contiguous chunk. | 503 | * Adjust the request and return a contiguous chunk. |
