Skip to content

Commit

Permalink
KVM: Move kvm_guest_init out of generic code
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alexander Graf authored and Avi Kivity committed Oct 24, 2010
1 parent 5fc8740 commit ba49296
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
6 changes: 6 additions & 0 deletions arch/x86/include/asm/kvm_para.h
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,12 @@ static inline unsigned int kvm_arch_para_features(void)
return cpuid_eax(KVM_CPUID_FEATURES);
}

#ifdef CONFIG_KVM_GUEST
void __init kvm_guest_init(void);
#else
#define kvm_guest_init() do { } while (0)
#endif

#endif /* __KERNEL__ */

#endif /* _ASM_X86_KVM_PARA_H */
5 changes: 0 additions & 5 deletions include/linux/kvm_para.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,6 @@
#include <asm/kvm_para.h>

#ifdef __KERNEL__
#ifdef CONFIG_KVM_GUEST
void __init kvm_guest_init(void);
#else
#define kvm_guest_init() do { } while (0)
#endif

static inline int kvm_para_has_feature(unsigned int feature)
{
Expand Down

0 comments on commit ba49296

Please sign in to comment.