Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit ba492962363a02c45836be205f339be48093e1be

Authored by Alexander Graf
Committed by Avi Kivity
1 parent 5fc87407b5
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

KVM: Move kvm_guest_init out of generic code 

Currently x86 is the only architecture that uses kvm_guest_init(). With
PowerPC we're getting a second user, but the signature is different there
and we don't need to export it, as it uses the normal kernel init framework.

So let's move the x86 specific definition of that function over to the x86
specfic header file.

Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Avi Kivity <avi@redhat.com>

Showing 2 changed files with 6 additions and 5 deletions Side-by-side Diff

arch/x86/include/asm/kvm_para.h
Diff comments   View file @ ba49296
... ... @@ -158,7 +158,13 @@
158 158 return cpuid_eax(KVM_CPUID_FEATURES);
159 159 }
160 160  
  161 +#ifdef CONFIG_KVM_GUEST
  162 +void __init kvm_guest_init(void);
  163 +#else
  164 +#define kvm_guest_init() do { } while (0)
161 165 #endif
  166 +
  167 +#endif /* __KERNEL__ */
162 168  
163 169 #endif /* _ASM_X86_KVM_PARA_H */
include/linux/kvm_para.h
Diff comments   View file @ ba49296
... ... @@ -26,11 +26,6 @@
26 26 #include <asm/kvm_para.h>
27 27  
28 28 #ifdef __KERNEL__
29   -#ifdef CONFIG_KVM_GUEST
30   -void __init kvm_guest_init(void);
31   -#else
32   -#define kvm_guest_init() do { } while (0)
33   -#endif
34 29  
35 30 static inline int kvm_para_has_feature(unsigned int feature)
36 31 {