aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/mm
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2008-07-15 21:07:59 -0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2008-07-15 21:07:59 -0400
commit84c3d4aaec3338201b449034beac41635866bddf (patch)
tree3412951682fb2dd4feb8a5532f8efbaf8b345933 /arch/powerpc/mm
parent43d2548bb2ef7e6d753f91468a746784041e522d (diff)
parentfafa3a3f16723997f039a0193997464d66dafd8f (diff)
Merge commit 'origin/master'
Manual merge of: arch/powerpc/Kconfig arch/powerpc/kernel/stacktrace.c arch/powerpc/mm/slice.c arch/ppc/kernel/smp.c
Diffstat (limited to 'arch/powerpc/mm')
-rw-r--r--arch/powerpc/mm/slice.c2
-rw-r--r--arch/powerpc/mm/tlb_64.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
index 583be67ad938..db44e02e045b 100644
--- a/arch/powerpc/mm/slice.c
+++ b/arch/powerpc/mm/slice.c
@@ -556,7 +556,7 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
556 if (mask.low_slices || mask.high_slices) { 556 if (mask.low_slices || mask.high_slices) {
557 slice_convert(mm, mask, psize); 557 slice_convert(mm, mask, psize);
558 if (psize > MMU_PAGE_BASE) 558 if (psize > MMU_PAGE_BASE)
559 on_each_cpu(slice_flush_segments, mm, 0, 1); 559 on_each_cpu(slice_flush_segments, mm, 1);
560 } 560 }
561 return addr; 561 return addr;
562 562
diff --git a/arch/powerpc/mm/tlb_64.c b/arch/powerpc/mm/tlb_64.c
index 509bc560159b..a01b5c608ff9 100644
--- a/arch/powerpc/mm/tlb_64.c
+++ b/arch/powerpc/mm/tlb_64.c
@@ -63,7 +63,7 @@ static void pgtable_free_now(pgtable_free_t pgf)
63{ 63{
64 pte_freelist_forced_free++; 64 pte_freelist_forced_free++;
65 65
66 smp_call_function(pte_free_smp_sync, NULL, 0, 1); 66 smp_call_function(pte_free_smp_sync, NULL, 1);
67 67
68 pgtable_free(pgf); 68 pgtable_free(pgf);
69} 69}