xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'origin/master'

Browse Source 
Manual merge of:

	arch/powerpc/Kconfig
	arch/powerpc/kernel/stacktrace.c
	arch/powerpc/mm/slice.c
	arch/ppc/kernel/smp.c
This commit is contained in:
Benjamin Herrenschmidt
2008-07-16 11:07:59 +10:00
parent 43d2548bb2 fafa3a3f16
commit 84c3d4aaec
941 changed files with 48176 additions and 76671 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/mm/slice.c
View File

@@ -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;