Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 113533
b: refs/heads/master
c: 461ebd1
h: refs/heads/master
i:
  113531: 4202b1e
v: v3
  • Loading branch information
Glauber Costa authored and Ingo Molnar committed Oct 13, 2008
1 parent 5232f99 commit 02e208a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 780209af714ba733cd9e2f3526107becfc1969bc
refs/heads/master: 461ebd109569d666d367f774f74002add6444d49
4 changes: 2 additions & 2 deletions trunk/arch/x86/kernel/time_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ unsigned long profile_pc(struct pt_regs *regs)
}
EXPORT_SYMBOL(profile_pc);

static irqreturn_t timer_event_interrupt(int irq, void *dev_id)
irqreturn_t timer_interrupt(int irq, void *dev_id)
{
add_pda(irq0_irqs, 1);

Expand Down Expand Up @@ -104,7 +104,7 @@ unsigned long __init calibrate_cpu(void)
}

static struct irqaction irq0 = {
.handler = timer_event_interrupt,
.handler = timer_interrupt,
.flags = IRQF_DISABLED | IRQF_IRQPOLL | IRQF_NOBALANCING,
.mask = CPU_MASK_NONE,
.name = "timer"
Expand Down

0 comments on commit 02e208a

Please sign in to comment.