git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux...
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
io_apic.c
diff --git
a/arch/x86/kernel/io_apic.c
b/arch/x86/kernel/io_apic.c
index
1cbf7c8
..
3e070bb
100644
(file)
--- a/
arch/x86/kernel/io_apic.c
+++ b/
arch/x86/kernel/io_apic.c
@@
-2472,10
+2472,9
@@
static void set_ir_ioapic_affinity_irq(unsigned int irq,
asmlinkage void smp_irq_move_cleanup_interrupt(void)
{
unsigned vector, me;
asmlinkage void smp_irq_move_cleanup_interrupt(void)
{
unsigned vector, me;
+
ack_APIC_irq();
ack_APIC_irq();
-#ifdef CONFIG_X86_64
exit_idle();
exit_idle();
-#endif
irq_enter();
me = smp_processor_id();
irq_enter();
me = smp_processor_id();
@@
-2520,7
+2519,7
@@
static void irq_complete_move(struct irq_desc **descp)
if (likely(!cfg->move_desc_pending))
return;
if (likely(!cfg->move_desc_pending))
return;
- /* domain
is not change, but affinity is change
d */
+ /* domain
has not changed, but affinity di
d */
me = smp_processor_id();
if (cpu_isset(me, desc->affinity)) {
*descp = desc = move_irq_desc(desc, me);
me = smp_processor_id();
if (cpu_isset(me, desc->affinity)) {
*descp = desc = move_irq_desc(desc, me);