diff options
| author | Stewart Smith <stewart@linux.vnet.ibm.com> | 2015-06-05 13:00:12 +1000 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2015-06-05 13:00:12 +1000 |
| commit | 06e3461a975578c61c7cdb87a3f18acf3100e736 (patch) | |
| tree | a9e5680b6bc825372dfbfbc0e36fad35dd780269 /core | |
| parent | a20233587a88d343a89f719f17a8391e8e1028c2 (diff) | |
| parent | 9ea274ef840bc90fc6df40bf884325cdb565b689 (diff) | |
| download | talos-skiboot-06e3461a975578c61c7cdb87a3f18acf3100e736.tar.gz talos-skiboot-06e3461a975578c61c7cdb87a3f18acf3100e736.zip | |
Merge branch 'stable'
Diffstat (limited to 'core')
| -rw-r--r-- | core/mem_region.c | 4 | ||||
| -rw-r--r-- | core/test/run-mem_region_reservations.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/core/mem_region.c b/core/mem_region.c index 5e9393d1..48fdd7d6 100644 --- a/core/mem_region.c +++ b/core/mem_region.c @@ -700,13 +700,13 @@ static bool add_region(struct mem_region *region) return true; } -void mem_reserve(const char *name, uint64_t start, uint64_t len) +void mem_reserve_hw(const char *name, uint64_t start, uint64_t len) { struct mem_region *region; bool added; lock(&mem_region_lock); - region = new_region(name, start, len, NULL, REGION_RESERVED); + region = new_region(name, start, len, NULL, REGION_HW_RESERVED); assert(region); added = add_region(region); assert(added); diff --git a/core/test/run-mem_region_reservations.c b/core/test/run-mem_region_reservations.c index fcde1107..59b6e064 100644 --- a/core/test/run-mem_region_reservations.c +++ b/core/test/run-mem_region_reservations.c @@ -208,7 +208,8 @@ int main(void) /* create our reservations */ for (i = 0; i < ARRAY_SIZE(test_regions); i++) - mem_reserve(test_regions[i].name, test_regions[i].addr, 0x1000); + mem_reserve_hw(test_regions[i].name, + test_regions[i].addr, 0x1000); /* release unused */ mem_region_release_unused(); |
