diff --git a/[refs] b/[refs]
index 1185e2ba8b16..0ab837937721 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b3d2a206037b1471de6a6dc51427af034cfdb47
+refs/heads/master: 971cc3dcbc0e020b82f568e61a47b72be03307dd
diff --git a/trunk/include/linux/kvm.h b/trunk/include/linux/kvm.h
index 28582fcd3f79..11e3e6197c83 100644
--- a/trunk/include/linux/kvm.h
+++ b/trunk/include/linux/kvm.h
@@ -393,7 +393,9 @@ struct kvm_trace_rec {
 #ifdef __KVM_HAVE_USER_NMI
 #define KVM_CAP_USER_NMI 22
 #endif
+#if defined(CONFIG_X86)
 #define KVM_CAP_SET_GUEST_DEBUG 23
+#endif
 
 /*
  * ioctls for VM fds