xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: "Jan Beulich" <JBeulich@novell.com>
To: xen-devel@lists.xensource.com
Subject: [PATCH] x86: a little bit of cleanup
Date: Mon, 08 Mar 2010 16:33:54 +0000	[thread overview]
Message-ID: <4B953502020000780003346D@vpn.id2.novell.com> (raw)

[-- Attachment #1: Type: text/plain, Size: 1330 bytes --]

Signed-off-by: Jan Beulich <jbeulich@novell.com>

--- 2010-03-02.orig/xen/arch/x86/io_apic.c	2010-01-06 11:17:14.000000000 +0100
+++ 2010-03-02/xen/arch/x86/io_apic.c	2010-03-08 15:31:13.000000000 +0100
@@ -1658,15 +1658,7 @@ static void end_msi_irq(unsigned int irq
         ack_APIC_irq(); /* ACKTYPE_EOI */
 }
 
-static void shutdown_msi_irq(unsigned int irq)
-{
-    mask_msi_irq(irq);
-}
-
-static void set_msi_affinity_irq(unsigned int irq, cpumask_t cpu_mask)
-{
-    set_msi_affinity(irq, cpu_mask);
-}
+#define shutdown_msi_irq mask_msi_irq
 
 /*
  * IRQ Chip for MSI PCI/PCI-X/PCI-Express Devices,
@@ -1680,7 +1672,7 @@ hw_irq_controller pci_msi_type = {
     .disable    = mask_msi_irq,
     .ack        = ack_msi_irq,
     .end        = end_msi_irq,
-    .set_affinity   = set_msi_affinity_irq,
+    .set_affinity   = set_msi_affinity,
 };
 
 static inline void init_IO_APIC_traps(void)
--- 2010-03-02.orig/xen/arch/x86/irq.c	2010-03-02 09:23:24.000000000 +0100
+++ 2010-03-02/xen/arch/x86/irq.c	2010-03-08 15:29:55.000000000 +0100
@@ -42,7 +42,7 @@ int __read_mostly *irq_status = NULL;
 
 #define IRQ_VECTOR_UNASSIGNED (0)
 
-DECLARE_BITMAP(used_vectors, NR_VECTORS);
+static DECLARE_BITMAP(used_vectors, NR_VECTORS);
 
 struct irq_cfg __read_mostly *irq_cfg = NULL;
 




[-- Attachment #2: x86-irq-cleanup.patch --]
[-- Type: text/plain, Size: 1324 bytes --]

Signed-off-by: Jan Beulich <jbeulich@novell.com>

--- 2010-03-02.orig/xen/arch/x86/io_apic.c	2010-01-06 11:17:14.000000000 +0100
+++ 2010-03-02/xen/arch/x86/io_apic.c	2010-03-08 15:31:13.000000000 +0100
@@ -1658,15 +1658,7 @@ static void end_msi_irq(unsigned int irq
         ack_APIC_irq(); /* ACKTYPE_EOI */
 }
 
-static void shutdown_msi_irq(unsigned int irq)
-{
-    mask_msi_irq(irq);
-}
-
-static void set_msi_affinity_irq(unsigned int irq, cpumask_t cpu_mask)
-{
-    set_msi_affinity(irq, cpu_mask);
-}
+#define shutdown_msi_irq mask_msi_irq
 
 /*
  * IRQ Chip for MSI PCI/PCI-X/PCI-Express Devices,
@@ -1680,7 +1672,7 @@ hw_irq_controller pci_msi_type = {
     .disable    = mask_msi_irq,
     .ack        = ack_msi_irq,
     .end        = end_msi_irq,
-    .set_affinity   = set_msi_affinity_irq,
+    .set_affinity   = set_msi_affinity,
 };
 
 static inline void init_IO_APIC_traps(void)
--- 2010-03-02.orig/xen/arch/x86/irq.c	2010-03-02 09:23:24.000000000 +0100
+++ 2010-03-02/xen/arch/x86/irq.c	2010-03-08 15:29:55.000000000 +0100
@@ -42,7 +42,7 @@ int __read_mostly *irq_status = NULL;
 
 #define IRQ_VECTOR_UNASSIGNED (0)
 
-DECLARE_BITMAP(used_vectors, NR_VECTORS);
+static DECLARE_BITMAP(used_vectors, NR_VECTORS);
 
 struct irq_cfg __read_mostly *irq_cfg = NULL;
 

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

                 reply	other threads:[~2010-03-08 16:33 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4B953502020000780003346D@vpn.id2.novell.com \
    --to=jbeulich@novell.com \
    --cc=xen-devel@lists.xensource.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).