Alexey Kardashevskiy <a...@ozlabs.ru> writes:

> diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S 
> b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
> index d185dee26026..44d74bfe05df 100644
> --- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S
> +++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
> @@ -1784,13 +1784,8 @@ hcall_real_table:
>       .long   DOTSYM(kvmppc_h_clear_mod) - hcall_real_table
>       .long   DOTSYM(kvmppc_h_clear_ref) - hcall_real_table
>       .long   DOTSYM(kvmppc_h_protect) - hcall_real_table
> -#ifdef CONFIG_SPAPR_TCE_IOMMU
> -     .long   DOTSYM(kvmppc_h_get_tce) - hcall_real_table
> -     .long   DOTSYM(kvmppc_rm_h_put_tce) - hcall_real_table
> -#else
>       .long   0               /* 0x1c */
>       .long   0               /* 0x20 */
> -#endif
>       .long   0               /* 0x24 - H_SET_SPRG0 */
>       .long   DOTSYM(kvmppc_h_set_dabr) - hcall_real_table
>       .long   DOTSYM(kvmppc_rm_h_page_init) - hcall_real_table
> @@ -1868,13 +1863,8 @@ hcall_real_table:
>       .long   0               /* 0x12c */
>       .long   0               /* 0x130 */
>       .long   DOTSYM(kvmppc_h_set_xdabr) - hcall_real_table
> -#ifdef CONFIG_SPAPR_TCE_IOMMU
> -     .long   DOTSYM(kvmppc_rm_h_stuff_tce) - hcall_real_table
> -     .long   DOTSYM(kvmppc_rm_h_put_tce_indirect) - hcall_real_table
> -#else
>       .long   0               /* 0x138 */
>       .long   0               /* 0x13c */
> -#endif
>       .long   0               /* 0x140 */
>       .long   0               /* 0x144 */
>       .long   0               /* 0x148 */

The ones you remove from here need to be added to kvmppc_hcall_impl_hv,
otherwise we get the WARN at init_default_hcalls because
kvmppc_hcall_impl_hv_realmode can't find them.

Reply via email to