Commit:     2ff7354fe888f46f6629b57e463b0a1eb956c02b
Parent:     606135a3081e045b677cde164a296c51f66c4633
Author:     Eric W. Biederman <[EMAIL PROTECTED]>
AuthorDate: Tue Feb 27 00:27:41 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Wed Feb 28 08:52:31 2007 -0800

    [PATCH] x86_64/i386 irq: Fix !CONFIG_SMP compilation
    When removing set_native_irq I missed the fact that it was
    called in a couple of places that were compiled even when
    SMP support is disabled.  And since the irq_desc[].affinity
    field only exists in SMP things broke.
    Thanks to Simon Arlott <[EMAIL PROTECTED]> for spotting this.
    There are a couple of ways to fix this but the simplest one
    is to just remove the assignments.  The affinity field is only
    used to display a value to the user, and nothing on either i386
    or x86_64 reads it or depends on it being any particlua value,
    so skipping the assignment is safe.  The assignment that
    is being removed is just for the initial affinity value before
    the user explicitly sets it.  The irq_desc array initializes
    this field to CPU_MASK_ALL so the field is initialized to
    a reasonable value in the SMP case without being set.
    Signed-off-by: Eric W. Biederman <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 arch/i386/kernel/io_apic.c   |    2 --
 arch/x86_64/kernel/io_apic.c |    4 ----
 2 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c
index 6fec4da..e4408ff 100644
--- a/arch/i386/kernel/io_apic.c
+++ b/arch/i386/kernel/io_apic.c
@@ -1354,7 +1354,6 @@ static void __init setup_IO_APIC_irqs(void)
                spin_lock_irqsave(&ioapic_lock, flags);
                __ioapic_write_entry(apic, pin, entry);
-               irq_desc[irq].affinity = TARGET_CPUS;
                spin_unlock_irqrestore(&ioapic_lock, flags);
@@ -2875,7 +2874,6 @@ int io_apic_set_pci_routing (int ioapic, int pin, int 
irq, int edge_level, int a
        spin_lock_irqsave(&ioapic_lock, flags);
        __ioapic_write_entry(ioapic, pin, entry);
-       irq_desc[irq].affinity = TARGET_CPUS;
        spin_unlock_irqrestore(&ioapic_lock, flags);
        return 0;
diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c
index 48593f6..0a91368 100644
--- a/arch/x86_64/kernel/io_apic.c
+++ b/arch/x86_64/kernel/io_apic.c
@@ -830,10 +830,6 @@ static void setup_IO_APIC_irq(int apic, int pin, unsigned 
int irq,
        ioapic_write_entry(apic, pin, entry);
-       spin_lock_irqsave(&ioapic_lock, flags);
-       irq_desc[irq].affinity = TARGET_CPUS;
-       spin_unlock_irqrestore(&ioapic_lock, flags);
 static void __init setup_IO_APIC_irqs(void)
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to