From 5ed8b9850f2bb01e1e675425bbe979940b6fc0bf Mon Sep 17 00:00:00 2001
From: Chris Wright <chrisw@sous-sol.org>
Date: Thu, 21 May 2009 17:08:32 -0700
Subject: [PATCH 01/15] Fix request_irq for < 2.6.19

The irq handler changes (introduced in 2.6.19, not 2.6.20) dropped
struct pt_regs from the handler prototype, they are found globally now.
This introduces the back compat for older kernels.  The handler is just
a thin layer which calls the real registered handler (all this to work
around a minor little compiler warning ;-)  Needed for device assignment
on older kernels.

Signed-off-by: Chris Wright <chrisw@redhat.com
Signed-off-by: Avi Kivity <avi@redhat.com>
(cherry picked from commit kvm-kmod: 32658734cf540230d4cda11165e565794cc2bfda)
Signed-off-by: Chris Wright <chrisw@redhat.com>
Bugzilla: 498071
Message-Id: <1242950913-30143-2-git-send-email-chrisw@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
RH-Upstream-status: applied
Obsoletes: <20090428191108.GC17091@x200.localdomain>
Obsoletes: <20090428191315.GE17091@x200.localdomain>
Acked-by: Juan Quintela <quintela@redhat.com>
Acked-by: Marcelo Tosatti <mtosatti@redhat.com>
Acked-by: Don Dutile <ddutile@redhat.com>
Acked-by: Glauber Costa <glommer@redhat.com>
---
 kernel/external-module-compat-comm.h |   30 ++++++++++++++++++++++++++----
 kernel/ia64/hack-module.awk          |    2 +-
 kernel/x86/hack-module.awk           |    2 +-
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/kernel/external-module-compat-comm.h b/kernel/external-module-compat-comm.h
index e23f8eb..29db92b 100644
--- a/kernel/external-module-compat-comm.h
+++ b/kernel/external-module-compat-comm.h
@@ -644,19 +644,41 @@ static inline int pci_reset_function(struct pci_dev *dev)
 #endif
 
 #include <linux/interrupt.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+
+typedef irqreturn_t (*kvm_irq_handler_t)(int, void *);
+static kvm_irq_handler_t kvm_irq_handlers[NR_IRQS];
+
+static irqreturn_t kvm_irq_thunk(int irq, void *dev_id, struct pt_regs *regs)
+{
+	kvm_irq_handler_t handler = kvm_irq_handlers[irq];
+	return handler(irq, dev_id);
+}
 
-typedef irqreturn_t (*kvm_irq_handler_t)(int, void *, struct pt_regs *);
 static inline int kvm_request_irq(unsigned int a, kvm_irq_handler_t handler,
 				  unsigned long c, const char *d, void *e)
 {
-	/* FIXME: allocate thunk, etc. */
-	return -EINVAL;
+	int rc;
+	kvm_irq_handler_t old = kvm_irq_handlers[a];
+	if (old)
+		return -EBUSY;
+	kvm_irq_handlers[a] = handler;
+	rc = request_irq(a, kvm_irq_thunk, c, d, e);
+	if (rc)
+		kvm_irq_handlers[a] = NULL;
+	return rc;
+}
+
+static inline void kvm_free_irq(unsigned int irq, void *dev_id)
+{
+	free_irq(irq, dev_id);
+	kvm_irq_handlers[irq] = NULL;
 }
 
 #else
 
 #define kvm_request_irq request_irq
+#define kvm_free_irq free_irq
 
 #endif
 
diff --git a/kernel/ia64/hack-module.awk b/kernel/ia64/hack-module.awk
index d0ef130..2eb557a 100644
--- a/kernel/ia64/hack-module.awk
+++ b/kernel/ia64/hack-module.awk
@@ -2,7 +2,7 @@ BEGIN { split("INIT_WORK on_each_cpu smp_call_function " \
 	      "hrtimer_add_expires_ns hrtimer_get_expires " \
 	      "hrtimer_get_expires_ns hrtimer_start_expires " \
 	      "hrtimer_expires_remaining " \
-	      "request_irq", compat_apis); }
+	      "request_irq free_irq", compat_apis); }
 
 /MODULE_AUTHOR/ {
     printf("MODULE_INFO(version, \"%s\");\n", version)
diff --git a/kernel/x86/hack-module.awk b/kernel/x86/hack-module.awk
index 2b3e6ee..e07678f 100644
--- a/kernel/x86/hack-module.awk
+++ b/kernel/x86/hack-module.awk
@@ -2,7 +2,7 @@ BEGIN { split("INIT_WORK tsc_khz desc_struct ldttss_desc64 desc_ptr " \
 	      "hrtimer_add_expires_ns hrtimer_get_expires " \
 	      "hrtimer_get_expires_ns hrtimer_start_expires " \
 	      "hrtimer_expires_remaining " \
-	      "on_each_cpu relay_open request_irq get_user_pages_fast" , compat_apis); }
+	      "on_each_cpu relay_open request_irq free_irq get_user_pages_fast" , compat_apis); }
 
 /^int kvm_init\(/ { anon_inodes = 1 }
 
-- 
1.6.3.rc4.29.g8146