um: migrate from __do_IRQ() to generic_handle_irq()
This patch removes __do_IRQ() from user mode linux. __do_IRQ is deprecated. Signed-off-by: Richard Weinberger <richard@nod.at> Cc: Jeff Dike <jdike@addtoit.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
aa5fb4dbfd
commit
be76d81f99
@ -120,6 +120,9 @@ config SMP
|
|||||||
|
|
||||||
If you don't know what to do, say N.
|
If you don't know what to do, say N.
|
||||||
|
|
||||||
|
config GENERIC_HARDIRQS_NO__DO_IRQ
|
||||||
|
def_bool y
|
||||||
|
|
||||||
config NR_CPUS
|
config NR_CPUS
|
||||||
int "Maximum number of CPUs (2-32)"
|
int "Maximum number of CPUs (2-32)"
|
||||||
range 2 32
|
range 2 32
|
||||||
|
@ -334,7 +334,7 @@ unsigned int do_IRQ(int irq, struct uml_pt_regs *regs)
|
|||||||
{
|
{
|
||||||
struct pt_regs *old_regs = set_irq_regs((struct pt_regs *)regs);
|
struct pt_regs *old_regs = set_irq_regs((struct pt_regs *)regs);
|
||||||
irq_enter();
|
irq_enter();
|
||||||
__do_IRQ(irq);
|
generic_handle_irq(irq);
|
||||||
irq_exit();
|
irq_exit();
|
||||||
set_irq_regs(old_regs);
|
set_irq_regs(old_regs);
|
||||||
return 1;
|
return 1;
|
||||||
@ -391,17 +391,10 @@ void __init init_IRQ(void)
|
|||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
irq_desc[TIMER_IRQ].status = IRQ_DISABLED;
|
set_irq_chip_and_handler(TIMER_IRQ, &SIGVTALRM_irq_type, handle_edge_irq);
|
||||||
irq_desc[TIMER_IRQ].action = NULL;
|
|
||||||
irq_desc[TIMER_IRQ].depth = 1;
|
|
||||||
irq_desc[TIMER_IRQ].chip = &SIGVTALRM_irq_type;
|
|
||||||
enable_irq(TIMER_IRQ);
|
|
||||||
for (i = 1; i < NR_IRQS; i++) {
|
for (i = 1; i < NR_IRQS; i++) {
|
||||||
irq_desc[i].status = IRQ_DISABLED;
|
set_irq_chip_and_handler(i, &normal_irq_type, handle_edge_irq);
|
||||||
irq_desc[i].action = NULL;
|
|
||||||
irq_desc[i].depth = 1;
|
|
||||||
irq_desc[i].chip = &normal_irq_type;
|
|
||||||
enable_irq(i);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user