diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-24 15:52:27 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-24 15:52:27 -0500 |
| commit | 87b203079ed949de52f0d92aeae20e5e0116c12f (patch) | |
| tree | 1878756f936963822ed2d51a15db1da5814973e7 /arch/x86/mm/numa_32.c | |
| parent | 58105ef1857112a186696c9b8957020090226a28 (diff) | |
| parent | a852cbfaaf8122827602027b1614971cfd832304 (diff) | |
Merge branch 'x86/core' into core/percpu
Diffstat (limited to 'arch/x86/mm/numa_32.c')
| -rw-r--r-- | arch/x86/mm/numa_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/numa_32.c b/arch/x86/mm/numa_32.c index d1f7439d173..3957cd6d645 100644 --- 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) | |||
| 194 | size = ALIGN(size, L1_CACHE_BYTES); | 194 | size = ALIGN(size, L1_CACHE_BYTES); |
| 195 | 195 | ||
| 196 | if (!allocation || (allocation + size) >= node_remap_end_vaddr[nid]) | 196 | if (!allocation || (allocation + size) >= node_remap_end_vaddr[nid]) |
| 197 | return 0; | 197 | return NULL; |
| 198 | 198 | ||
| 199 | node_remap_alloc_vaddr[nid] += size; | 199 | node_remap_alloc_vaddr[nid] += size; |
| 200 | memset(allocation, 0, size); | 200 | memset(allocation, 0, size); |