From: Glauber de Oliveira Costa <gcosta@redhat.com>
Date: Tue, 15 Jan 2008 15:10:15 +0000 (-0200)
Subject: KVM: Put kvm_para.h include outside __KERNEL__
X-Git-Tag: v2.6.25-rc1~1138^2~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a03d7f4b544f699bbdd3cf14692bd8f476cb9d24;p=linux-2.6

KVM: Put kvm_para.h include outside __KERNEL__

kvm_para.h potentially contains definitions that are to be used by userspace,
so it should not be included inside the __KERNEL__ block. To protect its own
data structures, kvm_para.h already includes its own __KERNEL__ block.

Signed-off-by: Glauber de Oliveira Costa <gcosta@redhat.com>
Acked-by: Amit Shah <amit.shah@qumranet.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
---

diff --git a/include/linux/kvm_para.h b/include/linux/kvm_para.h
index 6af91a506f..5497aac0d2 100644
--- a/include/linux/kvm_para.h
+++ b/include/linux/kvm_para.h
@@ -14,12 +14,12 @@
 
 #define KVM_HC_VAPIC_POLL_IRQ            1
 
-#ifdef __KERNEL__
 /*
  * hypercalls use architecture specific
  */
 #include <asm/kvm_para.h>
 
+#ifdef __KERNEL__
 static inline int kvm_para_has_feature(unsigned int feature)
 {
 	if (kvm_arch_para_features() & (1UL << feature))