From c5c3cf17850f5304a35c3d4d82273b6b4139b1d6 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Wed, 30 Mar 2011 00:09:01 +0200 Subject: [PATCH] --- yaml --- r: 243527 b: refs/heads/master c: 86cc8dfc211695193a060a240ac9c9287606e5d8 h: refs/heads/master i: 243525: 6a895216261d062976c331fe1221c3e44daeb944 243523: 19a214686b647fba82758008e36314df830e6070 243519: ad9ed421ac852fc3d3d0f6175a108befb6d33374 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/apb_timer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d4a789395ed8..615d4f178aca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 353c8ed44f8f7414be614685ed29d1e23f5fa76b +refs/heads/master: 86cc8dfc211695193a060a240ac9c9287606e5d8 diff --git a/trunk/arch/x86/kernel/apb_timer.c b/trunk/arch/x86/kernel/apb_timer.c index 1293c709ee85..cd1ffed4ee22 100644 --- a/trunk/arch/x86/kernel/apb_timer.c +++ b/trunk/arch/x86/kernel/apb_timer.c @@ -316,7 +316,7 @@ static void apbt_setup_irq(struct apbt_dev *adev) irq_modify_status(adev->irq, 0, IRQ_MOVE_PCNTXT); irq_set_affinity(adev->irq, cpumask_of(adev->cpu)); /* APB timer irqs are set up as mp_irqs, timer is edge type */ - __set_irq_handler(adev->irq, handle_edge_irq, 0, "edge"); + __irq_set_handler(adev->irq, handle_edge_irq, 0, "edge"); if (system_state == SYSTEM_BOOTING) { if (request_irq(adev->irq, apbt_interrupt_handler,