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

1 files changed, 1 insertions, 1 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,
         if (mask.low_slices || mask.high_slices) {
                 slice_convert(mm, mask, psize);
                 if (psize > MMU_PAGE_BASE)
-                        on_each_cpu(slice_flush_segments, mm, 0, 1);
+                        on_each_cpu(slice_flush_segments, mm, 1);
         }
         return addr;