git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
i386
/
kernel
/
irq.c
diff --git
a/arch/i386/kernel/irq.c
b/arch/i386/kernel/irq.c
index
2904a66
..
7226f96
100644
(file)
--- a/
arch/i386/kernel/irq.c
+++ b/
arch/i386/kernel/irq.c
@@
-42,8
+42,8
@@
union irq_ctx {
u32 stack[THREAD_SIZE/sizeof(u32)];
};
u32 stack[THREAD_SIZE/sizeof(u32)];
};
-static union irq_ctx *hardirq_ctx[NR_CPUS];
-static union irq_ctx *softirq_ctx[NR_CPUS];
+static union irq_ctx *hardirq_ctx[NR_CPUS]
__read_mostly
;
+static union irq_ctx *softirq_ctx[NR_CPUS]
__read_mostly
;
#endif
/*
#endif
/*
@@
-53,13
+53,22
@@
static union irq_ctx *softirq_ctx[NR_CPUS];
*/
fastcall unsigned int do_IRQ(struct pt_regs *regs)
{
*/
fastcall unsigned int do_IRQ(struct pt_regs *regs)
{
+ struct pt_regs *old_regs;
/* high bit used in ret_from_ code */
int irq = ~regs->orig_eax;
/* high bit used in ret_from_ code */
int irq = ~regs->orig_eax;
+ struct irq_desc *desc = irq_desc + irq;
#ifdef CONFIG_4KSTACKS
union irq_ctx *curctx, *irqctx;
u32 *isp;
#endif
#ifdef CONFIG_4KSTACKS
union irq_ctx *curctx, *irqctx;
u32 *isp;
#endif
+ if (unlikely((unsigned)irq >= NR_IRQS)) {
+ printk(KERN_EMERG "%s: cannot handle IRQ %d\n",
+ __FUNCTION__, irq);
+ BUG();
+ }
+
+ old_regs = set_irq_regs(regs);
irq_enter();
#ifdef CONFIG_DEBUG_STACKOVERFLOW
/* Debugging check for stack overflow: is there less than 1KB free? */
irq_enter();
#ifdef CONFIG_DEBUG_STACKOVERFLOW
/* Debugging check for stack overflow: is there less than 1KB free? */
@@
-95,20
+104,29
@@
fastcall unsigned int do_IRQ(struct pt_regs *regs)
irqctx->tinfo.task = curctx->tinfo.task;
irqctx->tinfo.previous_esp = current_stack_pointer;
irqctx->tinfo.task = curctx->tinfo.task;
irqctx->tinfo.previous_esp = current_stack_pointer;
+ /*
+ * Copy the softirq bits in preempt_count so that the
+ * softirq checks work in the hardirq context.
+ */
+ irqctx->tinfo.preempt_count =
+ (irqctx->tinfo.preempt_count & ~SOFTIRQ_MASK) |
+ (curctx->tinfo.preempt_count & SOFTIRQ_MASK);
+
asm volatile(
asm volatile(
- " xchgl
%%ebx,%%esp \n"
- " call
__do_IRQ
\n"
+ " xchgl %%ebx,%%esp \n"
+ " call
*%%edi
\n"
" movl %%ebx,%%esp \n"
: "=a" (arg1), "=d" (arg2), "=b" (ebx)
" movl %%ebx,%%esp \n"
: "=a" (arg1), "=d" (arg2), "=b" (ebx)
- : "0" (irq), "1" (regs), "2" (isp)
- : "memory", "cc", "ecx"
+ : "0" (irq), "1" (desc), "2" (isp),
+ "D" (desc->handle_irq)
+ : "memory", "cc"
);
} else
#endif
);
} else
#endif
-
__do_IRQ(irq, regs
);
+
desc->handle_irq(irq, desc
);
irq_exit();
irq_exit();
-
+ set_irq_regs(old_regs);
return 1;
}
return 1;
}
@@
-147,7
+165,7
@@
void irq_ctx_init(int cpu)
irqctx->tinfo.task = NULL;
irqctx->tinfo.exec_domain = NULL;
irqctx->tinfo.cpu = cpu;
irqctx->tinfo.task = NULL;
irqctx->tinfo.exec_domain = NULL;
irqctx->tinfo.cpu = cpu;
- irqctx->tinfo.preempt_count =
SOFTIRQ_OFFSET
;
+ irqctx->tinfo.preempt_count =
0
;
irqctx->tinfo.addr_limit = MAKE_MM_SEG(0);
softirq_ctx[cpu] = irqctx;
irqctx->tinfo.addr_limit = MAKE_MM_SEG(0);
softirq_ctx[cpu] = irqctx;
@@
-192,6
+210,10
@@
asmlinkage void do_softirq(void)
: "0"(isp)
: "memory", "cc", "edx", "ecx", "eax"
);
: "0"(isp)
: "memory", "cc", "edx", "ecx", "eax"
);
+ /*
+ * Shouldnt happen, we returned above if in_interrupt():
+ */
+ WARN_ON_ONCE(softirq_count());
}
local_irq_restore(flags);
}
local_irq_restore(flags);
@@
-219,7
+241,7
@@
int show_interrupts(struct seq_file *p, void *v)
if (i == 0) {
seq_printf(p, " ");
for_each_online_cpu(j)
if (i == 0) {
seq_printf(p, " ");
for_each_online_cpu(j)
- seq_printf(p, "CPU%
d
",j);
+ seq_printf(p, "CPU%
-8d
",j);
seq_putc(p, '\n');
}
seq_putc(p, '\n');
}
@@
-235,7
+257,8
@@
int show_interrupts(struct seq_file *p, void *v)
for_each_online_cpu(j)
seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);
#endif
for_each_online_cpu(j)
seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);
#endif
- seq_printf(p, " %14s", irq_desc[i].handler->typename);
+ seq_printf(p, " %8s", irq_desc[i].chip->name);
+ seq_printf(p, "-%-8s", irq_desc[i].name);
seq_printf(p, " %s", action->name);
for (action=action->next; action; action = action->next)
seq_printf(p, " %s", action->name);
for (action=action->next; action; action = action->next)
@@
-265,7
+288,9
@@
skip:
}
#ifdef CONFIG_HOTPLUG_CPU
}
#ifdef CONFIG_HOTPLUG_CPU
+#ifndef CONFIG_XEN
#include <mach_apic.h>
#include <mach_apic.h>
+#endif
void fixup_irqs(cpumask_t map)
{
void fixup_irqs(cpumask_t map)
{
@@
-277,13
+302,15
@@
void fixup_irqs(cpumask_t map)
if (irq == 2)
continue;
if (irq == 2)
continue;
- cpus_and(mask, irq_
affinity[irq]
, map);
+ cpus_and(mask, irq_
desc[irq].affinity
, map);
if (any_online_cpu(mask) == NR_CPUS) {
if (any_online_cpu(mask) == NR_CPUS) {
+#ifndef CONFIG_XEN
printk("Breaking affinity for irq %i\n", irq);
printk("Breaking affinity for irq %i\n", irq);
+#endif
mask = map;
}
mask = map;
}
- if (irq_desc[irq].
handler
->set_affinity)
- irq_desc[irq].
handler
->set_affinity(irq, mask);
+ if (irq_desc[irq].
chip
->set_affinity)
+ irq_desc[irq].
chip
->set_affinity(irq, mask);
else if (irq_desc[irq].action && !(warned++))
printk("Cannot set affinity for irq %i\n", irq);
}
else if (irq_desc[irq].action && !(warned++))
printk("Cannot set affinity for irq %i\n", irq);
}