diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-08 04:32:56 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 04:32:56 -0400 |
| commit | 896395c290f902576270d84291c1f7f8bfbe339d (patch) | |
| tree | 650114bff3a5f808ee1d713ecc443b0eaab2e1c3 /arch/powerpc/platforms/ps3/mm.c | |
| parent | af1cf204ba2fd8135933a2e4df523fb1112dc0e2 (diff) | |
| parent | 1b40a895df6c7d5a80e71f65674060b03d84bbef (diff) | |
Merge branch 'linus' into tmp.x86.mpparse.new
Diffstat (limited to 'arch/powerpc/platforms/ps3/mm.c')
| -rw-r--r-- | arch/powerpc/platforms/ps3/mm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/ps3/mm.c b/arch/powerpc/platforms/ps3/mm.c index 5b3fb2b321ab..3a58ffabccd9 100644 --- a/arch/powerpc/platforms/ps3/mm.c +++ b/arch/powerpc/platforms/ps3/mm.c | |||
| @@ -317,6 +317,9 @@ static int __init ps3_mm_add_memory(void) | |||
| 317 | return result; | 317 | return result; |
| 318 | } | 318 | } |
| 319 | 319 | ||
| 320 | lmb_add(start_addr, map.r1.size); | ||
| 321 | lmb_analyze(); | ||
| 322 | |||
| 320 | result = online_pages(start_pfn, nr_pages); | 323 | result = online_pages(start_pfn, nr_pages); |
| 321 | 324 | ||
| 322 | if (result) | 325 | if (result) |