diff --git a/[refs] b/[refs] index 4d0174bb6e70..344a2a25f4ba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c14280125a374d4c279a68276f97245e03e3f68 +refs/heads/master: a03d7f4b544f699bbdd3cf14692bd8f476cb9d24 diff --git a/trunk/include/linux/kvm_para.h b/trunk/include/linux/kvm_para.h index 6af91a506fbf..5497aac0d2f8 100644 --- a/trunk/include/linux/kvm_para.h +++ b/trunk/include/linux/kvm_para.h @@ -14,12 +14,12 @@ #define KVM_HC_VAPIC_POLL_IRQ 1 -#ifdef __KERNEL__ /* * hypercalls use architecture specific */ #include +#ifdef __KERNEL__ static inline int kvm_para_has_feature(unsigned int feature) { if (kvm_arch_para_features() & (1UL << feature))