Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask: oprofile: Thou shalt not call __exit functions from __init functions cpumask: remove the now-obsoleted pcibus_to_cpumask(): generic cpumask: remove cpumask_t from core cpumask: convert rcutorture.c cpumask: use new cpumask_ functions in core code. cpumask: remove references to struct irqaction's mask field. cpumask: use mm_cpumask() wrapper: kernel/fork.c cpumask: use set_cpu_active in init/main.c cpumask: remove node_to_first_cpu cpumask: fix seq_bitmap_*() functions. cpumask: remove dangerous CPU_MASK_ALL_PTR, &CPU_MASK_ALL
This commit is contained in:
@@ -47,7 +47,6 @@ asmlinkage void plat_irq_dispatch(void)
|
||||
|
||||
static struct irqaction cascade = {
|
||||
.handler = no_action,
|
||||
.mask = CPU_MASK_NONE,
|
||||
.name = "cascade",
|
||||
};
|
||||
|
||||
|
@@ -186,7 +186,6 @@ void emma2rh_gpio_irq_init(void)
|
||||
static struct irqaction irq_cascade = {
|
||||
.handler = no_action,
|
||||
.flags = 0,
|
||||
.mask = CPU_MASK_NONE,
|
||||
.name = "cascade",
|
||||
.dev_id = NULL,
|
||||
.next = NULL,
|
||||
|
@@ -26,7 +26,6 @@ extern struct cpuinfo_ip27 sn_cpu_info[NR_CPUS];
|
||||
#define parent_node(node) (node)
|
||||
#define node_to_cpumask(node) (hub_data(node)->h_cpus)
|
||||
#define cpumask_of_node(node) (&hub_data(node)->h_cpus)
|
||||
#define node_to_first_cpu(node) (cpumask_first(cpumask_of_node(node)))
|
||||
struct pci_bus;
|
||||
extern int pcibus_to_node(struct pci_bus *);
|
||||
|
||||
|
@@ -134,7 +134,6 @@ static irqreturn_t r4030_timer_interrupt(int irq, void *dev_id)
|
||||
static struct irqaction r4030_timer_irqaction = {
|
||||
.handler = r4030_timer_interrupt,
|
||||
.flags = IRQF_DISABLED,
|
||||
.mask = CPU_MASK_CPU0,
|
||||
.name = "R4030 timer",
|
||||
};
|
||||
|
||||
|
@@ -144,7 +144,6 @@ void __cpuinit sb1480_clockevent_init(void)
|
||||
|
||||
action->handler = sibyte_counter_handler;
|
||||
action->flags = IRQF_DISABLED | IRQF_PERCPU;
|
||||
action->mask = cpumask_of_cpu(cpu);
|
||||
action->name = name;
|
||||
action->dev_id = cd;
|
||||
|
||||
|
@@ -143,7 +143,6 @@ void __cpuinit sb1250_clockevent_init(void)
|
||||
|
||||
action->handler = sibyte_counter_handler;
|
||||
action->flags = IRQF_DISABLED | IRQF_PERCPU;
|
||||
action->mask = cpumask_of_cpu(cpu);
|
||||
action->name = name;
|
||||
action->dev_id = cd;
|
||||
|
||||
|
@@ -98,7 +98,6 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id)
|
||||
static struct irqaction irq0 = {
|
||||
.handler = timer_interrupt,
|
||||
.flags = IRQF_DISABLED | IRQF_NOBALANCING,
|
||||
.mask = CPU_MASK_NONE,
|
||||
.name = "timer"
|
||||
};
|
||||
|
||||
@@ -121,7 +120,6 @@ void __init setup_pit_timer(void)
|
||||
cd->min_delta_ns = clockevent_delta2ns(0xF, cd);
|
||||
clockevents_register_device(cd);
|
||||
|
||||
irq0.mask = cpumask_of_cpu(cpu);
|
||||
setup_irq(0, &irq0);
|
||||
}
|
||||
|
||||
|
@@ -306,7 +306,6 @@ static void init_8259A(int auto_eoi)
|
||||
*/
|
||||
static struct irqaction irq2 = {
|
||||
.handler = no_action,
|
||||
.mask = CPU_MASK_NONE,
|
||||
.name = "cascade",
|
||||
};
|
||||
|
||||
|
@@ -104,7 +104,6 @@ asmlinkage void plat_irq_dispatch(void)
|
||||
|
||||
static struct irqaction cascade = {
|
||||
.handler = no_action,
|
||||
.mask = CPU_MASK_NONE,
|
||||
.name = "cascade",
|
||||
};
|
||||
|
||||
|
@@ -92,7 +92,6 @@ asmlinkage void plat_irq_dispatch(void)
|
||||
|
||||
static struct irqaction cascade_irqaction = {
|
||||
.handler = no_action,
|
||||
.mask = CPU_MASK_NONE,
|
||||
.name = "cascade",
|
||||
};
|
||||
|
||||
|
@@ -219,7 +219,7 @@ cont_nmi_dump(void)
|
||||
if (i == 1000) {
|
||||
for_each_online_node(node)
|
||||
if (NODEPDA(node)->dump_count == 0) {
|
||||
cpu = node_to_first_cpu(node);
|
||||
cpu = cpumask_first(cpumask_of_node(node));
|
||||
for (n=0; n < CNODE_NUM_CPUS(node); cpu++, n++) {
|
||||
CPUMASK_SETB(nmied_cpus, cpu);
|
||||
/*
|
||||
|
@@ -115,14 +115,12 @@ extern irqreturn_t crime_cpuerr_intr(int irq, void *dev_id);
|
||||
struct irqaction memerr_irq = {
|
||||
.handler = crime_memerr_intr,
|
||||
.flags = IRQF_DISABLED,
|
||||
.mask = CPU_MASK_NONE,
|
||||
.name = "CRIME memory error",
|
||||
};
|
||||
|
||||
struct irqaction cpuerr_irq = {
|
||||
.handler = crime_cpuerr_intr,
|
||||
.flags = IRQF_DISABLED,
|
||||
.mask = CPU_MASK_NONE,
|
||||
.name = "CRIME CPU error",
|
||||
};
|
||||
|
||||
|
@@ -359,7 +359,8 @@ void sni_rm200_init_8259A(void)
|
||||
* IRQ2 is cascade interrupt to second interrupt controller
|
||||
*/
|
||||
static struct irqaction sni_rm200_irq2 = {
|
||||
no_action, 0, CPU_MASK_NONE, "cascade", NULL, NULL
|
||||
.handler = no_action,
|
||||
.name = "cascade",
|
||||
};
|
||||
|
||||
static struct resource sni_rm200_pic1_resource = {
|
||||
|
@@ -32,7 +32,6 @@ static irq_cascade_t irq_cascade[NR_IRQS] __cacheline_aligned;
|
||||
|
||||
static struct irqaction cascade_irqaction = {
|
||||
.handler = no_action,
|
||||
.mask = CPU_MASK_NONE,
|
||||
.name = "cascade",
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user