Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 116394
b: refs/heads/master
c: 1f45f56
h: refs/heads/master
v: v3
  • Loading branch information
Yinghai Lu authored and Ingo Molnar committed Oct 16, 2008
1 parent 65c1f01 commit 181fd23
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 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: 0799e432acfda879eaeef9622426bfa1434f3786
refs/heads/master: 1f45f5621df82033cb4964d03530ade2f9a25e7b
2 changes: 1 addition & 1 deletion trunk/drivers/char/hpet.c
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ static void hpet_timer_set_irq(struct hpet_dev *devp)
for (irq = find_first_bit(&v, HPET_MAX_IRQ); irq < HPET_MAX_IRQ;
irq = find_next_bit(&v, HPET_MAX_IRQ, 1 + irq)) {

if (irq >= NR_IRQS) {
if (irq >= nr_irqs) {
irq = HPET_MAX_IRQ;
break;
}
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/char/random.c
Original file line number Diff line number Diff line change
Expand Up @@ -648,7 +648,7 @@ EXPORT_SYMBOL_GPL(add_input_randomness);

void add_interrupt_randomness(int irq)
{
if (irq >= NR_IRQS || irq_timer_state[irq] == NULL)
if (irq >= nr_irqs || irq_timer_state[irq] == NULL)
return;

DEBUG_ENT("irq event %d\n", irq);
Expand Down Expand Up @@ -912,7 +912,7 @@ void rand_initialize_irq(int irq)
{
struct timer_rand_state *state;

if (irq >= NR_IRQS || irq_timer_state[irq])
if (irq >= nr_irqs || irq_timer_state[irq])
return;

/*
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/char/vr41xx_giu.c
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,7 @@ static int __devinit giu_probe(struct platform_device *dev)
}

irq = platform_get_irq(dev, 0);
if (irq < 0 || irq >= NR_IRQS)
if (irq < 0 || irq >= nr_irqs)
return -EBUSY;

return cascade_irq(irq, giu_get_irq);
Expand Down

0 comments on commit 181fd23

Please sign in to comment.