git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...
[sfrench/cifs-2.6.git]
/
lib
/
lmb.c
diff --git
a/lib/lmb.c
b/lib/lmb.c
index 0343c05609f0d62f9b48b259bf3018db728b11a5..9cee17142b2cdc6d2d7a78c8b6ca5fd6573eb4b8 100644
(file)
--- a/
lib/lmb.c
+++ b/
lib/lmb.c
@@
-263,7
+263,7
@@
long __init lmb_reserve(u64 base, u64 size)
return lmb_add_region(_rgn, base, size);
}
return lmb_add_region(_rgn, base, size);
}
-long
__init
lmb_overlaps_region(struct lmb_region *rgn, u64 base, u64 size)
+long lmb_overlaps_region(struct lmb_region *rgn, u64 base, u64 size)
{
unsigned long i;
{
unsigned long i;
@@
-493,6
+493,11
@@
int __init lmb_is_reserved(u64 addr)
return 0;
}
return 0;
}
+int lmb_is_region_reserved(u64 base, u64 size)
+{
+ return lmb_overlaps_region(&lmb.reserved, base, size);
+}
+
/*
* Given a <base, len>, find which memory regions belong to this range.
* Adjust the request and return a contiguous chunk.
/*
* Given a <base, len>, find which memory regions belong to this range.
* Adjust the request and return a contiguous chunk.