redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

sh: intc: remove dependency on NR_IRQS 

SH intc has a compile time dependency on NR_IRQS. Make this dependency a
local define so that shmobile (and ARM in general) can have run-time
NR_IRQS setting.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
hifive-unleashed-5.1
Rob Herring 2012-01-17 13:10:25 -06:00
parent 7f1e76370b
commit 0f55239348
5 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/sh/intc/balancing.c
View File

@ -9,7 +9,7 @@
*/
#include "internals.h"
static unsigned long dist_handle[NR_IRQS];
static unsigned long dist_handle[INTC_NR_IRQS];
void intc_balancing_enable(unsigned int irq)
{

2
drivers/sh/intc/core.c
View File

@ -42,7 +42,7 @@ unsigned int nr_intc_controllers;
* - this needs to be at least 2 for 5-bit priorities on 7780
*/
static unsigned int default_prio_level = 2; /* 2 - 16 */
static unsigned int intc_prio_level[NR_IRQS]; /* for now */
static unsigned int intc_prio_level[INTC_NR_IRQS]; /* for now */
unsigned int intc_get_dfl_prio_level(void)
{

2
drivers/sh/intc/handle.c
View File

@ -13,7 +13,7 @@
#include <linux/spinlock.h>
#include "internals.h"
static unsigned long ack_handle[NR_IRQS];
static unsigned long ack_handle[INTC_NR_IRQS];
static intc_enum __init intc_grp_id(struct intc_desc *desc,
intc_enum enum_id)

2
drivers/sh/intc/virq.c
View File

@ -17,7 +17,7 @@
#include <linux/export.h>
#include "internals.h"
static struct intc_map_entry intc_irq_xlate[NR_IRQS];
static struct intc_map_entry intc_irq_xlate[INTC_NR_IRQS];
struct intc_virq_list {
unsigned int irq;

6
include/linux/sh_intc.h
View File

@ -3,6 +3,12 @@
#include <linux/ioport.h>
#ifdef CONFIG_SUPERH
#define INTC_NR_IRQS 512
#else
#define INTC_NR_IRQS 1024
#endif
/*
* Convert back and forth between INTEVT and IRQ values.
*/