From a9ab08f7e731d79a2c722be8f30b2eb35ab797e5 Mon Sep 17 00:00:00 2001
From: Gleb Natapov <gleb@redhat.com>
Date: Mon, 30 Aug 2010 12:49:13 +0300
Subject: [PATCH] --- yaml --- r: 210547 b: refs/heads/master c:
 eebb5f31b8d9a2620dcf32297096f8ce1240b179 h: refs/heads/master i:   210545:
 9a767e910eee3e2462d4db7f9d51f1b1f85dc343   210543:
 c2f1580307056e31e9f65b472157575ebd64c565 v: v3

---
 [refs]                   | 2 +-
 trunk/arch/x86/kvm/irq.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e5393edd1881..32d70c97cbc6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae0635b3580844e320a253a16985f4ce8b5bd0b6
+refs/heads/master: eebb5f31b8d9a2620dcf32297096f8ce1240b179
diff --git a/trunk/arch/x86/kvm/irq.h b/trunk/arch/x86/kvm/irq.h
index ffed06871c5c..63c314502993 100644
--- a/trunk/arch/x86/kvm/irq.h
+++ b/trunk/arch/x86/kvm/irq.h
@@ -43,7 +43,6 @@ struct kvm_kpic_state {
 	u8 irr;		/* interrupt request register */
 	u8 imr;		/* interrupt mask register */
 	u8 isr;		/* interrupt service register */
-	u8 isr_ack;	/* interrupt ack detection */
 	u8 priority_add;	/* highest irq priority */
 	u8 irq_base;
 	u8 read_reg_select;
@@ -56,6 +55,7 @@ struct kvm_kpic_state {
 	u8 init4;		/* true if 4 byte init */
 	u8 elcr;		/* PIIX edge/trigger selection */
 	u8 elcr_mask;
+	u8 isr_ack;	/* interrupt ack detection */
 	struct kvm_pic *pics_state;
 };