x86/xen: add some __init annotations in arch/x86/xen/mmu.c
The file arch/x86/xen/mmu.c has some functions that can be annotated with "__init". Signed-off-by: Juergen Gross <jgross@suse.com> Signed-off-by: David Vrabel <david.vrabel@citrix.com>
This commit is contained in:
Родитель
a3f5239650
Коммит
bf9d834a9b
|
@ -1489,7 +1489,7 @@ static void __init xen_set_pte_init(pte_t *ptep, pte_t pte)
|
||||||
native_set_pte(ptep, pte);
|
native_set_pte(ptep, pte);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void pin_pagetable_pfn(unsigned cmd, unsigned long pfn)
|
static void __init pin_pagetable_pfn(unsigned cmd, unsigned long pfn)
|
||||||
{
|
{
|
||||||
struct mmuext_op op;
|
struct mmuext_op op;
|
||||||
op.cmd = cmd;
|
op.cmd = cmd;
|
||||||
|
@ -1657,7 +1657,7 @@ void __init xen_reserve_top(void)
|
||||||
* Like __va(), but returns address in the kernel mapping (which is
|
* Like __va(), but returns address in the kernel mapping (which is
|
||||||
* all we have until the physical memory mapping has been set up.
|
* all we have until the physical memory mapping has been set up.
|
||||||
*/
|
*/
|
||||||
static void *__ka(phys_addr_t paddr)
|
static void * __init __ka(phys_addr_t paddr)
|
||||||
{
|
{
|
||||||
#ifdef CONFIG_X86_64
|
#ifdef CONFIG_X86_64
|
||||||
return (void *)(paddr + __START_KERNEL_map);
|
return (void *)(paddr + __START_KERNEL_map);
|
||||||
|
@ -1667,7 +1667,7 @@ static void *__ka(phys_addr_t paddr)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Convert a machine address to physical address */
|
/* Convert a machine address to physical address */
|
||||||
static unsigned long m2p(phys_addr_t maddr)
|
static unsigned long __init m2p(phys_addr_t maddr)
|
||||||
{
|
{
|
||||||
phys_addr_t paddr;
|
phys_addr_t paddr;
|
||||||
|
|
||||||
|
@ -1678,13 +1678,14 @@ static unsigned long m2p(phys_addr_t maddr)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Convert a machine address to kernel virtual */
|
/* Convert a machine address to kernel virtual */
|
||||||
static void *m2v(phys_addr_t maddr)
|
static void * __init m2v(phys_addr_t maddr)
|
||||||
{
|
{
|
||||||
return __ka(m2p(maddr));
|
return __ka(m2p(maddr));
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Set the page permissions on an identity-mapped pages */
|
/* Set the page permissions on an identity-mapped pages */
|
||||||
static void set_page_prot_flags(void *addr, pgprot_t prot, unsigned long flags)
|
static void __init set_page_prot_flags(void *addr, pgprot_t prot,
|
||||||
|
unsigned long flags)
|
||||||
{
|
{
|
||||||
unsigned long pfn = __pa(addr) >> PAGE_SHIFT;
|
unsigned long pfn = __pa(addr) >> PAGE_SHIFT;
|
||||||
pte_t pte = pfn_pte(pfn, prot);
|
pte_t pte = pfn_pte(pfn, prot);
|
||||||
|
@ -1696,7 +1697,7 @@ static void set_page_prot_flags(void *addr, pgprot_t prot, unsigned long flags)
|
||||||
if (HYPERVISOR_update_va_mapping((unsigned long)addr, pte, flags))
|
if (HYPERVISOR_update_va_mapping((unsigned long)addr, pte, flags))
|
||||||
BUG();
|
BUG();
|
||||||
}
|
}
|
||||||
static void set_page_prot(void *addr, pgprot_t prot)
|
static void __init set_page_prot(void *addr, pgprot_t prot)
|
||||||
{
|
{
|
||||||
return set_page_prot_flags(addr, prot, UVMF_NONE);
|
return set_page_prot_flags(addr, prot, UVMF_NONE);
|
||||||
}
|
}
|
||||||
|
@ -1769,7 +1770,7 @@ void __init xen_setup_machphys_mapping(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_X86_64
|
#ifdef CONFIG_X86_64
|
||||||
static void convert_pfn_mfn(void *v)
|
static void __init convert_pfn_mfn(void *v)
|
||||||
{
|
{
|
||||||
pte_t *pte = v;
|
pte_t *pte = v;
|
||||||
int i;
|
int i;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче