diff options
| author | Andrii Nakryiko <andrii@kernel.org> | 2024-08-13 13:52:30 -0700 |
|---|---|---|
| committer | Andrii Nakryiko <andrii@kernel.org> | 2024-08-13 13:52:30 -0700 |
| commit | 50470d3899cdf06fd58def74dec87f31e13cda6f (patch) | |
| tree | 9d4d04c0c394f079127752d6d5b796aa33b903ca /arch/x86/include/asm/xen/hypervisor.h | |
| parent | 4a4c013d3385b0db85dc361203dc42ff048b6fd6 (diff) | |
| parent | de12c3391bce10504c0e7bd767516c74110cfce1 (diff) | |
Merge remote-tracking branch 'vfs/stable-struct_fd'
Merge Al Viro's struct fd refactorings.
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/xen/hypervisor.h')
| -rw-r--r-- | arch/x86/include/asm/xen/hypervisor.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/x86/include/asm/xen/hypervisor.h b/arch/x86/include/asm/xen/hypervisor.h index 64fbd2dbc5b7..a9088250770f 100644 --- a/arch/x86/include/asm/xen/hypervisor.h +++ b/arch/x86/include/asm/xen/hypervisor.h @@ -62,11 +62,6 @@ void xen_arch_unregister_cpu(int num); #ifdef CONFIG_PVH void __init xen_pvh_init(struct boot_params *boot_params); void __init mem_map_via_hcall(struct boot_params *boot_params_p); -#ifdef CONFIG_XEN_PVH -void __init xen_reserve_extra_memory(struct boot_params *bootp); -#else -static inline void xen_reserve_extra_memory(struct boot_params *bootp) { } -#endif #endif /* Lazy mode for batching updates / context switch */ |