diff options
| author | Dong Aisheng <aisheng.dong@nxp.com> | 2019-12-02 18:02:29 +0800 |
|---|---|---|
| committer | Dong Aisheng <aisheng.dong@nxp.com> | 2019-12-02 18:02:29 +0800 |
| commit | 96f124e4180dc83550138ad9a3ebe33ec1b3e9ce (patch) | |
| tree | 95ace49e809120b7e13a4e06c3d4ed093a1cc17b /arch/arm64/include | |
| parent | 501fcef208a1a0e4224c4c73a65a1968b5b6c7d4 (diff) | |
| parent | 8172f7383570261b33e309fde97b9756f08be666 (diff) | |
Merge branch 'jailhouse/next' into next
* jailhouse/next: (22 commits)
mm: Re-export ioremap_page_range
arm64: export __hyp_stub_vectors
jailhouse: Add simple debug console via the hypervisor
ivshmem-net: Switch to netdev_xmit_more helper
ivshmem-net: Refactor and comment ivshm_net_state_change
...
Diffstat (limited to 'arch/arm64/include')
| -rw-r--r-- | arch/arm64/include/asm/virt.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/virt.h b/arch/arm64/include/asm/virt.h index 0958ed6191aa..b1b48353e3b3 100644 --- a/arch/arm64/include/asm/virt.h +++ b/arch/arm64/include/asm/virt.h @@ -62,6 +62,8 @@ */ extern u32 __boot_cpu_mode[2]; +extern char __hyp_stub_vectors[]; + void __hyp_set_vectors(phys_addr_t phys_vector_base); void __hyp_reset_vectors(void); |