linux-mips
[Top] [All Lists]

[PATCH 1/3] MIPS: OCTEON: Fix build error when configured without PCI_MS

To: linux-mips@linux-mips.org, ralf@linux-mips.org
Subject: [PATCH 1/3] MIPS: OCTEON: Fix build error when configured without PCI_MSI
From: David Daney <ddaney.cavm@gmail.com>
Date: Thu, 7 Jun 2012 12:52:05 -0700
Cc: David Daney <david.daney@cavium.com>
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=ZzDm0Sk1yC/2I+TBQ93H9xUYlpr/q5jsNUw9B05mNds=; b=ZzOEo33YyWKb5kJItWJypWDFq+iUw1fYZRlyU7ZWNiSMYdZj8glBkfLlOO4b0PcJZb 65jk5Su+6f2UBqYQFs65Wm93ZigF5aKL4ybCUNXE2LzdcwSTBGMHeM4qcOga/eaXSAZt M2aODPAeEOMEaN5jsb9xnvH924u0ohkSbAo38U2I476mM0mgDnKX0M36MOvDv2qhmxZS ochn36b6rPfPKvOYcf0PpOdv+LMFpOIji/d0+0065hcS/bSDQKOz8MAkHiNZ7RY5j8Uw OnoZjULPUhVu07ZBq9guqgIuJelVUwKzjAJCRc2RkcKWw+Sj0VvupyLmKdhaMbpr/1UL OO/g==
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
Sender: linux-mips-bounce@linux-mips.org
From: David Daney <david.daney@cavium.com>

The build dies with complaints about missing definition of
OCTEON_IRQ_RST.  This symbol was removed, so don't use it as part of
the definition of OCTEON_IRQ_LAST.

Set OCTEON_IRQ_LAST to 127 so there is space for all the automatically
allocated (via irq_domain) irqs.

Signed-off-by: David Daney <david.daney@cavium.com>
---
 arch/mips/include/asm/mach-cavium-octeon/irq.h |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/mips/include/asm/mach-cavium-octeon/irq.h 
b/arch/mips/include/asm/mach-cavium-octeon/irq.h
index f9bfb63..4189920 100644
--- a/arch/mips/include/asm/mach-cavium-octeon/irq.h
+++ b/arch/mips/include/asm/mach-cavium-octeon/irq.h
@@ -50,6 +50,9 @@ enum octeon_irq {
        OCTEON_IRQ_MII0,
        OCTEON_IRQ_MII1,
        OCTEON_IRQ_BOOTDMA,
+#ifndef CONFIG_PCI_MSI
+       OCTEON_IRQ_LAST = 127
+#endif
 };
 
 #ifdef CONFIG_PCI_MSI
@@ -58,8 +61,6 @@ enum octeon_irq {
 
 #define OCTEON_IRQ_MSI_LAST      (OCTEON_IRQ_MSI_BIT0 + 255)
 #define OCTEON_IRQ_LAST          (OCTEON_IRQ_MSI_LAST + 1)
-#else
-#define OCTEON_IRQ_LAST         (OCTEON_IRQ_RST + 1)
 #endif
 
 #endif
-- 
1.7.2.3


<Prev in Thread] Current Thread [Next in Thread>
  • [PATCH 1/3] MIPS: OCTEON: Fix build error when configured without PCI_MSI, David Daney <=