Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 2 insertions, 17 deletions

diff --git a/arch/alpha/kernel/irq_alpha.c b/arch/alpha/kernel/irq_alpha.c
index 5f77afb88e89..51b7fbd9e4c1 100644
--- a/arch/alpha/kernel/irq_alpha.c
+++ b/arch/alpha/kernel/irq_alpha.c
@@ -112,8 +112,6 @@ init_IRQ(void)
         wrent(entInt, 0);
 
         alpha_mv.init_irq();
-
-        init_hw_perf_events();
 }
 
 /*
@@ -221,30 +219,17 @@ process_mcheck_info(unsigned long vector, unsigned long la_ptr,
  * processed by PALcode, and comes in via entInt vector 1.
  */
 
-static void rtc_enable_disable(unsigned int irq) { }
-static unsigned int rtc_startup(unsigned int irq) { return 0; }
-
 struct irqaction timer_irqaction = {
         .handler        = timer_interrupt,
         .flags          = IRQF_DISABLED,
         .name           = "timer",
 };
 
-static struct irq_chip rtc_irq_type = {
-        .name           = "RTC",
-        .startup        = rtc_startup,
-        .shutdown       = rtc_enable_disable,
-        .enable         = rtc_enable_disable,
-        .disable        = rtc_enable_disable,
-        .ack            = rtc_enable_disable,
-        .end            = rtc_enable_disable,
-};
-
 void __init
 init_rtc_irq(void)
 {
-        irq_desc[RTC_IRQ].status = IRQ_DISABLED;
-        irq_desc[RTC_IRQ].chip = &rtc_irq_type;
+        irq_set_chip_and_handler_name(RTC_IRQ, &dummy_irq_chip,
+                                      handle_simple_irq, "RTC");
         setup_irq(RTC_IRQ, &timer_irqaction);
 }