|
@@ -43,7 +43,7 @@ static void uv_ack_apic(unsigned int irq)
|
|
|
ack_APIC_irq();
|
|
|
}
|
|
|
|
|
|
-struct irq_chip uv_irq_chip = {
|
|
|
+static struct irq_chip uv_irq_chip = {
|
|
|
.name = "UV-CORE",
|
|
|
.startup = uv_noop_ret,
|
|
|
.shutdown = uv_noop,
|
|
@@ -140,7 +140,7 @@ int uv_irq_2_mmr_info(int irq, unsigned long *offset, int *pnode)
|
|
|
*/
|
|
|
static int
|
|
|
arch_enable_uv_irq(char *irq_name, unsigned int irq, int cpu, int mmr_blade,
|
|
|
- unsigned long mmr_offset, int restrict)
|
|
|
+ unsigned long mmr_offset, int limit)
|
|
|
{
|
|
|
const struct cpumask *eligible_cpu = cpumask_of(cpu);
|
|
|
struct irq_desc *desc = irq_to_desc(irq);
|
|
@@ -159,7 +159,7 @@ arch_enable_uv_irq(char *irq_name, unsigned int irq, int cpu, int mmr_blade,
|
|
|
if (err != 0)
|
|
|
return err;
|
|
|
|
|
|
- if (restrict == UV_AFFINITY_CPU)
|
|
|
+ if (limit == UV_AFFINITY_CPU)
|
|
|
desc->status |= IRQ_NO_BALANCING;
|
|
|
else
|
|
|
desc->status |= IRQ_MOVE_PCNTXT;
|
|
@@ -213,7 +213,7 @@ static int uv_set_irq_affinity(unsigned int irq, const struct cpumask *mask)
|
|
|
unsigned long mmr_value;
|
|
|
struct uv_IO_APIC_route_entry *entry;
|
|
|
unsigned long mmr_offset;
|
|
|
- unsigned mmr_pnode;
|
|
|
+ int mmr_pnode;
|
|
|
|
|
|
if (set_desc_affinity(desc, mask, &dest))
|
|
|
return -1;
|
|
@@ -247,7 +247,7 @@ static int uv_set_irq_affinity(unsigned int irq, const struct cpumask *mask)
|
|
|
* interrupt is raised.
|
|
|
*/
|
|
|
int uv_setup_irq(char *irq_name, int cpu, int mmr_blade,
|
|
|
- unsigned long mmr_offset, int restrict)
|
|
|
+ unsigned long mmr_offset, int limit)
|
|
|
{
|
|
|
int irq, ret;
|
|
|
|
|
@@ -257,7 +257,7 @@ int uv_setup_irq(char *irq_name, int cpu, int mmr_blade,
|
|
|
return -EBUSY;
|
|
|
|
|
|
ret = arch_enable_uv_irq(irq_name, irq, cpu, mmr_blade, mmr_offset,
|
|
|
- restrict);
|
|
|
+ limit);
|
|
|
if (ret == irq)
|
|
|
uv_set_irq_2_mmr_info(irq, mmr_offset, mmr_blade);
|
|
|
else
|