projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/mingo/mutex-2.6
[powerpc.git]
/
arch
/
powerpc
/
mm
/
imalloc.c
diff --git
a/arch/powerpc/mm/imalloc.c
b/arch/powerpc/mm/imalloc.c
index
f9587bc
..
8b0c132
100644
(file)
--- a/
arch/powerpc/mm/imalloc.c
+++ b/
arch/powerpc/mm/imalloc.c
@@
-107,6
+107,7
@@
static int im_region_status(unsigned long v_addr, unsigned long size,
if (v_addr < (unsigned long) tmp->addr + tmp->size)
break;
+ *vm = NULL;
if (tmp) {
if (im_region_overlaps(v_addr, size, tmp))
return IM_REGION_OVERLAP;
@@
-127,7
+128,6
@@
static int im_region_status(unsigned long v_addr, unsigned long size,
}
}
- *vm = NULL;
return IM_REGION_UNUSED;
}