svn commit: r296893 - in head/sys/arm: conf mv

[Wojciech Macek]

Author: wma
Date: Tue Mar 15 06:06:09 2016
New Revision: 296893
URL: https://svnweb.freebsd.org/changeset/base/296893

Log:
  Remove redefinitions in ARMADA code
  
  * Rename IRQ_MASK to MPIC_IRQ_MASK not to overlap with
    register name from mvreg.h
  * Remove ARM_INTRNG from ARMADA38X, apparently was already
    included.

Modified:
  head/sys/arm/conf/ARMADA38X
  head/sys/arm/mv/mpic.c

Modified: head/sys/arm/conf/ARMADA38X
==============================================================================
--- head/sys/arm/conf/ARMADA38X	Tue Mar 15 05:17:31 2016	(r296892)
+++ head/sys/arm/conf/ARMADA38X	Tue Mar 15 06:06:09 2016	(r296893)
@@ -23,7 +23,6 @@ options 	SCHED_ULE		# ULE scheduler
 #options 	SCHED_4BSD		# 4BSD scheduler
 
 options 	SMP
-options 	ARM_INTRNG
 
 # Debugging
 #options 	DEBUG

Modified: head/sys/arm/mv/mpic.c
==============================================================================
--- head/sys/arm/mv/mpic.c	Tue Mar 15 05:17:31 2016	(r296892)
+++ head/sys/arm/mv/mpic.c	Tue Mar 15 06:06:09 2016	(r296893)
@@ -74,7 +74,7 @@ __FBSDID("$FreeBSD$");
 #define	MPIC_INT_ERR			4
 #define	MPIC_INT_MSI			96
 
-#define	IRQ_MASK		0x3ff
+#define	MPIC_IRQ_MASK		0x3ff
 
 #define	MPIC_CTRL		0x0
 #define	MPIC_SOFT_INT		0x4
@@ -409,10 +409,10 @@ arm_get_next_irq(int last)
 {
 	u_int irq, next = -1;
 
-	irq = mv_mpic_get_cause() & IRQ_MASK;
+	irq = mv_mpic_get_cause() & MPIC_IRQ_MASK;
 	CTR2(KTR_INTR, "%s: irq:%#x", __func__, irq);
 
-	if (irq != IRQ_MASK) {
+	if (irq != MPIC_IRQ_MASK) {
 		if (irq == MPIC_INT_ERR)
 			irq = mv_mpic_get_cause_err();
 		if (irq == MPIC_INT_MSI)