Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 234688
b: refs/heads/master
c: 44951a6
h: refs/heads/master
v: v3
  • Loading branch information
Thomas Gleixner committed Feb 8, 2011
1 parent 6c9ff4c commit 1d2d0a4
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 18 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: c305d524e5dd3c3c7a6035083e30950bea1b52dc
refs/heads/master: 44951a60ff888add9e84f509ffce20052e45af94
17 changes: 0 additions & 17 deletions trunk/kernel/irq/irqdesc.c
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,6 @@ int __init early_irq_init(void)
for (i = 0; i < count; i++) {
desc[i].irq_data.irq = i;
desc[i].irq_data.chip = &no_irq_chip;
/* TODO : do this allocation on-demand ... */
desc[i].kstat_irqs = alloc_percpu(unsigned int);
alloc_masks(desc + i, GFP_KERNEL, node);
desc_smp_init(desc + i, node);
Expand All @@ -277,22 +276,6 @@ static void free_desc(unsigned int irq)

static inline int alloc_descs(unsigned int start, unsigned int cnt, int node)
{
#if defined(CONFIG_KSTAT_IRQS_ONDEMAND)
struct irq_desc *desc;
unsigned int i;

for (i = 0; i < cnt; i++) {
desc = irq_to_desc(start + i);
if (desc && !desc->kstat_irqs) {
unsigned int __percpu *stats = alloc_percpu(unsigned int);

if (!stats)
return -1;
if (cmpxchg(&desc->kstat_irqs, NULL, stats) != NULL)
free_percpu(stats);
}
}
#endif
return start;
}
#endif /* !CONFIG_SPARSE_IRQ */
Expand Down

0 comments on commit 1d2d0a4

Please sign in to comment.