git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
kernel
/
resource.c
diff --git
a/kernel/resource.c
b/kernel/resource.c
index
52f696f
..
e3080fc
100644
(file)
--- a/
kernel/resource.c
+++ b/
kernel/resource.c
@@
-263,7
+263,7
@@
static int find_resource(struct resource *root, struct resource *new,
new->start = min;
if (new->end > max)
new->end = max;
new->start = min;
if (new->end > max)
new->end = max;
- new->start =
(new->start + align - 1) & ~(align - 1
);
+ new->start =
ALIGN(new->start, align
);
if (alignf)
alignf(alignf_data, new, size, align);
if (new->start < new->end && new->end - new->start >= size - 1) {
if (alignf)
alignf(alignf_data, new, size, align);
if (new->start < new->end && new->end - new->start >= size - 1) {
@@
-430,10
+430,9
@@
EXPORT_SYMBOL(adjust_resource);
*/
struct resource * __request_region(struct resource *parent, unsigned long start, unsigned long n, const char *name)
{
*/
struct resource * __request_region(struct resource *parent, unsigned long start, unsigned long n, const char *name)
{
- struct resource *res = k
m
alloc(sizeof(*res), GFP_KERNEL);
+ struct resource *res = k
z
alloc(sizeof(*res), GFP_KERNEL);
if (res) {
if (res) {
- memset(res, 0, sizeof(*res));
res->name = name;
res->start = start;
res->end = start + n - 1;
res->name = name;
res->start = start;
res->end = start + n - 1;
@@
-465,7
+464,7
@@
struct resource * __request_region(struct resource *parent, unsigned long start,
EXPORT_SYMBOL(__request_region);
EXPORT_SYMBOL(__request_region);
-int __
deprecated __
check_region(struct resource *parent, unsigned long start, unsigned long n)
+int __check_region(struct resource *parent, unsigned long start, unsigned long n)
{
struct resource * res;
{
struct resource * res;