All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/1] um: Get rid of __do_IRQ()
@ 2010-10-11 21:29 Richard Weinberger
  2010-10-11 22:14   ` Andrew Morton
  0 siblings, 1 reply; 6+ messages in thread
From: Richard Weinberger @ 2010-10-11 21:29 UTC (permalink / raw)
  To: akpm
  Cc: linux-kernel, jdike, user-mode-linux-devel, user-mode-linux-user,
	peterz, tj, tglx, mingo, Richard Weinberger

This patch removes __do_IRQ() from user mode linux.

Signed-off-by: Richard Weinberger <richard@nod.at>
---
 arch/um/Kconfig.um   |    3 +++
 arch/um/kernel/irq.c |   15 ++++-----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/arch/um/Kconfig.um b/arch/um/Kconfig.um
index ec2b8da..7ad0916 100644
--- a/arch/um/Kconfig.um
+++ b/arch/um/Kconfig.um
@@ -147,3 +147,6 @@ config KERNEL_STACK_ORDER
 	  This option determines the size of UML kernel stacks.  They will
 	  be 1 << order pages.  The default is OK unless you're running Valgrind
 	  on UML, in which case, set this to 3.
+
+config GENERIC_HARDIRQS_NO__DO_IRQ
+	def_bool y
diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
index a3f0b04..ea21a87 100644
--- a/arch/um/kernel/irq.c
+++ b/arch/um/kernel/irq.c
@@ -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);
 	irq_enter();
-	__do_IRQ(irq);
+	generic_handle_irq(irq);
 	irq_exit();
 	set_irq_regs(old_regs);
 	return 1;
@@ -391,17 +391,10 @@ void __init init_IRQ(void)
 {
 	int i;
 
-	irq_desc[TIMER_IRQ].status = IRQ_DISABLED;
-	irq_desc[TIMER_IRQ].action = NULL;
-	irq_desc[TIMER_IRQ].depth = 1;
-	irq_desc[TIMER_IRQ].chip = &SIGVTALRM_irq_type;
-	enable_irq(TIMER_IRQ);
+	set_irq_chip_and_handler(TIMER_IRQ, &SIGVTALRM_irq_type, handle_edge_irq);
+
 	for (i = 1; i < NR_IRQS; i++) {
-		irq_desc[i].status = IRQ_DISABLED;
-		irq_desc[i].action = NULL;
-		irq_desc[i].depth = 1;
-		irq_desc[i].chip = &normal_irq_type;
-		enable_irq(i);
+		set_irq_chip_and_handler(i, &normal_irq_type, handle_edge_irq);
 	}
 }
 
-- 
1.6.6.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2010-10-11 22:29 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-11 21:29 [PATCH 1/1] um: Get rid of __do_IRQ() Richard Weinberger
2010-10-11 22:14 ` [uml-devel] " Andrew Morton
2010-10-11 22:14   ` Andrew Morton
2010-10-11 22:23   ` [uml-devel] " Richard Weinberger
2010-10-11 22:23     ` Richard Weinberger
2010-10-11 22:29   ` Thomas Gleixner

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.