aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2010-10-26 15:41:13 -0600
committerJesse Barnes <jbarnes@virtuousgeek.org>2010-10-26 15:33:22 -0700
commita9cea017411c95ec789092971f9baaef1f826883 (patch)
treec26c60f9c4b4e73eccd9ce6597daa250270691e6 /kernel
parent1ca98fa652bb5dc3c8793335db9ccc5d0f2e1f65 (diff)
downloadmrst-s0i3-test-a9cea017411c95ec789092971f9baaef1f826883.tar.gz
mrst-s0i3-test-a9cea017411c95ec789092971f9baaef1f826883.tar.xz
mrst-s0i3-test-a9cea017411c95ec789092971f9baaef1f826883.zip
resources: add a default alignf to simplify find_resource()
This removes a test from find_resource(), which is getting cluttered. No functional change. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/resource.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/kernel/resource.c b/kernel/resource.c
index 7b36976e5de..7dc8ad24f91 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -357,6 +357,14 @@ int __weak page_is_ram(unsigned long pfn)
return walk_system_ram_range(pfn, 1, NULL, __is_ram) == 1;
}
+static resource_size_t simple_align_resource(void *data,
+ const struct resource *avail,
+ resource_size_t size,
+ resource_size_t align)
+{
+ return avail->start;
+}
+
/*
* Find empty slot in the resource tree given range and alignment.
*/
@@ -391,8 +399,8 @@ static int find_resource(struct resource *root, struct resource *new,
if (tmp.end > max)
tmp.end = max;
tmp.start = ALIGN(tmp.start, align);
- if (alignf)
- tmp.start = alignf(alignf_data, &tmp, size, align);
+
+ tmp.start = alignf(alignf_data, &tmp, size, align);
if (tmp.start < tmp.end && tmp.end - tmp.start >= size - 1) {
new->start = tmp.start;
new->end = tmp.start + size - 1;
@@ -428,6 +436,9 @@ int allocate_resource(struct resource *root, struct resource *new,
{
int err;
+ if (!alignf)
+ alignf = simple_align_resource;
+
write_lock(&resource_lock);
err = find_resource(root, new, size, min, max, align, alignf, alignf_data);
if (err >= 0 && __request_resource(root, new))