diff options
| author | Linus Torvalds | 2017-09-22 06:40:47 -1000 |
|---|---|---|
| committer | Linus Torvalds | 2017-09-22 06:40:47 -1000 |
| commit | 0a8abd97dcda50e5d2c893a51733416534e95706 (patch) | |
| tree | 394b79791f6d9f45d9ac8e16d3f97b7bb5eb29d4 /arch/x86 | |
| parent | d6396a7331dbbe69c7e3fac2ab07b281ffe71fc8 (diff) | |
| parent | 0555ac4333d7da7cff83d5b06bd3679a3e1ef584 (diff) | |
Merge tag 'for-linus-4.14b-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fixes from Juergen Gross:
"A fix for a missing __init annotation and two cleanup patches"
* tag 'for-linus-4.14b-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen, arm64: drop dummy lookup_address()
xen: don't compile pv-specific parts if XEN_PV isn't configured
xen: x86: mark xen_find_pt_base as __init
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/xen/mmu_pv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/mmu_pv.c b/arch/x86/xen/mmu_pv.c index 509f560bd0c6..7330cb3b2283 100644 --- a/arch/x86/xen/mmu_pv.c +++ b/arch/x86/xen/mmu_pv.c @@ -2220,7 +2220,7 @@ static void __init xen_write_cr3_init(unsigned long cr3) * not the first page table in the page table pool. * Iterate through the initial page tables to find the real page table base. */ -static phys_addr_t xen_find_pt_base(pmd_t *pmd) +static phys_addr_t __init xen_find_pt_base(pmd_t *pmd) { phys_addr_t pt_base, paddr; unsigned pmdidx; |