commit 84c3d4aaec3338201b449034beac41635866bddf
author Benjamin Herrenschmidt <benh@kernel.crashing.org> Wed Jul 16 11:07:59 2008 +1000
committer Benjamin Herrenschmidt <benh@kernel.crashing.org> Wed Jul 16 11:07:59 2008 +1000
tree 3412951682fb2dd4feb8a5532f8efbaf8b345933
parent 43d2548bb2ef7e6d753f91468a746784041e522d
parent fafa3a3f16723997f039a0193997464d66dafd8f

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

arch/powerpc/mm/slice.c

diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
index 583be67..db44e02 100644
--- a/arch/powerpc/mm/slice.c
+++ b/arch/powerpc/mm/slice.c
@@ -556,7 +556,7 @@
 	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;