diff options
author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-06-28 22:47:35 -0400 |
---|---|---|
committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-08-23 11:33:28 -0400 |
commit | 3699aad047e16a5775b1d051425f422a9384270d (patch) | |
tree | f82e25885f31eb84d5c62348af99c9f7d0c0d7ab /arch/x86/xen/mmu.c | |
parent | 51faaf2b0d5c7f44d82964f0c70b1c4e44d4e633 (diff) |
xen/mmu: The xen_setup_kernel_pagetable doesn't need to return anything.
We don't need to return the new PGD - as we do not use it.
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'arch/x86/xen/mmu.c')
-rw-r--r-- | arch/x86/xen/mmu.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index 3a73785631ce..4ac21a4c6da4 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c | |||
@@ -1719,8 +1719,7 @@ static void convert_pfn_mfn(void *v) | |||
1719 | * of the physical mapping once some sort of allocator has been set | 1719 | * of the physical mapping once some sort of allocator has been set |
1720 | * up. | 1720 | * up. |
1721 | */ | 1721 | */ |
1722 | pgd_t * __init xen_setup_kernel_pagetable(pgd_t *pgd, | 1722 | void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn) |
1723 | unsigned long max_pfn) | ||
1724 | { | 1723 | { |
1725 | pud_t *l3; | 1724 | pud_t *l3; |
1726 | pmd_t *l2; | 1725 | pmd_t *l2; |
@@ -1781,8 +1780,6 @@ pgd_t * __init xen_setup_kernel_pagetable(pgd_t *pgd, | |||
1781 | 1780 | ||
1782 | memblock_reserve(__pa(xen_start_info->pt_base), | 1781 | memblock_reserve(__pa(xen_start_info->pt_base), |
1783 | xen_start_info->nr_pt_frames * PAGE_SIZE); | 1782 | xen_start_info->nr_pt_frames * PAGE_SIZE); |
1784 | |||
1785 | return pgd; | ||
1786 | } | 1783 | } |
1787 | #else /* !CONFIG_X86_64 */ | 1784 | #else /* !CONFIG_X86_64 */ |
1788 | static RESERVE_BRK_ARRAY(pmd_t, initial_kernel_pmd, PTRS_PER_PMD); | 1785 | static RESERVE_BRK_ARRAY(pmd_t, initial_kernel_pmd, PTRS_PER_PMD); |
@@ -1825,8 +1822,7 @@ static void __init xen_write_cr3_init(unsigned long cr3) | |||
1825 | pv_mmu_ops.write_cr3 = &xen_write_cr3; | 1822 | pv_mmu_ops.write_cr3 = &xen_write_cr3; |
1826 | } | 1823 | } |
1827 | 1824 | ||
1828 | pgd_t * __init xen_setup_kernel_pagetable(pgd_t *pgd, | 1825 | void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn) |
1829 | unsigned long max_pfn) | ||
1830 | { | 1826 | { |
1831 | pmd_t *kernel_pmd; | 1827 | pmd_t *kernel_pmd; |
1832 | 1828 | ||
@@ -1858,8 +1854,6 @@ pgd_t * __init xen_setup_kernel_pagetable(pgd_t *pgd, | |||
1858 | 1854 | ||
1859 | memblock_reserve(__pa(xen_start_info->pt_base), | 1855 | memblock_reserve(__pa(xen_start_info->pt_base), |
1860 | xen_start_info->nr_pt_frames * PAGE_SIZE); | 1856 | xen_start_info->nr_pt_frames * PAGE_SIZE); |
1861 | |||
1862 | return initial_page_table; | ||
1863 | } | 1857 | } |
1864 | #endif /* CONFIG_X86_64 */ | 1858 | #endif /* CONFIG_X86_64 */ |
1865 | 1859 | ||