Skip to contentSkip to conversation

ARM: remove NR_IRQS dependency for ARM-specific HARDIRQ_BITS definition

PATCH New Kevin Hilman 2 participants 3 messages Oct 25, 2011 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: remove NR_IRQS dependency for ARM-specific HARDIRQ_BITS definition

As a first step towards removing NR_IRQS, remove the ARM customization of HARDIRQ_BITS based on NR_IRQS.

The generic code in <linux/hardirq.h> already has a default value of 10 for HARDIRQ_BITS which is the max used on ARM, so let's just remove the NR_IRQS based customization and use the generic default.

---
 arch/arm/include/asm/hardirq.h |   17 -----------------
 1 files changed, 0 insertions(+), 17 deletions(-)
arch/arm/include/asm/hardirq.h +0 -17
index 89ad180..96cb097 100644
@@ -30,23 +30,6 @@ u64 smp_irq_stat_cpu(unsigned int cpu);
 
 #define arch_irq_stat_cpu	smp_irq_stat_cpu
 
-#if NR_IRQS > 512
-#define HARDIRQ_BITS	10
-#elif NR_IRQS > 256
-#define HARDIRQ_BITS	9
-#else
-#define HARDIRQ_BITS	8
-#endif
-
-/*
- * The hardirq mask has to be large enough to have space
- * for potentially all IRQ sources in the system nesting
- * on a single CPU:
- */
-#if (1 << HARDIRQ_BITS) < NR_IRQS
-# error HARDIRQ_BITS is too low!
-#endif
-
 #define __ARCH_IRQ_EXIT_IRQS_DISABLED	1
 
 #endif /* __ASM_HARDIRQ_H */
Signature · 1 line
1.7.3.4
#1 lore raw

PATCH 1/1 ARM: remove NR_IRQS dependency for ARM-specific HARDIRQ_BITS definition

Quoted 8 lines · Kevin Hilman

As a first step towards removing NR_IRQS, remove the ARM customization of HARDIRQ_BITS based on NR_IRQS.

The generic code in <linux/hardirq.h> already has a default value of 10 for HARDIRQ_BITS which is the max used on ARM, so let's just remove the NR_IRQS based customization and use the generic default.

Quoted 41 lines
---
 arch/arm/include/asm/hardirq.h |   17 -----------------
 1 files changed, 0 insertions(+), 17 deletions(-)
arch/arm/include/asm/hardirq.h +0 -17
index 89ad180..96cb097 100644
@@ -30,23 +30,6 @@ u64 smp_irq_stat_cpu(unsigned int cpu);
 
 #define arch_irq_stat_cpu	smp_irq_stat_cpu
 
-#if NR_IRQS > 512
-#define HARDIRQ_BITS	10
-#elif NR_IRQS > 256
-#define HARDIRQ_BITS	9
-#else
-#define HARDIRQ_BITS	8
-#endif
-
-/*
- * The hardirq mask has to be large enough to have space
- * for potentially all IRQ sources in the system nesting
- * on a single CPU:
- */
-#if (1 << HARDIRQ_BITS) < NR_IRQS
-# error HARDIRQ_BITS is too low!
-#endif
-
 #define __ARCH_IRQ_EXIT_IRQS_DISABLED	1
 
 #endif /* __ASM_HARDIRQ_H */
Signature · 7 lines
1.7.3.4


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#2 lore raw

PATCH 1/1 ARM: remove NR_IRQS dependency for ARM-specific HARDIRQ_BITS definition

Quoted 5 lines · Nicolas Pitre
Quoted 3 lines · Kevin Hilman

As a first step towards removing NR_IRQS, remove the ARM customization of HARDIRQ_BITS based on NR_IRQS.

Quoted 7 lines
Quoted 5 lines

The generic code in <linux/hardirq.h> already has a default value of 10 for HARDIRQ_BITS which is the max used on ARM, so let's just remove the NR_IRQS based customization and use the generic default.

Thanks.

FYI, this is now in Russell's patch system as 7140/1:

http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7140/1

Kevin