Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d17abcd5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents db6f2040 bb75efdd

arch/cris/arch-v10/kernel/time.c

+0 −1
Original line number Diff line number Diff line
@@ -261,7 +261,6 @@ timer_interrupt(int irq, void *dev_id) 
static struct irqaction irq2  = {

	.handler = timer_interrupt,

	.flags = IRQF_SHARED | IRQF_DISABLED,

	.mask = CPU_MASK_NONE,

	.name = "timer",

};

arch/cris/arch-v32/kernel/smp.c

+0 −1
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ static int send_ipi(int vector, int wait, cpumask_t cpu_mask); 
static struct irqaction irq_ipi  = {

	.handler = crisv32_ipi_interrupt,

	.flags = IRQF_DISABLED,

	.mask = CPU_MASK_NONE,

	.name = "ipi",

};

arch/cris/arch-v32/kernel/time.c

+0 −1
Original line number Diff line number Diff line
@@ -267,7 +267,6 @@ timer_interrupt(int irq, void *dev_id) 
static struct irqaction irq_timer = {

	.handler = timer_interrupt,

	.flags = IRQF_SHARED | IRQF_DISABLED,

	.mask = CPU_MASK_NONE,

	.name = "timer"

};

arch/frv/kernel/irq-mb93091.c

+0 −4
Original line number Diff line number Diff line
@@ -109,28 +109,24 @@ static struct irqaction fpga_irq[4] = { 
	[0] = {

		.handler	= fpga_interrupt,

		.flags		= IRQF_DISABLED | IRQF_SHARED,

		.mask		= CPU_MASK_NONE,

		.name		= "fpga.0",

		.dev_id		= (void *) 0x0028UL,

	},

	[1] = {

		.handler	= fpga_interrupt,

		.flags		= IRQF_DISABLED | IRQF_SHARED,

		.mask		= CPU_MASK_NONE,

		.name		= "fpga.1",

		.dev_id		= (void *) 0x0050UL,

	},

	[2] = {

		.handler	= fpga_interrupt,

		.flags		= IRQF_DISABLED | IRQF_SHARED,

		.mask		= CPU_MASK_NONE,

		.name		= "fpga.2",

		.dev_id		= (void *) 0x1c00UL,

	},

	[3] = {

		.handler	= fpga_interrupt,

		.flags		= IRQF_DISABLED | IRQF_SHARED,

		.mask		= CPU_MASK_NONE,

		.name		= "fpga.3",

		.dev_id		= (void *) 0x6386UL,

	}

arch/frv/kernel/irq-mb93093.c

+0 −1
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ static struct irqaction fpga_irq[1] = { 
	[0] = {

		.handler	= fpga_interrupt,

		.flags		= IRQF_DISABLED,

		.mask		= CPU_MASK_NONE,

		.name		= "fpga.0",

		.dev_id		= (void *) 0x0700UL,

	}