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

Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc7' into tracing/core

Browse Source
This commit is contained in:
Ingo Molnar
2009-03-04 11:14:47 +01:00
parent 3612fdf780 fec6c6fec3
commit a1be621dfa
126 changed files with 1154 additions and 552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/mm/init_64.c
View File

@@ -714,6 +714,8 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
pos = start_pfn << PAGE_SHIFT;
end_pfn = ((pos + (PMD_SIZE - 1)) >> PMD_SHIFT)
<< (PMD_SHIFT - PAGE_SHIFT);
if (end_pfn > (end >> PAGE_SHIFT))
end_pfn = end >> PAGE_SHIFT;
if (start_pfn < end_pfn) {
nr_range = save_mr(mr, nr_range, start_pfn, end_pfn, 0);
pos = end_pfn << PAGE_SHIFT;