diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 13:03:44 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 13:03:44 -0500 |
commit | 6150c32589d1976ca8a5c987df951088c05a7542 (patch) | |
tree | 94073696576323ff966e365d8c47b8ecd8372f97 /arch/powerpc/mm/imalloc.c | |
parent | 44637a12f80b80157d9c1bc5b7d6ef09c9e05713 (diff) | |
parent | be42d5fa3772241b8ecebd443f1fb36247959c54 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'arch/powerpc/mm/imalloc.c')
-rw-r--r-- | arch/powerpc/mm/imalloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/imalloc.c b/arch/powerpc/mm/imalloc.c index f9587bcc6a48..8b0c132bc163 100644 --- 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, | |||
107 | if (v_addr < (unsigned long) tmp->addr + tmp->size) | 107 | if (v_addr < (unsigned long) tmp->addr + tmp->size) |
108 | break; | 108 | break; |
109 | 109 | ||
110 | *vm = NULL; | ||
110 | if (tmp) { | 111 | if (tmp) { |
111 | if (im_region_overlaps(v_addr, size, tmp)) | 112 | if (im_region_overlaps(v_addr, size, tmp)) |
112 | return IM_REGION_OVERLAP; | 113 | return IM_REGION_OVERLAP; |
@@ -127,7 +128,6 @@ static int im_region_status(unsigned long v_addr, unsigned long size, | |||
127 | } | 128 | } |
128 | } | 129 | } |
129 | 130 | ||
130 | *vm = NULL; | ||
131 | return IM_REGION_UNUSED; | 131 | return IM_REGION_UNUSED; |
132 | } | 132 | } |
133 | 133 | ||