diff options
| author | Becky Bruce <beckyb@kernel.crashing.org> | 2011-06-28 15:54:47 -0400 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2011-07-08 01:21:34 -0400 |
| commit | 3160b09796129abc9523ea3cd1633b0faba64a02 (patch) | |
| tree | 53713f22a00a100d8d1e3e2a677da26f206d9fd6 /arch/powerpc/mm/mem.c | |
| parent | f6ad160e6f4f4d6933eeb82a2bfa25ea008585f0 (diff) | |
powerpc: Create next_tlbcam_idx percpu variable for FSL_BOOKE
This is used to round-robin TLBCAM entries.
Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/mm/mem.c')
| -rw-r--r-- | arch/powerpc/mm/mem.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index a3841bb75cbb..457dc84154ba 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c | |||
| @@ -353,6 +353,15 @@ void __init mem_init(void) | |||
| 353 | } | 353 | } |
| 354 | #endif /* CONFIG_HIGHMEM */ | 354 | #endif /* CONFIG_HIGHMEM */ |
| 355 | 355 | ||
| 356 | #if defined(CONFIG_PPC_FSL_BOOK3E) && !defined(CONFIG_SMP) | ||
| 357 | /* | ||
| 358 | * If smp is enabled, next_tlbcam_idx is initialized in the cpu up | ||
| 359 | * functions.... do it here for the non-smp case. | ||
| 360 | */ | ||
| 361 | per_cpu(next_tlbcam_idx, smp_processor_id()) = | ||
| 362 | (mfspr(SPRN_TLB1CFG) & TLBnCFG_N_ENTRY) - 1; | ||
| 363 | #endif | ||
| 364 | |||
| 356 | printk(KERN_INFO "Memory: %luk/%luk available (%luk kernel code, " | 365 | printk(KERN_INFO "Memory: %luk/%luk available (%luk kernel code, " |
| 357 | "%luk reserved, %luk data, %luk bss, %luk init)\n", | 366 | "%luk reserved, %luk data, %luk bss, %luk init)\n", |
| 358 | nr_free_pages() << (PAGE_SHIFT-10), | 367 | nr_free_pages() << (PAGE_SHIFT-10), |