浏览代码

xen/mmu: Fix compile errors introduced by x86/memblock mismerge.

The git commit d4bbf7e7759afc172e2bfbc5c416324590049cdd
"Merge branch 'master' into x86/memblock" mismerged the 32-bit
section causing:

arch/x86/xen/mmu.c: In function ‘xen_setup_kernel_pagetable’:
arch/x86/xen/mmu.c:1855: error: expected ‘;’ before ‘)’ token
arch/x86/xen/mmu.c:1855: error: expected statement before ‘)’ token

Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Konrad Rzeszutek Wilk 13 年之前
父节点
当前提交
dc6821e0cf
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      arch/x86/xen/mmu.c

+ 1 - 1
arch/x86/xen/mmu.c

@@ -1852,7 +1852,7 @@ pgd_t * __init xen_setup_kernel_pagetable(pgd_t *pgd,
 	xen_write_cr3(__pa(initial_page_table));
 	xen_write_cr3(__pa(initial_page_table));
 
 
 	memblock_reserve(__pa(xen_start_info->pt_base),
 	memblock_reserve(__pa(xen_start_info->pt_base),
-			 xen_start_info->nr_pt_frames * PAGE_SIZE));
+			 xen_start_info->nr_pt_frames * PAGE_SIZE);
 
 
 	return initial_page_table;
 	return initial_page_table;
 }
 }