git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'x86/apic', 'x86/cpu', 'x86/fixmap', 'x86/mm', 'x86/sched', 'x86/setup...
[pandora-kernel.git]
/
arch
/
x86
/
mm
/
numa_32.c
diff --git
a/arch/x86/mm/numa_32.c
b/arch/x86/mm/numa_32.c
index
a04092a
..
451fe95
100644
(file)
--- a/
arch/x86/mm/numa_32.c
+++ b/
arch/x86/mm/numa_32.c
@@
-194,7
+194,7
@@
void *alloc_remap(int nid, unsigned long size)
size = ALIGN(size, L1_CACHE_BYTES);
if (!allocation || (allocation + size) >= node_remap_end_vaddr[nid])
- return
0
;
+ return
NULL
;
node_remap_alloc_vaddr[nid] += size;
memset(allocation, 0, size);