UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

x86, mm: use round_up/down in split_mem_range() 

to replace own inline version for those roundup and rounddown.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/1353123563-3103-36-git-send-email-yinghai@kernel.org
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
This commit is contained in:
Yinghai Lu 2012-11-16 19:39:12 -08:00 committed by H. Peter Anvin
parent 11ed9e927d
commit 5a0d3aeeef
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
arch/x86/mm/init.c
View File

@ -218,13 +218,11 @@ static int __meminit split_mem_range(struct map_range *mr, int nr_range,
* slowdowns. * slowdowns.
*/ */
if (pos == 0) if (pos == 0)
end_pfn = 1<<(PMD_SHIFT - PAGE_SHIFT); end_pfn = PMD_SIZE >> PAGE_SHIFT;
else else
end_pfn = ((pos + (PMD_SIZE - 1))>>PMD_SHIFT) end_pfn = round_up(pos, PMD_SIZE) >> PAGE_SHIFT;
<< (PMD_SHIFT - PAGE_SHIFT);
#else /* CONFIG_X86_64 */ #else /* CONFIG_X86_64 */
end_pfn = ((pos + (PMD_SIZE - 1)) >> PMD_SHIFT) end_pfn = round_up(pos, PMD_SIZE) >> PAGE_SHIFT;
<< (PMD_SHIFT - PAGE_SHIFT);
#endif #endif
if (end_pfn > (end >> PAGE_SHIFT)) if (end_pfn > (end >> PAGE_SHIFT))
end_pfn = end >> PAGE_SHIFT; end_pfn = end >> PAGE_SHIFT;
@ -234,15 +232,13 @@ static int __meminit split_mem_range(struct map_range *mr, int nr_range,
} }
/* big page (2M) range */ /* big page (2M) range */
start_pfn = ((pos + (PMD_SIZE - 1))>>PMD_SHIFT) start_pfn = round_up(pos, PMD_SIZE) >> PAGE_SHIFT;
<< (PMD_SHIFT - PAGE_SHIFT);
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
end_pfn = (end>>PMD_SHIFT) << (PMD_SHIFT - PAGE_SHIFT); end_pfn = round_down(end, PMD_SIZE) >> PAGE_SHIFT;
#else /* CONFIG_X86_64 */ #else /* CONFIG_X86_64 */
end_pfn = ((pos + (PUD_SIZE - 1))>>PUD_SHIFT) end_pfn = round_up(pos, PUD_SIZE) >> PAGE_SHIFT;
<< (PUD_SHIFT - PAGE_SHIFT); if (end_pfn > (round_down(end, PMD_SIZE) >> PAGE_SHIFT))
if (end_pfn > ((end>>PMD_SHIFT)<<(PMD_SHIFT - PAGE_SHIFT))) end_pfn = round_down(end, PMD_SIZE) >> PAGE_SHIFT;
end_pfn = ((end>>PMD_SHIFT)<<(PMD_SHIFT - PAGE_SHIFT));
#endif #endif
if (start_pfn < end_pfn) { if (start_pfn < end_pfn) {
@ -253,9 +249,8 @@ static int __meminit split_mem_range(struct map_range *mr, int nr_range,
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64
/* big page (1G) range */ /* big page (1G) range */
start_pfn = ((pos + (PUD_SIZE - 1))>>PUD_SHIFT) start_pfn = round_up(pos, PUD_SIZE) >> PAGE_SHIFT;
<< (PUD_SHIFT - PAGE_SHIFT); end_pfn = round_down(end, PUD_SIZE) >> PAGE_SHIFT;
end_pfn = (end >> PUD_SHIFT) << (PUD_SHIFT - PAGE_SHIFT);
if (start_pfn < end_pfn) { if (start_pfn < end_pfn) {
nr_range = save_mr(mr, nr_range, start_pfn, end_pfn, nr_range = save_mr(mr, nr_range, start_pfn, end_pfn,
page_size_mask & page_size_mask &
@ -264,9 +259,8 @@ static int __meminit split_mem_range(struct map_range *mr, int nr_range,
} }
/* tail is not big page (1G) alignment */ /* tail is not big page (1G) alignment */
start_pfn = ((pos + (PMD_SIZE - 1))>>PMD_SHIFT) start_pfn = round_up(pos, PMD_SIZE) >> PAGE_SHIFT;
<< (PMD_SHIFT - PAGE_SHIFT); end_pfn = round_down(end, PMD_SIZE) >> PAGE_SHIFT;
end_pfn = (end >> PMD_SHIFT) << (PMD_SHIFT - PAGE_SHIFT);
if (start_pfn < end_pfn) { if (start_pfn < end_pfn) {
nr_range = save_mr(mr, nr_range, start_pfn, end_pfn, nr_range = save_mr(mr, nr_range, start_pfn, end_pfn,
page_size_mask & (1<<PG_LEVEL_2M)); page_size_mask & (1<<PG_LEVEL_2M));